From 6bf36561f19fede5232329407dbdbd1dec82f33c Mon Sep 17 00:00:00 2001 From: Michael Monreal Date: Wed, 6 Aug 2008 09:32:08 +0000 Subject: ** Fix for bug #467115 2008-08-06 Michael Monreal ** Fix for bug #467115 * addressbook/gui/component/addressbook-view.c: (addressbook_view_init): * calendar/gui/GNOME_Evolution_Calendar.server.in.in: * calendar/gui/memos-component.c: (create_component_view): * calendar/gui/tasks-component.c: (create_component_view): * data/icons/Makefile.am: * mail/GNOME_Evolution_Mail.server.in.in: * mail/mail-component.c: (impl_createView): Ship and use tango icons for the mail, tasks and memos components. svn path=/trunk/; revision=35915 --- ChangeLog | 14 ++++++++++++++ addressbook/gui/component/addressbook-view.c | 2 +- calendar/gui/GNOME_Evolution_Calendar.server.in.in | 4 ++-- calendar/gui/memos-component.c | 2 +- calendar/gui/tasks-component.c | 2 +- data/icons/Makefile.am | 15 +++++++++++++++ data/icons/hicolor_apps_16x16_evolution-mail.png | Bin 0 -> 617 bytes data/icons/hicolor_apps_16x16_evolution-memos.png | Bin 0 -> 617 bytes data/icons/hicolor_apps_16x16_evolution-tasks.png | Bin 0 -> 818 bytes data/icons/hicolor_apps_22x22_evolution-mail.png | Bin 0 -> 900 bytes data/icons/hicolor_apps_22x22_evolution-memos.png | Bin 0 -> 930 bytes data/icons/hicolor_apps_22x22_evolution-tasks.png | Bin 0 -> 1147 bytes data/icons/hicolor_apps_24x24_evolution-mail.png | Bin 0 -> 902 bytes data/icons/hicolor_apps_24x24_evolution-memos.png | Bin 0 -> 964 bytes data/icons/hicolor_apps_24x24_evolution-tasks.png | Bin 0 -> 1132 bytes data/icons/hicolor_apps_32x32_evolution-mail.png | Bin 0 -> 1168 bytes data/icons/hicolor_apps_32x32_evolution-memos.png | Bin 0 -> 1611 bytes data/icons/hicolor_apps_32x32_evolution-tasks.png | Bin 0 -> 1718 bytes data/icons/hicolor_apps_48x48_evolution-mail.png | Bin 0 -> 1609 bytes data/icons/hicolor_apps_48x48_evolution-memos.png | Bin 0 -> 2644 bytes data/icons/hicolor_apps_48x48_evolution-tasks.png | Bin 0 -> 2496 bytes mail/GNOME_Evolution_Mail.server.in.in | 6 +++--- mail/mail-component.c | 2 +- 23 files changed, 38 insertions(+), 9 deletions(-) create mode 100644 data/icons/hicolor_apps_16x16_evolution-mail.png create mode 100644 data/icons/hicolor_apps_16x16_evolution-memos.png create mode 100644 data/icons/hicolor_apps_16x16_evolution-tasks.png create mode 100644 data/icons/hicolor_apps_22x22_evolution-mail.png create mode 100644 data/icons/hicolor_apps_22x22_evolution-memos.png create mode 100644 data/icons/hicolor_apps_22x22_evolution-tasks.png create mode 100644 data/icons/hicolor_apps_24x24_evolution-mail.png create mode 100644 data/icons/hicolor_apps_24x24_evolution-memos.png create mode 100644 data/icons/hicolor_apps_24x24_evolution-tasks.png create mode 100644 data/icons/hicolor_apps_32x32_evolution-mail.png create mode 100644 data/icons/hicolor_apps_32x32_evolution-memos.png create mode 100644 data/icons/hicolor_apps_32x32_evolution-tasks.png create mode 100644 data/icons/hicolor_apps_48x48_evolution-mail.png create mode 100644 data/icons/hicolor_apps_48x48_evolution-memos.png create mode 100644 data/icons/hicolor_apps_48x48_evolution-tasks.png diff --git a/ChangeLog b/ChangeLog index 996b784d2d..b372f98a09 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,17 @@ +2008-08-06 Michael Monreal + + ** Fix for bug #467115 + + * addressbook/gui/component/addressbook-view.c: + (addressbook_view_init): + * calendar/gui/GNOME_Evolution_Calendar.server.in.in: + * calendar/gui/memos-component.c: (create_component_view): + * calendar/gui/tasks-component.c: (create_component_view): + * data/icons/Makefile.am: + * mail/GNOME_Evolution_Mail.server.in.in: + * mail/mail-component.c: (impl_createView): + Ship and use tango icons for the mail, tasks and memos components. + 2008-08-06 Michael Monreal ** Fix for bug #531288 diff --git a/addressbook/gui/component/addressbook-view.c b/addressbook/gui/component/addressbook-view.c index cb66508eac..3db5bbdf36 100644 --- a/addressbook/gui/component/addressbook-view.c +++ b/addressbook/gui/component/addressbook-view.c @@ -1330,7 +1330,7 @@ addressbook_view_init (AddressbookView *view) e_activity_handler_attach_task_bar (priv->activity_handler, E_TASK_BAR (priv->statusbar_widget)); - priv->info_widget = e_info_label_new("contact-new"); + priv->info_widget = e_info_label_new("x-office-address-book"); e_info_label_set_info((EInfoLabel*)priv->info_widget, _("Contacts"), ""); gtk_widget_show (priv->info_widget); diff --git a/calendar/gui/GNOME_Evolution_Calendar.server.in.in b/calendar/gui/GNOME_Evolution_Calendar.server.in.in index fb5d1160cb..ad228ff451 100644 --- a/calendar/gui/GNOME_Evolution_Calendar.server.in.in +++ b/calendar/gui/GNOME_Evolution_Calendar.server.in.in @@ -74,7 +74,7 @@ - + @@ -99,7 +99,7 @@ - + diff --git a/calendar/gui/memos-component.c b/calendar/gui/memos-component.c index c6be74977b..89068a7f90 100644 --- a/calendar/gui/memos-component.c +++ b/calendar/gui/memos-component.c @@ -1098,7 +1098,7 @@ create_component_view (MemosComponent *memos_component) GTK_SHADOW_IN); gtk_widget_show (selector_scrolled_window); - component_view->info_label = (EInfoLabel *)e_info_label_new("stock_insert-note"); + component_view->info_label = (EInfoLabel *)e_info_label_new("evolution-memos"); e_info_label_set_info(component_view->info_label, _("Memos"), ""); gtk_widget_show (GTK_WIDGET (component_view->info_label)); diff --git a/calendar/gui/tasks-component.c b/calendar/gui/tasks-component.c index 4aea88b88f..c8e8b58f49 100644 --- a/calendar/gui/tasks-component.c +++ b/calendar/gui/tasks-component.c @@ -1087,7 +1087,7 @@ create_component_view (TasksComponent *tasks_component) GTK_SHADOW_IN); gtk_widget_show (selector_scrolled_window); - component_view->info_label = (EInfoLabel *)e_info_label_new("stock_task"); + component_view->info_label = (EInfoLabel *)e_info_label_new("evolution-tasks"); e_info_label_set_info(component_view->info_label, _("Tasks"), ""); gtk_widget_show (GTK_WIDGET (component_view->info_label)); diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am index 603de08044..e97397c5cc 100644 --- a/data/icons/Makefile.am +++ b/data/icons/Makefile.am @@ -2,10 +2,25 @@ NULL = public_icons = \ hicolor_apps_16x16_evolution.png \ + hicolor_apps_16x16_evolution-mail.png \ + hicolor_apps_16x16_evolution-memos.png \ + hicolor_apps_16x16_evolution-tasks.png \ hicolor_apps_22x22_evolution.png \ + hicolor_apps_22x22_evolution-mail.png \ + hicolor_apps_22x22_evolution-memos.png \ + hicolor_apps_22x22_evolution-tasks.png \ hicolor_apps_24x24_evolution.png \ + hicolor_apps_24x24_evolution-mail.png \ + hicolor_apps_24x24_evolution-memos.png \ + hicolor_apps_24x24_evolution-tasks.png \ hicolor_apps_32x32_evolution.png \ + hicolor_apps_32x32_evolution-mail.png \ + hicolor_apps_32x32_evolution-memos.png \ + hicolor_apps_32x32_evolution-tasks.png \ hicolor_apps_48x48_evolution.png \ + hicolor_apps_48x48_evolution-mail.png \ + hicolor_apps_48x48_evolution-memos.png \ + hicolor_apps_48x48_evolution-tasks.png \ hicolor_apps_scalable_evolution.svg \ $(NULL) diff --git a/data/icons/hicolor_apps_16x16_evolution-mail.png b/data/icons/hicolor_apps_16x16_evolution-mail.png new file mode 100644 index 0000000000..652d919c0a Binary files /dev/null and b/data/icons/hicolor_apps_16x16_evolution-mail.png differ diff --git a/data/icons/hicolor_apps_16x16_evolution-memos.png b/data/icons/hicolor_apps_16x16_evolution-memos.png new file mode 100644 index 0000000000..ad4f90064c Binary files /dev/null and b/data/icons/hicolor_apps_16x16_evolution-memos.png differ diff --git a/data/icons/hicolor_apps_16x16_evolution-tasks.png b/data/icons/hicolor_apps_16x16_evolution-tasks.png new file mode 100644 index 0000000000..b8faae63ae Binary files /dev/null and b/data/icons/hicolor_apps_16x16_evolution-tasks.png differ diff --git a/data/icons/hicolor_apps_22x22_evolution-mail.png b/data/icons/hicolor_apps_22x22_evolution-mail.png new file mode 100644 index 0000000000..27f867e461 Binary files /dev/null and b/data/icons/hicolor_apps_22x22_evolution-mail.png differ diff --git a/data/icons/hicolor_apps_22x22_evolution-memos.png b/data/icons/hicolor_apps_22x22_evolution-memos.png new file mode 100644 index 0000000000..f03b6ab05b Binary files /dev/null and b/data/icons/hicolor_apps_22x22_evolution-memos.png differ diff --git a/data/icons/hicolor_apps_22x22_evolution-tasks.png b/data/icons/hicolor_apps_22x22_evolution-tasks.png new file mode 100644 index 0000000000..3c0db1dcc5 Binary files /dev/null and b/data/icons/hicolor_apps_22x22_evolution-tasks.png differ diff --git a/data/icons/hicolor_apps_24x24_evolution-mail.png b/data/icons/hicolor_apps_24x24_evolution-mail.png new file mode 100644 index 0000000000..876715661a Binary files /dev/null and b/data/icons/hicolor_apps_24x24_evolution-mail.png differ diff --git a/data/icons/hicolor_apps_24x24_evolution-memos.png b/data/icons/hicolor_apps_24x24_evolution-memos.png new file mode 100644 index 0000000000..11b3168d41 Binary files /dev/null and b/data/icons/hicolor_apps_24x24_evolution-memos.png differ diff --git a/data/icons/hicolor_apps_24x24_evolution-tasks.png b/data/icons/hicolor_apps_24x24_evolution-tasks.png new file mode 100644 index 0000000000..14f6278c14 Binary files /dev/null and b/data/icons/hicolor_apps_24x24_evolution-tasks.png differ diff --git a/data/icons/hicolor_apps_32x32_evolution-mail.png b/data/icons/hicolor_apps_32x32_evolution-mail.png new file mode 100644 index 0000000000..736a134d82 Binary files /dev/null and b/data/icons/hicolor_apps_32x32_evolution-mail.png differ diff --git a/data/icons/hicolor_apps_32x32_evolution-memos.png b/data/icons/hicolor_apps_32x32_evolution-memos.png new file mode 100644 index 0000000000..a3c2bb12b2 Binary files /dev/null and b/data/icons/hicolor_apps_32x32_evolution-memos.png differ diff --git a/data/icons/hicolor_apps_32x32_evolution-tasks.png b/data/icons/hicolor_apps_32x32_evolution-tasks.png new file mode 100644 index 0000000000..2d12fb51e3 Binary files /dev/null and b/data/icons/hicolor_apps_32x32_evolution-tasks.png differ diff --git a/data/icons/hicolor_apps_48x48_evolution-mail.png b/data/icons/hicolor_apps_48x48_evolution-mail.png new file mode 100644 index 0000000000..33ad416682 Binary files /dev/null and b/data/icons/hicolor_apps_48x48_evolution-mail.png differ diff --git a/data/icons/hicolor_apps_48x48_evolution-memos.png b/data/icons/hicolor_apps_48x48_evolution-memos.png new file mode 100644 index 0000000000..8bdc4b42d1 Binary files /dev/null and b/data/icons/hicolor_apps_48x48_evolution-memos.png differ diff --git a/data/icons/hicolor_apps_48x48_evolution-tasks.png b/data/icons/hicolor_apps_48x48_evolution-tasks.png new file mode 100644 index 0000000000..694c921140 Binary files /dev/null and b/data/icons/hicolor_apps_48x48_evolution-tasks.png differ diff --git a/mail/GNOME_Evolution_Mail.server.in.in b/mail/GNOME_Evolution_Mail.server.in.in index 5de5a54df5..98eba23c39 100644 --- a/mail/GNOME_Evolution_Mail.server.in.in +++ b/mail/GNOME_Evolution_Mail.server.in.in @@ -34,9 +34,9 @@ - + - + @@ -59,7 +59,7 @@ _value="Evolution Mail component"/> + value="evolution-mail"/> diff --git a/mail/mail-component.c b/mail/mail-component.c index 39d2302ea0..43bf5485e5 100644 --- a/mail/mail-component.c +++ b/mail/mail-component.c @@ -756,7 +756,7 @@ impl_createView (PortableServer_Servant servant, gtk_widget_show (statusbar_widget); vbox = gtk_vbox_new(FALSE, 0); - info = e_info_label_new("stock_mail"); + info = e_info_label_new("evolution-mail"); e_info_label_set_info((EInfoLabel *)info, _("Mail"), ""); gtk_box_pack_start((GtkBox *)vbox, info, FALSE, TRUE, 0); gtk_box_pack_start((GtkBox *)vbox, tree_widget, TRUE, TRUE, 0); -- cgit v1.2.3