🚀 CD: update email & add qqc2-desktop-style as optdepends

.gitea/workflows/release.yml

@@ -24,7 +24,7 @@ jobs:
           SHA256=$(sha256sum source.tar.gz | awk '{print $1}')
 
           cat << 'EOF' > PKGBUILD
-          # Maintainer: Uyanide <me@uyani.de>
+          # Maintainer: Uyanide <pywang0608@foxmail.com>
           pkgname=wallreel
           pkgver=${{ env.VERSION }}
           pkgrel=1
@@ -34,6 +34,7 @@ jobs:
           license=('MIT')
           depends=('qt6-base' 'qt6-declarative' 'gcc-libs' 'glibc')
           makedepends=('cmake')
+          optdepends=('qqc2-desktop-style: native Plasma look and feel')
           options=('!debug')
           source=("${pkgname}-${pkgver}.tar.gz::https://git.uyani.de/Uyanide/WallReel/archive/v${pkgver}.tar.gz")
           sha256sums=('INSERT_SHA256_HERE')
@@ -150,7 +151,7 @@ jobs:
           cd aur-repo
 
           cat << 'EOF' > LICENSE
-          Copyright (C) 2026 by Uyanide me@uyani.de
+          Copyright (C) 2026 by Uyanide pywang0608@foxmail.com
 
           Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted.
 

CMakeLists.txt

@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.16)
 
-project(WallReel VERSION 2.1.0 LANGUAGES CXX)
+project(WallReel VERSION 2.2.0 LANGUAGES CXX)
 
 set(EXECUTABLE_NAME "wallreel")
 set(CORELIB_NAME "wallreel-core")

LICENSE

@@ -1,4 +1,4 @@
-Copyright 2026 Uyanide me@uyani.de
+Copyright 2026 Uyanide pywang0608@foxmail.com
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

WallReel/Core/Config/data.hpp

@@ -1,8 +1,6 @@
 #ifndef WALLREEL_CONFIG_DATA_HPP
 #define WALLREEL_CONFIG_DATA_HPP
 
-#include <qtmetamacros.h>
-
 #include <QColor>
 #include <QHash>
 #include <QList>

WallReel/Core/Config/manager.cpp

@@ -54,9 +54,6 @@ Manager::Manager(
         WR_INFO(QString("No search directories specified, using Pictures directory: %1").arg(picturesPath));
         m_wallpaperConfig.dirs.append({picturesPath, true});
     }
-
-    WR_DEBUG("Loading wallpapers ...");
-    _loadWallpapers();
 }
 
 Manager::~Manager() {
@@ -324,7 +321,7 @@ void Manager::_loadCacheConfig(const QJsonObject& root) {
     }
 }
 
