From 1826209521106ba9a98d55842c2c8d749fa54545 Mon Sep 17 00:00:00 2001 From: Digital Artifex <7929434+DigitalArtifex@users.noreply.github.com> Date: Thu, 13 Aug 2026 15:17:42 -0400 Subject: [PATCH] Cleanup unused assets --- CMakeLists.txt | 137 ++++++++++-------- Generated/Quick3DAssets.txt | 1 - KomplexHubPlugin/CMakeLists.txt | 100 +++++++------ KomplexHubPlugin/common/komplex_global.h | 10 ++ .../paginators/featuredcubemapspaginator.h | 47 ------ .../paginators/featuredshaderspaginator.h | 47 ------ KomplexHubPlugin/paginators/imagepaginator.h | 2 +- .../paginators/newestcubemapspaginator.h | 45 ------ .../paginators/newestshaderspaginator.h | 45 ------ .../{common => paginators}/paginator.h | 4 +- .../paginators/searchcubemapspaginator.h | 45 ------ .../paginators/searchshaderspaginator.h | 45 ------ KomplexHubPlugin/paginators/videopaginator.h | 2 +- .../paginators/wallpaperpaginator.h | 2 +- 14 files changed, 139 insertions(+), 393 deletions(-) delete mode 100644 Generated/Quick3DAssets.txt delete mode 100644 KomplexHubPlugin/paginators/featuredcubemapspaginator.h delete mode 100644 KomplexHubPlugin/paginators/featuredshaderspaginator.h delete mode 100644 KomplexHubPlugin/paginators/newestcubemapspaginator.h delete mode 100644 KomplexHubPlugin/paginators/newestshaderspaginator.h rename KomplexHubPlugin/{common => paginators}/paginator.h (99%) delete mode 100644 KomplexHubPlugin/paginators/searchcubemapspaginator.h delete mode 100644 KomplexHubPlugin/paginators/searchshaderspaginator.h diff --git a/CMakeLists.txt b/CMakeLists.txt index 84194f2..2b17a1e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -20,78 +20,91 @@ set(QML_IMPORT_PATH ${QT_QML_OUTPUT_DIRECTORY} FORCE ) -find_package(Qt6 6.8 REQUIRED COMPONENTS Core Gui Widgets Qml Quick QuickControls2 QuickTimeline ShaderTools Concurrent) +find_package( + Qt6 6.8 + REQUIRED COMPONENTS + Core + Gui + Widgets + Qml + Quick + QuickControls2 + QuickTimeline + ShaderTools + Concurrent +) + qt_standard_project_setup() qt_add_executable(${CMAKE_PROJECT_NAME} ) qt_add_resources(${CMAKE_PROJECT_NAME} "configuration" - PREFIX "/" - FILES - qtquickcontrols2.conf + PREFIX "/" + FILES + qtquickcontrols2.conf ) qt_add_resources(${CMAKE_PROJECT_NAME} "app_images" - FILES - "images/icons/icons8-back.svg" - "images/icons/icons8-bill.svg" - "images/icons/icons8-biotech.svg" - "images/icons/icons8-cancel.svg" - "images/icons/icons8-check-mark.svg" - "images/icons/icons8-close-window.svg" - "images/icons/icons8-famous.svg" - "images/icons/icons8-filter.svg" - "images/icons/icons8-forward.svg" - "images/icons/icons8-hdd.svg" - "images/icons/icons8-image.svg" - "images/icons/icons8-login.svg" - "images/icons/icons8-logout-rounded-left.svg" - "images/icons/icons8-next.svg" - "images/icons/icons8-reply-arrow.svg" - "images/icons/icons8-search.svg" - "images/icons/icons8-settings.svg" - "images/icons/icons8-shopping-cart.svg" - "images/icons/icons8-star-filled.svg" - "images/icons/icons8-store.svg" - "images/icons/icons8-user-account.svg" - "images/icons/icons8-view-more.svg" - "images/icons/icons8-video.svg" - "images/icons/pexels-icon-filled-256.svg" - "images/icons/icons8-trash.svg" - "images/icons/icons8-download.svg" - "images/icons/icons8-play.svg" - "images/icons/icons8-stop.svg" - "images/icons/icons8-codepen.svg" - "images/icons/icons8-cube.svg" - "images/icons/icons8-camera.svg" - "images/icons/icons8-audio.svg" - "images/icons/icons8-3d-model.svg" - "images/icons/icons8-3d-glasses.svg" - "images/icons/kofi.gif" - "images/kero/kero_build_1.png" - "images/kero/kero_build_2.png" - "images/kero/kero_build_3.png" - "images/kero/kero_build_4.png" - "images/kero/kero_build_error.png" - "images/kero/kero_choice.png" - "images/kero/kero_error.png" - "images/kero/kero_hello.png" - "images/kero/kero_login.png" - "images/kero/kero_no_results.png" - "images/kero/kero_run_1.png" - "images/kero/kero_run_2.png" - "images/kero/kero_run_3.png" - "images/kero/kero_run_4.png" - "images/kero/kero_success.png" - "images/kero/kero_warning.png" - ) + FILES + "images/icons/icons8-back.svg" + "images/icons/icons8-bill.svg" + "images/icons/icons8-biotech.svg" + "images/icons/icons8-cancel.svg" + "images/icons/icons8-check-mark.svg" + "images/icons/icons8-close-window.svg" + "images/icons/icons8-famous.svg" + "images/icons/icons8-filter.svg" + "images/icons/icons8-forward.svg" + "images/icons/icons8-hdd.svg" + "images/icons/icons8-image.svg" + "images/icons/icons8-login.svg" + "images/icons/icons8-logout-rounded-left.svg" + "images/icons/icons8-next.svg" + "images/icons/icons8-reply-arrow.svg" + "images/icons/icons8-search.svg" + "images/icons/icons8-settings.svg" + "images/icons/icons8-shopping-cart.svg" + "images/icons/icons8-star-filled.svg" + "images/icons/icons8-store.svg" + "images/icons/icons8-user-account.svg" + "images/icons/icons8-view-more.svg" + "images/icons/icons8-video.svg" + "images/icons/pexels-icon-filled-256.svg" + "images/icons/icons8-trash.svg" + "images/icons/icons8-download.svg" + "images/icons/icons8-play.svg" + "images/icons/icons8-stop.svg" + "images/icons/icons8-codepen.svg" + "images/icons/icons8-cube.svg" + "images/icons/icons8-camera.svg" + "images/icons/icons8-audio.svg" + "images/icons/icons8-3d-model.svg" + "images/icons/icons8-3d-glasses.svg" + "images/icons/kofi.gif" + "images/kero/kero_build_1.png" + "images/kero/kero_build_2.png" + "images/kero/kero_build_3.png" + "images/kero/kero_build_4.png" + "images/kero/kero_build_error.png" + "images/kero/kero_choice.png" + "images/kero/kero_error.png" + "images/kero/kero_hello.png" + "images/kero/kero_login.png" + "images/kero/kero_no_results.png" + "images/kero/kero_run_1.png" + "images/kero/kero_run_2.png" + "images/kero/kero_run_3.png" + "images/kero/kero_run_4.png" + "images/kero/kero_success.png" + "images/kero/kero_warning.png" +) - target_compile_definitions( - ${CMAKE_PROJECT_NAME} - PUBLIC - KOMPLEX_LOCAL_DEV - ) +target_compile_definitions( + ${CMAKE_PROJECT_NAME} + PUBLIC + KOMPLEX_LOCAL_DEV +) include(qds) diff --git a/Generated/Quick3DAssets.txt b/Generated/Quick3DAssets.txt deleted file mode 100644 index 84c843f..0000000 --- a/Generated/Quick3DAssets.txt +++ /dev/null @@ -1 +0,0 @@ -Imported 3D assets and components imported from bundles will be created in this folder. diff --git a/KomplexHubPlugin/CMakeLists.txt b/KomplexHubPlugin/CMakeLists.txt index 16f7a33..77ffa2a 100644 --- a/KomplexHubPlugin/CMakeLists.txt +++ b/KomplexHubPlugin/CMakeLists.txt @@ -10,57 +10,52 @@ qt_add_qml_module( VERSION 1.0 SOURCES - settingsmanager.h - settingsmanager.cpp - installedpackmanager.h - installedpackmanager.cpp - common/wallpapercache.h - newestpacksmodel.h - newestpacksmodel.cpp - common/komplex_global.h - common/slidingcachecontroller.h - common/paginator.h - common/coreservices.h - common/coreservices.cpp - common/logging.h - common/fetchresult.h - paginators/newestpackspaginator.h - paginators/featuredpackspaginator.h - paginators/featuredimagespaginator.h - paginators/wallpaperpaginator.h - paginators/packsearchpaginator.h - paginators/imagesearchpaginator.h - paginators/newestshaderspaginator.h - paginators/newestcubemapspaginator.h - paginators/featuredshaderspaginator.h - paginators/featuredcubemapspaginator.h - paginators/searchshaderspaginator.h - paginators/searchcubemapspaginator.h - paginators/videosearchpaginator.h - featuredpacksmodel.h - featuredpacksmodel.cpp - featuredimagesmodel.h - featuredimagesmodel.cpp - featuredvideosmodel.h - featuredvideosmodel.cpp - paginators/featuredvideospaginator.h - common/imagecache.h - paginators/imagepaginator.h - common/videocache.h - paginators/videopaginator.h - imagesearchmodel.cpp - imagesearchmodel.h - videosearchmodel.h - videosearchmodel.cpp - packsearchmodel.cpp - packsearchmodel.h - videoitemmodel.h - videoitemmodel.cpp - downloadmanager.h downloadmanager.cpp - common/exceptions.h - common/shadertoymetadata.h - common/shaderpack.h - SOURCES packcompiler.h packcompiler.cpp + settingsmanager.h + settingsmanager.cpp + installedpackmanager.h + installedpackmanager.cpp + common/wallpapercache.h + newestpacksmodel.h + newestpacksmodel.cpp + common/komplex_global.h + common/slidingcachecontroller.h + common/coreservices.h + common/coreservices.cpp + common/logging.h + common/fetchresult.h + paginators/paginator.h + paginators/newestpackspaginator.h + paginators/featuredpackspaginator.h + paginators/featuredimagespaginator.h + paginators/wallpaperpaginator.h + paginators/packsearchpaginator.h + paginators/imagesearchpaginator.h + paginators/videosearchpaginator.h + featuredpacksmodel.h + featuredpacksmodel.cpp + featuredimagesmodel.h + featuredimagesmodel.cpp + featuredvideosmodel.h + featuredvideosmodel.cpp + paginators/featuredvideospaginator.h + common/imagecache.h + paginators/imagepaginator.h + common/videocache.h + paginators/videopaginator.h + imagesearchmodel.cpp + imagesearchmodel.h + videosearchmodel.h + videosearchmodel.cpp + packsearchmodel.cpp + packsearchmodel.h + videoitemmodel.h + videoitemmodel.cpp + downloadmanager.h downloadmanager.cpp + common/exceptions.h + common/shadertoymetadata.h + common/shaderpack.h + packcompiler.h + packcompiler.cpp ) target_compile_definitions( @@ -69,9 +64,12 @@ target_compile_definitions( KOMPLEX_PLUGIN ) +add_subdirectory(3rdparty/qtkeychain) + target_link_libraries(KomplexHubPlugin PRIVATE Qt${QT_VERSION_MAJOR}::Core Qt${QT_VERSION_MAJOR}::Gui + qt6keychain ) if(ENABLE_ASAN) diff --git a/KomplexHubPlugin/common/komplex_global.h b/KomplexHubPlugin/common/komplex_global.h index 34f51d3..820af32 100644 --- a/KomplexHubPlugin/common/komplex_global.h +++ b/KomplexHubPlugin/common/komplex_global.h @@ -19,6 +19,7 @@ #ifndef KOMPLEX_GLOBAL_H #define KOMPLEX_GLOBAL_H #include +#include #include #ifdef KOMPLEX_PLUGIN @@ -66,5 +67,14 @@ inline static qsizetype nullsize = std::numeric_limits::min(); inline static std::chrono::milliseconds KOMPLEX_RATE_LIMIT(500); +inline static QString KOMPLEX_KEYCHAIN_PASSWORD_KEY = QStringLiteral +( + "com.digitalartifex.komplex.keychain.password" +); + +inline static QString KOMPLEX_KEYCHAIN_TOKEN_KEY = QStringLiteral +( + "com.digitalartifex.komplex.keychain.token" +); #endif // KOMPLEX_GLOBAL_H diff --git a/KomplexHubPlugin/paginators/featuredcubemapspaginator.h b/KomplexHubPlugin/paginators/featuredcubemapspaginator.h deleted file mode 100644 index e7e9731..0000000 --- a/KomplexHubPlugin/paginators/featuredcubemapspaginator.h +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Komplex Wallpaper Engine - * Copyright (C) 2026 @DigitalArtifex - * https://digitalartifex.dev - https://github.com/DigitalArtifex - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see - */ -#ifndef FEATUREDCUBEMAPSPAGINATOR_H -#define FEATUREDCUBEMAPSPAGINATOR_H - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "wallpaperpaginator.h" - -class KOMPLEX_EXPORT FeaturedCubemapsPaginator : public WallpaperPaginator -{ -public: - explicit FeaturedCubemapsPaginator(QObject *parent = nullptr) : WallpaperPaginator(parent) - { - setUri( - QString::fromUtf8(KOMPLEX_ENDPOINT_CUBEMAPS_FEATURED) - ); - - controller()->setWindowSize(20); - } -}; - -#endif // FEATUREDCUBEMAPSPAGINATOR_H diff --git a/KomplexHubPlugin/paginators/featuredshaderspaginator.h b/KomplexHubPlugin/paginators/featuredshaderspaginator.h deleted file mode 100644 index 6ddb9ac..0000000 --- a/KomplexHubPlugin/paginators/featuredshaderspaginator.h +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Komplex Wallpaper Engine - * Copyright (C) 2026 @DigitalArtifex - * https://digitalartifex.dev - https://github.com/DigitalArtifex - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see - */ -#ifndef FEATUREDSHADERSPAGINATOR_H -#define FEATUREDSHADERSPAGINATOR_H - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "wallpaperpaginator.h" - -class KOMPLEX_EXPORT FeaturedShadersPaginator : public WallpaperPaginator -{ -public: - explicit FeaturedShadersPaginator(QObject *parent = nullptr) : WallpaperPaginator(parent) - { - setUri( - QString::fromUtf8(KOMPLEX_ENDPOINT_SHADERS_FEATURED) - ); - - controller()->setWindowSize(20); - } -}; - -#endif // FEATUREDSHADERSPAGINATOR_H diff --git a/KomplexHubPlugin/paginators/imagepaginator.h b/KomplexHubPlugin/paginators/imagepaginator.h index 1393bfe..a63a9e7 100644 --- a/KomplexHubPlugin/paginators/imagepaginator.h +++ b/KomplexHubPlugin/paginators/imagepaginator.h @@ -30,9 +30,9 @@ #include #include "common/logging.h" -#include "common/paginator.h" #include "common/imagecache.h" #include "common/coreservices.h" +#include "paginator.h" /** * @brief The ImagePaginator class diff --git a/KomplexHubPlugin/paginators/newestcubemapspaginator.h b/KomplexHubPlugin/paginators/newestcubemapspaginator.h deleted file mode 100644 index b09adc3..0000000 --- a/KomplexHubPlugin/paginators/newestcubemapspaginator.h +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Komplex Wallpaper Engine - * Copyright (C) 2026 @DigitalArtifex - * https://digitalartifex.dev - https://github.com/DigitalArtifex - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see - */ -#ifndef NEWESTCUBEMAPSPAGINATOR_H -#define NEWESTCUBEMAPSPAGINATOR_H - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "wallpaperpaginator.h" - -class KOMPLEX_EXPORT NewestCubemapsPaginator : public WallpaperPaginator -{ -public: - explicit NewestCubemapsPaginator(QObject *parent = nullptr) : WallpaperPaginator(parent) - { - setUri( - QString::fromUtf8(KOMPLEX_ENDPOINT_CUBEMAPS_NEWEST) - ); - } -}; - -#endif // NEWESTCUBEMAPSPAGINATOR_H diff --git a/KomplexHubPlugin/paginators/newestshaderspaginator.h b/KomplexHubPlugin/paginators/newestshaderspaginator.h deleted file mode 100644 index 3f2b0f2..0000000 --- a/KomplexHubPlugin/paginators/newestshaderspaginator.h +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Komplex Wallpaper Engine - * Copyright (C) 2026 @DigitalArtifex - * https://digitalartifex.dev - https://github.com/DigitalArtifex - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see - */ -#ifndef NEWESTSHADERSPAGINATOR_H -#define NEWESTSHADERSPAGINATOR_H - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "wallpaperpaginator.h" - -class KOMPLEX_EXPORT NewestShadersPaginator : public WallpaperPaginator -{ -public: - explicit NewestShadersPaginator(QObject *parent = nullptr) : WallpaperPaginator(parent) - { - setUri( - QString::fromUtf8(KOMPLEX_ENDPOINT_SHADERS_NEWEST) - ); - } -}; - -#endif // NEWESTSHADERSPAGINATOR_H diff --git a/KomplexHubPlugin/common/paginator.h b/KomplexHubPlugin/paginators/paginator.h similarity index 99% rename from KomplexHubPlugin/common/paginator.h rename to KomplexHubPlugin/paginators/paginator.h index bcd967a..79e8407 100644 --- a/KomplexHubPlugin/common/paginator.h +++ b/KomplexHubPlugin/paginators/paginator.h @@ -27,8 +27,8 @@ #include #include -#include "komplex_global.h" -#include "slidingcachecontroller.h" +#include "common/komplex_global.h" +#include "common/slidingcachecontroller.h" /** * @brief The PaginationNotifier class diff --git a/KomplexHubPlugin/paginators/searchcubemapspaginator.h b/KomplexHubPlugin/paginators/searchcubemapspaginator.h deleted file mode 100644 index 9a2791b..0000000 --- a/KomplexHubPlugin/paginators/searchcubemapspaginator.h +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Komplex Wallpaper Engine - * Copyright (C) 2026 @DigitalArtifex - * https://digitalartifex.dev - https://github.com/DigitalArtifex - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see - */ -#ifndef SEARCHCUBEMAPSPAGINATOR_H -#define SEARCHCUBEMAPSPAGINATOR_H - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "wallpaperpaginator.h" - -class KOMPLEX_EXPORT SearchCubemapsPaginator : public WallpaperPaginator -{ -public: - explicit SearchCubemapsPaginator(QObject *parent = nullptr) : WallpaperPaginator(parent) - { - setUri( - QString::fromUtf8(KOMPLEX_ENDPOINT_CUBEMAPS_SEARCH) - ); - } -}; - -#endif // SEARCHCUBEMAPSPAGINATOR_H diff --git a/KomplexHubPlugin/paginators/searchshaderspaginator.h b/KomplexHubPlugin/paginators/searchshaderspaginator.h deleted file mode 100644 index 09e21a3..0000000 --- a/KomplexHubPlugin/paginators/searchshaderspaginator.h +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Komplex Wallpaper Engine - * Copyright (C) 2026 @DigitalArtifex - * https://digitalartifex.dev - https://github.com/DigitalArtifex - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see - */ -#ifndef SEARCHSHADERSPAGINATOR_H -#define SEARCHSHADERSPAGINATOR_H - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "wallpaperpaginator.h" - -class KOMPLEX_EXPORT SearchShadersPaginator : public WallpaperPaginator -{ -public: - explicit SearchShadersPaginator(QObject *parent = nullptr) : WallpaperPaginator(parent) - { - setUri( - QString::fromUtf8(KOMPLEX_ENDPOINT_SHADERS_SEARCH) - ); - } -}; - -#endif // SEARCHSHADERSPAGINATOR_H diff --git a/KomplexHubPlugin/paginators/videopaginator.h b/KomplexHubPlugin/paginators/videopaginator.h index dfe39c8..d9e6aeb 100644 --- a/KomplexHubPlugin/paginators/videopaginator.h +++ b/KomplexHubPlugin/paginators/videopaginator.h @@ -30,9 +30,9 @@ #include #include "common/logging.h" -#include "common/paginator.h" #include "common/videocache.h" #include "common/coreservices.h" +#include "paginator.h" /** * @brief The VideoPaginator class diff --git a/KomplexHubPlugin/paginators/wallpaperpaginator.h b/KomplexHubPlugin/paginators/wallpaperpaginator.h index 4d6a166..bcb52f6 100644 --- a/KomplexHubPlugin/paginators/wallpaperpaginator.h +++ b/KomplexHubPlugin/paginators/wallpaperpaginator.h @@ -30,9 +30,9 @@ #include #include "common/logging.h" -#include "common/paginator.h" #include "common/wallpapercache.h" #include "common/coreservices.h" +#include "paginator.h" /** * @brief The WallpaperPaginator class