[Xfce4-commits] <postler:master> Split menues into Edit, View and AppMenu action

[Christian Dywan]

Updating branch refs/heads/master
         to 9dca89fed573a830bf1ad07d79f53a0a81e0d683 (commit)
       from 80abd311b9eae60eedfee86cd5a291728c23d259 (commit)

commit 9dca89fed573a830bf1ad07d79f53a0a81e0d683
Author: Christian Dywan <christian at twotoasts.de>
Date:   Mon Mar 21 00:06:17 2011 +0100

    Split menues into Edit, View and AppMenu action

 postler/postler-bureau.vala |   16 +++++++++-------
 1 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/postler/postler-bureau.vala b/postler/postler-bureau.vala
index 91258ee..469fddf 100644
--- a/postler/postler-bureau.vala
+++ b/postler/postler-bureau.vala
@@ -42,6 +42,9 @@ public class Postler.Bureau : Gtk.Window {
                     <menuitem action="MessageReplyAll"/>
                     <menuitem action="MessageForward"/>
                     <separator/>
+                    <menuitem action="Quit"/>
+                </menu>
+                <menu action="Edit">
                     <menuitem action="MessageUnread"/>
                     <menuitem action="MessageFlag"/>
                     <menuitem action="MessageArchive"/>
@@ -50,10 +53,8 @@ public class Postler.Bureau : Gtk.Window {
                     <separator/>
                     <menuitem action="MessageNextUnread"/>
                     <menuitem action="MessagePreviousUnread"/>
-                    <separator/>
-                    <menuitem action="Quit"/>
                 </menu>
-                <menu action="Edit">
+                <menu action="View">
                     <menuitem action="HideRead"/>
                     <menuitem action="ZoomIn"/>
                     <menuitem action="ZoomOut"/>
@@ -458,7 +459,8 @@ public class Postler.Bureau : Gtk.Window {
           N_("Search the selected folder"), action_search },
         { "SaveSearch", null, N_("S_ave Search"), "<Ctrl><Shift>s",
           N_("Save the current search"), action_save_search },
-        { "View", Gtk.STOCK_PROPERTIES, N_("_View"), "",
+        { "View", null, N_("_View") },
+        { "AppMenu", Gtk.STOCK_PROPERTIES, N_("_View"), "",
           null, action_view },
         { "ZoomIn", Gtk.STOCK_ZOOM_IN, N_("_Enlarge Text"), "<Ctrl>plus",
           N_("Enlarge message text"), action_zoom_in },
@@ -481,7 +483,7 @@ public class Postler.Bureau : Gtk.Window {
 
     const Gtk.ToggleActionEntry[] toggle_entries = {
         { "HideRead", null, N_("_Hide Read"), "<Ctrl>h",
-          N_("Hide unread messages"), action_hide_read,
+          N_("Hide read messages"), action_hide_read,
           false }
     };
 
@@ -663,9 +665,9 @@ public class Postler.Bureau : Gtk.Window {
         toolitem.show_all ();
         toolitem = new Gtk.ToggleToolButton.from_stock (Gtk.STOCK_PROPERTIES);
         toolitem.set ("label", _("Menu"));
-        actions.get_action ("View").connect_proxy (toolitem);
+        actions.get_action ("AppMenu").connect_proxy (toolitem);
         (toolitem as Gtk.ToggleToolButton).clicked.connect ((widget) => {
-            action_view (actions.get_action ("View"));
+            action_view (actions.get_action ("AppMenu"));
         });
         toolbar.insert (toolitem, -1);
         shelf.pack_start (toolbar, false, false, 0);