feat(app): reuse last Window component in `MainWindow` AND USE A WORKAROUND TO...

feat(app): reuse last Window component in `MainWindow` AND USE A WORKAROUND TO DEAL WITH A FILE STYLE BULLSHIT on `Chat` component

linphone-desktop/resources.qrc

@@ -303,7 +303,6 @@
     <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/modules/Linphone/Chat/Chat.qml

@@ -12,6 +12,12 @@ import Utils 1.0
 ColumnLayout {
   property alias proxyModel: chat.model
 
+  // Unable to use it in style file at this moment.
+  // A `TypeError: Cannot read property 'XXX' of undefined` is launched for many properties
+  // in the style file otherwise.
+  // Seems related to: https://bugreports.qt.io/browse/QTBUG-58648
+  property color _backgroundColor: 'white'
+
   property bool _bindToEnd: false
   property var _contactObserver: SipAddressesModel.getContactObserver(proxyModel.sipAddress)
 
@@ -25,7 +31,7 @@ ColumnLayout {
 
   Rectangle {
     anchors.fill: parent
-    color: ChatStyle.color
+    color: _backgroundColor
   }
 
   ScrollableListView {
@@ -176,7 +182,7 @@ ColumnLayout {
           ChatStyle.entry.message.extraContent.leftMargin +
           ChatStyle.entry.message.outgoing.sendIconSize
       }
-      color: ChatStyle.color
+      color: _backgroundColor
       implicitHeight: layout.height + ChatStyle.entry.bottomMargin
 
       // -----------------------------------------------------------------------

linphone-desktop/ui/modules/Linphone/Styles/ChatStyle.qml

@@ -6,8 +6,6 @@ import Common 1.0
 // =============================================================================
 
 QtObject {
-  property color color: Colors.k
-
   property QtObject sectionHeading: QtObject {
     property int padding: 5
     property int bottomMargin: 20

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

@@ -2,8 +2,6 @@ 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
@@ -12,7 +10,7 @@ import App.Styles 1.0
 
 // =============================================================================
 
-Controls1.ApplicationWindow {
+ApplicationWindow {
   id: window
 
   property string _currentView: ''
@@ -64,7 +62,7 @@ Controls1.ApplicationWindow {
   }
 
   function _setView (view, props) {
-    window.setVisible(true)
+    window.show()
     window.requestActivate()
     collapse.setCollapsed(true)
 
@@ -86,160 +84,145 @@ Controls1.ApplicationWindow {
   onActiveFocusItemChanged: activeFocusItem == null && smartSearchBar.hideMenu()
 
   // ---------------------------------------------------------------------------
-  // Menu bar.
+  // Toolbar properties.
   // ---------------------------------------------------------------------------
 
-   menuBar: MainWindowMenuBar {}
+  header: ToolBar {
+    background: MainWindowStyle.toolBar.background
+    height: MainWindowStyle.toolBar.height
 
+    RowLayout {
+      anchors {
+        fill: parent
+        leftMargin: MainWindowStyle.toolBar.leftMargin
+        rightMargin: MainWindowStyle.toolBar.rightMargin
+      }
+      spacing: MainWindowStyle.toolBar.spacing
 
-  ColumnLayout {
-    anchors.fill: parent
-    spacing: 0
+      Collapse {
+        id: collapse
 
-    // -------------------------------------------------------------------------
-    // Toolbar properties.
-    // -------------------------------------------------------------------------
+        Layout.fillHeight: parent.height
+        target: window
+        targetHeight: MainWindowStyle.minimumHeight
+      }
 
-    ToolBar {
-      background: MainWindowStyle.toolBar.background
-      Layout.preferredHeight: MainWindowStyle.toolBar.height
-      Layout.fillWidth: true
+      AccountStatus {
+        id: accountStatus
 
-      RowLayout {
-        anchors {
-          fill: parent
-          leftMargin: MainWindowStyle.toolBar.leftMargin
-          rightMargin: MainWindowStyle.toolBar.rightMargin
-        }
-        spacing: MainWindowStyle.toolBar.spacing
+        Layout.fillHeight: parent.height
+        Layout.preferredWidth: MainWindowStyle.accountStatus.width
 
-        Collapse {
-          id: collapse
+        account: AccountSettingsModel
 
-          Layout.fillHeight: parent.height
-          target: window
-          targetHeight: MainWindowStyle.minimumHeight
+        TooltipArea {
+          text: AccountSettingsModel.sipAddress
         }
 
-        AccountStatus {
-          id: accountStatus
-
-          Layout.fillHeight: parent.height
-          Layout.preferredWidth: MainWindowStyle.accountStatus.width
-
-          account: AccountSettingsModel
+        onClicked: Utils.openWindow('ManageAccounts', window)
+      }
 
-          TooltipArea {
-            text: AccountSettingsModel.sipAddress
-          }
+      Column {
+        width: MainWindowStyle.autoAnswerStatus.width
 
-          onClicked: Utils.openWindow('ManageAccounts', window)
+        Icon {
+          icon: SettingsModel.autoAnswerStatus
+            ? 'auto_answer'
+            : ''
+          iconSize: MainWindowStyle.autoAnswerStatus.iconSize
         }
 
-        Column {
-          width: MainWindowStyle.autoAnswerStatus.width
-
-          Icon {
-            icon: SettingsModel.autoAnswerStatus
-              ? 'auto_answer'
-              : ''
-            iconSize: MainWindowStyle.autoAnswerStatus.iconSize
-          }
-
-          Text {
-            clip: true
-            font {
-              pointSize: MainWindowStyle.autoAnswerStatus.text.fontSize
-            }
-            text: qsTr('autoAnswerStatus')
-            width: parent.width
-            color: MainWindowStyle.autoAnswerStatus.text.color
+        Text {
+          clip: true
+          font {
+            pointSize: MainWindowStyle.autoAnswerStatus.text.fontSize
           }
+          text: qsTr('autoAnswerStatus')
+          width: parent.width
+          color: MainWindowStyle.autoAnswerStatus.text.color
         }
+      }
 
-        SmartSearchBar {
-          id: smartSearchBar
+      SmartSearchBar {
+        id: smartSearchBar
 
-          Layout.fillWidth: true
-          entryHeight: MainWindowStyle.searchBox.entryHeight
-          maxMenuHeight: MainWindowStyle.searchBox.maxHeight
-          placeholderText: qsTr('mainSearchBarPlaceholder')
+        Layout.fillWidth: true
+        entryHeight: MainWindowStyle.searchBox.entryHeight
+        maxMenuHeight: MainWindowStyle.searchBox.maxHeight
+        placeholderText: qsTr('mainSearchBarPlaceholder')
 
-          model: SmartSearchBarModel {}
+        model: SmartSearchBarModel {}
 
-          onAddContact: window.setView('ContactEdit', {
-            sipAddress: sipAddress
-          })
+        onAddContact: window.setView('ContactEdit', {
+          sipAddress: sipAddress
+        })
 
-          onLaunchCall: CallsListModel.launchAudioCall(sipAddress)
-          onLaunchChat: window.setView('Conversation', {
-            sipAddress: sipAddress
-          })
+        onLaunchCall: CallsListModel.launchAudioCall(sipAddress)
+        onLaunchChat: window.setView('Conversation', {
+          sipAddress: sipAddress
+        })
 
-          onLaunchVideoCall: CallsListModel.launchVideoCall(sipAddress)
+        onLaunchVideoCall: CallsListModel.launchVideoCall(sipAddress)
 
-          onEntryClicked: window.setView(entry.contact ? 'ContactEdit' : 'Conversation', {
-            sipAddress: entry.sipAddress
-          })
-        }
+        onEntryClicked: window.setView(entry.contact ? 'ContactEdit' : 'Conversation', {
+          sipAddress: entry.sipAddress
+        })
       }
     }
+  }
+
+  // ---------------------------------------------------------------------------
+  // Content.
+  // ---------------------------------------------------------------------------
 
-    // -------------------------------------------------------------------------
-    // Content.
-    // -------------------------------------------------------------------------
+  RowLayout {
+    anchors.fill: parent
+    spacing: 0
 
-    RowLayout {
+    // Main menu.
+    ColumnLayout {
       Layout.fillHeight: true
-      Layout.fillWidth: true
-
+      Layout.maximumWidth: MainWindowStyle.menu.width
+      Layout.preferredWidth: MainWindowStyle.menu.width
       spacing: 0
 
-      // Main menu.
-      ColumnLayout {
-        Layout.fillHeight: true
-        Layout.maximumWidth: MainWindowStyle.menu.width
-        Layout.preferredWidth: MainWindowStyle.menu.width
-        spacing: 0
-
-        Menu {
-          id: menu
-
-          entryHeight: MainWindowStyle.menu.entryHeight
-          entryWidth: MainWindowStyle.menu.width
+      Menu {
+        id: menu
 
-          entries: [{
-            entryName: qsTr('homeEntry'),
-            icon: 'home'
-          }, {
-            entryName: qsTr('contactsEntry'),
-            icon: 'contact'
-          }]
+        entryHeight: MainWindowStyle.menu.entryHeight
+        entryWidth: MainWindowStyle.menu.width
 
-          onEntrySelected: !entry ? setView('Home') : setView('Contacts')
-        }
-
-        // History.
-        Timeline {
-          id: timeline
-
-          Layout.fillHeight: true
-          Layout.fillWidth: true
-          model: TimelineModel
+        entries: [{
+          entryName: qsTr('homeEntry'),
+          icon: 'home'
+        }, {
+          entryName: qsTr('contactsEntry'),
+          icon: 'contact'
+        }]
 
-          onEntrySelected: setView('Conversation', { sipAddress: entry })
-        }
+        onEntrySelected: !entry ? setView('Home') : setView('Contacts')
       }
 
-      // Main content.
-      Loader {
-        id: contentLoader
+      // History.
+      Timeline {
+        id: timeline
 
         Layout.fillHeight: true
         Layout.fillWidth: true
+        model: TimelineModel
 
-        Component.onCompleted: setView('Home')
+        onEntrySelected: setView('Conversation', { sipAddress: entry })
       }
     }
+
+    // Main content.
+    Loader {
+      id: contentLoader
+
+      Layout.fillHeight: true
+      Layout.fillWidth: true
+
+      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" }
-        }
-
-}