From aae4a326f4738be368088f0d0f7a91d75b02a9ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20K=C3=BCgler?= Date: Sat, 7 Nov 2015 00:39:06 +0100 Subject: [PATCH] organize qml files in subdirectories MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Signed-off-by: Dirk Hohndel --- CMakeLists.txt | 2 +- qt-mobile/{ => qml}/DiveDetails.qml | 0 qt-mobile/{ => qml}/DiveList.qml | 0 qt-mobile/{ => qml}/DownloadFromDiveComputer.qml | 0 qt-mobile/{ => qml}/Log.qml | 0 qt-mobile/{ => qml}/Preferences.qml | 0 qt-mobile/{ => qml}/TextButton.qml | 0 qt-mobile/{ => qml}/ThemeTest.qml | 0 qt-mobile/{ => qml}/TopBar.qml | 0 qt-mobile/{ => qml/components}/Label.qml | 0 qt-mobile/{ => qml}/main.qml | 0 qt-mobile/{ => qml}/mobile-resources.qrc | 4 ++-- qt-mobile/{ => qml}/theme/Theme.qml | 0 qt-mobile/{ => qml}/theme/Units.qml | 0 qt-mobile/{ => qml}/theme/qmldir | 0 15 files changed, 3 insertions(+), 3 deletions(-) rename qt-mobile/{ => qml}/DiveDetails.qml (100%) rename qt-mobile/{ => qml}/DiveList.qml (100%) rename qt-mobile/{ => qml}/DownloadFromDiveComputer.qml (100%) rename qt-mobile/{ => qml}/Log.qml (100%) rename qt-mobile/{ => qml}/Preferences.qml (100%) rename qt-mobile/{ => qml}/TextButton.qml (100%) rename qt-mobile/{ => qml}/ThemeTest.qml (100%) rename qt-mobile/{ => qml}/TopBar.qml (100%) rename qt-mobile/{ => qml/components}/Label.qml (100%) rename qt-mobile/{ => qml}/main.qml (100%) rename qt-mobile/{ => qml}/mobile-resources.qrc (79%) rename qt-mobile/{ => qml}/theme/Theme.qml (100%) rename qt-mobile/{ => qml}/theme/Units.qml (100%) rename qt-mobile/{ => qml}/theme/qmldir (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 98456b13f..d45ca4321 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -353,7 +353,7 @@ if(SUBSURFACE_MOBILE) subsurface-mobile-helper.cpp ) add_definitions(-DSUBSURFACE_MOBILE) - qt5_add_resources(MOBILE_RESOURCES qt-mobile/mobile-resources.qrc) + qt5_add_resources(MOBILE_RESOURCES qt-mobile/qml/mobile-resources.qrc) if(ANDROID) add_library(subsurface-mobile SHARED ${MOBILE_SRC} ${SUBSURFACE_PKG} ${SUBSURFACE_RESOURCES} ${MOBILE_RESOURCES}) else() diff --git a/qt-mobile/DiveDetails.qml b/qt-mobile/qml/DiveDetails.qml similarity index 100% rename from qt-mobile/DiveDetails.qml rename to qt-mobile/qml/DiveDetails.qml diff --git a/qt-mobile/DiveList.qml b/qt-mobile/qml/DiveList.qml similarity index 100% rename from qt-mobile/DiveList.qml rename to qt-mobile/qml/DiveList.qml diff --git a/qt-mobile/DownloadFromDiveComputer.qml b/qt-mobile/qml/DownloadFromDiveComputer.qml similarity index 100% rename from qt-mobile/DownloadFromDiveComputer.qml rename to qt-mobile/qml/DownloadFromDiveComputer.qml diff --git a/qt-mobile/Log.qml b/qt-mobile/qml/Log.qml similarity index 100% rename from qt-mobile/Log.qml rename to qt-mobile/qml/Log.qml diff --git a/qt-mobile/Preferences.qml b/qt-mobile/qml/Preferences.qml similarity index 100% rename from qt-mobile/Preferences.qml rename to qt-mobile/qml/Preferences.qml diff --git a/qt-mobile/TextButton.qml b/qt-mobile/qml/TextButton.qml similarity index 100% rename from qt-mobile/TextButton.qml rename to qt-mobile/qml/TextButton.qml diff --git a/qt-mobile/ThemeTest.qml b/qt-mobile/qml/ThemeTest.qml similarity index 100% rename from qt-mobile/ThemeTest.qml rename to qt-mobile/qml/ThemeTest.qml diff --git a/qt-mobile/TopBar.qml b/qt-mobile/qml/TopBar.qml similarity index 100% rename from qt-mobile/TopBar.qml rename to qt-mobile/qml/TopBar.qml diff --git a/qt-mobile/Label.qml b/qt-mobile/qml/components/Label.qml similarity index 100% rename from qt-mobile/Label.qml rename to qt-mobile/qml/components/Label.qml diff --git a/qt-mobile/main.qml b/qt-mobile/qml/main.qml similarity index 100% rename from qt-mobile/main.qml rename to qt-mobile/qml/main.qml diff --git a/qt-mobile/mobile-resources.qrc b/qt-mobile/qml/mobile-resources.qrc similarity index 79% rename from qt-mobile/mobile-resources.qrc rename to 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 @@ Log.qml TopBar.qml ThemeTest.qml - Label.qml - ../icons/subsurface-mobile-icon.png + components/Label.qml + ../../icons/subsurface-mobile-icon.png theme/Theme.qml diff --git a/qt-mobile/theme/Theme.qml b/qt-mobile/qml/theme/Theme.qml similarity index 100% rename from qt-mobile/theme/Theme.qml rename to qt-mobile/qml/theme/Theme.qml diff --git a/qt-mobile/theme/Units.qml b/qt-mobile/qml/theme/Units.qml similarity index 100% rename from qt-mobile/theme/Units.qml rename to qt-mobile/qml/theme/Units.qml diff --git a/qt-mobile/theme/qmldir b/qt-mobile/qml/theme/qmldir similarity index 100% rename from qt-mobile/theme/qmldir rename to qt-mobile/qml/theme/qmldir