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
84110f16
Commit
84110f16
authored
May 30, 2017
by
Ronan Abhamon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat(app): move dialogs in a subdirectory
parent
1074ef45
Changes
11
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
14 additions
and
13 deletions
+14
-13
resources.qrc
linphone-desktop/resources.qrc
+7
-7
About.qml
linphone-desktop/ui/views/App/Main/Dialogs/About.qml
+0
-0
AuthenticationRequest.js
...esktop/ui/views/App/Main/Dialogs/AuthenticationRequest.js
+0
-0
AuthenticationRequest.qml
...sktop/ui/views/App/Main/Dialogs/AuthenticationRequest.qml
+0
-0
ManageAccounts.qml
...hone-desktop/ui/views/App/Main/Dialogs/ManageAccounts.qml
+0
-0
MainWindow.js
linphone-desktop/ui/views/App/Main/MainWindow.js
+2
-2
MainWindowMenuBar.qml
linphone-desktop/ui/views/App/Main/MainWindowMenuBar.qml
+1
-1
AboutStyle.qml
...e-desktop/ui/views/App/Styles/Main/Dialogs/AboutStyle.qml
+0
-0
AuthenticationRequestStyle.qml
...ws/App/Styles/Main/Dialogs/AuthenticationRequestStyle.qml
+0
-0
ManageAccountsStyle.qml
.../ui/views/App/Styles/Main/Dialogs/ManageAccountsStyle.qml
+0
-0
qmldir
linphone-desktop/ui/views/App/Styles/qmldir
+4
-3
No files found.
linphone-desktop/resources.qrc
View file @
84110f16
...
...
@@ -365,7 +365,6 @@
<file>
ui/views/App/Calls/Incall.qml
</file>
<file>
ui/views/App/Calls/IncomingCall.qml
</file>
<file>
ui/views/App/Calls/OutgoingCall.qml
</file>
<file>
ui/views/App/Main/About.qml
</file>
<file>
ui/views/App/Main/Assistant/ActivateLinphoneSipAccountWithEmail.qml
</file>
<file>
ui/views/App/Main/Assistant/AssistantAbstractView.qml
</file>
<file>
ui/views/App/Main/Assistant/AssistantHome.qml
</file>
...
...
@@ -378,19 +377,20 @@
<file>
ui/views/App/Main/Assistant/UseLinphoneSipAccountWithPhoneNumber.qml
</file>
<file>
ui/views/App/Main/Assistant/UseLinphoneSipAccountWithUsername.qml
</file>
<file>
ui/views/App/Main/Assistant/UseOtherSipAccount.qml
</file>
<file>
ui/views/App/Main/AuthenticationRequest.js
</file>
<file>
ui/views/App/Main/AuthenticationRequest.qml
</file>
<file>
ui/views/App/Main/ContactEdit.js
</file>
<file>
ui/views/App/Main/ContactEdit.qml
</file>
<file>
ui/views/App/Main/Contacts.qml
</file>
<file>
ui/views/App/Main/Conversation.js
</file>
<file>
ui/views/App/Main/Conversation.qml
</file>
<file>
ui/views/App/Main/Dialogs/About.qml
</file>
<file>
ui/views/App/Main/Dialogs/AuthenticationRequest.js
</file>
<file>
ui/views/App/Main/Dialogs/AuthenticationRequest.qml
</file>
<file>
ui/views/App/Main/Dialogs/ManageAccounts.qml
</file>
<file>
ui/views/App/Main/Home.qml
</file>
<file>
ui/views/App/Main/InviteFriends.qml
</file>
<file>
ui/views/App/Main/MainWindow.js
</file>
<file>
ui/views/App/Main/MainWindowMenuBar.qml
</file>
<file>
ui/views/App/Main/MainWindow.qml
</file>
<file>
ui/views/App/Main/ManageAccounts.qml
</file>
<file>
ui/views/App/Settings/SettingsAudio.qml
</file>
<file>
ui/views/App/Settings/SettingsCallsChat.qml
</file>
<file>
ui/views/App/Settings/SettingsNetwork.qml
</file>
...
...
@@ -410,21 +410,21 @@
<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>
<file>
ui/views/App/Styles/Main/Assistant/AssistantHomeStyle.qml
</file>
<file>
ui/views/App/Styles/Main/Assistant/CreateLinphoneSipAccountStyle.qml
</file>
<file>
ui/views/App/Styles/Main/AssistantStyle.qml
</file>
<file>
ui/views/App/Styles/Main/Assistant/UseLinphoneSipAccountStyle.qml
</file>
<file>
ui/views/App/Styles/Main/AuthenticationRequestStyle.qml
</file>
<file>
ui/views/App/Styles/Main/ContactEditStyle.qml
</file>
<file>
ui/views/App/Styles/Main/ContactsStyle.qml
</file>
<file>
ui/views/App/Styles/Main/ConversationStyle.qml
</file>
<file>
ui/views/App/Styles/Main/Dialogs/AboutStyle.qml
</file>
<file>
ui/views/App/Styles/Main/Dialogs/AuthenticationRequestStyle.qml
</file>
<file>
ui/views/App/Styles/Main/Dialogs/ManageAccountsStyle.qml
</file>
<file>
ui/views/App/Styles/Main/HomeStyle.qml
</file>
<file>
ui/views/App/Styles/Main/InviteFriendsStyle.qml
</file>
<file>
ui/views/App/Styles/Main/MainWindowStyle.qml
</file>
<file>
ui/views/App/Styles/Main/ManageAccountsStyle.qml
</file>
<file>
ui/views/App/Styles/qmldir
</file>
<file>
ui/views/App/Styles/Settings/SettingsAudioStyle.qml
</file>
<file>
ui/views/App/Styles/Settings/SettingsSipAccountsEditStyle.qml
</file>
...
...
linphone-desktop/ui/views/App/Main/About.qml
→
linphone-desktop/ui/views/App/Main/
Dialogs/
About.qml
View file @
84110f16
File moved
linphone-desktop/ui/views/App/Main/AuthenticationRequest.js
→
linphone-desktop/ui/views/App/Main/
Dialogs/
AuthenticationRequest.js
View file @
84110f16
File moved
linphone-desktop/ui/views/App/Main/AuthenticationRequest.qml
→
linphone-desktop/ui/views/App/Main/
Dialogs/
AuthenticationRequest.qml
View file @
84110f16
File moved
linphone-desktop/ui/views/App/Main/ManageAccounts.qml
→
linphone-desktop/ui/views/App/Main/
Dialogs/
ManageAccounts.qml
View file @
84110f16
File moved
linphone-desktop/ui/views/App/Main/MainWindow.js
View file @
84110f16
...
...
@@ -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
,
...
...
linphone-desktop/ui/views/App/Main/MainWindowMenuBar.qml
View file @
84110f16
...
...
@@ -40,7 +40,7 @@ Item {
onActivated
:
{
window
.
detachVirtualWindow
()
window
.
attachVirtualWindow
(
Qt
.
resolvedUrl
(
'
About.qml
'
))
window
.
attachVirtualWindow
(
Qt
.
resolvedUrl
(
'
Dialogs/
About.qml
'
))
}
}
...
...
linphone-desktop/ui/views/App/Styles/Main/AboutStyle.qml
→
linphone-desktop/ui/views/App/Styles/Main/
Dialogs/
AboutStyle.qml
View file @
84110f16
File moved
linphone-desktop/ui/views/App/Styles/Main/AuthenticationRequestStyle.qml
→
linphone-desktop/ui/views/App/Styles/Main/
Dialogs/
AuthenticationRequestStyle.qml
View file @
84110f16
File moved
linphone-desktop/ui/views/App/Styles/Main/ManageAccountsStyle.qml
→
linphone-desktop/ui/views/App/Styles/Main/
Dialogs/
ManageAccountsStyle.qml
View file @
84110f16
File moved
linphone-desktop/ui/views/App/Styles/qmldir
View file @
84110f16
...
...
@@ -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
...
...
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