diff options
23 files changed, 38 insertions, 9 deletions
@@ -1,5 +1,19 @@ 2008-08-06 Michael Monreal <mmonreal@svn.gnome.org> + ** 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 <mmonreal@svn.gnome.org> + ** Fix for bug #531288 * data/icons/Makefile.am: 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 @@ <oaf_attribute name="evolution:menu_accelerator" type="string" value="*Control*4"/> <oaf_attribute name="evolution:button_label" type="string" _value="Tasks"/> <oaf_attribute name="evolution:button_tooltips" type="string" _value="Tasks"/> - <oaf_attribute name="evolution:button_icon" type="string" value="stock_todo"/> + <oaf_attribute name="evolution:button_icon" type="string" value="evolution-tasks"/> <oaf_attribute name="evolution:button_sort_order" type="string" value="-7"/> <oaf_attribute name="evolution:uri_schemas" type="stringv"> @@ -99,7 +99,7 @@ <oaf_attribute name="evolution:menu_accelerator" type="string" value="*Control*5"/> <oaf_attribute name="evolution:button_label" type="string" _value="Memos"/> <oaf_attribute name="evolution:button_tooltips" type="string" _value="Memos"/> - <oaf_attribute name="evolution:button_icon" type="string" value="stock_notes"/> + <oaf_attribute name="evolution:button_icon" type="string" value="evolution-memos"/> <oaf_attribute name="evolution:button_sort_order" type="string" value="-6"/> </oaf_server> 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 Binary files differnew file mode 100644 index 0000000000..652d919c0a --- /dev/null +++ b/data/icons/hicolor_apps_16x16_evolution-mail.png diff --git a/data/icons/hicolor_apps_16x16_evolution-memos.png b/data/icons/hicolor_apps_16x16_evolution-memos.png Binary files differnew file mode 100644 index 0000000000..ad4f90064c --- /dev/null +++ b/data/icons/hicolor_apps_16x16_evolution-memos.png diff --git a/data/icons/hicolor_apps_16x16_evolution-tasks.png b/data/icons/hicolor_apps_16x16_evolution-tasks.png Binary files differnew file mode 100644 index 0000000000..b8faae63ae --- /dev/null +++ b/data/icons/hicolor_apps_16x16_evolution-tasks.png diff --git a/data/icons/hicolor_apps_22x22_evolution-mail.png b/data/icons/hicolor_apps_22x22_evolution-mail.png Binary files differnew file mode 100644 index 0000000000..27f867e461 --- /dev/null +++ b/data/icons/hicolor_apps_22x22_evolution-mail.png diff --git a/data/icons/hicolor_apps_22x22_evolution-memos.png b/data/icons/hicolor_apps_22x22_evolution-memos.png Binary files differnew file mode 100644 index 0000000000..f03b6ab05b --- /dev/null +++ b/data/icons/hicolor_apps_22x22_evolution-memos.png diff --git a/data/icons/hicolor_apps_22x22_evolution-tasks.png b/data/icons/hicolor_apps_22x22_evolution-tasks.png Binary files differnew file mode 100644 index 0000000000..3c0db1dcc5 --- /dev/null +++ b/data/icons/hicolor_apps_22x22_evolution-tasks.png diff --git a/data/icons/hicolor_apps_24x24_evolution-mail.png b/data/icons/hicolor_apps_24x24_evolution-mail.png Binary files differnew file mode 100644 index 0000000000..876715661a --- /dev/null +++ b/data/icons/hicolor_apps_24x24_evolution-mail.png diff --git a/data/icons/hicolor_apps_24x24_evolution-memos.png b/data/icons/hicolor_apps_24x24_evolution-memos.png Binary files differnew file mode 100644 index 0000000000..11b3168d41 --- /dev/null +++ b/data/icons/hicolor_apps_24x24_evolution-memos.png diff --git a/data/icons/hicolor_apps_24x24_evolution-tasks.png b/data/icons/hicolor_apps_24x24_evolution-tasks.png Binary files differnew file mode 100644 index 0000000000..14f6278c14 --- /dev/null +++ b/data/icons/hicolor_apps_24x24_evolution-tasks.png diff --git a/data/icons/hicolor_apps_32x32_evolution-mail.png b/data/icons/hicolor_apps_32x32_evolution-mail.png Binary files differnew file mode 100644 index 0000000000..736a134d82 --- /dev/null +++ b/data/icons/hicolor_apps_32x32_evolution-mail.png diff --git a/data/icons/hicolor_apps_32x32_evolution-memos.png b/data/icons/hicolor_apps_32x32_evolution-memos.png Binary files differnew file mode 100644 index 0000000000..a3c2bb12b2 --- /dev/null +++ b/data/icons/hicolor_apps_32x32_evolution-memos.png diff --git a/data/icons/hicolor_apps_32x32_evolution-tasks.png b/data/icons/hicolor_apps_32x32_evolution-tasks.png Binary files differnew file mode 100644 index 0000000000..2d12fb51e3 --- /dev/null +++ b/data/icons/hicolor_apps_32x32_evolution-tasks.png diff --git a/data/icons/hicolor_apps_48x48_evolution-mail.png b/data/icons/hicolor_apps_48x48_evolution-mail.png Binary files differnew file mode 100644 index 0000000000..33ad416682 --- /dev/null +++ b/data/icons/hicolor_apps_48x48_evolution-mail.png diff --git a/data/icons/hicolor_apps_48x48_evolution-memos.png b/data/icons/hicolor_apps_48x48_evolution-memos.png Binary files differnew file mode 100644 index 0000000000..8bdc4b42d1 --- /dev/null +++ b/data/icons/hicolor_apps_48x48_evolution-memos.png diff --git a/data/icons/hicolor_apps_48x48_evolution-tasks.png b/data/icons/hicolor_apps_48x48_evolution-tasks.png Binary files differnew file mode 100644 index 0000000000..694c921140 --- /dev/null +++ b/data/icons/hicolor_apps_48x48_evolution-tasks.png 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 @@ <oaf_attribute name="evolution:button_label" type="string" _value="Mail"/> <oaf_attribute name="evolution:button_tooltips" type="string" _value="Mail"/> <oaf_attribute name="evolution:button_sort_order" type="string" value="-10"/> - <oaf_attribute name="evolution:button_icon" type="string" value="stock_mail"/> + <oaf_attribute name="evolution:button_icon" type="string" value="evolution-mail"/> - <oaf_attribute name="evolution:component_icon" type="string" value="stock_mail"/> + <oaf_attribute name="evolution:component_icon" type="string" value="evolution-mail"/> <oaf_attribute name="evolution:component_display_order" type="number" value="1"/> <oaf_attribute name="evolution:uri_schemas" type="stringv"> @@ -59,7 +59,7 @@ _value="Evolution Mail component"/> <oaf_attribute name="evolution:shell_component_icon" type="string" - value="stock_mail"/> + value="evolution-mail"/> <oaf_attribute name="evolution:shell_component_launch_order" type="number" value="1"/> </oaf_server> 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); |
