From 14991cb317805a15daaf95d915904f53bfb65c4f Mon Sep 17 00:00:00 2001 From: Elias Steurer Date: Fri, 10 Jul 2020 20:49:11 +0200 Subject: [PATCH] Change Resources into two seperate qrc files --- ScreenPlay/CMakeLists.txt | 10 +-- ScreenPlay/Resources.qrc | 108 ++++++++--------------------- ScreenPlay/qml.qrc | 55 +++++++++++++++ ScreenPlayWallpaper/CMakeLists.txt | 8 ++- ScreenPlayWidget/CMakeLists.txt | 10 ++- 5 files changed, 98 insertions(+), 93 deletions(-) create mode 100644 ScreenPlay/qml.qrc diff --git a/ScreenPlay/CMakeLists.txt b/ScreenPlay/CMakeLists.txt index ec09d069..07722c5c 100644 --- a/ScreenPlay/CMakeLists.txt +++ b/ScreenPlay/CMakeLists.txt @@ -58,14 +58,16 @@ set(headers app.h src/util.h src/create.h) -set(resources Resources.qrc) +qt5_add_big_resources(resources resources.qrc) -if(NOT CMAKE_BUILD_TYPE STREQUAL "Debug") - qtquick_compiler_add_resources(resources ${resources}) +if(CMAKE_BUILD_TYPE STREQUAL "Debug") + set(qml qml.qrc) +else() + qtquick_compiler_add_resources(qml qml.qrc ) endif() -add_executable(${PROJECT_NAME} ${src} ${headers} ${resources}) +add_executable(${PROJECT_NAME} ${src} ${headers} ${resources} ${qml}) # Disable console window on Windows # https://stackoverflow.com/questions/8249028/how-do-i-keep-my-qt-c-program-from-opening-a-console-in-windows diff --git a/ScreenPlay/Resources.qrc b/ScreenPlay/Resources.qrc index dc7003b9..a7be202c 100644 --- a/ScreenPlay/Resources.qrc +++ b/ScreenPlay/Resources.qrc @@ -6,6 +6,10 @@ assets/fonts/Roboto-Thin.ttf assets/fonts/RobotoMono-Light.ttf assets/fonts/RobotoMono-Thin.ttf + assets/fonts/NotoSans-Light.ttf + assets/fonts/NotoSans-Medium.ttf + assets/fonts/NotoSans-Regular.ttf + assets/fonts/NotoSans-Thin.ttf assets/icons/favicon.ico assets/icons/font-awsome/close.svg assets/icons/font-awsome/frown-o.svg @@ -62,11 +66,33 @@ assets/images/noisy-texture-2.png assets/images/noisy-texture-3.png assets/images/noisy-texture.png - assets/licenses/Apache2.txt - assets/licenses/OFL.txt assets/particle/backgroundGlow.png assets/particle/dot.png assets/shader/movingcolorramp.fsh + qtquickcontrols2.conf + assets/icons/icon_screen.svg + assets/icons/icon_close.svg + assets/images/FFmpeg_Logo_new.svg + profiles.json + assets/images/mask_round.svg + assets/icons/icon_launch.svg + assets/icons/brand_twitch.svg + assets/icons/brand_github.svg + assets/icons/brand_gitlab.svg + assets/icons/brand_twitter.svg + assets/icons/icon_done.svg + assets/wizards/example_html.png + assets/wizards/example_qml.png + assets/images/undraw_static_website_0107.svg + translations/ScreenPlay_de.qm + translations/ScreenPlay_en.qm + translations/ScreenPlay_es.qm + translations/ScreenPlay_fr.qm + translations/ScreenPlay_ru.qm + translations/ScreenPlay_ko.qm + translations/ScreenPlay_vi.qm + assets/licenses/Apache2.txt + assets/licenses/OFL.txt legal/DataProtection.txt legal/Font Awesome Free License.txt legal/OFL.txt @@ -74,83 +100,5 @@ legal/Qt LGPLv3.txt legal/gpl-3.0.txt legal/lgpl-2.1.txt - main.qml - qml/Community/Community.qml - qml/Community/Feedback.qml - qml/Create/Create.qml - qml/Create/ImportContent.qml - qml/Create/CreateContent.qml - qml/Create/CreateContentButton.qml - qml/Installed/Installed.qml - qml/Installed/ScreenPlayItem.qml - qml/Installed/ScreenPlayItemImage.qml - qml/Installed/Sidebar.qml - qml/Settings/SettingBool.qml - qml/Settings/Settings.qml - qml/Settings/SettingsButton.qml - qml/Settings/SettingsComboBox.qml - qml/Settings/SettingsExpander.qml - qml/Settings/SettingsHeader.qml - qml/Settings/SettingsHorizontalSeperator.qml - qml/Workshop/Workshop.qml - qtquickcontrols2.conf - translations/ScreenPlay_de.qm - translations/ScreenPlay_en.qm - assets/icons/icon_screen.svg - qml/Community/XMLNewsfeed.qml - qml/Workshop/WorkshopAvailableTest.qml - qml/Workshop/WorkshopLoader.qml - qml/Create/Wizards/CreateWallpaper/CreateWallpaperVideoImportConvert.qml - qml/Create/Wizards/CreateWallpaper/CreateWallpaperResult.qml - qml/Common/TagSelector.qml - qml/Common/Tag.qml - assets/icons/icon_close.svg - qml/Common/ImageSelector.qml - qml/Common/Slider.qml - qml/Monitors/Monitors.qml - qml/Monitors/MonitorSelection.qml - qml/Monitors/MonitorSelectionItem.qml - qml/Monitors/MonitorsProjectSettingItem.qml - qml/Common/Background.qml - qml/Navigation/Navigation.qml - qml/Navigation/NavigationItem.qml - qml/Navigation/NavigationWallpaperConfiguration.qml - qml/Common/RippleEffect.qml - qml/Create/FFMPEGPopup.qml - assets/images/FFmpeg_Logo_new.svg - profiles.json - qml/Common/Shake.qml - qml/Common/Grow.qml - qml/Installed/InstalledWelcomeScreen.qml - qml/Monitors/DefaultVideoControls.qml - assets/images/mask_round.svg - assets/icons/icon_launch.svg - qml/Common/GrowIconLink.qml - assets/icons/brand_twitch.svg - assets/icons/brand_github.svg - assets/icons/brand_gitlab.svg - assets/icons/brand_twitter.svg - assets/icons/icon_done.svg - qml/Common/CloseIcon.qml - qml/Create/Wizard.qml - qml/Create/Wizards/CreateEmptyWidget/CreateEmptyWidget.qml - translations/ScreenPlay_es.qm - translations/ScreenPlay_fr.qm - translations/ScreenPlay_ru.qm - qml/Create/Footer.qml - qml/Create/BackgroundParticleSystem.qml - assets/wizards/example_html.png - assets/wizards/example_qml.png - qml/Create/Wizards/CreateWallpaper/CreateWallpaperCodec.qml - qml/Create/Wizards/CreateWallpaper/CreateWallpaper.qml - qml/Common/Headline.qml - qml/Create/Wizards/CreateEmptyHtmlWallpaper/CreateEmptyHtmlWallpaper.qml - assets/images/undraw_static_website_0107.svg - translations/ScreenPlay_ko.qm - assets/fonts/NotoSans-Light.ttf - assets/fonts/NotoSans-Medium.ttf - assets/fonts/NotoSans-Regular.ttf - assets/fonts/NotoSans-Thin.ttf - translations/ScreenPlay_vi.qm diff --git a/ScreenPlay/qml.qrc b/ScreenPlay/qml.qrc new file mode 100644 index 00000000..ab4431e5 --- /dev/null +++ b/ScreenPlay/qml.qrc @@ -0,0 +1,55 @@ + + main.qml + qml/Create/Create.qml + qml/Create/ImportContent.qml + qml/Create/CreateContent.qml + qml/Create/CreateContentButton.qml + qml/Create/Wizards/CreateWallpaper/CreateWallpaperVideoImportConvert.qml + qml/Create/Wizards/CreateWallpaper/CreateWallpaperResult.qml + qml/Create/FFMPEGPopup.qml + qml/Create/Wizard.qml + qml/Create/Wizards/CreateEmptyWidget/CreateEmptyWidget.qml + qml/Create/Footer.qml + qml/Create/BackgroundParticleSystem.qml + qml/Create/Wizards/CreateWallpaper/CreateWallpaperCodec.qml + qml/Create/Wizards/CreateWallpaper/CreateWallpaper.qml + qml/Create/Wizards/CreateEmptyHtmlWallpaper/CreateEmptyHtmlWallpaper.qml + qml/Installed/Installed.qml + qml/Installed/ScreenPlayItem.qml + qml/Installed/ScreenPlayItemImage.qml + qml/Installed/Sidebar.qml + qml/Installed/InstalledWelcomeScreen.qml + qml/Community/Community.qml + qml/Community/Feedback.qml + qml/Community/XMLNewsfeed.qml + qml/Settings/SettingBool.qml + qml/Settings/Settings.qml + qml/Settings/SettingsButton.qml + qml/Settings/SettingsComboBox.qml + qml/Settings/SettingsExpander.qml + qml/Settings/SettingsHeader.qml + qml/Settings/SettingsHorizontalSeperator.qml + qml/Workshop/Workshop.qml + qml/Workshop/WorkshopAvailableTest.qml + qml/Workshop/WorkshopLoader.qml + qml/Monitors/Monitors.qml + qml/Monitors/MonitorSelection.qml + qml/Monitors/MonitorSelectionItem.qml + qml/Monitors/MonitorsProjectSettingItem.qml + qml/Navigation/Navigation.qml + qml/Navigation/NavigationItem.qml + qml/Navigation/NavigationWallpaperConfiguration.qml + qml/Monitors/DefaultVideoControls.qml + qml/Common/TagSelector.qml + qml/Common/Tag.qml + qml/Common/ImageSelector.qml + qml/Common/Slider.qml + qml/Common/Background.qml + qml/Common/RippleEffect.qml + qml/Common/Shake.qml + qml/Common/Grow.qml + qml/Common/GrowIconLink.qml + qml/Common/CloseIcon.qml + qml/Common/Headline.qml + + diff --git a/ScreenPlayWallpaper/CMakeLists.txt b/ScreenPlayWallpaper/CMakeLists.txt index 3e0b2494..d496796c 100644 --- a/ScreenPlayWallpaper/CMakeLists.txt +++ b/ScreenPlayWallpaper/CMakeLists.txt @@ -43,13 +43,15 @@ set( src set( headers src/basewindow.h) -set(resources SPWResources.qrc) -if(NOT CMAKE_BUILD_TYPE STREQUAL "Debug") - qtquick_compiler_add_resources(resources ${resources}) +if(CMAKE_BUILD_TYPE STREQUAL "Debug") + set(resources SPWResources.qrc) +else() + qtquick_compiler_add_resources(resources SPWResources.qrc ) endif() + add_executable(${PROJECT_NAME} ${src} ${headers} ${src_plattform} ${headers_plattform} ${resources}) # Disable console window on Windows diff --git a/ScreenPlayWidget/CMakeLists.txt b/ScreenPlayWidget/CMakeLists.txt index e9657cc9..e1aff08b 100644 --- a/ScreenPlayWidget/CMakeLists.txt +++ b/ScreenPlayWidget/CMakeLists.txt @@ -18,14 +18,12 @@ set(src main.cpp set(headers src/widgetwindow.h) -set(resources - SPWidgetResources.qrc) - -if(NOT CMAKE_BUILD_TYPE STREQUAL "Debug") - qtquick_compiler_add_resources( resources ${resources}) +if(CMAKE_BUILD_TYPE STREQUAL "Debug") + set(resources SPWidgetResources.qrc) +else() + qtquick_compiler_add_resources(resources SPWidgetResources.qrc ) endif() - add_executable(${PROJECT_NAME} ${src} ${headers} ${resources}) # Disable console window on Windows