GNOME.org
 

[evolution-patches] patch for #45524

Makes calendar and tasks controls use GTK stock icons

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/calendar/ChangeLog,v
retrieving revision 1.1802.2.4
diff -u -p -r1.1802.2.4 ChangeLog
--- ChangeLog	29 Jun 2003 19:33:38 -0000	1.1802.2.4
+++ ChangeLog	30 Jun 2003 22:57:39 -0000
@@ -1,3 +1,13 @@
+2003-07-01  Rodrigo Moya <rodrigo ximian com>
+
+	Fixes #45524
+
+	* gui/calendar-commands.c: use stock icons where approppriate.
+
+	* gui/tasks-control.c: removed EPixmaps structure, since we only use
+	stock icons now.
+	(tasks_control_activate): no need to call e_pixmaps_update.
+
 2003-06-27  Rodrigo Moya <rodrigo ximian com>
 
 	* gui/dialogs/send-comp.[ch] (send_component_dialog):
Index: gui/calendar-commands.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/calendar-commands.c,v
retrieving revision 1.120
diff -u -p -r1.120 calendar-commands.c
--- gui/calendar-commands.c	30 May 2003 17:35:09 -0000	1.120
+++ gui/calendar-commands.c	30 Jun 2003 22:57:40 -0000
@@ -725,21 +725,6 @@ static BonoboUIVerb verbs [] = {
 
 static EPixmap pixmaps [] =
 {
-	E_PIXMAP ("/menu/EditPlaceholder/Edit/Cut",			      "16_cut.png"),
-	E_PIXMAP ("/menu/EditPlaceholder/Edit/Copy",			      "16_copy.png"),
-	E_PIXMAP ("/menu/EditPlaceholder/Edit/Paste",			      "16_paste.png"),
-	E_PIXMAP ("/menu/EditPlaceholder/Edit/Delete",			      "evolution-trash-mini.png"),
-	E_PIXMAP ("/menu/EditPlaceholder/Edit/DeleteOccurrence",	      "evolution-trash-mini.png"),
-	E_PIXMAP ("/menu/EditPlaceholder/Edit/DeleteAllOccurrences",	      "evolution-trash-mini.png"),
-	E_PIXMAP ("/menu/File/Print/Print",				      "print.xpm"),
-	E_PIXMAP ("/menu/File/Print/PrintPreview",			      "print-preview.xpm"),
-	E_PIXMAP ("/menu/View/ViewBegin/Goto",				      "goto-16.png"),
-
-	E_PIXMAP ("/Toolbar/Print",					      "buttons/print.png"),
-	E_PIXMAP ("/Toolbar/Delete",					      "buttons/delete-message.png"),
-	E_PIXMAP ("/Toolbar/Prev",					      "buttons/arrow-left-24.png"),
-	E_PIXMAP ("/Toolbar/Next",					      "buttons/arrow-right-24.png"),
-	E_PIXMAP ("/Toolbar/Goto",					      "buttons/goto-24.png"),
 	E_PIXMAP ("/Toolbar/DayView",					      "buttons/dayview.xpm"),
 	E_PIXMAP ("/Toolbar/WorkWeekView",				      "buttons/workweekview.xpm"),
 	E_PIXMAP ("/Toolbar/WeekView",					      "buttons/weekview.xpm"),
Index: gui/tasks-control.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/tasks-control.c,v
retrieving revision 1.58
diff -u -p -r1.58 tasks-control.c
--- gui/tasks-control.c	23 Jun 2003 20:27:31 -0000	1.58
+++ gui/tasks-control.c	30 Jun 2003 22:57:40 -0000
@@ -287,21 +287,6 @@ static BonoboUIVerb verbs [] = {
 	BONOBO_UI_VERB_END
 };
 
-static EPixmap pixmaps [] = {
-	E_PIXMAP ("/menu/File/Print/Print",			    "print.xpm"),
-	E_PIXMAP ("/menu/File/Print/PrintPreview",		    "print-preview.xpm"),
-	E_PIXMAP ("/menu/EditPlaceholder/Edit/TasksCut",            "16_cut.png"),
-	E_PIXMAP ("/menu/EditPlaceholder/Edit/TasksCopy",           "16_copy.png"),
-	E_PIXMAP ("/menu/EditPlaceholder/Edit/TasksPaste",          "16_paste.png"),
-	E_PIXMAP ("/menu/EditPlaceholder/Edit/TasksDelete",         "evolution-trash-mini.png"),
-	E_PIXMAP ("/Toolbar/Cut",                                   "buttons/cut.png"),
-	E_PIXMAP ("/Toolbar/Copy",                                  "buttons/copy.png"),
-	E_PIXMAP ("/Toolbar/Paste",                                 "buttons/paste.png"),
-	E_PIXMAP ("/Toolbar/Delete",                                "buttons/delete-message.png"),
-	E_PIXMAP ("/Toolbar/Print",				    "buttons/print.png"),
-	E_PIXMAP_END
-};
-
 static void
 tasks_control_activate (BonoboControl *control, ETasks *tasks)
 {
@@ -328,8 +313,6 @@ tasks_control_activate (BonoboControl *c
 			       EVOLUTION_UIDIR "/evolution-tasks.xml",
 			       "evolution-tasks",
 			       NULL);
-
-	e_pixmaps_update (uic, pixmaps);
 
 	e_tasks_setup_view_menus (tasks, uic);
 

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/ui/ChangeLog,v
retrieving revision 1.340
diff -u -p -r1.340 ChangeLog
--- ChangeLog	25 Jun 2003 16:12:12 -0000	1.340
+++ ChangeLog	30 Jun 2003 22:54:50 -0000
@@ -1,6 +1,13 @@
+2003-07-01  Rodrigo Moya <rodrigo ximian com>
+
+	Fixes #45524
+
+	* evolution-tasks.xml:
+	* evolution-calendar.xml: use stock icons where appropriate.
+
 2003-06-25  Bolian Yin <bolian yin sun com>
 
 	Fixes #45423
 
 	* evolution-calendar.xml: added keyboard shortcuts for "Go to today"
-	and "Go to date" menu/toolbar items.
\ No newline at end of file
+	and "Go to date" menu/toolbar items.
Index: evolution-calendar.xml
===================================================================
RCS file: /cvs/gnome/evolution/ui/evolution-calendar.xml,v
retrieving revision 1.57
diff -u -p -r1.57 evolution-calendar.xml
--- evolution-calendar.xml	25 Jun 2003 16:12:12 -0000	1.57
+++ evolution-calendar.xml	30 Jun 2003 22:54:50 -0000
@@ -1,26 +1,26 @@
 <Root>
   <commands>
-    <cmd name="CalendarPrint" _tip="Print this calendar" pixtype="pixbuf" 
+    <cmd name="CalendarPrint" _tip="Print this calendar" pixtype="stock" pixname="gtk-print"
 	 accel="*Control*p"/>
-    <cmd name="CalendarPrintPreview" _tip="Previews the calendar to be printed" pixtype="pixbuf"/>
+    <cmd name="CalendarPrintPreview" _tip="Previews the calendar to be printed" pixtype="stock" pixname="gtk-print-preview"/>
 
-    <cmd name="CalendarPrev" _tip="Go back" pixtype="pixbuf"/>
+    <cmd name="CalendarPrev" _tip="Go back" pixtype="stock" pixname="gtk-go-back"/>
     <cmd name="CalendarToday" _tip="Go to today" pixtype="stock" pixname="Home"/>
-    <cmd name="CalendarNext" _tip="Go forward" pixtype="pixbuf"/>
-    <cmd name="CalendarGoto" _tip="Go to a specific date"/>
+    <cmd name="CalendarNext" _tip="Go forward" pixtype="stock" pixname="gtk-go-forward"/>
+    <cmd name="CalendarGoto" _tip="Go to a specific date" pixtype="stock" pixname="gtk-jump-to"/>
 
     <cmd name="ShowDayView" _tip="Show one day" pixtype="pixbuf"/>
     <cmd name="ShowWorkWeekView" _tip="Show the working week" pixtype="pixbuf"/>
     <cmd name="ShowWeekView" _tip="Show one week" pixtype="pixbuf"/>
     <cmd name="ShowMonthView" _tip="Show one month" pixtype="pixbuf"/>
 
-    <cmd name="Cut" _tip="Cut the selection" accel="*Control*x"/>
-    <cmd name="Copy" _tip="Copy the selection" accel="*Control*c"/>
-    <cmd name="Paste" _tip="Paste the clipboard" accel="*Control*v"/>
-
-    <cmd name="Delete" _tip="Delete the appointment" accel="*Control*d"/>
-    <cmd name="DeleteOccurrence" _tip="Delete this occurrence"/>
-    <cmd name="DeleteAllOccurrences" _tip="Delete All Occurrences"/>
+    <cmd name="Cut" _tip="Cut the selection" accel="*Control*x" pixtype="stock" pixname="gtk-cut"/>
+    <cmd name="Copy" _tip="Copy the selection" accel="*Control*c" pixtype="stock" pixname="gtk-copy"/>
+    <cmd name="Paste" _tip="Paste the clipboard" accel="*Control*v" pixtype="stock" pixname="gtk-paste"/>
+
+    <cmd name="Delete" _tip="Delete the appointment" accel="*Control*d" pixtype="stock" pixname="gtk-delete"/>
+    <cmd name="DeleteOccurrence" _tip="Delete this occurrence" pixtype="stock" pixname="gtk-delete"/>
+    <cmd name="DeleteAllOccurrences" _tip="Delete All Occurrences" pixtype="stock" pixname="gtk-delete"/>
 
     <cmd name="PublishFreeBusy" _tip="Publish Free/Busy information for this calendar"/>
   </commands>
@@ -30,25 +30,25 @@
 
       <placeholder name="Print">
 	<menuitem name="PrintPreview" verb="CalendarPrintPreview"
-		  _label="Print Pre_view" pixtype="pixbuf"/>
+		  _label="Print Pre_view"/>
 
 	<menuitem name="Print" verb="CalendarPrint" accel="*Control*p"
-		  _label="_Print..." pixtype="pixbuf"/>
+		  _label="_Print..."/>
       </placeholder>
 
     </submenu>
 
     <placeholder name="EditPlaceholder">
       <submenu name="Edit" _label="_Edit">
-      	<menuitem name="Cut" verb="" _label="C_ut" pixtype="pixbuf"/>
-      	<menuitem name="Copy" verb="" _label="_Copy" pixtype="pixbuf"/>
-      	<menuitem name="Paste" verb="" _label="_Paste" pixtype="pixbuf"/>
+      	<menuitem name="Cut" verb="" _label="C_ut"/>
+      	<menuitem name="Copy" verb="" _label="_Copy"/>
+      	<menuitem name="Paste" verb="" _label="_Paste"/>
 
       	<separator/>
 
-      	<menuitem name="Delete" verb="" _label="_Delete" pixtype="pixbuf"/>
-	<menuitem name="DeleteOccurrence" verb="" _label="Delete this Occurrence" pixtype="pixbuf"/>
-	<menuitem name="DeleteAllOccurrences" verb="" _label="Delete All Occurrences" pixtype="pixbuf"/>
+      	<menuitem name="Delete" verb="" _label="_Delete"/>
+	<menuitem name="DeleteOccurrence" verb="" _label="Delete this Occurrence"/>
+	<menuitem name="DeleteAllOccurrences" verb="" _label="Delete All Occurrences"/>
       </submenu>
     </placeholder>
 
@@ -56,8 +56,7 @@
       <placeholder name="ViewBegin">
 	<menuitem name="Today" verb="CalendarToday" _label="Go to _Today"
                   accel="*Control**Alt*t"/>
-	<menuitem name="Goto" verb="CalendarGoto" _label="Go to _Date"
-                  pixtype="pixbuf" accel="*Control**Alt*g"/>
+	<menuitem name="Goto" verb="CalendarGoto" _label="Go to _Date" accel="*Control**Alt*g"/>
 	<separator f="" name="ecal"/>
       </placeholder>
 
@@ -72,18 +71,18 @@
 
   <dockitem name="Toolbar">
   
-    <toolitem name="Print" verb="CalendarPrint" pixtype = "pixbuf"/>
-    <toolitem name="Delete" verb="" pixtype="pixbuf"/>
+    <toolitem name="Print" verb="CalendarPrint"/>
+    <toolitem name="Delete" verb=""/>
 
     <separator f="" name="ecal2"/>
 
-    <toolitem name="Prev" verb="CalendarPrev" pixtype="pixbuf"/>
+    <toolitem name="Prev" verb="CalendarPrev"/>
     <toolitem name="Today" verb="CalendarToday"/>
-    <toolitem name="Next" verb="CalendarNext" pixtype="pixbuf"/>
+    <toolitem name="Next" verb="CalendarNext"/>
 
     <separator f="" name="ecal3"/>
 
-    <toolitem name="Goto" verb="CalendarGoto" _label="Go To" priority="1" pixtype="pixbuf"/>
+    <toolitem name="Goto" verb="CalendarGoto" _label="Go To" priority="1"/>
 
     <separator f="" name="ecal4"/>
 
Index: evolution-tasks.xml
===================================================================
RCS file: /cvs/gnome/evolution/ui/evolution-tasks.xml,v
retrieving revision 1.29
diff -u -p -r1.29 evolution-tasks.xml
--- evolution-tasks.xml	21 Mar 2002 00:07:49 -0000	1.29
+++ evolution-tasks.xml	30 Jun 2003 22:54:51 -0000
@@ -1,40 +1,38 @@
 <Root>
   <commands>
-    <cmd name="TasksPrint" _tip="Print the list of tasks" pixtype="pixbuf" 
+    <cmd name="TasksPrint" _tip="Print the list of tasks" pixtype="stock" pixname="gtk-print"
 	 accel="*Control*p"/>
-    <cmd name="TasksPrintPreview" _tip="Previews the list of tasks to be printed" pixtype="pixbuf"/>
+    <cmd name="TasksPrintPreview" _tip="Previews the list of tasks to be printed" pixtype="stock" pixname="gtk-print-preview"/>
 
-    <cmd name="TasksCut" _tip="Cut selected task" accel="*Control*x"/>
-    <cmd name="TasksCopy" _tip="Copy selected task" accel="*Control*c"/>
-    <cmd name="TasksPaste" _tip="Paste task from the clipboard" accel="*Control*v"/>
-    <cmd name="TasksDelete" _tip="Delete selected tasks" accel="*Control*d" sensitive="0"/>
-    <cmd name="TasksMarkComplete" _tip="Delete selected tasks" accel="*Control*k" sensitive="0"/>
+    <cmd name="TasksCut" _tip="Cut selected task" accel="*Control*x" pixtype="stock" pixname="gtk-cut"/>
+    <cmd name="TasksCopy" _tip="Copy selected task" accel="*Control*c" pixtype="stock" pixname="gtk-copy"/>
+    <cmd name="TasksPaste" _tip="Paste task from the clipboard" accel="*Control*v" pixtype="stock" pixname="gtk-paste"/>
+    <cmd name="TasksDelete" _tip="Delete selected tasks" accel="*Control*d" sensitive="0"
+         pixtype="stock" pixname="gtk-delete"/>
+    <cmd name="TasksMarkComplete" _tip="Mark selected tasks as complete" accel="*Control*k" sensitive="0"/>
 
-    <cmd name="TasksExpunge" _label="_Expunge" _tip="Delete completed tasks" 
-         accel="*Control*e"/>
+    <cmd name="TasksExpunge" _label="_Expunge" _tip="Delete completed tasks" accel="*Control*e"/>
   </commands>
   
   <menu>
     <submenu name="File">
       <placeholder name="Print">
-	<menuitem name="PrintPreview" verb="TasksPrintPreview"
-		  _label="Print Pre_view" pixtype="pixbuf"/>
+	<menuitem name="PrintPreview" verb="TasksPrintPreview" _label="Print Pre_view"/>
 
-	<menuitem name="Print" verb="TasksPrint" accel="*Control*p"
-		  _label="_Print..." pixtype="pixbuf"/>
+	<menuitem name="Print" verb="TasksPrint" accel="*Control*p" _label="_Print..."/>
       </placeholder>
 
     </submenu>
 
     <placeholder name="EditPlaceholder">
       <submenu name="Edit" _label="_Edit">
-	<menuitem name="TasksCut" verb="" _label="C_ut" pixtype="pixbuf"/>
-	<menuitem name="TasksCopy" verb="" _label="_Copy" pixtype="pixbuf"/>
-	<menuitem name="TasksPaste" verb="" _label="_Paste" pixtype="pixbuf"/>
+	<menuitem name="TasksCut" verb="" _label="C_ut"/>
+	<menuitem name="TasksCopy" verb="" _label="_Copy"/>
+	<menuitem name="TasksPaste" verb="" _label="_Paste"/>
 
 	<separator/>
 
-	<menuitem name="TasksDelete" verb="" _label="_Delete" pixtype="pixbuf"/>
+	<menuitem name="TasksDelete" verb="" _label="_Delete"/>
 
 	<separator/>
 
@@ -44,22 +42,22 @@
 
     <submenu name="Actions" _label="_Actions">
       <placeholder name="ComponentActionsPlaceholder">
-	<menuitem name="TasksExpunge" verb="" pixtype="pixbuf"/>
+	<menuitem name="TasksExpunge" verb=""/>
       </placeholder>
     </submenu>
 
   </menu>
 
   <dockitem name="Toolbar">
-    <toolitem name="Cut" _label="Cut" verb="TasksCut" pixtype="pixbuf"/>
-    <toolitem name="Copy" _label="Copy" verb="TasksCopy" pixtype="pixbuf"/>
-    <toolitem name="Paste" _label="Paste" verb="TasksPaste" pixtype="pixbuf"/>
+    <toolitem name="Cut" _label="Cut" verb="TasksCut"/>
+    <toolitem name="Copy" _label="Copy" verb="TasksCopy"/>
+    <toolitem name="Paste" _label="Paste" verb="TasksPaste"/>
 
     <separator/>
 
-    <toolitem name="Delete" verb="TasksDelete" pixtype="pixbuf"/>
+    <toolitem name="Delete" verb="TasksDelete"/>
 
-    <toolitem name="Print" verb="TasksPrint" pixtype = "pixbuf"/>
+    <toolitem name="Print" verb="TasksPrint"/>
 
   </dockitem>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]