aboutsummaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
Diffstat (limited to 'ui')
-rw-r--r--ui/ChangeLog6
-rw-r--r--ui/evolution-mail-global.xml4
-rw-r--r--ui/evolution-mail-list.xml33
-rw-r--r--ui/evolution.xml5
4 files changed, 17 insertions, 31 deletions
diff --git a/ui/ChangeLog b/ui/ChangeLog
index 434d6cc795..03a4ab1017 100644
--- a/ui/ChangeLog
+++ b/ui/ChangeLog
@@ -1,3 +1,9 @@
+2005-07-21 Not Zed <NotZed@Ximian.com>
+
+ * evolution.xml: removed the useless tools menu.
+
+ * evolution-mail-list.xml: reverted dobey's broken hide menus.
+
2005-06-03 ANdre Klapper <a9016009@gmx.de>
* evolution-mail-message.xml: Removing duplicate mnemonic,
this fixes bug 306153
diff --git a/ui/evolution-mail-global.xml b/ui/evolution-mail-global.xml
index 1f1bda2498..1cd706b8d3 100644
--- a/ui/evolution-mail-global.xml
+++ b/ui/evolution-mail-global.xml
@@ -114,10 +114,6 @@
</submenu>
</placeholder>
- <submenu name="Tools">
- <placeholder name="ComponentPlaceholder"/>
- </submenu>
-
</menu>
<dockitem name="Toolbar">
diff --git a/ui/evolution-mail-list.xml b/ui/evolution-mail-list.xml
index e11c0e5077..e274ea4e18 100644
--- a/ui/evolution-mail-list.xml
+++ b/ui/evolution-mail-list.xml
@@ -40,18 +40,17 @@
<cmd name="FolderRename"
_tip="Change the name of this folder"/>
- <cmd name="HideDeleted"
- _tip="Hide deleted messages rather than displaying them with a line through them"
- type="toggle" />
+ <cmd name="HideDeleted" _tip="Hide deleted messages rather than displaying them with a line through them"
+ pixtype="pixbuf" />
- <cmd name="ViewHideRead" _tip="Temporarily hide all messages that have already been read"
- type="radio" group="Message_Filter"/>
+ <cmd name="ViewHideRead" _tip="Temporarily hide all messages that have already been read"
+ pixtype="pixbuf" />
<cmd name="ViewShowSelected" _tip="Temporarily hide the selected messages"
- type="radio" group="Message_Filter"/>
+ pixtype="pixbuf" />
<cmd name="ViewShowAll" _tip="Show messages that have been temporarily hidden"
- type="radio" group="Message_Filter"/>
+ pixtype="pixbuf" />
<cmd name="ViewThreaded"
_tip="Threaded Message list"
@@ -68,27 +67,15 @@
<submenu name="View">
- <placeholder name="MailMessageFilter">
- <submenu name="FilterMessages" _label="Show _Messages">
-
- <menuitem name="ViewShowAll" verb="" _label="_All"/>
-<!--
- <menuitem name="ViewShowSelected" verb="" _label="_Selected Messages"/>
--->
- <menuitem name="ViewHideRead" verb="" _label="Un_read Messages"/>
-
- </submenu>
-
- </placeholder>
-
<placeholder name="MailMessageView">
<menuitem name="ViewThreaded" verb="" _label="Group By _Threads"/>
<menuitem name="HideDeleted" verb="" _label="Hide _Deleted Messages"/>
+ <separator f="" name="emaillist"/>
+ <menuitem name="ViewHideSelected" verb="" _label="Hide S_elected Messages"/>
+ <menuitem name="ViewHideRead" verb="" _label="Hide _Read Messages"/>
+ <menuitem name="ViewShowAll" verb="" _label="Sh_ow Hidden Messages"/>
</placeholder>
- <placeholder name="MailListView">
- <separator f="" name="emaillist"/>
- </placeholder>
</submenu>
<placeholder name="MessagePlaceholder">
diff --git a/ui/evolution.xml b/ui/evolution.xml
index a9fc5dabab..d68badfb6e 100644
--- a/ui/evolution.xml
+++ b/ui/evolution.xml
@@ -107,6 +107,7 @@
<submenu name="View" _label="_View">
<placeholder name="ViewBegin"/>
+ <submenu name="Window" _label="_Window"/>
<menuitem name="ViewToolbar" id="ViewToolbar" verb="" accel="*Control**Shift*o"/>
<placeholder name="ViewPreview"/>
<submenu name="Buttons" _label="_Switcher Appearance">
@@ -129,10 +130,6 @@
<placeholder name="ActionsPlaceholder">
</placeholder>
- <submenu name="Tools" _label="_Tools">
- <placeholder name="ComponentPlaceholder"/>
- </submenu>
-
<placeholder name="SearchPlaceholder">
</placeholder>