aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ui/ChangeLog9
-rw-r--r--ui/evolution-mail.xml12
-rw-r--r--ui/evolution.xml3
-rw-r--r--widgets/ChangeLog5
-rw-r--r--widgets/menus/gal-view-menus.c10
5 files changed, 27 insertions, 12 deletions
diff --git a/ui/ChangeLog b/ui/ChangeLog
index babb1df2e0..a82b480191 100644
--- a/ui/ChangeLog
+++ b/ui/ChangeLog
@@ -1,3 +1,12 @@
+2001-03-16 Miguel de Icaza <miguel@ximian.com>
+
+ * evolution-mail.xml: Added accelerator to elements missing
+ accelerators (Reply, Inline, Quoted, Attachments, Empty Trash,
+ Full Headers).
+
+ * evolution.xml: Added a placeholder for the beginning of the
+ view.
+
2001-03-12 Jeffrey Stedfast <fejj@ximian.com>
* evolution-message-composer.xml: Added Reply-To field.
diff --git a/ui/evolution-mail.xml b/ui/evolution-mail.xml
index 9638bab8be..1570c7a59b 100644
--- a/ui/evolution-mail.xml
+++ b/ui/evolution-mail.xml
@@ -121,7 +121,7 @@
<submenu name="MessageDisplayMenu" _label="Message _Display">
<menuitem name="MessageDisplayFullHeaders"
- _label="Full Headers"
+ _label="Full _Headers"
_tip="Display all of the message headers"/>
<menuitem name="Source" verb="ViewSource" accel=""/>
</submenu>
@@ -135,7 +135,7 @@
<separator/>
<menuitem name="MessageReplySndr" verb=""
- _label="Reply"
+ _label="_Reply"
pixtype="pixbuf"
accel="*Control*r"/>
@@ -150,14 +150,14 @@
<submenu name="ForwardAs" _label="Forward As">
<menuitem name="MessageForwardInlined" verb=""
- _label="Inline"
+ _label="_Inline"
accel="*Control**Shift*j"/>
<menuitem name="MessageForwardQuoted" verb=""
- _label="Quoted"/>
+ _label="_Quoted"/>
<menuitem name="MessageForwardAttachment" verb=""
- _label="Attachment"/>
+ _label="_Attachment"/>
<separator/>
@@ -187,7 +187,7 @@
<menuitem name="FolderExpunge" verb="" _label="_Expunge"
accel="*Control*x"/>
- <menuitem name="ActionsEmptyTrash" verb="" _label="Empty Trash"
+ <menuitem name="ActionsEmptyTrash" verb="" _label="Empty _Trash"
accel=""/>
</submenu>
</placeholder>
diff --git a/ui/evolution.xml b/ui/evolution.xml
index ccd4df565a..a0176241bb 100644
--- a/ui/evolution.xml
+++ b/ui/evolution.xml
@@ -103,7 +103,8 @@
</submenu>
<submenu name="View" _label="_View">
- <menuitem name="ShortcutBar" id="ViewShortcutBar"/>
+ <placeholder name="ViewBegin"/>
+ <menuitem name="ShortcutBar" id="ViewShortcutBar"/>
<menuitem name="FolderBar" id="ViewFolderBar"/>
</submenu>
diff --git a/widgets/ChangeLog b/widgets/ChangeLog
index 96fdb81ba8..80e49ef174 100644
--- a/widgets/ChangeLog
+++ b/widgets/ChangeLog
@@ -1,3 +1,8 @@
+2001-03-16 Miguel de Icaza <miguel@ximian.com>
+
+ * menus/gal-view-menus.c (build_menus): Hook this up under the
+ "ViewBegin" node.
+
2001-02-28 Miguel de Icaza <miguel@ximian.com>
* menus/gal-view-menus.c (build_menus): Add translation string
diff --git a/widgets/menus/gal-view-menus.c b/widgets/menus/gal-view-menus.c
index 6c8de18af0..6dc4633c84 100644
--- a/widgets/menus/gal-view-menus.c
+++ b/widgets/menus/gal-view-menus.c
@@ -148,10 +148,7 @@ define_views(BonoboUIComponent *component,
static char *
build_menus(GalViewMenus *menus)
{
- BonoboUINode *root;
- BonoboUINode *menu;
- BonoboUINode *submenu;
- BonoboUINode *menuitem;
+ BonoboUINode *root, *menu, *submenu, *place, *menuitem;
char *xml;
xmlChar *string;
int length;
@@ -166,7 +163,10 @@ build_menus(GalViewMenus *menus)
submenu = bonobo_ui_node_new_child(menu, "submenu");
bonobo_ui_node_set_attr(submenu, "name", "View");
- submenu = bonobo_ui_node_new_child(submenu, "submenu");
+ place = bonobo_ui_node_new_child(submenu, "placeholder");
+ bonobo_ui_node_set_attr(place, "name", "ViewBegin");
+
+ submenu = bonobo_ui_node_new_child(place, "submenu");
bonobo_ui_node_set_attr(submenu, "name", "CurrentView");
bonobo_ui_node_set_attr(submenu, "_label", _("_Current View"));