diff options
author | Sebastian Kügler <sebas@kde.org> | 2015-11-07 00:39:06 +0100 |
---|---|---|
committer | Dirk Hohndel <dirk@hohndel.org> | 2015-11-07 09:00:59 -0800 |
commit | aae4a326f4738be368088f0d0f7a91d75b02a9ad (patch) | |
tree | 937c2253e015da2a127285e957a98f785b5cfc94 /qt-mobile | |
parent | 95ac4c4454aa49326500639aab839eb3d11efa87 (diff) | |
download | subsurface-aae4a326f4738be368088f0d0f7a91d75b02a9ad.tar.gz |
organize qml files in subdirectories
This makes the organization of the qml files a bit more fine-grained, it
prevents mixing of .cpp and QML files, and also of what's compiled, and
what's included in the app as qrc data.
In particular:
- subsurface specific QML items go into the qml/ subdirectory
- theme and unit definitions to into qml/theme subdirectory (they
already were located in a theme directory)
- generic components, such as our Label goes into qml/components
This facilitates sharing of functionality and identifying common stuff
better. Ideally, we can pull qml/theme and qml/components from a
standardized set at some point, so we don't have to maintain that code.
Signed-off-by: Sebastian Kügler <sebas@kde.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'qt-mobile')
-rw-r--r-- | qt-mobile/qml/DiveDetails.qml (renamed from qt-mobile/DiveDetails.qml) | 0 | ||||
-rw-r--r-- | qt-mobile/qml/DiveList.qml (renamed from qt-mobile/DiveList.qml) | 0 | ||||
-rw-r--r-- | qt-mobile/qml/DownloadFromDiveComputer.qml (renamed from qt-mobile/DownloadFromDiveComputer.qml) | 0 | ||||
-rw-r--r-- | qt-mobile/qml/Log.qml (renamed from qt-mobile/Log.qml) | 0 | ||||
-rw-r--r-- | qt-mobile/qml/Preferences.qml (renamed from qt-mobile/Preferences.qml) | 0 | ||||
-rw-r--r-- | qt-mobile/qml/TextButton.qml (renamed from qt-mobile/TextButton.qml) | 0 | ||||
-rw-r--r-- | qt-mobile/qml/ThemeTest.qml (renamed from qt-mobile/ThemeTest.qml) | 0 | ||||
-rw-r--r-- | qt-mobile/qml/TopBar.qml (renamed from qt-mobile/TopBar.qml) | 0 | ||||
-rw-r--r-- | qt-mobile/qml/components/Label.qml (renamed from qt-mobile/Label.qml) | 0 | ||||
-rw-r--r-- | qt-mobile/qml/main.qml (renamed from qt-mobile/main.qml) | 0 | ||||
-rw-r--r-- | qt-mobile/qml/mobile-resources.qrc (renamed from qt-mobile/mobile-resources.qrc) | 4 | ||||
-rw-r--r-- | qt-mobile/qml/theme/Theme.qml (renamed from qt-mobile/theme/Theme.qml) | 0 | ||||
-rw-r--r-- | qt-mobile/qml/theme/Units.qml (renamed from qt-mobile/theme/Units.qml) | 0 | ||||
-rw-r--r-- | qt-mobile/qml/theme/qmldir (renamed from qt-mobile/theme/qmldir) | 0 |
14 files changed, 2 insertions, 2 deletions
diff --git a/qt-mobile/DiveDetails.qml b/qt-mobile/qml/DiveDetails.qml index afb62104a..afb62104a 100644 --- a/qt-mobile/DiveDetails.qml +++ b/qt-mobile/qml/DiveDetails.qml diff --git a/qt-mobile/DiveList.qml b/qt-mobile/qml/DiveList.qml index c95b4dcaa..c95b4dcaa 100644 --- a/qt-mobile/DiveList.qml +++ b/qt-mobile/qml/DiveList.qml diff --git a/qt-mobile/DownloadFromDiveComputer.qml b/qt-mobile/qml/DownloadFromDiveComputer.qml index d23754407..d23754407 100644 --- a/qt-mobile/DownloadFromDiveComputer.qml +++ b/qt-mobile/qml/DownloadFromDiveComputer.qml diff --git a/qt-mobile/Log.qml b/qt-mobile/qml/Log.qml index 8e660f2c7..8e660f2c7 100644 --- a/qt-mobile/Log.qml +++ b/qt-mobile/qml/Log.qml diff --git a/qt-mobile/Preferences.qml b/qt-mobile/qml/Preferences.qml index 8f4a15328..8f4a15328 100644 --- a/qt-mobile/Preferences.qml +++ b/qt-mobile/qml/Preferences.qml diff --git a/qt-mobile/TextButton.qml b/qt-mobile/qml/TextButton.qml index 3e5a36735..3e5a36735 100644 --- a/qt-mobile/TextButton.qml +++ b/qt-mobile/qml/TextButton.qml diff --git a/qt-mobile/ThemeTest.qml b/qt-mobile/qml/ThemeTest.qml index 7452acc1b..7452acc1b 100644 --- a/qt-mobile/ThemeTest.qml +++ b/qt-mobile/qml/ThemeTest.qml diff --git a/qt-mobile/TopBar.qml b/qt-mobile/qml/TopBar.qml index 552159d53..552159d53 100644 --- a/qt-mobile/TopBar.qml +++ b/qt-mobile/qml/TopBar.qml diff --git a/qt-mobile/Label.qml b/qt-mobile/qml/components/Label.qml index 617e05245..617e05245 100644 --- a/qt-mobile/Label.qml +++ b/qt-mobile/qml/components/Label.qml diff --git a/qt-mobile/main.qml b/qt-mobile/qml/main.qml index f75476537..f75476537 100644 --- a/qt-mobile/main.qml +++ b/qt-mobile/qml/main.qml diff --git a/qt-mobile/mobile-resources.qrc b/qt-mobile/qml/mobile-resources.qrc index e331288f8..42a89bd21 100644 --- a/qt-mobile/mobile-resources.qrc +++ b/qt-mobile/qml/mobile-resources.qrc @@ -9,8 +9,8 @@ <file>Log.qml</file> <file>TopBar.qml</file> <file>ThemeTest.qml</file> - <file>Label.qml</file> - <file alias="subsurface-mobile-icon.png">../icons/subsurface-mobile-icon.png</file> + <file alias="Label.qml">components/Label.qml</file> + <file alias="subsurface-mobile-icon.png">../../icons/subsurface-mobile-icon.png</file> </qresource> <qresource prefix="/qml/theme"> <file alias="Theme.qml">theme/Theme.qml</file> diff --git a/qt-mobile/theme/Theme.qml b/qt-mobile/qml/theme/Theme.qml index 2c51ae00f..2c51ae00f 100644 --- a/qt-mobile/theme/Theme.qml +++ b/qt-mobile/qml/theme/Theme.qml diff --git a/qt-mobile/theme/Units.qml b/qt-mobile/qml/theme/Units.qml index 1d0899fbc..1d0899fbc 100644 --- a/qt-mobile/theme/Units.qml +++ b/qt-mobile/qml/theme/Units.qml diff --git a/qt-mobile/theme/qmldir b/qt-mobile/qml/theme/qmldir index c654dbad6..c654dbad6 100644 --- a/qt-mobile/theme/qmldir +++ b/qt-mobile/qml/theme/qmldir |