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

feat(ui/views/App/Calls/ConferenceManager): move this file in a Dialogs directory

Browse source
This commit is contained in:
Ronan Abhamon 2017-05-30 11:37:33 +02:00
parent 22db039cdd
commit 1074ef45bc
6 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
linphone-desktop/resources.qrc
View file

@ -356,9 +356,9 @@
<file>ui/views/App/Calls/AbstractStartingCall.qml</file>
<file>ui/views/App/Calls/CallsWindow.js</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/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/IncallFullscreenWindow.qml</file>
<file>ui/views/App/Calls/Incall.js</file>
@ -407,9 +407,9 @@
<file>ui/views/App/SplashScreen/SplashScreen.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/ConferenceManagerStyle.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/ConferenceManagerStyle.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/AssistantAbstractViewStyle.qml</file>

2
linphone-desktop/ui/views/App/Calls/CallsWindow.js
View file

@ -36,7 +36,7 @@ function handleClosing (close) {
// -----------------------------------------------------------------------------
function openConferenceManager () {
window.attachVirtualWindow(Qt.resolvedUrl('ConferenceManager.qml'))
window.attachVirtualWindow(Qt.resolvedUrl('Dialogs/ConferenceManager.qml'))
}
// -----------------------------------------------------------------------------

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

@ -44,6 +44,10 @@ DialogPlus {
spacing: 0
// -------------------------------------------------------------------------
// Contact.
// -------------------------------------------------------------------------
Contact {
Layout.fillWidth: true

0
linphone-desktop/ui/views/App/Calls/ConferenceManager.qml → linphone-desktop/ui/views/App/Calls/Dialogs/ConferenceManager.qml
View file

0
linphone-desktop/ui/views/App/Styles/Calls/ConferenceManagerStyle.qml → linphone-desktop/ui/views/App/Styles/Calls/Dialogs/ConferenceManagerStyle.qml
View file

2
linphone-desktop/ui/views/App/Styles/qmldir
View file

@ -6,10 +6,10 @@ module App.Styles
singleton CallStyle 1.0 Calls/CallStyle.qml
singleton CallsWindowStyle 1.0 Calls/CallsWindowStyle.qml
singleton ConferenceManagerStyle 1.0 Calls/ConferenceManagerStyle.qml
singleton ConferenceStyle 1.0 Calls/ConferenceStyle.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 AssistantAbstractViewStyle 1.0 Main/Assistant/AssistantAbstractViewStyle.qml