From 8ca0b5e05179ac7b04bf4c72121801525bb19d7f Mon Sep 17 00:00:00 2001 From: Luca Ferretti Date: Thu, 18 Jan 2007 12:36:08 +0000 Subject: configure.ac 2007-01-18 Luca Ferretti * data/icons/*/places/bookmark-web.*: * data/icons/*/places/Makefile.am: * data/icons/*/Makefile.am: * configure.ac Add to build new "bookmark-web" custom named icon at 16, 22 and 24 pixels - under new places directory. * lib/ephy-stock-icons.c: * lib/ephy-stock-icons.h: * src/bookmarks/ephy-bookmark-properties.c: * src/bookmarks/ephy-bookmark-action.c: Remove STOCK_BOOKMARK and add EPHY_STOCK_BOOKMARK using new "bookmark-web" custom named icon. svn path=/trunk/; revision=6830 --- ChangeLog | 18 +++++ configure.ac | 3 + data/icons/16x16/Makefile.am | 3 +- data/icons/16x16/places/Makefile.am | 15 ++++ data/icons/16x16/places/bookmark-web.png | Bin 0 -> 576 bytes data/icons/16x16/places/bookmark-web.svg | 121 ++++++++++++++++++++++++++++ data/icons/22x22/Makefile.am | 3 +- data/icons/22x22/places/Makefile.am | 15 ++++ data/icons/22x22/places/bookmark-web.png | Bin 0 -> 989 bytes data/icons/22x22/places/bookmark-web.svg | 134 +++++++++++++++++++++++++++++++ data/icons/24x24/Makefile.am | 3 +- data/icons/24x24/places/Makefile.am | 14 ++++ data/icons/24x24/places/bookmark-web.png | Bin 0 -> 1025 bytes lib/ephy-stock-icons.c | 2 +- lib/ephy-stock-icons.h | 2 +- src/bookmarks/ephy-bookmark-action.c | 2 +- src/bookmarks/ephy-bookmark-properties.c | 2 +- 17 files changed, 330 insertions(+), 7 deletions(-) create mode 100644 data/icons/16x16/places/Makefile.am create mode 100644 data/icons/16x16/places/bookmark-web.png create mode 100644 data/icons/16x16/places/bookmark-web.svg create mode 100644 data/icons/22x22/places/Makefile.am create mode 100644 data/icons/22x22/places/bookmark-web.png create mode 100644 data/icons/22x22/places/bookmark-web.svg create mode 100644 data/icons/24x24/places/Makefile.am create mode 100644 data/icons/24x24/places/bookmark-web.png diff --git a/ChangeLog b/ChangeLog index f5a85a2db..06217d07a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,21 @@ +2007-01-18 Luca Ferretti + + * data/icons/*/places/bookmark-web.*: + * data/icons/*/places/Makefile.am: + * data/icons/*/Makefile.am: + * configure.ac + + Add to build new "bookmark-web" custom named icon at + 16, 22 and 24 pixels - under new places directory. + + * lib/ephy-stock-icons.c: + * lib/ephy-stock-icons.h: + * src/bookmarks/ephy-bookmark-properties.c: + * src/bookmarks/ephy-bookmark-action.c: + + Remove STOCK_BOOKMARK and add EPHY_STOCK_BOOKMARK using + new "bookmark-web" custom named icon. + 2007-01-17 Diego Escalante Urrelo * src/popup-commands.c: diff --git a/configure.ac b/configure.ac index c59f76be8..5fb868e93 100644 --- a/configure.ac +++ b/configure.ac @@ -642,12 +642,15 @@ data/glade/Makefile data/icons/Makefile data/icons/16x16/Makefile data/icons/16x16/actions/Makefile +data/icons/16x16/places/Makefile data/icons/16x16/status/Makefile data/icons/22x22/Makefile data/icons/22x22/actions/Makefile +data/icons/22x22/places/Makefile data/icons/22x22/status/Makefile data/icons/24x24/Makefile data/icons/24x24/actions/Makefile +data/icons/24x24/places/Makefile data/icons/24x24/status/Makefile data/icons/32x32/Makefile data/icons/32x32/actions/Makefile diff --git a/data/icons/16x16/Makefile.am b/data/icons/16x16/Makefile.am index a7a411110..a15b2be3f 100644 --- a/data/icons/16x16/Makefile.am +++ b/data/icons/16x16/Makefile.am @@ -1,3 +1,4 @@ SUBDIRS = \ - actions \ + actions \ + places \ status diff --git a/data/icons/16x16/places/Makefile.am b/data/icons/16x16/places/Makefile.am new file mode 100644 index 000000000..e0280192d --- /dev/null +++ b/data/icons/16x16/places/Makefile.am @@ -0,0 +1,15 @@ +themedir = $(pkgdatadir)/icons/hicolor +size = 16x16 +context = actions + +iconsdir = $(themedir)/$(size)/$(context) + +icons_DATA = \ + bookmark-web.png + +noinst_DATA = \ + bookmark-web.svg + +EXTRA_DIST = \ + $(icons_DATA) \ + $(noinst_DATA) diff --git a/data/icons/16x16/places/bookmark-web.png b/data/icons/16x16/places/bookmark-web.png new file mode 100644 index 000000000..627f7ade1 Binary files /dev/null and b/data/icons/16x16/places/bookmark-web.png differ diff --git a/data/icons/16x16/places/bookmark-web.svg b/data/icons/16x16/places/bookmark-web.svg new file mode 100644 index 000000000..80d969a32 --- /dev/null +++ b/data/icons/16x16/places/bookmark-web.svg @@ -0,0 +1,121 @@ + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/data/icons/22x22/Makefile.am b/data/icons/22x22/Makefile.am index a7a411110..a15b2be3f 100644 --- a/data/icons/22x22/Makefile.am +++ b/data/icons/22x22/Makefile.am @@ -1,3 +1,4 @@ SUBDIRS = \ - actions \ + actions \ + places \ status diff --git a/data/icons/22x22/places/Makefile.am b/data/icons/22x22/places/Makefile.am new file mode 100644 index 000000000..8c6f09410 --- /dev/null +++ b/data/icons/22x22/places/Makefile.am @@ -0,0 +1,15 @@ +themedir = $(pkgdatadir)/icons/hicolor +size = 22x22 +context = actions + +iconsdir = $(themedir)/$(size)/$(context) + +icons_DATA = \ + bookmark-web.png + +noinst_DATA = \ + bookmark-web.svg + +EXTRA_DIST = \ + $(icons_DATA) \ + $(noinst_DATA) diff --git a/data/icons/22x22/places/bookmark-web.png b/data/icons/22x22/places/bookmark-web.png new file mode 100644 index 000000000..f254b2c91 Binary files /dev/null and b/data/icons/22x22/places/bookmark-web.png differ diff --git a/data/icons/22x22/places/bookmark-web.svg b/data/icons/22x22/places/bookmark-web.svg new file mode 100644 index 000000000..d59a6e07a --- /dev/null +++ b/data/icons/22x22/places/bookmark-web.svg @@ -0,0 +1,134 @@ + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/data/icons/24x24/Makefile.am b/data/icons/24x24/Makefile.am index a7a411110..9e425c3e6 100644 --- a/data/icons/24x24/Makefile.am +++ b/data/icons/24x24/Makefile.am @@ -1,3 +1,4 @@ SUBDIRS = \ - actions \ + actions \ + places \ status diff --git a/data/icons/24x24/places/Makefile.am b/data/icons/24x24/places/Makefile.am new file mode 100644 index 000000000..226d76fee --- /dev/null +++ b/data/icons/24x24/places/Makefile.am @@ -0,0 +1,14 @@ +themedir = $(pkgdatadir)/icons/hicolor +size = 24x24 +context = actions + +iconsdir = $(themedir)/$(size)/$(context) + +icons_DATA = \ + bookmark-web.png + +noinst_DATA = + +EXTRA_DIST = \ + $(icons_DATA) \ + $(noinst_DATA) diff --git a/data/icons/24x24/places/bookmark-web.png b/data/icons/24x24/places/bookmark-web.png new file mode 100644 index 000000000..f86e7b78a Binary files /dev/null and b/data/icons/24x24/places/bookmark-web.png differ diff --git a/lib/ephy-stock-icons.c b/lib/ephy-stock-icons.c index 57faf72f1..e09276d8f 100644 --- a/lib/ephy-stock-icons.c +++ b/lib/ephy-stock-icons.c @@ -43,7 +43,6 @@ ephy_stock_icons_init (void) STOCK_NEW_WINDOW, STOCK_SEND_MAIL, STOCK_ADD_BOOKMARK, - STOCK_BOOKMARK, STOCK_PRINT_SETUP, STOCK_LOCK_INSECURE, STOCK_LOCK_SECURE, @@ -54,6 +53,7 @@ ephy_stock_icons_init (void) { { EPHY_STOCK_POPUPS, N_("Popup Windows"), 0, 0, NULL }, { EPHY_STOCK_HISTORY, N_("History"), 0, 0, NULL }, + { EPHY_STOCK_BOOKMARK, N_("Bookmark"), 0, 0, NULL }, { EPHY_STOCK_BOOKMARKS, N_("Bookmarks"), 0, 0, NULL }, { EPHY_STOCK_ENTRY, N_("Address Entry"), 0, 0, NULL }, { EPHY_STOCK_DOWNLOAD, N_("_Download"), 0, 0, NULL } diff --git a/lib/ephy-stock-icons.h b/lib/ephy-stock-icons.h index 030ad1dc9..3e0003040 100644 --- a/lib/ephy-stock-icons.h +++ b/lib/ephy-stock-icons.h @@ -27,6 +27,7 @@ G_BEGIN_DECLS #define EPHY_STOCK_POPUPS "popup-hidden" #define EPHY_STOCK_HISTORY "history-view" +#define EPHY_STOCK_BOOKMARK "bookmark-web" #define EPHY_STOCK_BOOKMARKS "bookmark-view" #define EPHY_STOCK_ENTRY "location-entry" #define EPHY_STOCK_DOWNLOAD "download" @@ -35,7 +36,6 @@ G_BEGIN_DECLS #define STOCK_NEW_WINDOW "window-new" #define STOCK_SEND_MAIL "mail-forward" #define STOCK_ADD_BOOKMARK "bookmark-new" -#define STOCK_BOOKMARK "stock_bookmark" #define STOCK_PRINT_SETUP "stock_print-setup" /*document-page-setup*/ #define STOCK_LOCK_INSECURE "stock_lock-open" #define STOCK_LOCK_SECURE "stock_lock" diff --git a/src/bookmarks/ephy-bookmark-action.c b/src/bookmarks/ephy-bookmark-action.c index acb8b7b4e..9d14554e7 100644 --- a/src/bookmarks/ephy-bookmark-action.c +++ b/src/bookmarks/ephy-bookmark-action.c @@ -214,7 +214,7 @@ ephy_bookmark_action_sync_icon (GtkAction *action, if (pixbuf == NULL && icon_location == NULL) { - pixbuf = gtk_widget_render_icon (proxy, STOCK_BOOKMARK, + pixbuf = gtk_widget_render_icon (proxy, EPHY_STOCK_BOOKMARK, GTK_ICON_SIZE_MENU, NULL); } diff --git a/src/bookmarks/ephy-bookmark-properties.c b/src/bookmarks/ephy-bookmark-properties.c index bc83675d2..29528a9d8 100644 --- a/src/bookmarks/ephy-bookmark-properties.c +++ b/src/bookmarks/ephy-bookmark-properties.c @@ -514,7 +514,7 @@ ephy_bookmark_properties_constructor (GType type, properties = EPHY_BOOKMARK_PROPERTIES (object); priv = properties->priv; - gtk_window_set_icon_name (window, STOCK_BOOKMARK); + gtk_window_set_icon_name (window, EPHY_STOCK_BOOKMARK); gtk_window_set_type_hint (window, GDK_WINDOW_TYPE_HINT_NORMAL); g_signal_connect (properties, "response", -- cgit v1.2.3