diff --git a/YACReader/CMakeLists.txt b/YACReader/CMakeLists.txt index 070fb9dd..e6f74b0a 100644 --- a/YACReader/CMakeLists.txt +++ b/YACReader/CMakeLists.txt @@ -54,15 +54,163 @@ target_include_directories(YACReader PRIVATE target_compile_definitions(YACReader PRIVATE YACREADER) # Resources -qt_add_resources(yacreader_images_rcc "${CMAKE_CURRENT_SOURCE_DIR}/yacreader_images.qrc") -qt_add_resources(yacreader_files_rcc "${CMAKE_CURRENT_SOURCE_DIR}/yacreader_files.qrc") -qt_add_resources(yacreader_themes_rcc "${CMAKE_CURRENT_SOURCE_DIR}/themes/themes.qrc") -qt_add_resources(yacreader_common_images_rcc "${PROJECT_SOURCE_DIR}/common/themes/appearance_config_images.qrc") -target_sources(YACReader PRIVATE - ${yacreader_images_rcc} - ${yacreader_files_rcc} - ${yacreader_themes_rcc} - ${yacreader_common_images_rcc} +set(yacreader_image_files + ${PROJECT_SOURCE_DIR}/images/icon-new.svg + ${PROJECT_SOURCE_DIR}/images/goto.svg + ${PROJECT_SOURCE_DIR}/images/find_folder.svg + ${PROJECT_SOURCE_DIR}/images/flow1.png + ${PROJECT_SOURCE_DIR}/images/flow2.png + ${PROJECT_SOURCE_DIR}/images/flow3.png + ${PROJECT_SOURCE_DIR}/images/flow4.png + ${PROJECT_SOURCE_DIR}/images/flow5.png + ${PROJECT_SOURCE_DIR}/images/notCover.png + ${PROJECT_SOURCE_DIR}/images/close.svg + ${PROJECT_SOURCE_DIR}/images/centerFlow.svg + ${PROJECT_SOURCE_DIR}/images/gotoFlow.svg + ${PROJECT_SOURCE_DIR}/images/defaultCover.png + ${PROJECT_SOURCE_DIR}/images/translator/close.svg + ${PROJECT_SOURCE_DIR}/images/translator/dropDownArrow.svg + ${PROJECT_SOURCE_DIR}/images/translator/fromTo.svg + ${PROJECT_SOURCE_DIR}/images/translator/speaker.svg + ${PROJECT_SOURCE_DIR}/images/translator/translatorSearch.svg + ${PROJECT_SOURCE_DIR}/images/shortcuts/clear_shortcut.svg + ${PROJECT_SOURCE_DIR}/images/shortcuts/accept_shortcut.svg + ${PROJECT_SOURCE_DIR}/images/shortcuts/shortcuts_group_comics.svg + ${PROJECT_SOURCE_DIR}/images/shortcuts/shortcuts_group_folders.svg + ${PROJECT_SOURCE_DIR}/images/shortcuts/shortcuts_group_general.svg + ${PROJECT_SOURCE_DIR}/images/shortcuts/shortcuts_group_libraries.svg + ${PROJECT_SOURCE_DIR}/images/shortcuts/shortcuts_group_mglass.svg + ${PROJECT_SOURCE_DIR}/images/shortcuts/shortcuts_group_page.svg + ${PROJECT_SOURCE_DIR}/images/shortcuts/shortcuts_group_reading.svg + ${PROJECT_SOURCE_DIR}/images/shortcuts/shortcuts_group_visualization.svg + ${PROJECT_SOURCE_DIR}/images/custom_dialog/custom_close_button.svg + ${PROJECT_SOURCE_DIR}/images/whats_new/whatsnew_header.svg + ${PROJECT_SOURCE_DIR}/images/viewer_toolbar/bookmark.svg + ${PROJECT_SOURCE_DIR}/images/viewer_toolbar/close.svg + ${PROJECT_SOURCE_DIR}/images/viewer_toolbar/doublePage.svg + ${PROJECT_SOURCE_DIR}/images/viewer_toolbar/doubleMangaPage.svg + ${PROJECT_SOURCE_DIR}/images/viewer_toolbar/fitToPage.svg + ${PROJECT_SOURCE_DIR}/images/viewer_toolbar/flow.svg + ${PROJECT_SOURCE_DIR}/images/viewer_toolbar/full.svg + ${PROJECT_SOURCE_DIR}/images/viewer_toolbar/goto.svg + ${PROJECT_SOURCE_DIR}/images/viewer_toolbar/help.svg + ${PROJECT_SOURCE_DIR}/images/viewer_toolbar/info.svg + ${PROJECT_SOURCE_DIR}/images/viewer_toolbar/magnifyingGlass.svg + ${PROJECT_SOURCE_DIR}/images/viewer_toolbar/next.svg + ${PROJECT_SOURCE_DIR}/images/viewer_toolbar/open.svg + ${PROJECT_SOURCE_DIR}/images/viewer_toolbar/openFolder.svg + ${PROJECT_SOURCE_DIR}/images/viewer_toolbar/openNext.svg + ${PROJECT_SOURCE_DIR}/images/viewer_toolbar/openPrevious.svg + ${PROJECT_SOURCE_DIR}/images/viewer_toolbar/options.svg + ${PROJECT_SOURCE_DIR}/images/viewer_toolbar/previous.svg + ${PROJECT_SOURCE_DIR}/images/viewer_toolbar/rotateL.svg + ${PROJECT_SOURCE_DIR}/images/viewer_toolbar/rotateR.svg + ${PROJECT_SOURCE_DIR}/images/viewer_toolbar/save.svg + ${PROJECT_SOURCE_DIR}/images/viewer_toolbar/shortcuts.svg + ${PROJECT_SOURCE_DIR}/images/viewer_toolbar/showBookmarks.svg + ${PROJECT_SOURCE_DIR}/images/viewer_toolbar/toHeight.svg + ${PROJECT_SOURCE_DIR}/images/viewer_toolbar/toContinuousScroll.svg + ${PROJECT_SOURCE_DIR}/images/viewer_toolbar/toWidth.svg + ${PROJECT_SOURCE_DIR}/images/viewer_toolbar/translator.svg + ${PROJECT_SOURCE_DIR}/images/viewer_toolbar/zoom.svg + ${PROJECT_SOURCE_DIR}/images/viewer_toolbar/bookmark_18x18.svg + ${PROJECT_SOURCE_DIR}/images/viewer_toolbar/close_18x18.svg + ${PROJECT_SOURCE_DIR}/images/viewer_toolbar/doublePage_18x18.svg + ${PROJECT_SOURCE_DIR}/images/viewer_toolbar/doubleMangaPage_18x18.svg + ${PROJECT_SOURCE_DIR}/images/viewer_toolbar/fitToPage_18x18.svg + ${PROJECT_SOURCE_DIR}/images/viewer_toolbar/flow_18x18.svg + ${PROJECT_SOURCE_DIR}/images/viewer_toolbar/full_18x18.svg + ${PROJECT_SOURCE_DIR}/images/viewer_toolbar/goto_18x18.svg + ${PROJECT_SOURCE_DIR}/images/viewer_toolbar/help_18x18.svg + ${PROJECT_SOURCE_DIR}/images/viewer_toolbar/info_18x18.svg + ${PROJECT_SOURCE_DIR}/images/viewer_toolbar/magnifyingGlass_18x18.svg + ${PROJECT_SOURCE_DIR}/images/viewer_toolbar/next_18x18.svg + ${PROJECT_SOURCE_DIR}/images/viewer_toolbar/open_18x18.svg + ${PROJECT_SOURCE_DIR}/images/viewer_toolbar/openFolder_18x18.svg + ${PROJECT_SOURCE_DIR}/images/viewer_toolbar/openNext_18x18.svg + ${PROJECT_SOURCE_DIR}/images/viewer_toolbar/openPrevious_18x18.svg + ${PROJECT_SOURCE_DIR}/images/viewer_toolbar/options_18x18.svg + ${PROJECT_SOURCE_DIR}/images/viewer_toolbar/previous_18x18.svg + ${PROJECT_SOURCE_DIR}/images/viewer_toolbar/rotateL_18x18.svg + ${PROJECT_SOURCE_DIR}/images/viewer_toolbar/rotateR_18x18.svg + ${PROJECT_SOURCE_DIR}/images/viewer_toolbar/save_18x18.svg + ${PROJECT_SOURCE_DIR}/images/viewer_toolbar/shortcuts_18x18.svg + ${PROJECT_SOURCE_DIR}/images/viewer_toolbar/showBookmarks_18x18.svg + ${PROJECT_SOURCE_DIR}/images/viewer_toolbar/toHeight_18x18.svg + ${PROJECT_SOURCE_DIR}/images/viewer_toolbar/toContinuousScroll_18x18.svg + ${PROJECT_SOURCE_DIR}/images/viewer_toolbar/toWidth_18x18.svg + ${PROJECT_SOURCE_DIR}/images/viewer_toolbar/translator_18x18.svg + ${PROJECT_SOURCE_DIR}/images/viewer_toolbar/zoom_18x18.svg + ${PROJECT_SOURCE_DIR}/images/viewer_toolbar/menuArrow.svg +) +set(yacreader_file_files + ${PROJECT_SOURCE_DIR}/files/about.html + ${PROJECT_SOURCE_DIR}/files/helpYACReader.html + ${PROJECT_SOURCE_DIR}/files/shortcuts.html +) +set(yacreader_file_files_es + ${PROJECT_SOURCE_DIR}/files/about_es_ES.html + ${PROJECT_SOURCE_DIR}/files/helpYACReader_es_ES.html +) +set_source_files_properties( + ${PROJECT_SOURCE_DIR}/files/about_es_ES.html + PROPERTIES QT_RESOURCE_ALIAS "about.html" +) +set_source_files_properties( + ${PROJECT_SOURCE_DIR}/files/helpYACReader_es_ES.html + PROPERTIES QT_RESOURCE_ALIAS "helpYACReader.html" +) +set(yacreader_theme_files + ${CMAKE_CURRENT_SOURCE_DIR}/themes/builtin_classic.json + ${CMAKE_CURRENT_SOURCE_DIR}/themes/builtin_light.json + ${CMAKE_CURRENT_SOURCE_DIR}/themes/builtin_light1.json + ${CMAKE_CURRENT_SOURCE_DIR}/themes/builtin_light2.json + ${CMAKE_CURRENT_SOURCE_DIR}/themes/builtin_light3.json + ${CMAKE_CURRENT_SOURCE_DIR}/themes/builtin_light4.json + ${CMAKE_CURRENT_SOURCE_DIR}/themes/builtin_light5.json + ${CMAKE_CURRENT_SOURCE_DIR}/themes/builtin_dark.json + ${CMAKE_CURRENT_SOURCE_DIR}/themes/builtin_dark1.json + ${CMAKE_CURRENT_SOURCE_DIR}/themes/builtin_dark2.json + ${CMAKE_CURRENT_SOURCE_DIR}/themes/builtin_dark3.json + ${CMAKE_CURRENT_SOURCE_DIR}/themes/builtin_dark4.json +) +set(yacreader_common_theme_image_files + ${PROJECT_SOURCE_DIR}/images/appearance_config/theme-mode-system.svg + ${PROJECT_SOURCE_DIR}/images/appearance_config/theme-mode-light.svg + ${PROJECT_SOURCE_DIR}/images/appearance_config/theme-mode-dark.svg + ${PROJECT_SOURCE_DIR}/images/appearance_config/theme-mode-custom.svg +) + +qt_add_resources(YACReader "yacreader_images" + PREFIX "/" + BASE "${PROJECT_SOURCE_DIR}" + FILES + ${yacreader_image_files} +) +qt_add_resources(YACReader "yacreader_files" + PREFIX "/files" + BASE "${PROJECT_SOURCE_DIR}/files" + FILES + ${yacreader_file_files} +) +qt_add_resources(YACReader "yacreader_files_es" + PREFIX "/files" + LANG "es_ES" + BASE "${PROJECT_SOURCE_DIR}/files" + FILES + ${yacreader_file_files_es} +) +qt_add_resources(YACReader "yacreader_themes" + PREFIX "/themes" + BASE "${CMAKE_CURRENT_SOURCE_DIR}/themes" + FILES + ${yacreader_theme_files} +) +qt_add_resources(YACReader "yacreader_common_theme_images" + PREFIX "/" + BASE "${PROJECT_SOURCE_DIR}" + FILES + ${yacreader_common_theme_image_files} ) # Translations diff --git a/YACReader/themes/themes.qrc b/YACReader/themes/themes.qrc deleted file mode 100644 index d96de307..00000000 --- a/YACReader/themes/themes.qrc +++ /dev/null @@ -1,16 +0,0 @@ - - - builtin_classic.json - builtin_light.json - builtin_light1.json - builtin_light2.json - builtin_light3.json - builtin_light4.json - builtin_light5.json - builtin_dark.json - builtin_dark1.json - builtin_dark2.json - builtin_dark3.json - builtin_dark4.json - - diff --git a/YACReader/yacreader_files.qrc b/YACReader/yacreader_files.qrc deleted file mode 100644 index b7540312..00000000 --- a/YACReader/yacreader_files.qrc +++ /dev/null @@ -1,12 +0,0 @@ - - - ../files/about.html - ../files/helpYACReader.html - ../files/shortcuts.html - - - - ../files/about_es_ES.html - ../files/helpYACReader_es_ES.html - - diff --git a/YACReader/yacreader_images.qrc b/YACReader/yacreader_images.qrc deleted file mode 100644 index a573b9fb..00000000 --- a/YACReader/yacreader_images.qrc +++ /dev/null @@ -1,92 +0,0 @@ - - - ../images/icon-new.svg - ../images/goto.svg - ../images/find_folder.svg - ../images/flow1.png - ../images/flow2.png - ../images/flow3.png - ../images/flow4.png - ../images/flow5.png - ../images/notCover.png - ../images/close.svg - ../images/centerFlow.svg - ../images/gotoFlow.svg - ../images/defaultCover.png - - ../images/translator/close.svg - ../images/translator/dropDownArrow.svg - ../images/translator/fromTo.svg - ../images/translator/speaker.svg - ../images/translator/translatorSearch.svg - ../images/shortcuts/clear_shortcut.svg - ../images/shortcuts/accept_shortcut.svg - ../images/shortcuts/shortcuts_group_comics.svg - ../images/shortcuts/shortcuts_group_folders.svg - ../images/shortcuts/shortcuts_group_general.svg - ../images/shortcuts/shortcuts_group_libraries.svg - ../images/shortcuts/shortcuts_group_mglass.svg - ../images/shortcuts/shortcuts_group_page.svg - ../images/shortcuts/shortcuts_group_reading.svg - ../images/shortcuts/shortcuts_group_visualization.svg - ../images/custom_dialog/custom_close_button.svg - ../images/whats_new/whatsnew_header.svg - ../images/viewer_toolbar/bookmark.svg - ../images/viewer_toolbar/close.svg - ../images/viewer_toolbar/doublePage.svg - ../images/viewer_toolbar/doubleMangaPage.svg - ../images/viewer_toolbar/fitToPage.svg - ../images/viewer_toolbar/flow.svg - ../images/viewer_toolbar/full.svg - ../images/viewer_toolbar/goto.svg - ../images/viewer_toolbar/help.svg - ../images/viewer_toolbar/info.svg - ../images/viewer_toolbar/magnifyingGlass.svg - ../images/viewer_toolbar/next.svg - ../images/viewer_toolbar/open.svg - ../images/viewer_toolbar/openFolder.svg - ../images/viewer_toolbar/openNext.svg - ../images/viewer_toolbar/openPrevious.svg - ../images/viewer_toolbar/options.svg - ../images/viewer_toolbar/previous.svg - ../images/viewer_toolbar/rotateL.svg - ../images/viewer_toolbar/rotateR.svg - ../images/viewer_toolbar/save.svg - ../images/viewer_toolbar/shortcuts.svg - ../images/viewer_toolbar/showBookmarks.svg - ../images/viewer_toolbar/toHeight.svg - ../images/viewer_toolbar/toContinuousScroll.svg - ../images/viewer_toolbar/toWidth.svg - ../images/viewer_toolbar/translator.svg - ../images/viewer_toolbar/zoom.svg - ../images/viewer_toolbar/bookmark_18x18.svg - ../images/viewer_toolbar/close_18x18.svg - ../images/viewer_toolbar/doublePage_18x18.svg - ../images/viewer_toolbar/doubleMangaPage_18x18.svg - ../images/viewer_toolbar/fitToPage_18x18.svg - ../images/viewer_toolbar/flow_18x18.svg - ../images/viewer_toolbar/full_18x18.svg - ../images/viewer_toolbar/goto_18x18.svg - ../images/viewer_toolbar/help_18x18.svg - ../images/viewer_toolbar/info_18x18.svg - ../images/viewer_toolbar/magnifyingGlass_18x18.svg - ../images/viewer_toolbar/next_18x18.svg - ../images/viewer_toolbar/open_18x18.svg - ../images/viewer_toolbar/openFolder_18x18.svg - ../images/viewer_toolbar/openNext_18x18.svg - ../images/viewer_toolbar/openPrevious_18x18.svg - ../images/viewer_toolbar/options_18x18.svg - ../images/viewer_toolbar/previous_18x18.svg - ../images/viewer_toolbar/rotateL_18x18.svg - ../images/viewer_toolbar/rotateR_18x18.svg - ../images/viewer_toolbar/save_18x18.svg - ../images/viewer_toolbar/shortcuts_18x18.svg - ../images/viewer_toolbar/showBookmarks_18x18.svg - ../images/viewer_toolbar/toHeight_18x18.svg - ../images/viewer_toolbar/toContinuousScroll_18x18.svg - ../images/viewer_toolbar/toWidth_18x18.svg - ../images/viewer_toolbar/translator_18x18.svg - ../images/viewer_toolbar/zoom_18x18.svg - ../images/viewer_toolbar/menuArrow.svg - - diff --git a/YACReaderLibrary/CMakeLists.txt b/YACReaderLibrary/CMakeLists.txt index a86629fa..ef562b5e 100644 --- a/YACReaderLibrary/CMakeLists.txt +++ b/YACReaderLibrary/CMakeLists.txt @@ -200,32 +200,262 @@ target_compile_definitions(YACReaderLibrary PRIVATE ) # Resources -qt_add_resources(yacreaderlibrary_images_rcc "${CMAKE_CURRENT_SOURCE_DIR}/images.qrc") -qt_add_resources(yacreaderlibrary_files_rcc "${CMAKE_CURRENT_SOURCE_DIR}/files.qrc") -qt_add_resources(yacreaderlibrary_qml_rcc "${CMAKE_CURRENT_SOURCE_DIR}/qml.qrc") -qt_add_resources(yacreaderlibrary_themes_rcc "${CMAKE_CURRENT_SOURCE_DIR}/themes/themes.qrc") -qt_add_resources(yacreaderlibrary_common_images_rcc "${PROJECT_SOURCE_DIR}/common/themes/appearance_config_images.qrc") -target_sources(YACReaderLibrary PRIVATE - ${yacreaderlibrary_images_rcc} - ${yacreaderlibrary_files_rcc} - ${yacreaderlibrary_qml_rcc} - ${yacreaderlibrary_themes_rcc} - ${yacreaderlibrary_common_images_rcc} +set(yacreaderlibrary_image_files + ${PROJECT_SOURCE_DIR}/images/shortcuts/accept_shortcut.svg + ${PROJECT_SOURCE_DIR}/images/shortcuts/clear_shortcut.svg + ${PROJECT_SOURCE_DIR}/images/comic_vine/downArrow.svg + ${PROJECT_SOURCE_DIR}/images/comic_vine/nextPage.svg + ${PROJECT_SOURCE_DIR}/images/comic_vine/previousPage.svg + ${PROJECT_SOURCE_DIR}/images/comic_vine/radioChecked.svg + ${PROJECT_SOURCE_DIR}/images/comic_vine/radioUnchecked.svg + ${PROJECT_SOURCE_DIR}/images/comic_vine/rowDown.svg + ${PROJECT_SOURCE_DIR}/images/comic_vine/rowUp.svg + ${PROJECT_SOURCE_DIR}/images/comic_vine/upArrow.svg + ${PROJECT_SOURCE_DIR}/images/comic_vine/checkBoxTick.svg + ${PROJECT_SOURCE_DIR}/images/comics_view_toolbar/asignNumber.svg + ${PROJECT_SOURCE_DIR}/images/comics_view_toolbar/big_size_grid_zoom.svg + ${PROJECT_SOURCE_DIR}/images/comics_view_toolbar/editComic.svg + ${PROJECT_SOURCE_DIR}/images/comics_view_toolbar/getInfo.svg + ${PROJECT_SOURCE_DIR}/images/comics_view_toolbar/hideComicFlow.svg + ${PROJECT_SOURCE_DIR}/images/comics_view_toolbar/openInYACReader.svg + ${PROJECT_SOURCE_DIR}/images/comics_view_toolbar/selectAll.svg + ${PROJECT_SOURCE_DIR}/images/comics_view_toolbar/setReadButton.svg + ${PROJECT_SOURCE_DIR}/images/comics_view_toolbar/setUnread.svg + ${PROJECT_SOURCE_DIR}/images/comics_view_toolbar/showMarks.svg + ${PROJECT_SOURCE_DIR}/images/comics_view_toolbar/small_size_grid_zoom.svg + ${PROJECT_SOURCE_DIR}/images/comics_view_toolbar/trash.svg + ${PROJECT_SOURCE_DIR}/images/comics_view_toolbar/show_comic_info.svg + ${PROJECT_SOURCE_DIR}/images/comics_view_toolbar/setManga.svg + ${PROJECT_SOURCE_DIR}/images/comics_view_toolbar/setNormal.svg + ${PROJECT_SOURCE_DIR}/images/comics_view_toolbar/showRecentIndicator.svg + ${PROJECT_SOURCE_DIR}/images/defaultCover.png + ${PROJECT_SOURCE_DIR}/images/library_dialogs/edit.svg + ${PROJECT_SOURCE_DIR}/images/empty_container/empty_current_readings.svg + ${PROJECT_SOURCE_DIR}/images/empty_container/empty_favorites.svg + ${PROJECT_SOURCE_DIR}/images/empty_container/empty_folder.svg + ${PROJECT_SOURCE_DIR}/images/empty_container/empty_label.svg + ${PROJECT_SOURCE_DIR}/images/empty_container/empty_reading_list.svg + ${PROJECT_SOURCE_DIR}/images/library_dialogs/exportComicsInfo.svg + ${PROJECT_SOURCE_DIR}/images/library_dialogs/exportLibrary.svg + ${PROJECT_SOURCE_DIR}/images/find_folder.svg + ${PROJECT_SOURCE_DIR}/images/flow1.png + ${PROJECT_SOURCE_DIR}/images/flow2.png + ${PROJECT_SOURCE_DIR}/images/flow3.png + ${PROJECT_SOURCE_DIR}/images/flow4.png + ${PROJECT_SOURCE_DIR}/images/flow5.png + ${PROJECT_SOURCE_DIR}/images/glowLine.svg + ${PROJECT_SOURCE_DIR}/images/metadata_dialog/loadCustomCover.svg + ${PROJECT_SOURCE_DIR}/images/import/coversToggle.svg + ${PROJECT_SOURCE_DIR}/images/icon-new.svg + ${PROJECT_SOURCE_DIR}/images/iconLibrary.png + ${PROJECT_SOURCE_DIR}/images/import/importBottomCoversDecoration.svg + ${PROJECT_SOURCE_DIR}/images/library_dialogs/importComicsInfo.svg + ${PROJECT_SOURCE_DIR}/images/import/importingIcon.svg + ${PROJECT_SOURCE_DIR}/images/library_dialogs/importLibrary.svg + ${PROJECT_SOURCE_DIR}/images/import/importTopCoversDecoration.svg + ${PROJECT_SOURCE_DIR}/images/main_toolbar/back.svg + ${PROJECT_SOURCE_DIR}/images/main_toolbar/forward.svg + ${PROJECT_SOURCE_DIR}/images/main_toolbar/settings.svg + ${PROJECT_SOURCE_DIR}/images/main_toolbar/server.svg + ${PROJECT_SOURCE_DIR}/images/main_toolbar/help.svg + ${PROJECT_SOURCE_DIR}/images/main_toolbar/fullscreen.svg + ${PROJECT_SOURCE_DIR}/images/main_toolbar/flow.svg + ${PROJECT_SOURCE_DIR}/images/main_toolbar/grid.svg + ${PROJECT_SOURCE_DIR}/images/main_toolbar/info.svg + ${PROJECT_SOURCE_DIR}/images/main_toolbar/divider.svg + ${PROJECT_SOURCE_DIR}/images/menus_icons/editIcon.svg + ${PROJECT_SOURCE_DIR}/images/menus_icons/exportComicsInfoIcon.svg + ${PROJECT_SOURCE_DIR}/images/menus_icons/exportLibraryIcon.svg + ${PROJECT_SOURCE_DIR}/images/menus_icons/importComicsInfoIcon.svg + ${PROJECT_SOURCE_DIR}/images/menus_icons/importLibraryIcon.svg + ${PROJECT_SOURCE_DIR}/images/menus_icons/removeLibraryIcon.svg + ${PROJECT_SOURCE_DIR}/images/menus_icons/updateLibraryIcon.svg + ${PROJECT_SOURCE_DIR}/images/menus_icons/open_containing_folder.svg + ${PROJECT_SOURCE_DIR}/images/menus_icons/update_current_folder.svg + ${PROJECT_SOURCE_DIR}/images/library_dialogs/new.svg + ${PROJECT_SOURCE_DIR}/images/metadata_dialog/nextCoverPage.svg + ${PROJECT_SOURCE_DIR}/images/noLibrariesIcon.svg + ${PROJECT_SOURCE_DIR}/images/noLibrariesLine.svg + ${PROJECT_SOURCE_DIR}/images/notCover.png + ${PROJECT_SOURCE_DIR}/images/library_dialogs/openLibrary.svg + ${PROJECT_SOURCE_DIR}/images/metadata_dialog/previousCoverPage.svg + ${PROJECT_SOURCE_DIR}/images/readingRibbon.svg + ${PROJECT_SOURCE_DIR}/images/readRibbon.svg + ${PROJECT_SOURCE_DIR}/images/metadata_dialog/resetCover.svg + ${PROJECT_SOURCE_DIR}/images/search_result.svg + ${PROJECT_SOURCE_DIR}/images/serverConfigBackground.svg + ${PROJECT_SOURCE_DIR}/images/shortcuts/shortcuts_group_comics.svg + ${PROJECT_SOURCE_DIR}/images/shortcuts/shortcuts_group_folders.svg + ${PROJECT_SOURCE_DIR}/images/shortcuts/shortcuts_group_general.svg + ${PROJECT_SOURCE_DIR}/images/shortcuts/shortcuts_group_libraries.svg + ${PROJECT_SOURCE_DIR}/images/shortcuts/shortcuts_group_mglass.svg + ${PROJECT_SOURCE_DIR}/images/shortcuts/shortcuts_group_page.svg + ${PROJECT_SOURCE_DIR}/images/shortcuts/shortcuts_group_reading.svg + ${PROJECT_SOURCE_DIR}/images/shortcuts/shortcuts_group_visualization.svg + ${PROJECT_SOURCE_DIR}/images/sidebar/libraryIcon.svg + ${PROJECT_SOURCE_DIR}/images/sidebar/setRoot.svg + ${PROJECT_SOURCE_DIR}/images/sidebar/expand.svg + ${PROJECT_SOURCE_DIR}/images/sidebar/colapse.svg + ${PROJECT_SOURCE_DIR}/images/sidebar/newLibraryIcon.svg + ${PROJECT_SOURCE_DIR}/images/sidebar/openLibraryIcon.svg + ${PROJECT_SOURCE_DIR}/images/sidebar/addNew_sidebar.svg + ${PROJECT_SOURCE_DIR}/images/sidebar/delete_sidebar.svg + ${PROJECT_SOURCE_DIR}/images/sidebar/addLabelIcon.svg + ${PROJECT_SOURCE_DIR}/images/sidebar/renameListIcon.svg + ${PROJECT_SOURCE_DIR}/images/sidebar/branch-closed.svg + ${PROJECT_SOURCE_DIR}/images/sidebar/branch-open.svg + ${PROJECT_SOURCE_DIR}/images/sidebar/folder.svg + ${PROJECT_SOURCE_DIR}/images/sidebar/folder_finished.svg + ${PROJECT_SOURCE_DIR}/images/sidebar/folder_read_overlay.svg + ${PROJECT_SOURCE_DIR}/images/sidebar/libraryIconSelected.svg + ${PROJECT_SOURCE_DIR}/images/sidebar/libraryOptions.svg + ${PROJECT_SOURCE_DIR}/images/import/updatingIcon.svg + ${PROJECT_SOURCE_DIR}/images/custom_dialog/custom_close_button.svg + ${PROJECT_SOURCE_DIR}/images/whats_new/whatsnew_header.svg + ${PROJECT_SOURCE_DIR}/images/lists/default_0.svg + ${PROJECT_SOURCE_DIR}/images/lists/default_1.svg + ${PROJECT_SOURCE_DIR}/images/lists/default_2.svg + ${PROJECT_SOURCE_DIR}/images/lists/label_template.svg + ${PROJECT_SOURCE_DIR}/images/lists/list.svg + ${PROJECT_SOURCE_DIR}/images/clearSearchNew.svg + ${PROJECT_SOURCE_DIR}/images/iconSearchNew.svg +) +set(yacreaderlibrary_file_files + ${PROJECT_SOURCE_DIR}/files/about.html + ${PROJECT_SOURCE_DIR}/files/helpYACReaderLibrary.html +) +set(yacreaderlibrary_file_files_es + ${PROJECT_SOURCE_DIR}/files/about_es_ES.html + ${PROJECT_SOURCE_DIR}/files/helpYACReaderLibrary_es_ES.html +) +set_source_files_properties( + ${PROJECT_SOURCE_DIR}/files/about_es_ES.html + PROPERTIES QT_RESOURCE_ALIAS "about.html" +) +set_source_files_properties( + ${PROJECT_SOURCE_DIR}/files/helpYACReaderLibrary_es_ES.html + PROPERTIES QT_RESOURCE_ALIAS "helpYACReaderLibrary.html" +) +set(yacreaderlibrary_qml_files + ${CMAKE_CURRENT_SOURCE_DIR}/qml/GridComicsView.qml + ${CMAKE_CURRENT_SOURCE_DIR}/qml/FolderContentView.qml + ${CMAKE_CURRENT_SOURCE_DIR}/qml/FlowView.qml + ${CMAKE_CURRENT_SOURCE_DIR}/qml/InfoTick.qml + ${CMAKE_CURRENT_SOURCE_DIR}/qml/InfoFavorites.qml + ${CMAKE_CURRENT_SOURCE_DIR}/qml/InfoRating.qml + ${CMAKE_CURRENT_SOURCE_DIR}/qml/InfoComicsView.qml + ${CMAKE_CURRENT_SOURCE_DIR}/qml/tick.svg + ${CMAKE_CURRENT_SOURCE_DIR}/qml/reading.svg + ${CMAKE_CURRENT_SOURCE_DIR}/qml/star.svg + ${CMAKE_CURRENT_SOURCE_DIR}/qml/page.svg + ${CMAKE_CURRENT_SOURCE_DIR}/qml/info-indicator.svg + ${CMAKE_CURRENT_SOURCE_DIR}/qml/info-shadow.svg + ${CMAKE_CURRENT_SOURCE_DIR}/qml/info-top-shadow.svg + ${CMAKE_CURRENT_SOURCE_DIR}/qml/ComicInfoView.qml + ${CMAKE_CURRENT_SOURCE_DIR}/qml/info-favorites.svg + ${CMAKE_CURRENT_SOURCE_DIR}/qml/info-rating.svg + ${CMAKE_CURRENT_SOURCE_DIR}/qml/info-tag.svg + ${CMAKE_CURRENT_SOURCE_DIR}/qml/info-tick.svg + ${CMAKE_CURRENT_SOURCE_DIR}/qml/prerendered_cover_shadow.png +) +set(yacreaderlibrary_qml_translation_files + ${CMAKE_CURRENT_SOURCE_DIR}/qml/GridComicsView.qml + ${CMAKE_CURRENT_SOURCE_DIR}/qml/FolderContentView.qml + ${CMAKE_CURRENT_SOURCE_DIR}/qml/FlowView.qml + ${CMAKE_CURRENT_SOURCE_DIR}/qml/InfoTick.qml + ${CMAKE_CURRENT_SOURCE_DIR}/qml/InfoFavorites.qml + ${CMAKE_CURRENT_SOURCE_DIR}/qml/InfoRating.qml + ${CMAKE_CURRENT_SOURCE_DIR}/qml/InfoComicsView.qml + ${CMAKE_CURRENT_SOURCE_DIR}/qml/ComicInfoView.qml +) +set(yacreaderlibrary_theme_files + ${CMAKE_CURRENT_SOURCE_DIR}/themes/builtin_classic.json + ${CMAKE_CURRENT_SOURCE_DIR}/themes/builtin_light.json + ${CMAKE_CURRENT_SOURCE_DIR}/themes/builtin_light1.json + ${CMAKE_CURRENT_SOURCE_DIR}/themes/builtin_light2.json + ${CMAKE_CURRENT_SOURCE_DIR}/themes/builtin_light3.json + ${CMAKE_CURRENT_SOURCE_DIR}/themes/builtin_light4.json + ${CMAKE_CURRENT_SOURCE_DIR}/themes/builtin_light5.json + ${CMAKE_CURRENT_SOURCE_DIR}/themes/builtin_dark.json + ${CMAKE_CURRENT_SOURCE_DIR}/themes/builtin_dark1.json + ${CMAKE_CURRENT_SOURCE_DIR}/themes/builtin_dark2.json + ${CMAKE_CURRENT_SOURCE_DIR}/themes/builtin_dark3.json + ${CMAKE_CURRENT_SOURCE_DIR}/themes/builtin_dark4.json +) +set(yacreaderlibrary_common_theme_image_files + ${PROJECT_SOURCE_DIR}/images/appearance_config/theme-mode-system.svg + ${PROJECT_SOURCE_DIR}/images/appearance_config/theme-mode-light.svg + ${PROJECT_SOURCE_DIR}/images/appearance_config/theme-mode-dark.svg + ${PROJECT_SOURCE_DIR}/images/appearance_config/theme-mode-custom.svg +) + +qt_add_resources(YACReaderLibrary "yacreaderlibrary_images" + PREFIX "/" + BASE "${PROJECT_SOURCE_DIR}" + FILES + ${yacreaderlibrary_image_files} +) +qt_add_resources(YACReaderLibrary "yacreaderlibrary_files" + PREFIX "/files" + BASE "${PROJECT_SOURCE_DIR}/files" + FILES + ${yacreaderlibrary_file_files} +) +qt_add_resources(YACReaderLibrary "yacreaderlibrary_files_es" + PREFIX "/files" + LANG "es_ES" + BASE "${PROJECT_SOURCE_DIR}/files" + FILES + ${yacreaderlibrary_file_files_es} +) +qt_add_resources(YACReaderLibrary "yacreaderlibrary_qml" + PREFIX "/" + BASE "${CMAKE_CURRENT_SOURCE_DIR}" + FILES + ${yacreaderlibrary_qml_files} +) +qt_add_resources(YACReaderLibrary "yacreaderlibrary_themes" + PREFIX "/themes" + BASE "${CMAKE_CURRENT_SOURCE_DIR}/themes" + FILES + ${yacreaderlibrary_theme_files} +) +qt_add_resources(YACReaderLibrary "yacreaderlibrary_common_theme_images" + PREFIX "/" + BASE "${PROJECT_SOURCE_DIR}" + FILES + ${yacreaderlibrary_common_theme_image_files} ) if(WIN32 OR (UNIX AND NOT APPLE)) - qt_add_resources(yacreaderlibrary_images_win_rcc "${CMAKE_CURRENT_SOURCE_DIR}/images_win.qrc") - target_sources(YACReaderLibrary PRIVATE ${yacreaderlibrary_images_win_rcc}) + set(yacreaderlibrary_windows_resource_files + ${PROJECT_SOURCE_DIR}/images/viewer_toolbar/close.svg + ${CMAKE_CURRENT_SOURCE_DIR}/icon.ico + ) + set_source_files_properties( + ${CMAKE_CURRENT_SOURCE_DIR}/icon.ico + PROPERTIES QT_RESOURCE_ALIAS "icon.ico" + ) + qt_add_resources(YACReaderLibrary "yacreaderlibrary_windows_resources" + PREFIX "/" + BASE "${PROJECT_SOURCE_DIR}" + FILES + ${yacreaderlibrary_windows_resource_files} + ) endif() if(APPLE) - qt_add_resources(yacreaderlibrary_images_osx_rcc "${CMAKE_CURRENT_SOURCE_DIR}/images_osx.qrc") - target_sources(YACReaderLibrary PRIVATE ${yacreaderlibrary_images_osx_rcc}) + qt_add_resources(YACReaderLibrary "yacreaderlibrary_macos_resources" + PREFIX "/" + BASE "${CMAKE_CURRENT_SOURCE_DIR}" + FILES + ${CMAKE_CURRENT_SOURCE_DIR}/macostrayicon.svg + ) endif() # Translations qt_add_translations(YACReaderLibrary SOURCE_TARGETS YACReaderLibrary - # Keep full C++ extraction via SOURCE_TARGETS and add qml.qrc as extra input + # Keep full C++ extraction via SOURCE_TARGETS and add the QML files directly # so qsTr() strings in QML are collected too. TS_FILES yacreaderlibrary_es.ts @@ -242,7 +472,7 @@ qt_add_translations(YACReaderLibrary yacreaderlibrary_source.ts yacreaderlibrary_en.ts SOURCES - ${CMAKE_CURRENT_SOURCE_DIR}/qml.qrc + ${yacreaderlibrary_qml_translation_files} ) target_link_libraries(YACReaderLibrary PRIVATE diff --git a/YACReaderLibrary/files.qrc b/YACReaderLibrary/files.qrc deleted file mode 100644 index 7a37b2ec..00000000 --- a/YACReaderLibrary/files.qrc +++ /dev/null @@ -1,12 +0,0 @@ - - - ../files/about.html - ../files/helpYACReaderLibrary.html - - - - ../files/about_es_ES.html - ../files/helpYACReaderLibrary_es_ES.html - - - diff --git a/YACReaderLibrary/images.qrc b/YACReaderLibrary/images.qrc deleted file mode 100644 index 86783e83..00000000 --- a/YACReaderLibrary/images.qrc +++ /dev/null @@ -1,122 +0,0 @@ - - - ../images/shortcuts/accept_shortcut.svg - ../images/shortcuts/clear_shortcut.svg - ../images/comic_vine/downArrow.svg - ../images/comic_vine/nextPage.svg - ../images/comic_vine/previousPage.svg - ../images/comic_vine/radioChecked.svg - ../images/comic_vine/radioUnchecked.svg - ../images/comic_vine/rowDown.svg - ../images/comic_vine/rowUp.svg - ../images/comic_vine/upArrow.svg - ../images/comic_vine/checkBoxTick.svg - ../images/comics_view_toolbar/asignNumber.svg - ../images/comics_view_toolbar/big_size_grid_zoom.svg - ../images/comics_view_toolbar/editComic.svg - ../images/comics_view_toolbar/getInfo.svg - ../images/comics_view_toolbar/hideComicFlow.svg - ../images/comics_view_toolbar/openInYACReader.svg - ../images/comics_view_toolbar/selectAll.svg - ../images/comics_view_toolbar/setReadButton.svg - ../images/comics_view_toolbar/setUnread.svg - ../images/comics_view_toolbar/showMarks.svg - ../images/comics_view_toolbar/small_size_grid_zoom.svg - ../images/comics_view_toolbar/trash.svg - ../images/comics_view_toolbar/show_comic_info.svg - ../images/comics_view_toolbar/setManga.svg - ../images/comics_view_toolbar/setNormal.svg - ../images/comics_view_toolbar/showRecentIndicator.svg - ../images/defaultCover.png - ../images/library_dialogs/edit.svg - ../images/empty_container/empty_current_readings.svg - ../images/empty_container/empty_favorites.svg - ../images/empty_container/empty_folder.svg - ../images/empty_container/empty_label.svg - ../images/empty_container/empty_reading_list.svg - ../images/library_dialogs/exportComicsInfo.svg - ../images/library_dialogs/exportLibrary.svg - ../images/find_folder.svg - ../images/flow1.png - ../images/flow2.png - ../images/flow3.png - ../images/flow4.png - ../images/flow5.png - ../images/glowLine.svg - ../images/metadata_dialog/loadCustomCover.svg - ../images/import/coversToggle.svg - ../images/icon-new.svg - ../images/iconLibrary.png - ../images/import/importBottomCoversDecoration.svg - ../images/library_dialogs/importComicsInfo.svg - ../images/import/importingIcon.svg - ../images/library_dialogs/importLibrary.svg - ../images/import/importTopCoversDecoration.svg - ../images/main_toolbar/back.svg - ../images/main_toolbar/forward.svg - ../images/main_toolbar/settings.svg - ../images/main_toolbar/server.svg - ../images/main_toolbar/help.svg - ../images/main_toolbar/fullscreen.svg - ../images/main_toolbar/flow.svg - ../images/main_toolbar/grid.svg - ../images/main_toolbar/info.svg - ../images/main_toolbar/divider.svg - ../images/menus_icons/editIcon.svg - ../images/menus_icons/exportComicsInfoIcon.svg - ../images/menus_icons/exportLibraryIcon.svg - ../images/menus_icons/importComicsInfoIcon.svg - ../images/menus_icons/importLibraryIcon.svg - ../images/menus_icons/removeLibraryIcon.svg - ../images/menus_icons/updateLibraryIcon.svg - ../images/menus_icons/open_containing_folder.svg - ../images/menus_icons/update_current_folder.svg - ../images/library_dialogs/new.svg - ../images/metadata_dialog/nextCoverPage.svg - ../images/noLibrariesIcon.svg - ../images/noLibrariesLine.svg - ../images/notCover.png - ../images/library_dialogs/openLibrary.svg - ../images/metadata_dialog/previousCoverPage.svg - ../images/readingRibbon.svg - ../images/readRibbon.svg - ../images/metadata_dialog/resetCover.svg - ../images/search_result.svg - ../images/serverConfigBackground.svg - ../images/shortcuts/shortcuts_group_comics.svg - ../images/shortcuts/shortcuts_group_folders.svg - ../images/shortcuts/shortcuts_group_general.svg - ../images/shortcuts/shortcuts_group_libraries.svg - ../images/shortcuts/shortcuts_group_mglass.svg - ../images/shortcuts/shortcuts_group_page.svg - ../images/shortcuts/shortcuts_group_reading.svg - ../images/shortcuts/shortcuts_group_visualization.svg - ../images/sidebar/libraryIcon.svg - ../images/sidebar/setRoot.svg - ../images/sidebar/expand.svg - ../images/sidebar/colapse.svg - ../images/sidebar/newLibraryIcon.svg - ../images/sidebar/openLibraryIcon.svg - ../images/sidebar/addNew_sidebar.svg - ../images/sidebar/delete_sidebar.svg - ../images/sidebar/addLabelIcon.svg - ../images/sidebar/renameListIcon.svg - ../images/sidebar/branch-closed.svg - ../images/sidebar/branch-open.svg - ../images/sidebar/folder.svg - ../images/sidebar/folder_finished.svg - ../images/sidebar/folder_read_overlay.svg - ../images/sidebar/libraryIconSelected.svg - ../images/sidebar/libraryOptions.svg - ../images/import/updatingIcon.svg - ../images/custom_dialog/custom_close_button.svg - ../images/whats_new/whatsnew_header.svg - ../images/lists/default_0.svg - ../images/lists/default_1.svg - ../images/lists/default_2.svg - ../images/lists/label_template.svg - ../images/lists/list.svg - ../images/clearSearchNew.svg - ../images/iconSearchNew.svg - - diff --git a/YACReaderLibrary/images_osx.qrc b/YACReaderLibrary/images_osx.qrc deleted file mode 100644 index a26df5b0..00000000 --- a/YACReaderLibrary/images_osx.qrc +++ /dev/null @@ -1,5 +0,0 @@ - - - macostrayicon.svg - - diff --git a/YACReaderLibrary/images_win.qrc b/YACReaderLibrary/images_win.qrc deleted file mode 100644 index 9eb496ef..00000000 --- a/YACReaderLibrary/images_win.qrc +++ /dev/null @@ -1,6 +0,0 @@ - - - ../images/viewer_toolbar/close.svg - icon.ico - - diff --git a/YACReaderLibrary/qml.qrc b/YACReaderLibrary/qml.qrc deleted file mode 100644 index 2d767d06..00000000 --- a/YACReaderLibrary/qml.qrc +++ /dev/null @@ -1,24 +0,0 @@ - - - qml/GridComicsView.qml - qml/FolderContentView.qml - qml/FlowView.qml - qml/InfoTick.qml - qml/InfoFavorites.qml - qml/InfoRating.qml - qml/InfoComicsView.qml - qml/tick.svg - qml/reading.svg - qml/star.svg - qml/page.svg - qml/info-indicator.svg - qml/info-shadow.svg - qml/info-top-shadow.svg - qml/ComicInfoView.qml - qml/info-favorites.svg - qml/info-rating.svg - qml/info-tag.svg - qml/info-tick.svg - qml/prerendered_cover_shadow.png - - diff --git a/YACReaderLibrary/themes/themes.qrc b/YACReaderLibrary/themes/themes.qrc deleted file mode 100644 index d96de307..00000000 --- a/YACReaderLibrary/themes/themes.qrc +++ /dev/null @@ -1,16 +0,0 @@ - - - builtin_classic.json - builtin_light.json - builtin_light1.json - builtin_light2.json - builtin_light3.json - builtin_light4.json - builtin_light5.json - builtin_dark.json - builtin_dark1.json - builtin_dark2.json - builtin_dark3.json - builtin_dark4.json - - diff --git a/common/themes/appearance_config_images.qrc b/common/themes/appearance_config_images.qrc deleted file mode 100644 index b67edae7..00000000 --- a/common/themes/appearance_config_images.qrc +++ /dev/null @@ -1,8 +0,0 @@ - - - ../../images/appearance_config/theme-mode-system.svg - ../../images/appearance_config/theme-mode-light.svg - ../../images/appearance_config/theme-mode-dark.svg - ../../images/appearance_config/theme-mode-custom.svg - -