aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ui/ChangeLog9
-rw-r--r--ui/evolution-addressbook.xml20
-rw-r--r--ui/evolution.xml49
3 files changed, 46 insertions, 32 deletions
diff --git a/ui/ChangeLog b/ui/ChangeLog
index f1cb346760..8812c81235 100644
--- a/ui/ChangeLog
+++ b/ui/ChangeLog
@@ -1,3 +1,12 @@
+2002-07-26 Ettore Perazzoli <ettore@ximian.com>
+
+ * evolution.xml: Move File/New/NewItems placeholder on the top and
+ add some separators. Also add items to the popups/NewPopup so the
+ pop-up and the "New" submenu look the same.
+
+ * evolution-addressbook.xml: Remove ContactNew and ContactNewList
+ verbs, as well as the corresponding menu items.
+
2002-07-23 Jeffrey Stedfast <fejj@ximian.com>
* evolution-message-composer.xml: Add a View/Post-To ui dingus.
diff --git a/ui/evolution-addressbook.xml b/ui/evolution-addressbook.xml
index 3ec685f448..2a5ed8f87f 100644
--- a/ui/evolution-addressbook.xml
+++ b/ui/evolution-addressbook.xml
@@ -4,13 +4,6 @@
_tip="Delete selected contacts"
accel="*Control*d"/>
- <cmd name="ContactNew"
- _tip="Create new contact"
- accel="*Control*n"/>
-
- <cmd name="ContactNewList"
- _tip="Create new contact list"/>
-
<cmd name="ContactsPrint"
_tip="Print selected contacts"
pixtype="stock" pixname="Print"
@@ -73,20 +66,7 @@
pixtype="pixbuf"/>
</placeholder>
- <submenu name="New">
- <placeholder name="NewFirstItem">
- <menuitem name="ContactNew" verb=""
- _label="_Contact"
- pixtype="pixbuf"/>
- <menuitem name="ContactNewList" verb=""
- _label="_Contact List"
- pixtype="pixbuf"/>
- <separator f="" name="eadbk1"/>
- </placeholder>
- </submenu>
-
<placeholder name="Print">
-
<menuitem name="ContactsPrintPreview" verb=""
_label="Print Pre_view"
pixtype="pixbuf"/>
diff --git a/ui/evolution.xml b/ui/evolution.xml
index 820f45e481..402f4fc366 100644
--- a/ui/evolution.xml
+++ b/ui/evolution.xml
@@ -33,27 +33,30 @@
<menu>
<submenu name="File" _label="_File">
<submenu name="New" _label="_New">
- <placeholder name="NewFirstItem">
- </placeholder>
-
- <menuitem name="EvolutionWindow"
- verb="OpenFolderInNewWindow"
- _label="Evolution _Window"
- _tip="Create a new window displaying this folder"
- accel="*Control**Shift*w"/>
+ <placeholder name="NewFirstItem"/>
+ <placeholder name="ComponentItems"/>
+
+ <separator f="" name="eshell6"/>
<menuitem name="Folder" verb="NewFolder"
- _label="_Folder"
+ _label="_Folder..."
_tip="Create a new folder"
accel="*Control**Shift*e"
pixtype="pixbuf"/>
<menuitem name="Shortcut" verb="NewShortcut"
- _label="_Shortcut"
+ _label="_Shortcut..."
_tip="Create a new shortcut"
accel="*Control**Shift*s"/>
- <placeholder name="NewItems"/>
+ <separator f="" name="eshell6"/>
+
+ <menuitem name="EvolutionWindow"
+ verb="OpenFolderInNewWindow"
+ _label="Evolution _Window"
+ _tip="Create a new window displaying this folder"
+ accel="*Control**Shift*w"/>
+
</submenu>
<placeholder name="FileOps"/>
@@ -110,7 +113,7 @@
delimit="top"/>
</submenu>
-
+
<menuitem name="FileGoToFolder" verb=""
_label="_Go to Folder..."
_tip="Display a different folder" accel="*Control*g"/>
@@ -207,6 +210,28 @@
<popups>
<popup name="NewPopup">
+ <placeholder name="ComponentItems"/>
+
+ <separator f="" name="eshell7"/>
+
+ <menuitem name="Folder" verb="NewFolder"
+ _label="_Folder..."
+ _tip="Create a new folder"
+ accel="*Control**Shift*e"
+ pixtype="pixbuf"/>
+
+ <menuitem name="Shortcut" verb="NewShortcut"
+ _label="_Shortcut..."
+ _tip="Create a new shortcut"
+ accel="*Control**Shift*s"/>
+
+ <separator f="" name="eshell8"/>
+
+ <menuitem name="EvolutionWindow"
+ verb="OpenFolderInNewWindow"
+ _label="Evolution _Window"
+ _tip="Create a new window displaying this folder"
+ accel="*Control**Shift*w"/>
</popup>
<popup name="FolderPopup">