-void Manager::_loadWallpapers() {
+void Manager::scanWallpapers() {
     m_wallpapers.clear();
 
     // Add paths first using a set to avoid duplicates

WallReel/Core/Config/manager.hpp

@@ -1,5 +1,5 @@
-#ifndef WALLREEL_CONFIGMGR_HPP
-#define WALLREEL_CONFIGMGR_HPP
+#ifndef WALLREEL_CONFIG_MANAGER_HPP
+#define WALLREEL_CONFIG_MANAGER_HPP
 
 #include <QDir>
 
@@ -72,6 +72,8 @@ class Manager : public QObject {
      */
     Q_INVOKABLE void captureState();
 
+    void scanWallpapers();
+
   signals:
     void stateCaptured();
 
@@ -83,8 +85,6 @@ class Manager : public QObject {
     void _loadActionConfig(const QJsonObject& config);
     void _loadStyleConfig(const QJsonObject& config);
     void _loadCacheConfig(const QJsonObject& config);
-    // Load wallpapers
-    void _loadWallpapers();
     // Callback for state capture results
     void _onCaptureResult(const QString& key, const QString& value);
 
@@ -106,4 +106,4 @@ class Manager : public QObject {
 
 }  // namespace WallReel::Core::Config
 
-#endif  // WALLREEL_CONFIGMGR_HPP
+#endif  // WALLREEL_CONFIG_MANAGER_HPP

WallReel/Core/Image/data.hpp

@@ -1,5 +1,5 @@
-#ifndef WALLREEL_IMAGEDATA_HPP
-#define WALLREEL_IMAGEDATA_HPP
+#ifndef WALLREEL_IMAGE_DATA_HPP
+#define WALLREEL_IMAGE_DATA_HPP
 
 #include <QDir>
 #include <QFileInfo>
@@ -106,4 +106,4 @@ class Data {
 
 }  // namespace WallReel::Core::Image
 
-#endif  // WALLREEL_IMAGEDATA_HPP
+#endif  // WALLREEL_IMAGE_DATA_HPP

WallReel/Core/Image/manager.cpp

@@ -9,10 +9,12 @@
 WALLREEL_DECLARE_SENDER("ImageManager")
 
 WallReel::Core::Image::Manager::Manager(
+    Config::Manager& configMgr,
     Cache::Manager& cacheMgr,
     const QSize& thumbnailSize,
     QObject* parent)
     : QObject(parent),
+      m_configMgr(configMgr),
       m_cacheMgr(cacheMgr),
       m_thumbnailSize(thumbnailSize) {
     m_dataModel  = new Model(this);
@@ -38,6 +40,21 @@ WallReel::Core::Image::Manager::~Manager() {
     m_watcher.waitForFinished();
 }
 
+void WallReel::Core::Image::Manager::loadAndProcess() {
+    if (m_isLoading) {
+        WR_WARN("Already loading images. Ignoring new load request.");
+        return;
+    }
+    m_isLoading = true;
+    emit isLoadingChanged();
+
+    _clearData();
+
+    m_configMgr.scanWallpapers();
+    const auto paths = m_configMgr.getWallpapers();
+    return _process(paths);
+}
+
 void WallReel::Core::Image::Manager::loadAndProcess(const QStringList& paths) {
     if (m_isLoading) {
         WR_WARN("Already loading images. Ignoring new load request.");
@@ -48,6 +65,10 @@ void WallReel::Core::Image::Manager::loadAndProcess(const QStringList& paths) {
 
     _clearData();
 
+    return _process(paths);
+}
+
+void WallReel::Core::Image::Manager::_process(const QStringList& paths) {
     m_processedCount = 0;
     m_progressUpdateTimer.start(s_ProgressUpdateIntervalMs);
     // These are all small objects so capturing by value should be fine
@@ -75,6 +96,7 @@ void WallReel::Core::Image::Manager::stop() {
 
 void WallReel::Core::Image::Manager::_clearData() {
     m_dataModel->clearData();
+    m_dataMap.clear();
 }
 
 void WallReel::Core::Image::Manager::_onProgressValueChanged(int value) {

WallReel/Core/Image/manager.hpp

@@ -1,5 +1,5 @@
-#ifndef WALLREEL_IMAGEMANAGER_HPP
-#define WALLREEL_IMAGEMANAGER_HPP
+#ifndef WALLREEL_IMAGE_MANAGER_HPP
+#define WALLREEL_IMAGE_MANAGER_HPP
 
 #include <QAbstractListModel>
 #include <QDir>
@@ -8,6 +8,7 @@
 #include <atomic>
 
 #include "Cache/manager.hpp"
+#include "Config/manager.hpp"
 #include "data.hpp"
 #include "model.hpp"
 
@@ -20,6 +21,7 @@ class Manager : public QObject {
     // Constructor / Destructor
 
     Manager(
+        Config::Manager& configMgr,
         Cache::Manager& cacheMgr,
         const QSize& thumbnailSize,
         QObject* parent = nullptr);
@@ -32,6 +34,8 @@ class Manager : public QObject {
 
     int processedCount() const { return m_processedCount.load(std::memory_order_relaxed); }
 
+    // Total count of processing items, NOT the count of items in the model
+    // (Why did I name this method like this? idk)
     int totalCount() const { return m_watcher.progressMaximum(); }
 
     void setSortType(Config::SortType type) { m_proxyModel->setSortType(type); }
@@ -46,6 +50,8 @@ class Manager : public QObject {
 
     QString searchText() const { return m_proxyModel->getSearchText(); }
 
+    void loadAndProcess();
+
     void loadAndProcess(const QStringList& paths);
 
     void stop();
@@ -59,6 +65,7 @@ class Manager : public QObject {
 
   private:
     void _clearData();
+    void _process(const QStringList& paths);
 
   signals:
     // Properties
@@ -75,6 +82,7 @@ class Manager : public QObject {
     ProxyModel* m_proxyModel;
     QHash<QString, Data*> m_dataMap;
 
+    Config::Manager& m_configMgr;
     Cache::Manager& m_cacheMgr;
     QSize m_thumbnailSize;
 
@@ -88,4 +96,4 @@ class Manager : public QObject {
 
 }  // namespace WallReel::Core::Image
 
-#endif  // WALLREEL_IMAGEMANAGER_HPP
+#endif  // WALLREEL_IMAGE_MANAGER_HPP

WallReel/Core/Image/model.hpp

@@ -1,5 +1,5 @@
-#ifndef WALLREEL_IMAGEMODEL_HPP
-#define WALLREEL_IMAGEMODEL_HPP
+#ifndef WALLREEL_IMAGE_MODEL_HPP
+#define WALLREEL_IMAGE_MODEL_HPP
 
 #include <QAbstractListModel>
 #include <QSortFilterProxyModel>
@@ -78,10 +78,10 @@ class ProxyModel : public QSortFilterProxyModel {
 
   private:
     QString m_searchText;
-    Config::SortType m_sortType;
-    bool m_sortDescending;
+    Config::SortType m_sortType = Config::SortType::Date;
+    bool m_sortDescending       = true;
 };
 
 }  // namespace WallReel::Core::Image
 
-#endif  // WALLREEL_IMAGEMODEL_HPP
+#endif  // WALLREEL_IMAGE_MODEL_HPP

WallReel/Core/Palette/data.hpp

@@ -1,8 +1,6 @@
 #ifndef WALLREEL_PALETTE_DATA_HPP
 #define WALLREEL_PALETTE_DATA_HPP
 
-#include <qcolor.h>
-
 #include <QColor>
 #include <QList>
 #include <QObject>

WallReel/Core/Palette/domcolor.hpp

@@ -1,5 +1,5 @@
-#ifndef WALLREEL_CORE_PALETTE_DOMCOLOR_HPP
-#define WALLREEL_CORE_PALETTE_DOMCOLOR_HPP
+#ifndef WALLREEL_PALETTE_DOMCOLOR_HPP
+#define WALLREEL_PALETTE_DOMCOLOR_HPP
 
 #include <QImage>
 
@@ -15,4 +15,4 @@ QColor getDominantColor(const QImage& image);
 
 }  // namespace WallReel::Core::Palette
 
-#endif  // WALLREEL_CORE_PALETTE_DOMCOLOR_HPP
+#endif  // WALLREEL_PALETTE_DOMCOLOR_HPP

WallReel/Core/Palette/manager.cpp

@@ -1,7 +1,5 @@
 #include "manager.hpp"
 
-#include <qcontainerfwd.h>
-
 #include "Palette/matchcolor.hpp"
 #include "Utils/misc.hpp"
 #include "logger.hpp"

WallReel/Core/Palette/manager.hpp

@@ -1,8 +1,6 @@
 #ifndef WALLREEL_PALETTE_MANAGER_HPP
 #define WALLREEL_PALETTE_MANAGER_HPP
 
-#include <qcolor.h>
-
 #include "Config/data.hpp"
 #include "Image/manager.hpp"
 #include "data.hpp"

WallReel/Core/Palette/matchcolor.hpp

@@ -1,5 +1,5 @@
-#ifndef WALLREEL_CORE_PALETTE_MATCHCOLOR_HPP
-#define WALLREEL_CORE_PALETTE_MATCHCOLOR_HPP
+#ifndef WALLREEL_PALETTE_MATCHCOLOR_HPP
+#define WALLREEL_PALETTE_MATCHCOLOR_HPP
 
 #include "data.hpp"
 
@@ -16,4 +16,4 @@ ColorItem bestMatch(const QColor& target, const QList<ColorItem>& candidates);
 
 }  // namespace WallReel::Core::Palette
 
-#endif  // WALLREEL_CORE_PALETTE_MATCHCOLOR_HPP
+#endif  // WALLREEL_PALETTE_MATCHCOLOR_HPP

WallReel/Core/Provider/bootstrap.hpp

@@ -36,6 +36,7 @@ class Bootstrap {
         }
 
         imageMgr = new Image::Manager(
+            *configMgr,
             *cacheMgr,
             configMgr->getFocusImageSize());
 
@@ -55,7 +56,7 @@ class Bootstrap {
     void start() {
         cacheMgr->evictOldEntries();
         configMgr->captureState();
-        imageMgr->loadAndProcess(configMgr->getWallpapers());
+        imageMgr->loadAndProcess();
     }
 
     bool apply(const QString& path) {

WallReel/Core/Provider/carousel.hpp

@@ -171,6 +171,10 @@ class Carousel : public QObject {
         }
     }
 
+    Q_INVOKABLE void requestReload() {
+        m_imageMgr->loadAndProcess();
+    }
+
   signals:
     void currentImageIdChanged();
     void currentIndexChanged();

WallReel/Core/Service/wallpaper.cpp

@@ -1,9 +1,5 @@
 #include "Service/wallpaper.hpp"
 
-#include <qprocess.h>
-
-#include <QColor>
-
 #include "logger.hpp"
 
 WALLREEL_DECLARE_SENDER("WallpaperService")

WallReel/Core/Service/wallpaper.hpp

@@ -1,5 +1,5 @@
-#ifndef WALLREEL_WALLPAPERSERVICE_HPP
-#define WALLREEL_WALLPAPERSERVICE_HPP
+#ifndef WALLREEL_SERVICE_WALLPAPER_HPP
+#define WALLREEL_SERVICE_WALLPAPER_HPP
 
 #include <QProcess>
 #include <QTimer>
@@ -38,4 +38,4 @@ class WallpaperService : public QObject {
 
 }  // namespace WallReel::Core::Service
 
-#endif  // WALLREEL_WALLPAPERSERVICE_HPP
+#endif  // WALLREEL_SERVICE_WALLPAPER_HPP

WallReel/Core/Utils/misc.hpp

@@ -1,5 +1,5 @@
-#ifndef WALLREEL_MISC_HPP
-#define WALLREEL_MISC_HPP
+#ifndef WALLREEL_UTILS_MISC_HPP
+#define WALLREEL_UTILS_MISC_HPP
 
 #include <QDir>
 #include <QFileInfo>
@@ -199,4 +199,4 @@ inline void printPath(const QString& path, std::FILE* out = stdout) {
 
 }  // namespace WallReel::Core::Utils
 
-#endif  // WALLREEL_MISC_HPP
+#endif  // WALLREEL_UTILS_MISC_HPP

WallReel/Core/Utils/texttemplate.hpp

@@ -1,5 +1,5 @@
-#ifndef TEXTTEMPLATE_HPP
-#define TEXTTEMPLATE_HPP
+#ifndef WALLREEL_UTILS_TEXTTEMPLATE_HPP
+#define WALLREEL_UTILS_TEXTTEMPLATE_HPP
 
 #include <QMap>
 #include <QRegularExpression>
@@ -139,4 +139,4 @@ inline QStringList extractTemplateKeys(const QString& templateStr) {
 
 }  // namespace WallReel::Core::Utils
 
-#endif  // TEXTTEMPLATE_HPP
+#endif  // WALLREEL_UTILS_TEXTTEMPLATE_HPP

WallReel/Core/appoptions.hpp

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef WALLREEL_CORE_APPOPTIONS_HPP
+#define WALLREEL_CORE_APPOPTIONS_HPP
 
 #include <QCommandLineParser>
 #include <QStringList>
@@ -36,3 +37,5 @@ class AppOptions {
 };
 
 }  // namespace WallReel::Core
+
+#endif  // WALLREEL_CORE_APPOPTIONS_HPP

WallReel/Core/logger.hpp

@@ -1,8 +1,6 @@
 #ifndef WALLREEL_LOGGER_HPP
 #define WALLREEL_LOGGER_HPP
 
-#include <qcontainerfwd.h>
-
 #include <QLoggingCategory>
 #include <QString>
 #include <cstdio>

WallReel/UI/CMakeLists.txt

@@ -28,6 +28,7 @@ qt_add_qml_module(${UILIB_NAME}_Modules
     Modules/ColorControl.qml
     Modules/TopBar.qml
     Modules/BottomBar.qml
+    Modules/ReloadButton.qml
 )
 qt_add_qml_module(${UILIB_NAME}_Components
     STATIC

WallReel/UI/Modules/ReloadButton.qml

@@ -0,0 +1,17 @@
+import QtQuick
+import QtQuick.Controls
+
+ToolButton {
+    id: reloadBtn
+
+    property bool isLoading: false
+
+    icon.name: "view-refresh"
+    icon.width: 16
+    icon.height: 16
+    focusPolicy: Qt.NoFocus
+    ToolTip.visible: hovered
+    ToolTip.delay: 600
+    ToolTip.text: "Reload from disk"
+    enabled: !isLoading
+}

WallReel/UI/Modules/TopBar.qml

@@ -14,10 +14,12 @@ Item {
     property alias availableSortTypes: sortCtrl.availableSortTypes
     property alias selectedSortType: sortCtrl.selectedSortType
     property alias isSortDescending: sortCtrl.isDescending
+    property alias isLoading: reloadBtn.isLoading
 
     signal sortTypeSelected(string sortType)
     signal sortDescendingToggled(bool descending)
     signal searchDismissed()
+    signal reloadRequested()
 
     function requestSearchFocus() {
         searchBar.requestFocus();
@@ -63,6 +65,13 @@ Item {
             }
         }
 
+        ReloadButton {
+            id: reloadBtn
+
+            Layout.alignment: Qt.AlignVCenter
+            onClicked: root.reloadRequested()
+        }
+
     }
 
 }

WallReel/UI/Pages/CarouselScreen.qml

@@ -32,6 +32,10 @@ Item {
             root.forceActiveFocus();
         }
 
+        function onReloadRequested() {
+            CarouselProvider.requestReload();
+        }
+
         target: topBar
     }
 
@@ -48,6 +52,7 @@ Item {
             title: carousel.currentImageName
             availableSortTypes: CarouselProvider.availableSortTypes
             isSortDescending: CarouselProvider.sortDescending
+            isLoading: CarouselProvider.isLoading
             onSortTypeSelected: (t) => {
                 return CarouselProvider.setSortType(t);
             }

WallReel/main.cpp

@@ -1,8 +1,8 @@
-#include <qobject.h>
-
 #include <QApplication>
+#include <QFileInfo>
 #include <QQmlApplicationEngine>
 #include <QQmlContext>
+#include <QQuickStyle>
 #include <QSocketNotifier>
 
 extern "C" {
@@ -21,6 +21,26 @@ using namespace WallReel::Core;
 
 WALLREEL_DECLARE_SENDER("Main")
 
+static QString pickControlsStyle(const QQmlApplicationEngine& engine) {
+    // Respect env
+    if (!qEnvironmentVariableIsEmpty("QT_QUICK_CONTROLS_STYLE"))
+        return {};
+#if QT_VERSION >= QT_VERSION_CHECK(6, 4, 0)
+    using namespace Qt::StringLiterals;
+    // Prefer KDE style if available,
+    for (const QString& p : engine.importPathList())
+        if (QFileInfo::exists(p + u"/org/kde/desktop/qmldir"_s))
+            return u"org.kde.desktop"_s;
+    // fallback to Fusion
+    return u"Fusion"_s;
+#else
+    for (const QString& p : engine.importPathList())
+        if (QFileInfo::exists(p + u"/org/kde/desktop/qmldir"_qs))
+            return u"org.kde.desktop"_qs;
+    return u"Fusion"_qs;
+#endif
+}
+
 int main(int argc, char* argv[]) {
     // Destruction order after QApplication quits its event loop:
     // 1. QQmlApplicationEngine (with all QML objects)
@@ -46,12 +66,14 @@ int main(int argc, char* argv[]) {
     QApplication a(argc, argv);
     a.setApplicationName(APP_NAME);
     a.setApplicationVersion(APP_VERSION);
+    {
 #if QT_VERSION >= QT_VERSION_CHECK(6, 4, 0)
-    using namespace Qt::StringLiterals;
-    a.setWindowIcon(QIcon(u":/icon.svg"_s));
+        using namespace Qt::StringLiterals;
+        a.setWindowIcon(QIcon(u":/icon.svg"_s));
 #else
-    a.setWindowIcon(QIcon(u":/%1.svg"_qs.arg(APP_NAME)));
+        a.setWindowIcon(QIcon(u":/icon.svg"_qs));
 #endif
+    }
 
     {
         Logger::init();
@@ -105,6 +127,10 @@ int main(int argc, char* argv[]) {
             {
                 QQmlApplicationEngine engine;
 
+                if (const QString s = pickControlsStyle(engine); !s.isEmpty()) {
+                    QQuickStyle::setStyle(s);
+                }
+
                 QObject::connect(
                     &engine,
                     &QQmlApplicationEngine::objectCreationFailed,
@@ -112,13 +138,15 @@ int main(int argc, char* argv[]) {
                     []() { QCoreApplication::exit(-1); },
                     Qt::QueuedConnection);
 
+                {
 #if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
-                using namespace Qt::StringLiterals;
-                engine.loadFromModule(UIMODULE_URI, u"Main"_s);
+                    using namespace Qt::StringLiterals;
+                    engine.loadFromModule(UIMODULE_URI, u"Main"_s);
 #else
-                engine.addImportPath(u"qrc:/"_qs);
-                engine.load(QUrl(u"qrc:/WallReel/UI/Main.qml"_qs));
+                    engine.addImportPath(u"qrc:/"_qs);
+                    engine.load(QUrl(u"qrc:/WallReel/UI/Main.qml"_qs));
 #endif
+                }
 
                 bootstrap.start();