From 7eb331dd4c20ecd58d03f640ad444713d2431f09 Mon Sep 17 00:00:00 2001
From: Ronan Abhamon <ronan.abhamon@belledonne-communications.com>
Date: Mon, 22 May 2017 11:12:53 +0200
Subject: [PATCH] feat(ui/views/App/Main/MainWindow): can launch a conference
 in the header bar

---
 linphone-desktop/src/app/App.hpp                    | 2 +-
 linphone-desktop/ui/views/App/Calls/CallsWindow.qml | 4 ++++
 linphone-desktop/ui/views/App/Main/MainWindow.js    | 8 ++++++++
 linphone-desktop/ui/views/App/Main/MainWindow.qml   | 6 ++++++
 4 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/linphone-desktop/src/app/App.hpp b/linphone-desktop/src/app/App.hpp
index 9e26f2a8f..f712e6faf 100644
--- a/linphone-desktop/src/app/App.hpp
+++ b/linphone-desktop/src/app/App.hpp
@@ -61,7 +61,6 @@ public:
     return mNotifier;
   }
 
-  QQuickWindow *getCallsWindow ();
   QQuickWindow *getMainWindow () const;
 
   bool hasFocus () const;
@@ -74,6 +73,7 @@ public:
     exit(APP_CODE_RESTART);
   }
 
+  Q_INVOKABLE QQuickWindow *getCallsWindow ();
   Q_INVOKABLE QQuickWindow *getSettingsWindow ();
 
   Q_INVOKABLE static void smartShowWindow (QQuickWindow *window);
diff --git a/linphone-desktop/ui/views/App/Calls/CallsWindow.qml b/linphone-desktop/ui/views/App/Calls/CallsWindow.qml
index 4374e63cd..90ebd92ef 100644
--- a/linphone-desktop/ui/views/App/Calls/CallsWindow.qml
+++ b/linphone-desktop/ui/views/App/Calls/CallsWindow.qml
@@ -32,6 +32,10 @@ Window {
     rightPaned.close()
   }
 
+  function openConferenceManager () {
+    Logic.openConferenceManager()
+  }
+
   // ---------------------------------------------------------------------------
 
   minimumHeight: CallsWindowStyle.minimumHeight
diff --git a/linphone-desktop/ui/views/App/Main/MainWindow.js b/linphone-desktop/ui/views/App/Main/MainWindow.js
index 27ecf10a9..8c638618d 100644
--- a/linphone-desktop/ui/views/App/Main/MainWindow.js
+++ b/linphone-desktop/ui/views/App/Main/MainWindow.js
@@ -66,6 +66,14 @@ function setView (view, props) {
 
 // -----------------------------------------------------------------------------
 
+function openConferenceManager () {
+  var App = Linphone.App
+  var callsWindow = App.getCallsWindow()
+
+  App.smartShowWindow(callsWindow)
+  callsWindow.openConferenceManager()
+}
+
 function manageAccounts () {
   window.attachVirtualWindow(Qt.resolvedUrl('ManageAccounts.qml'))
 }
diff --git a/linphone-desktop/ui/views/App/Main/MainWindow.qml b/linphone-desktop/ui/views/App/Main/MainWindow.qml
index 79bbcc899..66d4526a5 100644
--- a/linphone-desktop/ui/views/App/Main/MainWindow.qml
+++ b/linphone-desktop/ui/views/App/Main/MainWindow.qml
@@ -174,6 +174,12 @@ ApplicationWindow {
             }
           }
 
+          ActionButton {
+            icon: 'new_conference'
+
+            onClicked: Logic.openConferenceManager()
+          }
+
           ActionButton {
             icon: 'burger_menu'
             iconSize: MainWindowStyle.menuBurgerSize