From f18b3f40e7f86ed673668eedbe607768fd6044bc Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Wed, 17 May 2017 13:24:21 +0200
Subject: [PATCH] Simplified menu to workaround issue with sub menus on Windows
 and Kwin

---
 .../ui/views/App/Main/MainWindowMenuBar.qml   | 63 ++++---------------
 1 file changed, 13 insertions(+), 50 deletions(-)

diff --git a/linphone-desktop/ui/views/App/Main/MainWindowMenuBar.qml b/linphone-desktop/ui/views/App/Main/MainWindowMenuBar.qml
index f423cce54..2535584a7 100644
--- a/linphone-desktop/ui/views/App/Main/MainWindowMenuBar.qml
+++ b/linphone-desktop/ui/views/App/Main/MainWindowMenuBar.qml
@@ -19,8 +19,7 @@ Item {
   Shortcut {
     id: settingsShortcut
 
-    context: Qt.ApplicationShortcut
-    sequence: StandardKey.Preferences
+    sequence: "Ctrl+P"
 
     onActivated: App.smartShowWindow(App.getSettingsWindow())
   }
@@ -52,61 +51,25 @@ Item {
   Menu {
     id: menu
 
-    Menu {
-      title: qsTr('options')
+    MenuItem {
+      shortcut: settingsShortcut.sequence
+      text: qsTr('settings')
 
-      MenuItem {
-        shortcut: settingsShortcut.sequence
-        text: qsTr('settings')
-
-        onTriggered: settingsShortcut.onActivated()
-      }
-
-      MenuSeparator {}
-
-      MenuItem {
-        shortcut: quitShortcut.sequence
-        text: qsTr('quit')
-
-        onTriggered: quitShortcut.onActivated()
-      }
+      onTriggered: settingsShortcut.onActivated()
     }
 
-    // ---------------------------------------------------------------------------
-    // Tools.
-    // ---------------------------------------------------------------------------
+    MenuItem {
+      shortcut: aboutShortcut.sequence
+      text: qsTr('about')
 
-    Menu {
-      title: qsTr('tools')
-
-      MenuItem {
-        text: qsTr('audioAssistant')
-
-        onTriggered: console.log('TODO')
-      }
+      onTriggered: aboutShortcut.onActivated()
     }
 
-    // ---------------------------------------------------------------------------
-    // Help.
-    // ---------------------------------------------------------------------------
+    MenuItem {
+      shortcut: quitShortcut.sequence
+      text: qsTr('quit')
 
-    Menu {
-      title: qsTr('help')
-
-      MenuItem {
-        shortcut: aboutShortcut.sequence
-        text: qsTr('about')
-
-        onTriggered: aboutShortcut.onActivated()
-      }
-
-      MenuSeparator {}
-
-      MenuItem {
-        text: qsTr('checkForUpdates')
-
-        onTriggered: console.log('TODO')
-      }
+      onTriggered: quitShortcut.onActivated()
     }
   }
 }