aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ui/ChangeLog6
-rw-r--r--ui/evolution-addressbook.xml42
2 files changed, 25 insertions, 23 deletions
diff --git a/ui/ChangeLog b/ui/ChangeLog
index b4289150a2..55e2d79aa9 100644
--- a/ui/ChangeLog
+++ b/ui/ChangeLog
@@ -1,3 +1,9 @@
+2001-05-22 Chris Toshok <toshok@ximian.com>
+
+ * evolution-addressbook.xml: make the name of menuitem/toolitem's
+ the same as the verb to save us from having to specify both, and
+ move some more accels into the <commands>.
+
2001-05-21 Chris Toshok <toshok@ximian.com>
* evolution-addressbook.xml: remove ViewAsTable menu item.
diff --git a/ui/evolution-addressbook.xml b/ui/evolution-addressbook.xml
index f3ff0ed088..d8495e0b3d 100644
--- a/ui/evolution-addressbook.xml
+++ b/ui/evolution-addressbook.xml
@@ -11,7 +11,8 @@
<cmd name="ContactsPrint"
_tip="Print contacts"
- pixtype="stock" pixname="Print"/>
+ pixtype="stock" pixname="Print"
+ accel="*Control*p"/>
<cmd name="ContactStop"
_tip="Stop Loading"
@@ -23,25 +24,21 @@
<submenu name="New">
<placeholder name="NewFirstItem">
- <menuitem name="New"
+ <menuitem name="ContactNew" verb=""
_label="_Contact"
- verb="ContactNew"
- pixtype="pixbuf"
- accel="*Control*n"/>
+ pixtype="pixbuf"/>
<separator/>
</placeholder>
</submenu>
<placeholder name="Print">
- <menuitem name="Print Preview" verb="PrintPreviewMessage"
+ <menuitem name="ContactPrintPreview" verb=""
_label="Print Preview"
_tip="Previews the message to be printed"
pixtype="pixbuf"/>
- <menuitem name="Print" verb="ContactsPrint"
- _label="_Print..."
- pixtype="stock" pixname="Print"
- accel="*Control*p"/>
+ <menuitem name="ContactsPrint" verb=""
+ _label="_Print..."/>
</placeholder>
</submenu>
@@ -57,12 +54,11 @@
<submenu name="Tools" _label="_Tools">
<placeholder name="Component">
- <menuitem name="Search" verb="ToolSearch "
+ <menuitem name="ToolSearch" verb=""
_label="_Search for contacts"
pixtype="stock" pixname="Search" />
- <menuitem name="AddressbookConfig"
- verb="AddressbookConfig"
+ <menuitem name="AddressbookConfig" verb=""
_label="_Addressbook Sources..."
pixtype ="pixbuf"/>
</placeholder>
@@ -70,26 +66,26 @@
</menu>
<dockitem name="Toolbar">
- <toolitem name="New" _label="New contact"
- verb="ContactNew"
+ <toolitem name="ContactNew" verb=""
+ _label="New contact"
pixtype="pixbuf" priority="1"/>
<separator/>
- <toolitem name="Print" _label="Print"
- verb="ContactsPrint"/>
+ <toolitem name="ContactsPrint" verb=""
+ _label="Print"/>
- <toolitem name="Delete" _label="Delete"
- verb="ContactDelete"/>
+ <toolitem name="ContactDelete" verb=""
+ _label="Delete"/>
<separator/>
- <toolitem name="View All" _label="View All"
- _tip="View all contacts" verb="ContactViewAll"
+ <toolitem name="ContactViewAll" verb=""
+ _label="View All" _tip="View all contacts"
pixtype="pixbuf"/>
- <toolitem name="Stop" _label="Stop"
- verb="ContactStop"/>
+ <toolitem name="ContactStop" verb=""
+ _label="Stop"/>
</dockitem>