gallery: cleanup the menubar

Remove the non-functional submenu items that belong to a manual
test application. The edit/context menu presents submenu items
well enough. Furthermore, reduce the amount of cruft in main.qml
by declaring the non-shared about action inline as a menu item
instead.

Change-Id: I1060a3ed63aa1a388e220fedddda4b7d5b412ba7
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>

1 files changed, 5 insertions, 23 deletions

diff --git a/examples/quick/controls/gallery/main.qml b/examples/quick/controls/gallery/main.qml
index c8011e13..c1d61a68 100644
--- a/examples/quick/controls/gallery/main.qml
+++ b/examples/quick/controls/gallery/main.qml
@@ -103,12 +103,6 @@ ApplicationWindow {
         onTriggered: activeFocusItem.paste()
     }
 
-    Action {
-        id: aboutAction
-        text: "About"
-        onTriggered: aboutDialog.open()
-    }
-
     ChildWindow { id: window1 }
 
     toolBar: ToolBar {
@@ -143,7 +137,7 @@ ApplicationWindow {
             title: "&File"
             MenuItem { action: openAction }
             MenuItem {
-                text: "Close"
+                text: "E&xit"
                 shortcut: StandardKey.Quit
                 onTriggered: Qt.quit()
             }
@@ -153,25 +147,13 @@ ApplicationWindow {
             MenuItem { action: cutAction }
             MenuItem { action: copyAction }
             MenuItem { action: pasteAction }
-            MenuSeparator { }
-            MenuItem {
-                text: "Do Nothing"
-                shortcut: "Ctrl+E,Shift+Ctrl+X"
-                enabled: false
-            }
-            MenuItem {
-                text: "Not Even There"
-                shortcut: "Ctrl+E,Shift+Ctrl+Y"
-                visible: false
-            }
-            Menu {
-                title: "Me Neither"
-                visible: false
-            }
         }
         Menu {
             title: "&Help"
-            MenuItem { action: aboutAction }
+            MenuItem {
+                text: "About..."
+                onTriggered: aboutDialog.open()
+            }
         }
     }