evolution r35915 - in trunk: . addressbook/gui/component calendar/gui data/icons mail

[mmonreal svn gnome org]

Author: mmonreal
Date: Wed Aug  6 09:32:08 2008
New Revision: 35915
URL: http://svn.gnome.org/viewvc/evolution?rev=35915&view=rev

Log:
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.


Added:
   trunk/data/icons/hicolor_apps_16x16_evolution-mail.png   (contents, props changed)
   trunk/data/icons/hicolor_apps_16x16_evolution-memos.png   (contents, props changed)
   trunk/data/icons/hicolor_apps_16x16_evolution-tasks.png   (contents, props changed)
   trunk/data/icons/hicolor_apps_22x22_evolution-mail.png   (contents, props changed)
   trunk/data/icons/hicolor_apps_22x22_evolution-memos.png   (contents, props changed)
   trunk/data/icons/hicolor_apps_22x22_evolution-tasks.png   (contents, props changed)
   trunk/data/icons/hicolor_apps_24x24_evolution-mail.png   (contents, props changed)
   trunk/data/icons/hicolor_apps_24x24_evolution-memos.png   (contents, props changed)
   trunk/data/icons/hicolor_apps_24x24_evolution-tasks.png   (contents, props changed)
   trunk/data/icons/hicolor_apps_32x32_evolution-mail.png   (contents, props changed)
   trunk/data/icons/hicolor_apps_32x32_evolution-memos.png   (contents, props changed)
   trunk/data/icons/hicolor_apps_32x32_evolution-tasks.png   (contents, props changed)
   trunk/data/icons/hicolor_apps_48x48_evolution-mail.png   (contents, props changed)
   trunk/data/icons/hicolor_apps_48x48_evolution-memos.png   (contents, props changed)
   trunk/data/icons/hicolor_apps_48x48_evolution-tasks.png   (contents, props changed)
Modified:
   trunk/ChangeLog
   trunk/addressbook/gui/component/addressbook-view.c
   trunk/calendar/gui/GNOME_Evolution_Calendar.server.in.in
   trunk/calendar/gui/memos-component.c
   trunk/calendar/gui/tasks-component.c
   trunk/data/icons/Makefile.am
   trunk/mail/GNOME_Evolution_Mail.server.in.in
   trunk/mail/mail-component.c

Modified: trunk/addressbook/gui/component/addressbook-view.c
==============================================================================
--- trunk/addressbook/gui/component/addressbook-view.c	(original)
+++ trunk/addressbook/gui/component/addressbook-view.c	Wed Aug  6 09:32:08 2008
@@ -1330,7 +1330,7 @@
 	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);
 

Modified: trunk/calendar/gui/GNOME_Evolution_Calendar.server.in.in
==============================================================================
--- trunk/calendar/gui/GNOME_Evolution_Calendar.server.in.in	(original)
+++ trunk/calendar/gui/GNOME_Evolution_Calendar.server.in.in	Wed Aug  6 09:32:08 2008
@@ -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>
 

Modified: trunk/calendar/gui/memos-component.c
==============================================================================
--- trunk/calendar/gui/memos-component.c	(original)
+++ trunk/calendar/gui/memos-component.c	Wed Aug  6 09:32:08 2008
@@ -1098,7 +1098,7 @@
 					     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));
 

Modified: trunk/calendar/gui/tasks-component.c
==============================================================================
--- trunk/calendar/gui/tasks-component.c	(original)
+++ trunk/calendar/gui/tasks-component.c	Wed Aug  6 09:32:08 2008
@@ -1087,7 +1087,7 @@
 					     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));
 

Modified: trunk/data/icons/Makefile.am
==============================================================================
--- trunk/data/icons/Makefile.am	(original)
+++ trunk/data/icons/Makefile.am	Wed Aug  6 09:32:08 2008
@@ -2,10 +2,25 @@
 
 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)
 

Added: trunk/data/icons/hicolor_apps_16x16_evolution-mail.png
==============================================================================
Binary file. No diff available.

Added: trunk/data/icons/hicolor_apps_16x16_evolution-memos.png
==============================================================================
Binary file. No diff available.

Added: trunk/data/icons/hicolor_apps_16x16_evolution-tasks.png
==============================================================================
Binary file. No diff available.

Added: trunk/data/icons/hicolor_apps_22x22_evolution-mail.png
==============================================================================
Binary file. No diff available.

Added: trunk/data/icons/hicolor_apps_22x22_evolution-memos.png
==============================================================================
Binary file. No diff available.

Added: trunk/data/icons/hicolor_apps_22x22_evolution-tasks.png
==============================================================================
Binary file. No diff available.

Added: trunk/data/icons/hicolor_apps_24x24_evolution-mail.png
==============================================================================
Binary file. No diff available.

Added: trunk/data/icons/hicolor_apps_24x24_evolution-memos.png
==============================================================================
Binary file. No diff available.

Added: trunk/data/icons/hicolor_apps_24x24_evolution-tasks.png
==============================================================================
Binary file. No diff available.

Added: trunk/data/icons/hicolor_apps_32x32_evolution-mail.png
==============================================================================
Binary file. No diff available.

Added: trunk/data/icons/hicolor_apps_32x32_evolution-memos.png
==============================================================================
Binary file. No diff available.

Added: trunk/data/icons/hicolor_apps_32x32_evolution-tasks.png
==============================================================================
Binary file. No diff available.

Added: trunk/data/icons/hicolor_apps_48x48_evolution-mail.png
==============================================================================
Binary file. No diff available.

Added: trunk/data/icons/hicolor_apps_48x48_evolution-memos.png
==============================================================================
Binary file. No diff available.

Added: trunk/data/icons/hicolor_apps_48x48_evolution-tasks.png
==============================================================================
Binary file. No diff available.

Modified: trunk/mail/GNOME_Evolution_Mail.server.in.in
==============================================================================
--- trunk/mail/GNOME_Evolution_Mail.server.in.in	(original)
+++ trunk/mail/GNOME_Evolution_Mail.server.in.in	Wed Aug  6 09:32:08 2008
@@ -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>

Modified: trunk/mail/mail-component.c
==============================================================================
--- trunk/mail/mail-component.c	(original)
+++ trunk/mail/mail-component.c	Wed Aug  6 09:32:08 2008
@@ -756,7 +756,7 @@
 	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);