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
d373f9cd
Commit
d373f9cd
authored
Sep 26, 2016
by
Ronan Abhamon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat(app): use styles modules instead of qrc paths
parent
5f98c29a
Changes
21
Hide whitespace changes
Inline
Side-by-side
Showing
21 changed files
with
33 additions
and
30 deletions
+33
-30
resources.qrc
tests/resources.qrc
+10
-10
main.cpp
tests/src/main.cpp
+3
-0
Collapse.qml
tests/ui/components/collapse/Collapse.qml
+2
-2
ConfirmDialog.qml
tests/ui/components/dialog/ConfirmDialog.qml
+2
-2
DialogDescription.qml
tests/ui/components/dialog/DialogDescription.qml
+1
-1
DialogPlus.qml
tests/ui/components/dialog/DialogPlus.qml
+1
-1
InvertedMouseArea.qml
tests/ui/components/invertedMouseArea/InvertedMouseArea.qml
+1
-1
PopupShadow.qml
tests/ui/components/popup/PopupShadow.qml
+1
-1
ForceScrollBar.qml
tests/ui/components/scrollBar/ForceScrollBar.qml
+1
-1
SearchBox.qml
tests/ui/components/searchBox/SearchBox.qml
+3
-3
Timeline.qml
tests/ui/components/timeline/Timeline.qml
+2
-2
Colors.qml
tests/ui/style/AppStyle/Colors.qml
+0
-0
Constants.qml
tests/ui/style/AppStyle/Constants.qml
+0
-0
qmldir
tests/ui/style/AppStyle/qmldir
+1
-1
CollapseStyle.qml
tests/ui/style/ComponentsStyle/CollapseStyle.qml
+0
-0
DialogStyle.qml
tests/ui/style/ComponentsStyle/DialogStyle.qml
+0
-0
PopupStyle.qml
tests/ui/style/ComponentsStyle/PopupStyle.qml
+1
-1
ScrollBarStyle.qml
tests/ui/style/ComponentsStyle/ScrollBarStyle.qml
+1
-1
SearchBoxStyle.qml
tests/ui/style/ComponentsStyle/SearchBoxStyle.qml
+1
-1
TimelineStyle.qml
tests/ui/style/ComponentsStyle/TimelineStyle.qml
+1
-1
qmldir
tests/ui/style/ComponentsStyle/qmldir
+1
-1
No files found.
tests/resources.qrc
View file @
d373f9cd
...
...
@@ -35,16 +35,16 @@
<file>
ui/components/form/DarkButton.qml
</file>
<file>
ui/components/invertedMouseArea/InvertedMouseArea.qml
</file>
<file>
ui/scripts/utils.js
</file>
<file>
ui/style/
components
/qmldir
</file>
<file>
ui/style/
components
/DialogStyle.qml
</file>
<file>
ui/style/
components
/ScrollBarStyle.qml
</file>
<file>
ui/style/
components
/TimelineStyle.qml
</file>
<file>
ui/style/
components
/SearchBoxStyle.qml
</file>
<file>
ui/style/
components
/CollapseStyle.qml
</file>
<file>
ui/style/
components
/PopupStyle.qml
</file>
<file>
ui/style/
global
/qmldir
</file>
<file>
ui/style/
global
/Colors.qml
</file>
<file>
ui/style/
global
/Constants.qml
</file>
<file>
ui/style/
ComponentsStyle
/qmldir
</file>
<file>
ui/style/
ComponentsStyle
/DialogStyle.qml
</file>
<file>
ui/style/
ComponentsStyle
/ScrollBarStyle.qml
</file>
<file>
ui/style/
ComponentsStyle
/TimelineStyle.qml
</file>
<file>
ui/style/
ComponentsStyle
/SearchBoxStyle.qml
</file>
<file>
ui/style/
ComponentsStyle
/CollapseStyle.qml
</file>
<file>
ui/style/
ComponentsStyle
/PopupStyle.qml
</file>
<file>
ui/style/
AppStyle
/qmldir
</file>
<file>
ui/style/
AppStyle
/Colors.qml
</file>
<file>
ui/style/
AppStyle
/Constants.qml
</file>
<file>
ui/views/newCall.qml
</file>
<file>
ui/views/manageAccounts.qml
</file>
<file>
ui/views/mainWindow/mainWindow.qml
</file>
...
...
tests/src/main.cpp
View file @
d373f9cd
...
...
@@ -55,6 +55,9 @@ int main (int argc, char *argv[]) {
QQmlFileSelector
*
selector
=
new
QQmlFileSelector
(
&
engine
);
selector
->
setExtraSelectors
(
QStringList
(
"custom"
));
// Set modules paths.
engine
.
addImportPath
(
":/ui/style"
);
engine
.
load
(
QUrl
(
"qrc:/ui/views/mainWindow/mainWindow.qml"
));
if
(
engine
.
rootObjects
().
isEmpty
())
return
EXIT_FAILURE
;
...
...
tests/ui/components/collapse/Collapse.qml
View file @
d373f9cd
import
QtQuick
2.7
import
'
qrc:/ui/components/form
'
import
ComponentsStyle
1.0
import
'
qrc:/ui/
style/components
'
import
'
qrc:/ui/
components/form
'
// ===================================================================
// A simple component to build collapsed item.
...
...
tests/ui/components/dialog/ConfirmDialog.qml
View file @
d373f9cd
import
QtQuick
2.7
import
'
qrc:/ui/components/form
'
import
ComponentsStyle
1.0
import
'
qrc:/ui/
style/components
'
import
'
qrc:/ui/
components/form
'
// ===================================================================
// A dialog with OK/Cancel buttons.
...
...
tests/ui/components/dialog/DialogDescription.qml
View file @
d373f9cd
import
QtQuick
2.7
import
'
qrc:/ui/style/components
'
import
ComponentsStyle
1.0
// ===================================================================
// Description content used by dialogs.
...
...
tests/ui/components/dialog/DialogPlus.qml
View file @
d373f9cd
...
...
@@ -2,7 +2,7 @@ import QtQuick 2.7
import
QtQuick
.
Layouts
1.3
import
QtQuick
.
Window
2.2
import
'
qrc:/ui/style/components
'
import
ComponentsStyle
1.0
// ===================================================================
// Helper to build quickly dialogs.
...
...
tests/ui/components/invertedMouseArea/InvertedMouseArea.qml
View file @
d373f9cd
import
QtQuick
2.7
import
'
qrc:/ui/style/global
'
import
AppStyle
1.0
// ===================================================================
// Helper to handle button click outside a component.
...
...
tests/ui/components/popup/PopupShadow.qml
View file @
d373f9cd
import
QtGraphicalEffects
1.0
import
'
qrc:/ui/style/components
'
import
ComponentsStyle
1.0
// ===================================================================
...
...
tests/ui/components/scrollBar/ForceScrollBar.qml
View file @
d373f9cd
import
QtQuick
2.7
import
QtQuick
.
Controls
2.0
import
'
qrc:/ui/style/components
'
import
ComponentsStyle
1.0
// ===================================================================
...
...
tests/ui/components/searchBox/SearchBox.qml
View file @
d373f9cd
import
QtQuick
2.7
import
QtQuick
.
Controls
2.0
import
AppStyle
1.0
import
ComponentsStyle
1.0
import
'
qrc:/ui/components/invertedMouseArea
'
import
'
qrc:/ui/components/popup
'
import
'
qrc:/ui/style/components
'
import
'
qrc:/ui/style/global
'
// ===================================================================
Item
{
...
...
tests/ui/components/timeline/Timeline.qml
View file @
d373f9cd
import
QtQuick
2.7
import
QtQuick
.
Layouts
1.3
import
ComponentsStyle
1.0
import
'
qrc:/ui/components/contact
'
import
'
qrc:/ui/components/image
'
import
'
qrc:/ui/components/view
'
import
'
qrc:/ui/style/components
'
// ===================================================================
ColumnLayout
{
...
...
tests/ui/style/
global
/Colors.qml
→
tests/ui/style/
AppStyle
/Colors.qml
View file @
d373f9cd
File moved
tests/ui/style/
global
/Constants.qml
→
tests/ui/style/
AppStyle
/Constants.qml
View file @
d373f9cd
File moved
tests/ui/style/
global
/qmldir
→
tests/ui/style/
AppStyle
/qmldir
View file @
d373f9cd
# See: https://wiki.qt.io/Qml_Styling
module Style
module
App
Style
singleton Colors 1.0 Colors.qml
singleton Constants 1.0 Constants.qml
tests/ui/style/
components
/CollapseStyle.qml
→
tests/ui/style/
ComponentsStyle
/CollapseStyle.qml
View file @
d373f9cd
File moved
tests/ui/style/
components
/DialogStyle.qml
→
tests/ui/style/
ComponentsStyle
/DialogStyle.qml
View file @
d373f9cd
File moved
tests/ui/style/
components
/PopupStyle.qml
→
tests/ui/style/
ComponentsStyle
/PopupStyle.qml
View file @
d373f9cd
pragma
Singleton
import
QtQuick
2.7
import
'
qrc:/ui/style/global
'
import
AppStyle
1.0
QtObject
{
property
QtObject
shadow
:
QtObject
{
...
...
tests/ui/style/
components
/ScrollBarStyle.qml
→
tests/ui/style/
ComponentsStyle
/ScrollBarStyle.qml
View file @
d373f9cd
pragma
Singleton
import
QtQuick
2.7
import
'
qrc:/ui/style/global
'
import
AppStyle
1.0
QtObject
{
property
string
color
:
Colors
.
c
...
...
tests/ui/style/
components
/SearchBoxStyle.qml
→
tests/ui/style/
ComponentsStyle
/SearchBoxStyle.qml
View file @
d373f9cd
pragma
Singleton
import
QtQuick
2.7
import
'
qrc:/ui/style/global
'
import
AppStyle
1.0
QtObject
{
property
string
shadowColor
:
Colors
.
a
...
...
tests/ui/style/
components
/TimelineStyle.qml
→
tests/ui/style/
ComponentsStyle
/TimelineStyle.qml
View file @
d373f9cd
pragma
Singleton
import
QtQuick
2.7
import
'
qrc:/ui/style/global
'
import
AppStyle
1.0
QtObject
{
property
QtObject
legend
:
QtObject
{
...
...
tests/ui/style/
components
/qmldir
→
tests/ui/style/
ComponentsStyle
/qmldir
View file @
d373f9cd
# See: https://wiki.qt.io/Qml_Styling
module Style
module
Components
Style
singleton CollapseStyle 1.0 CollapseStyle.qml
singleton DialogStyle 1.0 DialogStyle.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