From 84110f16cb683ed85f53c06db334a0520e96faaa Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Tue, 30 May 2017 11:46:27 +0200 Subject: [PATCH] feat(app): move dialogs in a subdirectory --- linphone-desktop/resources.qrc | 14 +++++++------- .../ui/views/App/Main/{ => Dialogs}/About.qml | 0 .../Main/{ => Dialogs}/AuthenticationRequest.js | 0 .../Main/{ => Dialogs}/AuthenticationRequest.qml | 0 .../App/Main/{ => Dialogs}/ManageAccounts.qml | 0 linphone-desktop/ui/views/App/Main/MainWindow.js | 4 ++-- .../ui/views/App/Main/MainWindowMenuBar.qml | 2 +- .../App/Styles/Main/{ => Dialogs}/AboutStyle.qml | 0 .../{ => Dialogs}/AuthenticationRequestStyle.qml | 0 .../Main/{ => Dialogs}/ManageAccountsStyle.qml | 0 linphone-desktop/ui/views/App/Styles/qmldir | 7 ++++--- 11 files changed, 14 insertions(+), 13 deletions(-) rename linphone-desktop/ui/views/App/Main/{ => Dialogs}/About.qml (100%) rename linphone-desktop/ui/views/App/Main/{ => Dialogs}/AuthenticationRequest.js (100%) rename linphone-desktop/ui/views/App/Main/{ => Dialogs}/AuthenticationRequest.qml (100%) rename linphone-desktop/ui/views/App/Main/{ => Dialogs}/ManageAccounts.qml (100%) rename linphone-desktop/ui/views/App/Styles/Main/{ => Dialogs}/AboutStyle.qml (100%) rename linphone-desktop/ui/views/App/Styles/Main/{ => Dialogs}/AuthenticationRequestStyle.qml (100%) rename linphone-desktop/ui/views/App/Styles/Main/{ => Dialogs}/ManageAccountsStyle.qml (100%) diff --git a/linphone-desktop/resources.qrc b/linphone-desktop/resources.qrc index 3ccf8b1d6..6b590b9a1 100644 --- a/linphone-desktop/resources.qrc +++ b/linphone-desktop/resources.qrc @@ -365,7 +365,6 @@ ui/views/App/Calls/Incall.qml ui/views/App/Calls/IncomingCall.qml ui/views/App/Calls/OutgoingCall.qml - ui/views/App/Main/About.qml ui/views/App/Main/Assistant/ActivateLinphoneSipAccountWithEmail.qml ui/views/App/Main/Assistant/AssistantAbstractView.qml ui/views/App/Main/Assistant/AssistantHome.qml @@ -378,19 +377,20 @@ ui/views/App/Main/Assistant/UseLinphoneSipAccountWithPhoneNumber.qml ui/views/App/Main/Assistant/UseLinphoneSipAccountWithUsername.qml ui/views/App/Main/Assistant/UseOtherSipAccount.qml - ui/views/App/Main/AuthenticationRequest.js - ui/views/App/Main/AuthenticationRequest.qml ui/views/App/Main/ContactEdit.js ui/views/App/Main/ContactEdit.qml ui/views/App/Main/Contacts.qml ui/views/App/Main/Conversation.js ui/views/App/Main/Conversation.qml + ui/views/App/Main/Dialogs/About.qml + ui/views/App/Main/Dialogs/AuthenticationRequest.js + ui/views/App/Main/Dialogs/AuthenticationRequest.qml + ui/views/App/Main/Dialogs/ManageAccounts.qml ui/views/App/Main/Home.qml ui/views/App/Main/InviteFriends.qml ui/views/App/Main/MainWindow.js ui/views/App/Main/MainWindowMenuBar.qml ui/views/App/Main/MainWindow.qml - ui/views/App/Main/ManageAccounts.qml ui/views/App/Settings/SettingsAudio.qml ui/views/App/Settings/SettingsCallsChat.qml ui/views/App/Settings/SettingsNetwork.qml @@ -410,21 +410,21 @@ 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 ui/views/App/Styles/Main/Assistant/AssistantHomeStyle.qml ui/views/App/Styles/Main/Assistant/CreateLinphoneSipAccountStyle.qml ui/views/App/Styles/Main/AssistantStyle.qml ui/views/App/Styles/Main/Assistant/UseLinphoneSipAccountStyle.qml - ui/views/App/Styles/Main/AuthenticationRequestStyle.qml ui/views/App/Styles/Main/ContactEditStyle.qml ui/views/App/Styles/Main/ContactsStyle.qml ui/views/App/Styles/Main/ConversationStyle.qml + ui/views/App/Styles/Main/Dialogs/AboutStyle.qml + ui/views/App/Styles/Main/Dialogs/AuthenticationRequestStyle.qml + ui/views/App/Styles/Main/Dialogs/ManageAccountsStyle.qml ui/views/App/Styles/Main/HomeStyle.qml ui/views/App/Styles/Main/InviteFriendsStyle.qml ui/views/App/Styles/Main/MainWindowStyle.qml - ui/views/App/Styles/Main/ManageAccountsStyle.qml ui/views/App/Styles/qmldir ui/views/App/Styles/Settings/SettingsAudioStyle.qml ui/views/App/Styles/Settings/SettingsSipAccountsEditStyle.qml diff --git a/linphone-desktop/ui/views/App/Main/About.qml b/linphone-desktop/ui/views/App/Main/Dialogs/About.qml similarity index 100% rename from linphone-desktop/ui/views/App/Main/About.qml rename to linphone-desktop/ui/views/App/Main/Dialogs/About.qml diff --git a/linphone-desktop/ui/views/App/Main/AuthenticationRequest.js b/linphone-desktop/ui/views/App/Main/Dialogs/AuthenticationRequest.js similarity index 100% rename from linphone-desktop/ui/views/App/Main/AuthenticationRequest.js rename to linphone-desktop/ui/views/App/Main/Dialogs/AuthenticationRequest.js diff --git a/linphone-desktop/ui/views/App/Main/AuthenticationRequest.qml b/linphone-desktop/ui/views/App/Main/Dialogs/AuthenticationRequest.qml similarity index 100% rename from linphone-desktop/ui/views/App/Main/AuthenticationRequest.qml rename to linphone-desktop/ui/views/App/Main/Dialogs/AuthenticationRequest.qml diff --git a/linphone-desktop/ui/views/App/Main/ManageAccounts.qml b/linphone-desktop/ui/views/App/Main/Dialogs/ManageAccounts.qml similarity index 100% rename from linphone-desktop/ui/views/App/Main/ManageAccounts.qml rename to linphone-desktop/ui/views/App/Main/Dialogs/ManageAccounts.qml diff --git a/linphone-desktop/ui/views/App/Main/MainWindow.js b/linphone-desktop/ui/views/App/Main/MainWindow.js index 8c638618d..ced0f31b4 100644 --- a/linphone-desktop/ui/views/App/Main/MainWindow.js +++ b/linphone-desktop/ui/views/App/Main/MainWindow.js @@ -75,7 +75,7 @@ function openConferenceManager () { } function manageAccounts () { - window.attachVirtualWindow(Qt.resolvedUrl('ManageAccounts.qml')) + window.attachVirtualWindow(Qt.resolvedUrl('Dialogs/ManageAccounts.qml')) } // ----------------------------------------------------------------------------- @@ -101,7 +101,7 @@ function updateSelectedEntry (view, props) { // ----------------------------------------------------------------------------- function handleAuthenticationRequested (authInfo, realm, sipAddress, userId) { - window.attachVirtualWindow(Qt.resolvedUrl('AuthenticationRequest.qml'), { + window.attachVirtualWindow(Qt.resolvedUrl('Dialogs/AuthenticationRequest.qml'), { authInfo: authInfo, realm: realm, sipAddress: sipAddress, diff --git a/linphone-desktop/ui/views/App/Main/MainWindowMenuBar.qml b/linphone-desktop/ui/views/App/Main/MainWindowMenuBar.qml index 611155192..57f930e60 100644 --- a/linphone-desktop/ui/views/App/Main/MainWindowMenuBar.qml +++ b/linphone-desktop/ui/views/App/Main/MainWindowMenuBar.qml @@ -40,7 +40,7 @@ Item { onActivated: { window.detachVirtualWindow() - window.attachVirtualWindow(Qt.resolvedUrl('About.qml')) + window.attachVirtualWindow(Qt.resolvedUrl('Dialogs/About.qml')) } } diff --git a/linphone-desktop/ui/views/App/Styles/Main/AboutStyle.qml b/linphone-desktop/ui/views/App/Styles/Main/Dialogs/AboutStyle.qml similarity index 100% rename from linphone-desktop/ui/views/App/Styles/Main/AboutStyle.qml rename to linphone-desktop/ui/views/App/Styles/Main/Dialogs/AboutStyle.qml diff --git a/linphone-desktop/ui/views/App/Styles/Main/AuthenticationRequestStyle.qml b/linphone-desktop/ui/views/App/Styles/Main/Dialogs/AuthenticationRequestStyle.qml similarity index 100% rename from linphone-desktop/ui/views/App/Styles/Main/AuthenticationRequestStyle.qml rename to linphone-desktop/ui/views/App/Styles/Main/Dialogs/AuthenticationRequestStyle.qml diff --git a/linphone-desktop/ui/views/App/Styles/Main/ManageAccountsStyle.qml b/linphone-desktop/ui/views/App/Styles/Main/Dialogs/ManageAccountsStyle.qml similarity index 100% rename from linphone-desktop/ui/views/App/Styles/Main/ManageAccountsStyle.qml rename to linphone-desktop/ui/views/App/Styles/Main/Dialogs/ManageAccountsStyle.qml diff --git a/linphone-desktop/ui/views/App/Styles/qmldir b/linphone-desktop/ui/views/App/Styles/qmldir index 3530263ef..d1eb4617b 100644 --- a/linphone-desktop/ui/views/App/Styles/qmldir +++ b/linphone-desktop/ui/views/App/Styles/qmldir @@ -17,16 +17,17 @@ singleton AssistantHomeStyle 1.0 Main/Assistant/AssistantH singleton CreateLinphoneSipAccountStyle 1.0 Main/Assistant/CreateLinphoneSipAccountStyle.qml singleton UseLinphoneSipAccountStyle 1.0 Main/Assistant/UseLinphoneSipAccountStyle.qml -singleton AboutStyle 1.0 Main/AboutStyle.qml singleton AssistantStyle 1.0 Main/AssistantStyle.qml -singleton AuthenticationRequestStyle 1.0 Main/AuthenticationRequestStyle.qml singleton ContactEditStyle 1.0 Main/ContactEditStyle.qml singleton ContactsStyle 1.0 Main/ContactsStyle.qml singleton ConversationStyle 1.0 Main/ConversationStyle.qml singleton HomeStyle 1.0 Main/HomeStyle.qml singleton InviteFriendsStyle 1.0 Main/InviteFriendsStyle.qml singleton MainWindowStyle 1.0 Main/MainWindowStyle.qml -singleton ManageAccountsStyle 1.0 Main/ManageAccountsStyle.qml + +singleton AboutStyle 1.0 Main/Dialogs/AboutStyle.qml +singleton AuthenticationRequestStyle 1.0 Main/Dialogs/AuthenticationRequestStyle.qml +singleton ManageAccountsStyle 1.0 Main/Dialogs/ManageAccountsStyle.qml singleton SettingsAudioStyle 1.0 Settings/SettingsAudioStyle.qml singleton SettingsSipAccountsEditStyle 1.0 Settings/SettingsSipAccountsEditStyle.qml