aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--calendar/ChangeLog6
-rw-r--r--calendar/gui/tasks-control.c8
-rw-r--r--ui/evolution-tasks.xml27
3 files changed, 21 insertions, 20 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index d0ff9c88f0..41a3247647 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,9 @@
+2001-10-29 Federico Mena Quintero <federico@ximian.com>
+
+ * gui/tasks-control.c (pixmaps): Fix the verb names for the
+ pixmaps in the Edit menu; they were out of synch with the XML
+ UI description.
+
2001-10-29 Chris Toshok <toshok@ximian.com>
* pcs/cal-factory.c (cal_factory_dump_active_backends): new
diff --git a/calendar/gui/tasks-control.c b/calendar/gui/tasks-control.c
index b7d6ffcf88..fa427e20ef 100644
--- a/calendar/gui/tasks-control.c
+++ b/calendar/gui/tasks-control.c
@@ -245,10 +245,10 @@ static BonoboUIVerb verbs [] = {
static EPixmap pixmaps [] = {
E_PIXMAP ("/menu/File/New/NewFirstItem/NewTask", "new_task-16.png"),
- E_PIXMAP ("/menu/Edit/Cut", "16_cut.png"),
- E_PIXMAP ("/menu/Edit/Copy", "16_copy.png"),
- E_PIXMAP ("/menu/Edit/Paste", "16_paste.png"),
- E_PIXMAP ("/menu/Edit/Delete", "evolution-trash-mini.png"),
+ E_PIXMAP ("/menu/Edit/TasksCut", "16_cut.png"),
+ E_PIXMAP ("/menu/Edit/TasksCopy", "16_copy.png"),
+ E_PIXMAP ("/menu/Edit/TasksPaste", "16_paste.png"),
+ E_PIXMAP ("/menu/Edit/TasksDelete", "evolution-trash-mini.png"),
E_PIXMAP ("/menu/File/Print/Print", "print.xpm"),
E_PIXMAP ("/menu/File/Print/Print Preview", "print-preview.xpm"),
E_PIXMAP ("/menu/Tools/ComponentPlaceholder/TasksSettings", "configure_16_calendar.xpm"),
diff --git a/ui/evolution-tasks.xml b/ui/evolution-tasks.xml
index f2d3cb7b1b..9907d3818f 100644
--- a/ui/evolution-tasks.xml
+++ b/ui/evolution-tasks.xml
@@ -1,18 +1,13 @@
<Root>
<commands>
- <cmd name="TasksNewTask" pixtype="pixbuf"
- _tip="Create a new task" verb="TasksNewTask"/>
- <cmd name="TasksDelete" _label="Delete"
- _tip="Delete selected tasks" verb="TasksDelete"
- accel="Delete" sensitive="0"/>
+ <cmd name="TasksNewTask" pixtype="pixbuf" _tip="Create a new task"/>
+ <cmd name="TasksDelete" _label="Delete" _tip="Delete selected tasks"
+accel="Delete" sensitive="0"/>
- <cmd name="TasksCut"
- _tip="Cut selected task" verb="TasksCut" accel="*Control*x"/>
- <cmd name="TasksCopy"
- _tip="Copy selected task" verb="TasksCopy" accel="*Control*c"/>
- <cmd name="TasksPaste"
- _tip="Paste task from the clipboard" verb="TasksPaste" accel="*Control*v"/>
+ <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="TasksSettings" _tip="Configure the task view's settings"/>
</commands>
@@ -34,10 +29,10 @@
<placeholder name="EditPlaceholder">
<submenu name="Edit" _label="_Edit">
- <menuitem name="Cut" verb="TasksCut" _label="C_ut" pixtype="pixbuf"/>
- <menuitem name="Copy" verb="TasksCopy" _label="_Copy" pixtype="pixbuf"/>
- <menuitem name="Paste" verb="TasksPaste" _label="_Paste" pixtype="pixbuf"/>
- <menuitem name="Delete" verb="TasksDelete" _label="_Delete" pixtype="pixbuf"/>
+ <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="TasksDelete" verb="" _label="_Delete" pixtype="pixbuf"/>
</submenu>
</placeholder>
@@ -45,7 +40,7 @@
<placeholder name="ComponentPlaceholder">
<menuitem name="TasksSettings"
_label="Tasks Settings..."
- verb="TasksSettings" pixtype="pixbuf"/>
+ verb="" pixtype="pixbuf"/>
<separator/>
</placeholder>
</submenu>