From 31ab3e7713d0613e6bd1cbb1610fed82cc53ddb8 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 14 Aug 2008 20:37:38 +0000 Subject: ** Fixes bug #547411 2008-08-14 Matthew Barnes ** Fixes bug #547411 * data/icons/hicolor_status_32x32_online.png: * data/icons/hicolor_status_32x32_online.svg: * data/icons/hicolor_status_32x32_offline.png: * data/icons/hicolor_status_32x32_offline.svg: New, Tangoized versions of the old "art" images. * art/online.png: * art/offline.png: These are now obsolete. Remove them. * widgets/misc/e-online-button.c (e_online_button_set_online): The button icons are themed now but still oblong. Load the icons by filename so GTK+ doesn't scale them. svn path=/trunk/; revision=35995 --- ChangeLog | 10 + art/ChangeLog | 9 + art/Makefile.am | 2 - art/offline.png | Bin 640 -> 0 bytes art/online.png | Bin 547 -> 0 bytes data/icons/Makefile.am | 14 +- data/icons/hicolor_status_32x32_offline.png | Bin 0 -> 1001 bytes data/icons/hicolor_status_32x32_offline.svg | 969 ++++++++++++++++++++++++++++ data/icons/hicolor_status_32x32_online.png | Bin 0 -> 870 bytes data/icons/hicolor_status_32x32_online.svg | 359 +++++++++++ widgets/misc/ChangeLog | 8 + widgets/misc/e-online-button.c | 20 +- 12 files changed, 1376 insertions(+), 15 deletions(-) delete mode 100644 art/offline.png delete mode 100644 art/online.png create mode 100644 data/icons/hicolor_status_32x32_offline.png create mode 100644 data/icons/hicolor_status_32x32_offline.svg create mode 100644 data/icons/hicolor_status_32x32_online.png create mode 100644 data/icons/hicolor_status_32x32_online.svg diff --git a/ChangeLog b/ChangeLog index 18d0f98f44..6525b02813 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2008-08-14 Matthew Barnes + + ** Fixes part of bug #547411 + + * data/icons/hicolor_status_32x32_online.png: + * data/icons/hicolor_status_32x32_online.svg: + * data/icons/hicolor_status_32x32_offline.png: + * data/icons/hicolor_status_32x32_offline.svg: + New, Tangoized versions of the old "art" images. + 2008-08-12 Matthew Barnes * configure.in: diff --git a/art/ChangeLog b/art/ChangeLog index 71bc919db2..5548a03715 100644 --- a/art/ChangeLog +++ b/art/ChangeLog @@ -1,3 +1,12 @@ +2008-08-14 Matthew Barnes + + ** Fixes part of bug #547411 + + * online.png: + * offline.png: + New, Tangoized versions of these images now live in data/icons. + Remove them from here. + 2008-07-18 Matthew Barnes ** Fixes part of bug #542125 diff --git a/art/Makefile.am b/art/Makefile.am index 193be3576c..2a22e6bf8b 100644 --- a/art/Makefile.am +++ b/art/Makefile.am @@ -1,6 +1,4 @@ images_DATA = \ - offline.png \ - online.png \ world_map-960.png \ plus.png \ minus.png diff --git a/art/offline.png b/art/offline.png deleted file mode 100644 index 57bdd27be2..0000000000 Binary files a/art/offline.png and /dev/null differ diff --git a/art/online.png b/art/online.png deleted file mode 100644 index 9a6a3980c2..0000000000 Binary files a/art/online.png and /dev/null differ diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am index b78d0c1510..2035d151bb 100644 --- a/data/icons/Makefile.am +++ b/data/icons/Makefile.am @@ -25,11 +25,11 @@ public_icons = \ $(NULL) private_icons = \ - hicolor_apps_16x16_contact-editor.png \ - hicolor_apps_22x22_contact-editor.png \ - hicolor_apps_24x24_contact-editor.png \ - hicolor_apps_32x32_contact-editor.png \ - hicolor_apps_48x48_contact-editor.png \ + hicolor_apps_16x16_contact-editor.png \ + hicolor_apps_22x22_contact-editor.png \ + hicolor_apps_24x24_contact-editor.png \ + hicolor_apps_32x32_contact-editor.png \ + hicolor_apps_48x48_contact-editor.png \ hicolor_actions_16x16_folder-copy.png \ hicolor_actions_16x16_folder-move.png \ hicolor_actions_16x16_mail-copy.png \ @@ -79,6 +79,8 @@ private_icons = \ hicolor_places_24x24_mail-inbox.png \ hicolor_places_24x24_mail-outbox.png \ hicolor_places_24x24_mail-sent.png \ + hicolor_status_32x32_offline.png \ + hicolor_status_32x32_online.png \ $(NULL) noinst_DATA = \ @@ -105,6 +107,8 @@ noinst_DATA = \ hicolor_places_22x22_mail-inbox.svg \ hicolor_places_22x22_mail-outbox.svg \ hicolor_places_22x22_mail-sent.svg \ + hicolor_status_32x32_offline.svg \ + hicolor_status_32x32_online.svg \ $(NULL) EXTRA_DIST = \ diff --git a/data/icons/hicolor_status_32x32_offline.png b/data/icons/hicolor_status_32x32_offline.png new file mode 100644 index 0000000000..6fc99ad4c6 Binary files /dev/null and b/data/icons/hicolor_status_32x32_offline.png differ diff --git a/data/icons/hicolor_status_32x32_offline.svg b/data/icons/hicolor_status_32x32_offline.svg new file mode 100644 index 0000000000..e72f33d492 --- /dev/null +++ b/data/icons/hicolor_status_32x32_offline.svg @@ -0,0 +1,969 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/icons/hicolor_status_32x32_online.png b/data/icons/hicolor_status_32x32_online.png new file mode 100644 index 0000000000..99a943194c Binary files /dev/null and b/data/icons/hicolor_status_32x32_online.png differ diff --git a/data/icons/hicolor_status_32x32_online.svg b/data/icons/hicolor_status_32x32_online.svg new file mode 100644 index 0000000000..e933be2a1e --- /dev/null +++ b/data/icons/hicolor_status_32x32_online.svg @@ -0,0 +1,359 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + diff --git a/widgets/misc/ChangeLog b/widgets/misc/ChangeLog index 15f82821c4..7f8567f96b 100644 --- a/widgets/misc/ChangeLog +++ b/widgets/misc/ChangeLog @@ -1,3 +1,11 @@ +2008-08-14 Matthew Barnes + + ** Fixes part of bug #547411 + + * e-online-button.c (e_online_button_set_online): + The button icons are themed now but still oblong. + Load the icons by filename so GTK+ doesn't scale them. + 2008-08-14 Matthew Barnes * e-multi-config-dialog.c: diff --git a/widgets/misc/e-online-button.c b/widgets/misc/e-online-button.c index 7391384950..346aec2857 100644 --- a/widgets/misc/e-online-button.c +++ b/widgets/misc/e-online-button.c @@ -22,9 +22,6 @@ #include -#define ONLINE_IMAGE "online.png" -#define OFFLINE_IMAGE "offline.png" - #define E_ONLINE_BUTTON_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE \ ((obj), E_TYPE_ONLINE_BUTTON, EOnlineButtonPrivate)) @@ -177,18 +174,25 @@ e_online_button_set_online (EOnlineButton *button, gboolean online) { GtkImage *image; - gchar *filename; - const gchar *image_name; + GtkIconInfo *icon_info; + GtkIconTheme *icon_theme; + const gchar *filename; + const gchar *icon_name; g_return_if_fail (E_IS_ONLINE_BUTTON (button)); button->priv->online = online; - image_name = online ? ONLINE_IMAGE : OFFLINE_IMAGE; image = GTK_IMAGE (button->priv->image); - filename = g_build_filename (EVOLUTION_IMAGES, image_name, NULL); + icon_name = online ? "online" : "offline"; + icon_theme = gtk_icon_theme_get_default (); + + /* Prevent GTK+ from scaling these rectangular icons. */ + icon_info = gtk_icon_theme_lookup_icon ( + icon_theme, icon_name, GTK_ICON_SIZE_BUTTON, 0); + filename = gtk_icon_info_get_filename (icon_info); gtk_image_set_from_file (image, filename); - g_free (filename); + gtk_icon_info_free (icon_info); g_object_notify (G_OBJECT (button), "online"); } -- cgit v1.2.3