Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
linphone-desktop
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
linphone-desktop
Commits
7eb331dd
Commit
7eb331dd
authored
May 22, 2017
by
Ronan Abhamon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat(ui/views/App/Main/MainWindow): can launch a conference in the header bar
parent
7bbd11b6
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
19 additions
and
1 deletion
+19
-1
App.hpp
linphone-desktop/src/app/App.hpp
+1
-1
CallsWindow.qml
linphone-desktop/ui/views/App/Calls/CallsWindow.qml
+4
-0
MainWindow.js
linphone-desktop/ui/views/App/Main/MainWindow.js
+8
-0
MainWindow.qml
linphone-desktop/ui/views/App/Main/MainWindow.qml
+6
-0
No files found.
linphone-desktop/src/app/App.hpp
View file @
7eb331dd
...
...
@@ -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
);
...
...
linphone-desktop/ui/views/App/Calls/CallsWindow.qml
View file @
7eb331dd
...
...
@@ -32,6 +32,10 @@ Window {
rightPaned
.
close
()
}
function
openConferenceManager
()
{
Logic
.
openConferenceManager
()
}
// ---------------------------------------------------------------------------
minimumHeight
:
CallsWindowStyle
.
minimumHeight
...
...
linphone-desktop/ui/views/App/Main/MainWindow.js
View file @
7eb331dd
...
...
@@ -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
'
))
}
...
...
linphone-desktop/ui/views/App/Main/MainWindow.qml
View file @
7eb331dd
...
...
@@ -174,6 +174,12 @@ ApplicationWindow {
}
}
ActionButton
{
icon
:
'
new_conference
'
onClicked
:
Logic
.
openConferenceManager
()
}
ActionButton
{
icon
:
'
burger_menu
'
iconSize
:
MainWindowStyle
.
menuBurgerSize
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment