test

linphone-desktop/resources.qrc

@@ -303,6 +303,7 @@
     <file>ui/views/App/Main/Contacts.qml</file>
     <file>ui/views/App/Main/Conversation.qml</file>
     <file>ui/views/App/Main/Home.qml</file>
+    <file>ui/views/App/Main/MainWindowMenuBar.qml</file>
     <file>ui/views/App/Main/MainWindow.qml</file>
     <file>ui/views/App/ManageAccounts.qml</file>
     <file>ui/views/App/qmldir</file>

linphone-desktop/ui/views/App/Main/MainWindow.qml

@@ -2,6 +2,8 @@ import QtQuick 2.7
 import QtQuick.Controls 2.0
 import QtQuick.Layouts 1.3
 
+import QtQuick.Controls 1.4 as Controls1
+
 import Common 1.0
 import Linphone 1.0
 import Utils 1.0
@@ -10,7 +12,7 @@ import App.Styles 1.0
 
 // =============================================================================
 
-ApplicationWindow {
+Controls1.ApplicationWindow {
   id: window
 
   property string _currentView: ''
@@ -62,7 +64,7 @@ ApplicationWindow {
   }
 
   function _setView (view, props) {
-    window.show()
+    window.setVisible(true)
     window.requestActivate()
     collapse.setCollapsed(true)
 
@@ -84,12 +86,24 @@ ApplicationWindow {
   onActiveFocusItemChanged: activeFocusItem == null && smartSearchBar.hideMenu()
 
   // ---------------------------------------------------------------------------
-  // Toolbar properties.
+  // Menu bar.
   // ---------------------------------------------------------------------------
 
-  header: ToolBar {
+   menuBar: MainWindowMenuBar {}
+
+
+  ColumnLayout {
+    anchors.fill: parent
+    spacing: 0
+
+    // -------------------------------------------------------------------------
+    // Toolbar properties.
+    // -------------------------------------------------------------------------
+
+    ToolBar {
       background: MainWindowStyle.toolBar.background
-    height: MainWindowStyle.toolBar.height
+      Layout.preferredHeight: MainWindowStyle.toolBar.height
+      Layout.fillWidth: true
 
       RowLayout {
         anchors {
@@ -171,12 +185,14 @@ ApplicationWindow {
       }
     }
 
-  // ---------------------------------------------------------------------------
+    // -------------------------------------------------------------------------
     // Content.
-  // ---------------------------------------------------------------------------
+    // -------------------------------------------------------------------------
 
     RowLayout {
-    anchors.fill: parent
+      Layout.fillHeight: true
+      Layout.fillWidth: true
+
       spacing: 0
 
       // Main menu.
@@ -225,4 +241,5 @@ ApplicationWindow {
         Component.onCompleted: setView('Home')
       }
     }
+  }
 }

linphone-desktop/ui/views/App/Main/MainWindowMenuBar.qml

+
+ import QtQuick.Controls 1.4
+MenuBar {
+
+  Menu {
+            title: "File"
+            MenuItem { text: "Open..." }
+            MenuItem { text: "Close" }
+        }
+
+}