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
1074ef45
Commit
1074ef45
authored
May 30, 2017
by
Ronan Abhamon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat(ui/views/App/Calls/ConferenceManager): move this file in a `Dialogs` directory
parent
22db039c
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
8 additions
and
4 deletions
+8
-4
resources.qrc
linphone-desktop/resources.qrc
+2
-2
CallsWindow.js
linphone-desktop/ui/views/App/Calls/CallsWindow.js
+1
-1
CallTransfer.qml
linphone-desktop/ui/views/App/Calls/Dialogs/CallTransfer.qml
+4
-0
ConferenceManager.qml
...-desktop/ui/views/App/Calls/Dialogs/ConferenceManager.qml
+0
-0
ConferenceManagerStyle.qml
...views/App/Styles/Calls/Dialogs/ConferenceManagerStyle.qml
+0
-0
qmldir
linphone-desktop/ui/views/App/Styles/qmldir
+1
-1
No files found.
linphone-desktop/resources.qrc
View file @
1074ef45
...
@@ -356,9 +356,9 @@
...
@@ -356,9 +356,9 @@
<file>
ui/views/App/Calls/AbstractStartingCall.qml
</file>
<file>
ui/views/App/Calls/AbstractStartingCall.qml
</file>
<file>
ui/views/App/Calls/CallsWindow.js
</file>
<file>
ui/views/App/Calls/CallsWindow.js
</file>
<file>
ui/views/App/Calls/CallsWindow.qml
</file>
<file>
ui/views/App/Calls/CallsWindow.qml
</file>
<file>
ui/views/App/Calls/ConferenceManager.qml
</file>
<file>
ui/views/App/Calls/Conference.qml
</file>
<file>
ui/views/App/Calls/Conference.qml
</file>
<file>
ui/views/App/Calls/Dialogs/CallTransfer.qml
</file>
<file>
ui/views/App/Calls/Dialogs/CallTransfer.qml
</file>
<file>
ui/views/App/Calls/Dialogs/ConferenceManager.qml
</file>
<file>
ui/views/App/Calls/EndedCall.qml
</file>
<file>
ui/views/App/Calls/EndedCall.qml
</file>
<file>
ui/views/App/Calls/IncallFullscreenWindow.qml
</file>
<file>
ui/views/App/Calls/IncallFullscreenWindow.qml
</file>
<file>
ui/views/App/Calls/Incall.js
</file>
<file>
ui/views/App/Calls/Incall.js
</file>
...
@@ -407,9 +407,9 @@
...
@@ -407,9 +407,9 @@
<file>
ui/views/App/SplashScreen/SplashScreen.qml
</file>
<file>
ui/views/App/SplashScreen/SplashScreen.qml
</file>
<file>
ui/views/App/Styles/Calls/CallStyle.qml
</file>
<file>
ui/views/App/Styles/Calls/CallStyle.qml
</file>
<file>
ui/views/App/Styles/Calls/CallsWindowStyle.qml
</file>
<file>
ui/views/App/Styles/Calls/CallsWindowStyle.qml
</file>
<file>
ui/views/App/Styles/Calls/ConferenceManagerStyle.qml
</file>
<file>
ui/views/App/Styles/Calls/ConferenceStyle.qml
</file>
<file>
ui/views/App/Styles/Calls/ConferenceStyle.qml
</file>
<file>
ui/views/App/Styles/Calls/Dialogs/CallTransferStyle.qml
</file>
<file>
ui/views/App/Styles/Calls/Dialogs/CallTransferStyle.qml
</file>
<file>
ui/views/App/Styles/Calls/Dialogs/ConferenceManagerStyle.qml
</file>
<file>
ui/views/App/Styles/Main/AboutStyle.qml
</file>
<file>
ui/views/App/Styles/Main/AboutStyle.qml
</file>
<file>
ui/views/App/Styles/Main/Assistant/ActivateLinphoneSipAccountWithEmailStyle.qml
</file>
<file>
ui/views/App/Styles/Main/Assistant/ActivateLinphoneSipAccountWithEmailStyle.qml
</file>
<file>
ui/views/App/Styles/Main/Assistant/AssistantAbstractViewStyle.qml
</file>
<file>
ui/views/App/Styles/Main/Assistant/AssistantAbstractViewStyle.qml
</file>
...
...
linphone-desktop/ui/views/App/Calls/CallsWindow.js
View file @
1074ef45
...
@@ -36,7 +36,7 @@ function handleClosing (close) {
...
@@ -36,7 +36,7 @@ function handleClosing (close) {
// -----------------------------------------------------------------------------
// -----------------------------------------------------------------------------
function
openConferenceManager
()
{
function
openConferenceManager
()
{
window
.
attachVirtualWindow
(
Qt
.
resolvedUrl
(
'
ConferenceManager.qml
'
))
window
.
attachVirtualWindow
(
Qt
.
resolvedUrl
(
'
Dialogs/
ConferenceManager.qml
'
))
}
}
// -----------------------------------------------------------------------------
// -----------------------------------------------------------------------------
...
...
linphone-desktop/ui/views/App/Calls/Dialogs/CallTransfer.qml
View file @
1074ef45
...
@@ -44,6 +44,10 @@ DialogPlus {
...
@@ -44,6 +44,10 @@ DialogPlus {
spacing
:
0
spacing
:
0
// -------------------------------------------------------------------------
// Contact.
// -------------------------------------------------------------------------
Contact
{
Contact
{
Layout.fillWidth
:
true
Layout.fillWidth
:
true
...
...
linphone-desktop/ui/views/App/Calls/ConferenceManager.qml
→
linphone-desktop/ui/views/App/Calls/
Dialogs/
ConferenceManager.qml
View file @
1074ef45
File moved
linphone-desktop/ui/views/App/Styles/Calls/ConferenceManagerStyle.qml
→
linphone-desktop/ui/views/App/Styles/Calls/
Dialogs/
ConferenceManagerStyle.qml
View file @
1074ef45
File moved
linphone-desktop/ui/views/App/Styles/qmldir
View file @
1074ef45
...
@@ -6,10 +6,10 @@ module App.Styles
...
@@ -6,10 +6,10 @@ module App.Styles
singleton CallStyle 1.0 Calls/CallStyle.qml
singleton CallStyle 1.0 Calls/CallStyle.qml
singleton CallsWindowStyle 1.0 Calls/CallsWindowStyle.qml
singleton CallsWindowStyle 1.0 Calls/CallsWindowStyle.qml
singleton ConferenceManagerStyle 1.0 Calls/ConferenceManagerStyle.qml
singleton ConferenceStyle 1.0 Calls/ConferenceStyle.qml
singleton ConferenceStyle 1.0 Calls/ConferenceStyle.qml
singleton CallTransferStyle 1.0 Calls/Dialogs/CallTransferStyle.qml
singleton CallTransferStyle 1.0 Calls/Dialogs/CallTransferStyle.qml
singleton ConferenceManagerStyle 1.0 Calls/Dialogs/ConferenceManagerStyle.qml
singleton ActivateLinphoneSipAccountWithEmailStyle 1.0 Main/Assistant/ActivateLinphoneSipAccountWithEmailStyle.qml
singleton ActivateLinphoneSipAccountWithEmailStyle 1.0 Main/Assistant/ActivateLinphoneSipAccountWithEmailStyle.qml
singleton AssistantAbstractViewStyle 1.0 Main/Assistant/AssistantAbstractViewStyle.qml
singleton AssistantAbstractViewStyle 1.0 Main/Assistant/AssistantAbstractViewStyle.qml
...
...
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