Commit 7eb331dd authored by Ronan Abhamon's avatar Ronan Abhamon

feat(ui/views/App/Main/MainWindow): can launch a conference in the header bar

parent 7bbd11b6
...@@ -61,7 +61,6 @@ public: ...@@ -61,7 +61,6 @@ public:
return mNotifier; return mNotifier;
} }
QQuickWindow *getCallsWindow ();
QQuickWindow *getMainWindow () const; QQuickWindow *getMainWindow () const;
bool hasFocus () const; bool hasFocus () const;
...@@ -74,6 +73,7 @@ public: ...@@ -74,6 +73,7 @@ public:
exit(APP_CODE_RESTART); exit(APP_CODE_RESTART);
} }
Q_INVOKABLE QQuickWindow *getCallsWindow ();
Q_INVOKABLE QQuickWindow *getSettingsWindow (); Q_INVOKABLE QQuickWindow *getSettingsWindow ();
Q_INVOKABLE static void smartShowWindow (QQuickWindow *window); Q_INVOKABLE static void smartShowWindow (QQuickWindow *window);
......
...@@ -32,6 +32,10 @@ Window { ...@@ -32,6 +32,10 @@ Window {
rightPaned.close() rightPaned.close()
} }
function openConferenceManager () {
Logic.openConferenceManager()
}
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
minimumHeight: CallsWindowStyle.minimumHeight minimumHeight: CallsWindowStyle.minimumHeight
......
...@@ -66,6 +66,14 @@ function setView (view, props) { ...@@ -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 () { function manageAccounts () {
window.attachVirtualWindow(Qt.resolvedUrl('ManageAccounts.qml')) window.attachVirtualWindow(Qt.resolvedUrl('ManageAccounts.qml'))
} }
......
...@@ -174,6 +174,12 @@ ApplicationWindow { ...@@ -174,6 +174,12 @@ ApplicationWindow {
} }
} }
ActionButton {
icon: 'new_conference'
onClicked: Logic.openConferenceManager()
}
ActionButton { ActionButton {
icon: 'burger_menu' icon: 'burger_menu'
iconSize: MainWindowStyle.menuBurgerSize iconSize: MainWindowStyle.menuBurgerSize
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment