From 53a85cd93b24a7fd98a7ae205fd9e20a4d54e71a Mon Sep 17 00:00:00 2001 From: David Bordoley Date: Mon, 24 Mar 2003 20:08:08 +0000 Subject: New epiphany-bookmark-page stock image. I'm not at all attached to this 2003-03-24 David Bordoley * data/art/epiphany-bookmark-page.png: (New file): * data/art/Makefile.am: * lib/ephy-stock-icons.c: * lib/ephy-stock-icons.h: New epiphany-bookmark-page stock image. I'm not at all attached to this icon, if you can make a better one, please do :) * data/glade/epiphany.glade: Change button ordering to [clear][cancel][jump to]. * embed/find-dialog.c: Use GTK_STOCK_FIND for the window border icon. * embed/print-dialog.c: Use GTK_STOCK_PRINT for the window border icon. * src/bookmarks/ephy-new-bookmark.c: Use EPHY_STOCK_BOOKMARK_PAGE for the window icon. s/add bookmark/new bookmark for the window title. * src/bookmarks/ephy-bookmark-properties.c: (set_window_icon), (update_window_title): New functions. Dynamically set the property window title base on the bookmark title. Use the favicon icon if available for the window icon, otherwise use GTK_STOCK_PROPERTIES. * src/window-commands.c: Use GNOME_STOCK_ABOUT for the about window icon. * src/prefs-dialog.c: USE GTK_STOCK_PREFERENCES for the window icon. * src/history-dialog.c: Use epiphany-history.png for the window border icon. * src/ephy-window.c: Use EPHY_STOCK_BOOKMARK_PAGE for the boomark page/link menu items. --- embed/find-dialog.c | 13 +++++++++++++ embed/print-dialog.c | 14 ++++++++++++++ 2 files changed, 27 insertions(+) (limited to 'embed') diff --git a/embed/find-dialog.c b/embed/find-dialog.c index d16b3733a..80d594502 100755 --- a/embed/find-dialog.c +++ b/embed/find-dialog.c @@ -19,6 +19,7 @@ #include "find-dialog.h" #include "ephy-prefs.h" #include "ephy-embed.h" +#include #define CONF_FIND_MATCH_CASE "/apps/epiphany/find/match_case" #define CONF_FIND_AUTOWRAP "/apps/epiphany/find/autowrap" @@ -51,6 +52,7 @@ static GObjectClass *parent_class = NULL; struct FindDialogPrivate { EmbedFindInfo *properties; + GtkWidget *window; gboolean can_go_prev; gboolean can_go_next; gboolean constructed; @@ -64,6 +66,7 @@ enum enum { + WINDOW_PROP, MATCH_CASE_PROP, AUTOWRAP_PROP, WORD_PROP, @@ -74,6 +77,7 @@ enum static const EphyDialogProperty properties [] = { + { WINDOW_PROP, "find_dialog", NULL, PT_NORMAL, NULL }, { MATCH_CASE_PROP, "case_check", CONF_FIND_MATCH_CASE, PT_NORMAL, NULL }, { AUTOWRAP_PROP, "wrap_check", CONF_FIND_AUTOWRAP, PT_NORMAL, NULL }, { WORD_PROP, "find_entry", CONF_FIND_WORD, PT_NORMAL, NULL }, @@ -250,11 +254,13 @@ find_get_info (EphyDialog *dialog) static void impl_show (EphyDialog *dialog) { + GdkPixbuf *icon; FindDialog *find_dialog = FIND_DIALOG(dialog); ensure_constructed (find_dialog); find_dialog->priv->can_go_prev = TRUE; find_dialog->priv->can_go_next = TRUE; + find_dialog->priv->window = ephy_dialog_get_control (dialog, WINDOW_PROP); find_get_info (dialog); find_update_nav (dialog); @@ -264,6 +270,13 @@ impl_show (EphyDialog *dialog) */ gtk_widget_grab_focus (ephy_dialog_get_control (dialog, WORD_PROP)); + + icon = gtk_widget_render_icon (find_dialog->priv->window, + GTK_STOCK_FIND, + GTK_ICON_SIZE_MENU, + "find_dialog"); + gtk_window_set_icon (GTK_WINDOW(find_dialog->priv->window), icon); + g_object_unref (icon); EPHY_DIALOG_CLASS (parent_class)->show (dialog); } diff --git a/embed/print-dialog.c b/embed/print-dialog.c index 7ea025fa1..4a19c7571 100755 --- a/embed/print-dialog.c +++ b/embed/print-dialog.c @@ -19,6 +19,7 @@ #include "print-dialog.h" #include "ephy-prefs.h" #include +#include #define CONF_PRINT_BOTTOM_MARGIN "/apps/epiphany/print/bottom_margin" #define CONF_PRINT_TOP_MARGIN "/apps/epiphany/print/top_margin" @@ -57,10 +58,12 @@ static GObjectClass *parent_class = NULL; struct PrintDialogPrivate { gpointer dummy; + GtkWidget *window; }; enum { + WINDOW_PROP, PRINTON_PROP, PRINTER_PROP, FILE_PROP, @@ -89,6 +92,7 @@ enum static const EphyDialogProperty properties [] = { + { WINDOW_PROP, "print_dialog", NULL, PT_NORMAL, NULL }, { PRINTON_PROP, "printer_radiobutton", CONF_PRINT_PRINTON, PT_NORMAL, NULL }, { PRINTER_PROP, "printer_entry", CONF_PRINT_PRINTER, PT_NORMAL, NULL }, { FILE_PROP, "file_entry", CONF_PRINT_FILE, PT_NORMAL, NULL }, @@ -164,6 +168,7 @@ print_dialog_class_init (PrintDialogClass *klass) static void print_dialog_init (PrintDialog *dialog) { + GdkPixbuf *icon; dialog->priv = g_new0 (PrintDialogPrivate, 1); dialog->only_collect_info = FALSE; @@ -173,6 +178,15 @@ print_dialog_init (PrintDialog *dialog) ephy_dialog_construct (EPHY_DIALOG(dialog), properties, "print.glade", "print_dialog"); + + dialog->priv->window = ephy_dialog_get_control (EPHY_DIALOG(dialog), WINDOW_PROP); + + icon = gtk_widget_render_icon (dialog->priv->window, + GTK_STOCK_PRINT, + GTK_ICON_SIZE_MENU, + "print_dialog"); + gtk_window_set_icon (GTK_WINDOW(dialog->priv->window), icon); + g_object_unref (icon); } static void -- cgit v1.2.3