diff --git a/linphone-desktop/resources.qrc b/linphone-desktop/resources.qrc index 5b8b2f316..3ccf8b1d6 100644 --- a/linphone-desktop/resources.qrc +++ b/linphone-desktop/resources.qrc @@ -356,9 +356,9 @@ ui/views/App/Calls/AbstractStartingCall.qml ui/views/App/Calls/CallsWindow.js ui/views/App/Calls/CallsWindow.qml - ui/views/App/Calls/ConferenceManager.qml ui/views/App/Calls/Conference.qml ui/views/App/Calls/Dialogs/CallTransfer.qml + ui/views/App/Calls/Dialogs/ConferenceManager.qml ui/views/App/Calls/EndedCall.qml ui/views/App/Calls/IncallFullscreenWindow.qml ui/views/App/Calls/Incall.js @@ -407,9 +407,9 @@ ui/views/App/SplashScreen/SplashScreen.qml ui/views/App/Styles/Calls/CallStyle.qml ui/views/App/Styles/Calls/CallsWindowStyle.qml - ui/views/App/Styles/Calls/ConferenceManagerStyle.qml ui/views/App/Styles/Calls/ConferenceStyle.qml ui/views/App/Styles/Calls/Dialogs/CallTransferStyle.qml + ui/views/App/Styles/Calls/Dialogs/ConferenceManagerStyle.qml ui/views/App/Styles/Main/AboutStyle.qml ui/views/App/Styles/Main/Assistant/ActivateLinphoneSipAccountWithEmailStyle.qml ui/views/App/Styles/Main/Assistant/AssistantAbstractViewStyle.qml diff --git a/linphone-desktop/ui/views/App/Calls/CallsWindow.js b/linphone-desktop/ui/views/App/Calls/CallsWindow.js index 789a50d84..32075e981 100644 --- a/linphone-desktop/ui/views/App/Calls/CallsWindow.js +++ b/linphone-desktop/ui/views/App/Calls/CallsWindow.js @@ -36,7 +36,7 @@ function handleClosing (close) { // ----------------------------------------------------------------------------- function openConferenceManager () { - window.attachVirtualWindow(Qt.resolvedUrl('ConferenceManager.qml')) + window.attachVirtualWindow(Qt.resolvedUrl('Dialogs/ConferenceManager.qml')) } // ----------------------------------------------------------------------------- diff --git a/linphone-desktop/ui/views/App/Calls/Dialogs/CallTransfer.qml b/linphone-desktop/ui/views/App/Calls/Dialogs/CallTransfer.qml index e8a5a9eb3..70c43ace2 100644 --- a/linphone-desktop/ui/views/App/Calls/Dialogs/CallTransfer.qml +++ b/linphone-desktop/ui/views/App/Calls/Dialogs/CallTransfer.qml @@ -44,6 +44,10 @@ DialogPlus { spacing: 0 + // ------------------------------------------------------------------------- + // Contact. + // ------------------------------------------------------------------------- + Contact { Layout.fillWidth: true diff --git a/linphone-desktop/ui/views/App/Calls/ConferenceManager.qml b/linphone-desktop/ui/views/App/Calls/Dialogs/ConferenceManager.qml similarity index 100% rename from linphone-desktop/ui/views/App/Calls/ConferenceManager.qml rename to linphone-desktop/ui/views/App/Calls/Dialogs/ConferenceManager.qml diff --git a/linphone-desktop/ui/views/App/Styles/Calls/ConferenceManagerStyle.qml b/linphone-desktop/ui/views/App/Styles/Calls/Dialogs/ConferenceManagerStyle.qml similarity index 100% rename from linphone-desktop/ui/views/App/Styles/Calls/ConferenceManagerStyle.qml rename to linphone-desktop/ui/views/App/Styles/Calls/Dialogs/ConferenceManagerStyle.qml diff --git a/linphone-desktop/ui/views/App/Styles/qmldir b/linphone-desktop/ui/views/App/Styles/qmldir index ce9b4f680..3530263ef 100644 --- a/linphone-desktop/ui/views/App/Styles/qmldir +++ b/linphone-desktop/ui/views/App/Styles/qmldir @@ -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