From 9ef34c4b9643bd7ae7f57c8a20be22d28e6f79ea Mon Sep 17 00:00:00 2001 From: Roland Winklmeier Date: Sat, 2 Apr 2016 18:17:39 +0200 Subject: [PATCH] Group all resources in data/ subfolder refs #615 --- .../{ => data}/shared/bootstrap/bootstrap.json | 0 .../{ => data}/shared/dbdata/aircrafticao.json | 0 resources/{ => data}/shared/dbdata/airlineicao.json | 0 resources/{ => data}/shared/dbdata/countries.json | 0 .../{ => data}/shared/dbdata/distributors.json | 0 resources/{ => data}/shared/dbdata/liveries.json | 0 resources/{ => data}/shared/dbdata/models.json | 0 .../{ => data}/shared/updateinfo/updateinfo.json | 0 resources/resources.pro | 7 +++---- src/blackgui/blackgui.pro | 12 ++++++------ src/blackgui/{ => data}/qss/dockwidgettab.qss | 0 src/blackgui/{ => data}/qss/filterdialog.qss | 0 src/blackgui/{ => data}/qss/fonts.qss | 0 src/blackgui/{ => data}/qss/gui.ini | 0 src/blackgui/{ => data}/qss/infobar.qss | 0 src/blackgui/{ => data}/qss/navigator.qss | 0 src/blackgui/{ => data}/qss/stdwidget.qss | 0 src/blackgui/{ => data}/qss/stylesheetintro.qss | 0 src/blackgui/{ => data}/qss/swiftcore.qss | 0 src/blackgui/{ => data}/qss/swiftdata.qss | 0 src/blackgui/{ => data}/qss/swiftlauncher.qss | 0 src/blackgui/{ => data}/qss/swiftstdgui.qss | 0 src/blackgui/{ => data}/qss/textmessage.css | 0 src/blackmisc/buildconfig.cpp | 2 +- src/blacksound/blacksound.pro | 10 +++++----- src/blacksound/{ => data}/sounds/buttonclick.wav | Bin src/blacksound/{ => data}/sounds/buttonpush.wav | Bin src/blacksound/{ => data}/sounds/error.wav | Bin .../{ => data}/sounds/frequencymessage.wav | Bin src/blacksound/{ => data}/sounds/login.wav | Bin src/blacksound/{ => data}/sounds/logoff.wav | Bin src/blacksound/{ => data}/sounds/privatemessage.wav | Bin src/blacksound/{ => data}/sounds/readme.txt | 0 .../{ => data}/sounds/voiceroomjoined.wav | Bin src/blacksound/{ => data}/sounds/voiceroomleft.wav | Bin 35 files changed, 15 insertions(+), 16 deletions(-) rename resources/{ => data}/shared/bootstrap/bootstrap.json (100%) rename resources/{ => data}/shared/dbdata/aircrafticao.json (100%) rename resources/{ => data}/shared/dbdata/airlineicao.json (100%) rename resources/{ => data}/shared/dbdata/countries.json (100%) rename resources/{ => data}/shared/dbdata/distributors.json (100%) rename resources/{ => data}/shared/dbdata/liveries.json (100%) rename resources/{ => data}/shared/dbdata/models.json (100%) rename resources/{ => data}/shared/updateinfo/updateinfo.json (100%) rename src/blackgui/{ => data}/qss/dockwidgettab.qss (100%) rename src/blackgui/{ => data}/qss/filterdialog.qss (100%) rename src/blackgui/{ => data}/qss/fonts.qss (100%) rename src/blackgui/{ => data}/qss/gui.ini (100%) rename src/blackgui/{ => data}/qss/infobar.qss (100%) rename src/blackgui/{ => data}/qss/navigator.qss (100%) rename src/blackgui/{ => data}/qss/stdwidget.qss (100%) rename src/blackgui/{ => data}/qss/stylesheetintro.qss (100%) rename src/blackgui/{ => data}/qss/swiftcore.qss (100%) rename src/blackgui/{ => data}/qss/swiftdata.qss (100%) rename src/blackgui/{ => data}/qss/swiftlauncher.qss (100%) rename src/blackgui/{ => data}/qss/swiftstdgui.qss (100%) rename src/blackgui/{ => data}/qss/textmessage.css (100%) rename src/blacksound/{ => data}/sounds/buttonclick.wav (100%) rename src/blacksound/{ => data}/sounds/buttonpush.wav (100%) rename src/blacksound/{ => data}/sounds/error.wav (100%) rename src/blacksound/{ => data}/sounds/frequencymessage.wav (100%) rename src/blacksound/{ => data}/sounds/login.wav (100%) rename src/blacksound/{ => data}/sounds/logoff.wav (100%) rename src/blacksound/{ => data}/sounds/privatemessage.wav (100%) rename src/blacksound/{ => data}/sounds/readme.txt (100%) rename src/blacksound/{ => data}/sounds/voiceroomjoined.wav (100%) rename src/blacksound/{ => data}/sounds/voiceroomleft.wav (100%) diff --git a/resources/shared/bootstrap/bootstrap.json b/resources/data/shared/bootstrap/bootstrap.json similarity index 100% rename from resources/shared/bootstrap/bootstrap.json rename to resources/data/shared/bootstrap/bootstrap.json diff --git a/resources/shared/dbdata/aircrafticao.json b/resources/data/shared/dbdata/aircrafticao.json similarity index 100% rename from resources/shared/dbdata/aircrafticao.json rename to resources/data/shared/dbdata/aircrafticao.json diff --git a/resources/shared/dbdata/airlineicao.json b/resources/data/shared/dbdata/airlineicao.json similarity index 100% rename from resources/shared/dbdata/airlineicao.json rename to resources/data/shared/dbdata/airlineicao.json diff --git a/resources/shared/dbdata/countries.json b/resources/data/shared/dbdata/countries.json similarity index 100% rename from resources/shared/dbdata/countries.json rename to resources/data/shared/dbdata/countries.json diff --git a/resources/shared/dbdata/distributors.json b/resources/data/shared/dbdata/distributors.json similarity index 100% rename from resources/shared/dbdata/distributors.json rename to resources/data/shared/dbdata/distributors.json diff --git a/resources/shared/dbdata/liveries.json b/resources/data/shared/dbdata/liveries.json similarity index 100% rename from resources/shared/dbdata/liveries.json rename to resources/data/shared/dbdata/liveries.json diff --git a/resources/shared/dbdata/models.json b/resources/data/shared/dbdata/models.json similarity index 100% rename from resources/shared/dbdata/models.json rename to resources/data/shared/dbdata/models.json diff --git a/resources/shared/updateinfo/updateinfo.json b/resources/data/shared/updateinfo/updateinfo.json similarity index 100% rename from resources/shared/updateinfo/updateinfo.json rename to resources/data/shared/updateinfo/updateinfo.json diff --git a/resources/resources.pro b/resources/resources.pro index 2324176ba..91fd99a9c 100644 --- a/resources/resources.pro +++ b/resources/resources.pro @@ -12,13 +12,12 @@ OTHER_FILES += shared/updateinfo/*.* COPY_FILES += $$PWD/data/images/flags/*.png COPY_FILES += $$PWD/data/images/airlines/*.png -COPY_FILES += $$PWD/shared/bootstrap/*.* -COPY_FILES += $$PWD/shared/dbdata/*.* -COPY_FILES += $$PWD/shared/updateinfo/*.* +COPY_FILES += $$PWD/data/shared/bootstrap/*.* +COPY_FILES += $$PWD/data/shared/dbdata/*.* +COPY_FILES += $$PWD/data/shared/updateinfo/*.* package_resources.path = $$PREFIX package_resources.files += data -package_resources.files += shared INSTALLS += package_resources load(common_post) diff --git a/src/blackgui/blackgui.pro b/src/blackgui/blackgui.pro index 804fc6548..485b04086 100644 --- a/src/blackgui/blackgui.pro +++ b/src/blackgui/blackgui.pro @@ -56,8 +56,8 @@ RESOURCES += DESTDIR = $$DestRoot/lib DLLDESTDIR = $$DestRoot/bin -OTHER_FILES += ./qss/*.qss ./qss/*.css ./qss/*.ini *.ico *.rc -COPY_FILES += $$PWD/qss/* +OTHER_FILES += ./data/qss/*.qss ./data/qss/*.css ./data/qss/*.ini *.ico *.rc +COPY_FILES += $$PWD/data/qss/* win32 { dlltarget.path = $$PREFIX/bin @@ -67,10 +67,10 @@ win32 { INSTALLS += target } -package_utils.path = $$PREFIX/qss -package_utils.files += qss/*.qss -package_utils.files += qss/*.css -package_utils.files += qss/*.ini +package_utils.path = $$PREFIX/data/qss +package_utils.files += data/qss/*.qss +package_utils.files += data/qss/*.css +package_utils.files += data/qss/*.ini INSTALLS += package_utils load(common_post) diff --git a/src/blackgui/qss/dockwidgettab.qss b/src/blackgui/data/qss/dockwidgettab.qss similarity index 100% rename from src/blackgui/qss/dockwidgettab.qss rename to src/blackgui/data/qss/dockwidgettab.qss diff --git a/src/blackgui/qss/filterdialog.qss b/src/blackgui/data/qss/filterdialog.qss similarity index 100% rename from src/blackgui/qss/filterdialog.qss rename to src/blackgui/data/qss/filterdialog.qss diff --git a/src/blackgui/qss/fonts.qss b/src/blackgui/data/qss/fonts.qss similarity index 100% rename from src/blackgui/qss/fonts.qss rename to src/blackgui/data/qss/fonts.qss diff --git a/src/blackgui/qss/gui.ini b/src/blackgui/data/qss/gui.ini similarity index 100% rename from src/blackgui/qss/gui.ini rename to src/blackgui/data/qss/gui.ini diff --git a/src/blackgui/qss/infobar.qss b/src/blackgui/data/qss/infobar.qss similarity index 100% rename from src/blackgui/qss/infobar.qss rename to src/blackgui/data/qss/infobar.qss diff --git a/src/blackgui/qss/navigator.qss b/src/blackgui/data/qss/navigator.qss similarity index 100% rename from src/blackgui/qss/navigator.qss rename to src/blackgui/data/qss/navigator.qss diff --git a/src/blackgui/qss/stdwidget.qss b/src/blackgui/data/qss/stdwidget.qss similarity index 100% rename from src/blackgui/qss/stdwidget.qss rename to src/blackgui/data/qss/stdwidget.qss diff --git a/src/blackgui/qss/stylesheetintro.qss b/src/blackgui/data/qss/stylesheetintro.qss similarity index 100% rename from src/blackgui/qss/stylesheetintro.qss rename to src/blackgui/data/qss/stylesheetintro.qss diff --git a/src/blackgui/qss/swiftcore.qss b/src/blackgui/data/qss/swiftcore.qss similarity index 100% rename from src/blackgui/qss/swiftcore.qss rename to src/blackgui/data/qss/swiftcore.qss diff --git a/src/blackgui/qss/swiftdata.qss b/src/blackgui/data/qss/swiftdata.qss similarity index 100% rename from src/blackgui/qss/swiftdata.qss rename to src/blackgui/data/qss/swiftdata.qss diff --git a/src/blackgui/qss/swiftlauncher.qss b/src/blackgui/data/qss/swiftlauncher.qss similarity index 100% rename from src/blackgui/qss/swiftlauncher.qss rename to src/blackgui/data/qss/swiftlauncher.qss diff --git a/src/blackgui/qss/swiftstdgui.qss b/src/blackgui/data/qss/swiftstdgui.qss similarity index 100% rename from src/blackgui/qss/swiftstdgui.qss rename to src/blackgui/data/qss/swiftstdgui.qss diff --git a/src/blackgui/qss/textmessage.css b/src/blackgui/data/qss/textmessage.css similarity index 100% rename from src/blackgui/qss/textmessage.css rename to src/blackgui/data/qss/textmessage.css diff --git a/src/blackmisc/buildconfig.cpp b/src/blackmisc/buildconfig.cpp index d2fb24629..23c6308e4 100644 --- a/src/blackmisc/buildconfig.cpp +++ b/src/blackmisc/buildconfig.cpp @@ -122,7 +122,7 @@ namespace BlackMisc QString getSwiftResourceDirImpl() { QDir dir(CBuildConfig::getApplicationDir()); - if (dir.cdUp()) + if (dir.cdUp() && dir.cd("data")) { Q_ASSERT_X(dir.exists(), Q_FUNC_INFO, "missing dir"); return dir.absolutePath(); diff --git a/src/blacksound/blacksound.pro b/src/blacksound/blacksound.pro index cd5625e38..0afec8f5f 100644 --- a/src/blacksound/blacksound.pro +++ b/src/blacksound/blacksound.pro @@ -26,8 +26,8 @@ SOURCES += *.cpp DESTDIR = $$DestRoot/lib DLLDESTDIR = $$DestRoot/bin -OTHER_FILES += ./sounds/*.wav sounds/readme.txt -COPY_FILES += $$PWD/sounds/* +OTHER_FILES += ./data/sounds/*.wav ./data/sounds/readme.txt +COPY_FILES += $$PWD/data/sounds/* RESOURCES += win32 { @@ -38,9 +38,9 @@ win32 { INSTALLS += target } -package_sounds.path = $$PREFIX/sounds -package_sounds.files += sounds/*.wav -package_sounds.files += sounds/readme.txt +package_sounds.path = $$PREFIX/data/sounds +package_sounds.files += data/sounds/*.wav +package_sounds.files += data/sounds/readme.txt INSTALLS += package_sounds load(common_post) diff --git a/src/blacksound/sounds/buttonclick.wav b/src/blacksound/data/sounds/buttonclick.wav similarity index 100% rename from src/blacksound/sounds/buttonclick.wav rename to src/blacksound/data/sounds/buttonclick.wav diff --git a/src/blacksound/sounds/buttonpush.wav b/src/blacksound/data/sounds/buttonpush.wav similarity index 100% rename from src/blacksound/sounds/buttonpush.wav rename to src/blacksound/data/sounds/buttonpush.wav diff --git a/src/blacksound/sounds/error.wav b/src/blacksound/data/sounds/error.wav similarity index 100% rename from src/blacksound/sounds/error.wav rename to src/blacksound/data/sounds/error.wav diff --git a/src/blacksound/sounds/frequencymessage.wav b/src/blacksound/data/sounds/frequencymessage.wav similarity index 100% rename from src/blacksound/sounds/frequencymessage.wav rename to src/blacksound/data/sounds/frequencymessage.wav diff --git a/src/blacksound/sounds/login.wav b/src/blacksound/data/sounds/login.wav similarity index 100% rename from src/blacksound/sounds/login.wav rename to src/blacksound/data/sounds/login.wav diff --git a/src/blacksound/sounds/logoff.wav b/src/blacksound/data/sounds/logoff.wav similarity index 100% rename from src/blacksound/sounds/logoff.wav rename to src/blacksound/data/sounds/logoff.wav diff --git a/src/blacksound/sounds/privatemessage.wav b/src/blacksound/data/sounds/privatemessage.wav similarity index 100% rename from src/blacksound/sounds/privatemessage.wav rename to src/blacksound/data/sounds/privatemessage.wav diff --git a/src/blacksound/sounds/readme.txt b/src/blacksound/data/sounds/readme.txt similarity index 100% rename from src/blacksound/sounds/readme.txt rename to src/blacksound/data/sounds/readme.txt diff --git a/src/blacksound/sounds/voiceroomjoined.wav b/src/blacksound/data/sounds/voiceroomjoined.wav similarity index 100% rename from src/blacksound/sounds/voiceroomjoined.wav rename to src/blacksound/data/sounds/voiceroomjoined.wav diff --git a/src/blacksound/sounds/voiceroomleft.wav b/src/blacksound/data/sounds/voiceroomleft.wav similarity index 100% rename from src/blacksound/sounds/voiceroomleft.wav rename to src/blacksound/data/sounds/voiceroomleft.wav