diff options
author | David Bordoley <bordoley@msu.edu> | 2003-03-25 04:08:08 +0800 |
---|---|---|
committer | Dave Bordoley <Bordoley@src.gnome.org> | 2003-03-25 04:08:08 +0800 |
commit | 53a85cd93b24a7fd98a7ae205fd9e20a4d54e71a (patch) | |
tree | b4192302efea2200304e148e7ae8345c3dea01da | |
parent | 63b600e23ba36103cc5d28b2314c2d885577bc56 (diff) | |
download | gsoc2013-epiphany-53a85cd93b24a7fd98a7ae205fd9e20a4d54e71a.tar gsoc2013-epiphany-53a85cd93b24a7fd98a7ae205fd9e20a4d54e71a.tar.gz gsoc2013-epiphany-53a85cd93b24a7fd98a7ae205fd9e20a4d54e71a.tar.bz2 gsoc2013-epiphany-53a85cd93b24a7fd98a7ae205fd9e20a4d54e71a.tar.lz gsoc2013-epiphany-53a85cd93b24a7fd98a7ae205fd9e20a4d54e71a.tar.xz gsoc2013-epiphany-53a85cd93b24a7fd98a7ae205fd9e20a4d54e71a.tar.zst gsoc2013-epiphany-53a85cd93b24a7fd98a7ae205fd9e20a4d54e71a.zip |
New epiphany-bookmark-page stock image. I'm not at all attached to this
2003-03-24 David Bordoley <bordoley@msu.edu>
* 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.
-rw-r--r-- | ChangeLog | 40 | ||||
-rw-r--r-- | data/art/Makefile.am | 1 | ||||
-rw-r--r-- | data/art/epiphany-bookmark-page.png | bin | 0 -> 486 bytes | |||
-rw-r--r-- | data/glade/epiphany.glade | 29 | ||||
-rwxr-xr-x | embed/find-dialog.c | 13 | ||||
-rwxr-xr-x | embed/print-dialog.c | 14 | ||||
-rw-r--r-- | lib/ephy-stock-icons.c | 1 | ||||
-rw-r--r-- | lib/ephy-stock-icons.h | 1 | ||||
-rw-r--r-- | src/bookmarks/ephy-bookmark-properties.c | 52 | ||||
-rw-r--r-- | src/bookmarks/ephy-new-bookmark.c | 11 | ||||
-rw-r--r-- | src/ephy-window.c | 4 | ||||
-rwxr-xr-x | src/history-dialog.c | 12 | ||||
-rw-r--r-- | src/prefs-dialog.c | 8 | ||||
-rw-r--r-- | src/window-commands.c | 10 |
14 files changed, 175 insertions, 21 deletions
@@ -1,3 +1,43 @@ +2003-03-24 David Bordoley <bordoley@msu.edu> + + * 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. + 2003-03-24 Xan Lopez <xan@masilla.org> * src/bookmarks/ephy-bookmarks-editor.c: diff --git a/data/art/Makefile.am b/data/art/Makefile.am index 9dabf7874..57b6a453d 100644 --- a/data/art/Makefile.am +++ b/data/art/Makefile.am @@ -4,6 +4,7 @@ art_DATA = \ epiphany.png \ epiphany-fullscreen.png \ epiphany-bookmarks.png \ + epiphany-bookmark-page.png \ epiphany-entry.png \ epiphany-download.png \ epiphany-history.png \ diff --git a/data/art/epiphany-bookmark-page.png b/data/art/epiphany-bookmark-page.png Binary files differnew file mode 100644 index 000000000..313b0cc3d --- /dev/null +++ b/data/art/epiphany-bookmark-page.png diff --git a/data/glade/epiphany.glade b/data/glade/epiphany.glade index 8500522aa..9ade85405 100644 --- a/data/glade/epiphany.glade +++ b/data/glade/epiphany.glade @@ -26,18 +26,6 @@ <property name="visible">True</property> <property name="layout_style">GTK_BUTTONBOX_END</property> - <child> - <widget class="GtkButton" id="history_go_button"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label">gtk-jump-to</property> - <property name="use_stock">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="sensitive">False</property> - <signal name="clicked" handler="history_go_button_clicked_cb"/> - </widget> - </child> - <child> <widget class="GtkButton" id="history_clear_button"> <property name="visible">True</property> @@ -111,13 +99,26 @@ <property name="can_default">True</property> <property name="has_default">True</property> <property name="can_focus">True</property> - <property name="label">gtk-close</property> + <property name="label">gtk-cancel</property> <property name="use_stock">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="response_id">-7</property> + <property name="response_id">-6</property> <signal name="clicked" handler="history_ok_button_clicked_cb"/> </widget> </child> + + <child> + <widget class="GtkButton" id="history_go_button"> + <property name="visible">True</property> + <property name="sensitive">False</property> + <property name="can_focus">True</property> + <property name="label">gtk-jump-to</property> + <property name="use_stock">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="response_id">0</property> + <signal name="clicked" handler="history_go_button_clicked_cb"/> + </widget> + </child> </widget> <packing> <property name="padding">0</property> 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 <gtk/gtk.h> #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 <gtk/gtkdialog.h> +#include <gtk/gtkstock.h> #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 diff --git a/lib/ephy-stock-icons.c b/lib/ephy-stock-icons.c index 28a5a6876..c69dcc71e 100644 --- a/lib/ephy-stock-icons.c +++ b/lib/ephy-stock-icons.c @@ -38,6 +38,7 @@ ephy_stock_icons_init (void) EPHY_STOCK_UNSECURE, EPHY_STOCK_HISTORY, EPHY_STOCK_BOOKMARKS, + EPHY_STOCK_BOOKMARK_PAGE, EPHY_STOCK_FULLSCREEN, EPHY_STOCK_NEW_TAB, EPHY_STOCK_VIEWSOURCE, diff --git a/lib/ephy-stock-icons.h b/lib/ephy-stock-icons.h index 83ce4d37f..e7b803831 100644 --- a/lib/ephy-stock-icons.h +++ b/lib/ephy-stock-icons.h @@ -27,6 +27,7 @@ G_BEGIN_DECLS #define EPHY_STOCK_UNSECURE "epiphany-unsecure" #define EPHY_STOCK_HISTORY "epiphany-history" #define EPHY_STOCK_BOOKMARKS "epiphany-bookmarks" +#define EPHY_STOCK_BOOKMARK_PAGE "epiphany-bookmark-page" #define EPHY_STOCK_NEW_TAB "epiphany-new-tab" #define EPHY_STOCK_FULLSCREEN "epiphany-fullscreen" #define EPHY_STOCK_VIEWSOURCE "epiphany-viewsource" diff --git a/src/bookmarks/ephy-bookmark-properties.c b/src/bookmarks/ephy-bookmark-properties.c index 1c15bb464..4b70b2e6b 100644 --- a/src/bookmarks/ephy-bookmark-properties.c +++ b/src/bookmarks/ephy-bookmark-properties.c @@ -20,6 +20,7 @@ #include "ephy-bookmark-properties.h" #include "ephy-topics-selector.h" #include "ephy-debug.h" +#include "ephy-shell.h" #include <gtk/gtkstock.h> #include <gtk/gtkentry.h> @@ -217,9 +218,24 @@ update_entry (EphyBookmarkProperties *props, GtkWidget *entry, guint prop) } static void +update_window_title(EphyBookmarkProperties *editor) +{ + char *title; + const char *tmp; + + tmp = ephy_node_get_property_string (editor->priv->bookmark, + EPHY_NODE_BMK_PROP_TITLE); + title = g_strdup_printf (_("%s Properties"), tmp); + gtk_window_set_title (GTK_WINDOW (editor), title); + g_free (title); +} + + +static void title_entry_changed_cb (GtkWidget *entry, EphyBookmarkProperties *props) { update_entry (props, entry, EPHY_NODE_BMK_PROP_TITLE); + update_window_title(props); } static void @@ -229,6 +245,36 @@ location_entry_changed_cb (GtkWidget *entry, EphyBookmarkProperties *props) } static void +set_window_icon (EphyBookmarkProperties *editor) +{ + EphyFaviconCache *cache; + const char *icon_location; + GdkPixbuf *icon = NULL; + + cache = ephy_embed_shell_get_favicon_cache (EPHY_EMBED_SHELL (ephy_shell)); + icon_location = ephy_node_get_property_string + (editor->priv->bookmark, EPHY_NODE_BMK_PROP_ICON); + + LOG ("Get favicon for %s", icon_location ? icon_location : "None") + + if (icon_location) + { + icon = ephy_favicon_cache_get (cache, icon_location); + } + + else + { + icon = gtk_widget_render_icon (GTK_WIDGET (editor), + GTK_STOCK_PROPERTIES, + GTK_ICON_SIZE_MENU, + NULL); + } + + gtk_window_set_icon (GTK_WINDOW (editor), icon); + g_object_unref (icon); +} + +static void build_ui (EphyBookmarkProperties *editor) { GtkWidget *table, *label, *entry, *topics_selector; @@ -239,9 +285,9 @@ build_ui (EphyBookmarkProperties *editor) "response", G_CALLBACK (bookmark_properties_response_cb), editor); - - gtk_window_set_title (GTK_WINDOW (editor), - _("Bookmark properties")); + + update_window_title (editor); + set_window_icon (editor); gtk_dialog_set_has_separator (GTK_DIALOG (editor), FALSE); gtk_container_set_border_width (GTK_CONTAINER (editor), 6); diff --git a/src/bookmarks/ephy-new-bookmark.c b/src/bookmarks/ephy-new-bookmark.c index 7edf24d6c..ac5c68c3f 100644 --- a/src/bookmarks/ephy-new-bookmark.c +++ b/src/bookmarks/ephy-new-bookmark.c @@ -29,6 +29,7 @@ #include "ephy-new-bookmark.h" #include "ephy-topics-selector.h" #include "ephy-debug.h" +#include "ephy-stock-icons.h" static void ephy_new_bookmark_class_init (EphyNewBookmarkClass *klass); static void ephy_new_bookmark_init (EphyNewBookmark *editor); @@ -228,8 +229,16 @@ build_editing_table (EphyNewBookmark *editor) static void ephy_new_bookmark_construct (EphyNewBookmark *editor) { + GdkPixbuf *icon; + gtk_window_set_title (GTK_WINDOW (editor), - _("Add bookmark")); + _("New Bookmark")); + icon = gtk_widget_render_icon (GTK_WIDGET (editor), + EPHY_STOCK_BOOKMARK_PAGE, + GTK_ICON_SIZE_MENU, + NULL); + gtk_window_set_icon (GTK_WINDOW (editor), icon); + g_object_unref(icon); gtk_dialog_set_has_separator (GTK_DIALOG (editor), FALSE); gtk_container_set_border_width (GTK_CONTAINER (editor), 6); diff --git a/src/ephy-window.c b/src/ephy-window.c index c2b6e9961..649c9ded3 100644 --- a/src/ephy-window.c +++ b/src/ephy-window.c @@ -81,7 +81,7 @@ static EggActionGroupEntry ephy_menu_entries [] = { { "FileSendTo", N_("S_end To..."), EPHY_STOCK_SEND_LINK, NULL, N_("Send a link of the current page"), G_CALLBACK (window_cmd_file_send_to), NULL }, - { "FileBookmarkPage", N_("Boo_kmark Page..."), NULL, "<control>D", + { "FileBookmarkPage", N_("Boo_kmark Page..."), EPHY_STOCK_BOOKMARK_PAGE, "<control>D", N_("Add a bookmark for the current page"), G_CALLBACK (window_cmd_file_bookmark_page), NULL }, { "FileCloseWindow", N_("_Close"), GTK_STOCK_CLOSE, "<control>W", @@ -225,7 +225,7 @@ static EggActionGroupEntry ephy_popups_entries [] = { NULL, G_CALLBACK (popup_cmd_link_in_new_tab), NULL }, { "DownloadLink", N_("_Download Link"), GTK_STOCK_SAVE, NULL, NULL, G_CALLBACK (popup_cmd_download_link), NULL }, - { "BookmarkLink", N_("_Bookmark Link..."), NULL, NULL, + { "BookmarkLink", N_("_Bookmark Link..."), EPHY_STOCK_BOOKMARK_PAGE, NULL, NULL, G_CALLBACK (popup_cmd_bookmark_link), NULL }, { "CopyLinkLocation", N_("_Copy Link Location"), NULL, NULL, NULL, G_CALLBACK (popup_cmd_copy_link_location), NULL }, diff --git a/src/history-dialog.c b/src/history-dialog.c index 70710252a..6756f14c3 100755 --- a/src/history-dialog.c +++ b/src/history-dialog.c @@ -19,6 +19,7 @@ #include "history-dialog.h" #include "ephy-shell.h" #include "ephy-embed-shell.h" +#include "ephy-file-helpers.h" #include "ephy-string.h" #include "ephy-gui.h" #include "ephy-dnd.h" @@ -69,6 +70,7 @@ static GObjectClass *parent_class = NULL; struct HistoryDialogPrivate { + GtkWidget *window; EphyHistory *gh; EphyNode *root; EphyNode *pages; @@ -91,6 +93,7 @@ enum enum { + PROP_WINDOW, PROP_TREEVIEW, PROP_WORD, PROP_TIME, @@ -100,6 +103,7 @@ enum static const EphyDialogProperty properties [] = { + { PROP_WINDOW, "history_dialog", NULL, PT_NORMAL, NULL }, { PROP_TREEVIEW, "history_treeview", NULL, PT_NORMAL, NULL }, { PROP_WORD, "history_entry", CONF_HISTORY_SEARCH_TEXT, PT_NORMAL, NULL }, { PROP_TIME, "history_time_optionmenu", CONF_HISTORY_SEARCH_TIME, PT_NORMAL, NULL }, @@ -402,6 +406,8 @@ static void history_dialog_set_embedded (HistoryDialog *dialog, gboolean embedded) { + const char *icon_path; + dialog->priv->embedded = embedded; ephy_dialog_construct (EPHY_DIALOG (dialog), @@ -410,11 +416,15 @@ history_dialog_set_embedded (HistoryDialog *dialog, embedded ? "history_dock_box" : "history_dialog"); + dialog->priv->window = ephy_dialog_get_control (EPHY_DIALOG (dialog), PROP_WINDOW); dialog->priv->go_button = ephy_dialog_get_control (EPHY_DIALOG (dialog), PROP_GO_BUTTON); - dialog->priv->treeview = GTK_TREE_VIEW ( ephy_dialog_get_control (EPHY_DIALOG(dialog), PROP_TREEVIEW)); + + icon_path = ephy_file ("epiphany-history.png"); + gtk_window_set_icon_from_file (GTK_WINDOW(dialog->priv->window), icon_path, NULL); + history_dialog_setup_view (dialog); history_dialog_setup_filter (dialog); } diff --git a/src/prefs-dialog.c b/src/prefs-dialog.c index c94998d60..94ff74c8c 100644 --- a/src/prefs-dialog.c +++ b/src/prefs-dialog.c @@ -301,6 +301,7 @@ prefs_build_notebook (PrefsDialog *pd) static void prefs_dialog_init (PrefsDialog *pd) { + GdkPixbuf *icon; pd->priv = g_new0 (PrefsDialogPrivate, 1); gtk_window_set_title (GTK_WINDOW(pd), _("Preferences")); @@ -308,6 +309,13 @@ prefs_dialog_init (PrefsDialog *pd) ephy_state_add_window (GTK_WIDGET(pd), "prefs_dialog", -1, -1); + + icon = gtk_widget_render_icon (GTK_WIDGET(pd), + GTK_STOCK_PREFERENCES, + GTK_ICON_SIZE_MENU, + "prefs_dialog"); + gtk_window_set_icon (GTK_WINDOW(pd), icon); + g_object_unref(icon); prefs_build_notebook (pd); } diff --git a/src/window-commands.c b/src/window-commands.c index 3da431353..2891160a6 100644 --- a/src/window-commands.c +++ b/src/window-commands.c @@ -38,6 +38,7 @@ #include <libgnomevfs/gnome-vfs-utils.h> #include <bonobo/bonobo-i18n.h> #include <libgnomeui/gnome-about.h> +#include <libgnomeui/gnome-stock-icons.h> #include <libgnome/gnome-help.h> #include <gtk/gtkmessagedialog.h> #include <gtk/gtkeditable.h> @@ -673,6 +674,7 @@ window_cmd_help_about (EggAction *action, EphyWindow *window) { static GtkWidget *about = NULL; + GdkPixbuf *icon; static gchar *authors[] = { "Marco Pesenti Gritti <mpeseng@tin.it>", @@ -704,6 +706,14 @@ window_cmd_help_about (EggAction *action, gtk_window_set_transient_for (GTK_WINDOW (about), GTK_WINDOW (window)); + + icon = gtk_widget_render_icon (about, + GNOME_STOCK_ABOUT, + GTK_ICON_SIZE_MENU, + NULL); + gtk_window_set_icon (GTK_WINDOW (about), icon); + g_object_unref(icon); + g_object_add_weak_pointer (G_OBJECT (about), (gpointer *)&about); gtk_widget_show (about); } |