mirrors/linphone-desktop
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-desktop.git synced 2026-01-20 13:18:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Ronan Abhamon 2017-05-22 11:12:53 +02:00
parent 7bbd11b655
commit 7eb331dd4c
4 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
linphone-desktop/src/app/App.hpp
View file

@ -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);

4
linphone-desktop/ui/views/App/Calls/CallsWindow.qml
View file

@ -32,6 +32,10 @@ Window {
rightPaned.close()
}
function openConferenceManager () {
Logic.openConferenceManager()
}
// ---------------------------------------------------------------------------
minimumHeight: CallsWindowStyle.minimumHeight

8
linphone-desktop/ui/views/App/Main/MainWindow.js
View file

@ -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'))
}

6
linphone-desktop/ui/views/App/Main/MainWindow.qml
View file

@ -174,6 +174,12 @@ ApplicationWindow {
}
}
ActionButton {
icon: 'new_conference'
onClicked: Logic.openConferenceManager()
}
ActionButton {
icon: 'burger_menu'
iconSize: MainWindowStyle.menuBurgerSize