[gnote] App menu: standardize help/about/quit



commit c3a02a9bb3f04ea1ad72bacebf2f25f17514a7fa
Author: Michael Catanzaro <mcatanzaro gnome org>
Date:   Mon Dec 9 13:26:12 2013 -0600

    App menu: standardize help/about/quit
    
    Remove the separator between About and Quit
    https://wiki.gnome.org/Design/HIG/ApplicationMenus
    Fixes Bug 720130.

 src/actionmanager.cpp  |   11 +++--------
 src/iactionmanager.cpp |    3 +--
 src/iactionmanager.hpp |    1 -
 3 files changed, 4 insertions(+), 11 deletions(-)
---
diff --git a/src/actionmanager.cpp b/src/actionmanager.cpp
index 063c709..c1e9df0 100644
--- a/src/actionmanager.cpp
+++ b/src/actionmanager.cpp
@@ -166,9 +166,9 @@ namespace gnote {
     add_app_menu_item(APP_ACTION_NEW, 100, _("_New Note"), "app.new-note");
     add_app_menu_item(APP_ACTION_NEW, 200, _("New _Window"), "app.new-window");
     add_app_menu_item(APP_ACTION_MANAGE, 100, _("_Preferences"), "app.show-preferences");
-    add_app_menu_item(APP_ACTION_HELP, 100, _("_Help"), "app.help-contents");
-    add_app_menu_item(APP_ACTION_HELP, 200, _("_About"), "app.about");
-    add_app_menu_item(APP_ACTION_LAST, 100, _("_Quit"), "app.quit");
+    add_app_menu_item(APP_ACTION_LAST, 100, _("_Help"), "app.help-contents");
+    add_app_menu_item(APP_ACTION_LAST, 200, _("_About"), "app.about");
+    add_app_menu_item(APP_ACTION_LAST, 300, _("_Quit"), "app.quit");
   }
 
   Glib::RefPtr<Gio::Menu> ActionManager::get_app_menu() const
@@ -186,11 +186,6 @@ namespace gnote {
       menu->insert_section(pos++, "", section);
     }
 
-    section = make_app_menu_section(APP_ACTION_HELP);
-    if(section != 0) {
-      menu->insert_section(pos++, "", section);
-    }
-
     section = make_app_menu_section(APP_ACTION_LAST);
     if(section != 0) {
       menu->insert_section(pos++, "", section);
diff --git a/src/iactionmanager.cpp b/src/iactionmanager.cpp
index 58ac2cb..790040c 100644
--- a/src/iactionmanager.cpp
+++ b/src/iactionmanager.cpp
@@ -24,8 +24,7 @@ namespace gnote {
 
 const int IActionManager::APP_ACTION_NEW = 1;
 const int IActionManager::APP_ACTION_MANAGE = 2;
-const int IActionManager::APP_ACTION_HELP = 3;
-const int IActionManager::APP_ACTION_LAST = 4;
+const int IActionManager::APP_ACTION_LAST = 3;
 
 IActionManager::~IActionManager()
 {}
diff --git a/src/iactionmanager.hpp b/src/iactionmanager.hpp
index 7f13c6b..eec30c3 100644
--- a/src/iactionmanager.hpp
+++ b/src/iactionmanager.hpp
@@ -46,7 +46,6 @@ class IActionManager
 public:
   static const int APP_ACTION_NEW;
   static const int APP_ACTION_MANAGE;
-  static const int APP_ACTION_HELP;
   static const int APP_ACTION_LAST;
 
   virtual ~IActionManager();


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]