🐛 fix: correct behaviour of --disable-actions
This commit is contained in:
+1
-1
@@ -1,6 +1,6 @@
|
|||||||
cmake_minimum_required(VERSION 3.16)
|
cmake_minimum_required(VERSION 3.16)
|
||||||
|
|
||||||
project(WallReel VERSION 2.0.1 LANGUAGES CXX)
|
project(WallReel VERSION 2.0.2 LANGUAGES CXX)
|
||||||
|
|
||||||
set(EXECUTABLE_NAME "wallreel")
|
set(EXECUTABLE_NAME "wallreel")
|
||||||
set(CORELIB_NAME "wallreel-core")
|
set(CORELIB_NAME "wallreel-core")
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
.\" Automatically generated by Pandoc 3.5
|
.\" Automatically generated by Pandoc 3.5
|
||||||
.\"
|
.\"
|
||||||
.TH "WALLREEL" "1" "2026\-03\-24" "WallReel 2.0.1" "User Commands"
|
.TH "WALLREEL" "1" "2026\-03\-24" "WallReel 2.0.2" "User Commands"
|
||||||
.SH NAME
|
.SH NAME
|
||||||
wallreel \- Choose and set desktop wallpapers with customizable themes
|
wallreel \- Choose and set desktop wallpapers with customizable themes
|
||||||
and actions
|
and actions
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
.\" Automatically generated by Pandoc 3.5
|
.\" Automatically generated by Pandoc 3.5
|
||||||
.\"
|
.\"
|
||||||
.TH "WALLREEL" "5" "2026\-03\-24" "WallReel 2.0.1" "File Formats Manual"
|
.TH "WALLREEL" "5" "2026\-03\-24" "WallReel 2.0.2" "File Formats Manual"
|
||||||
.SH NAME
|
.SH NAME
|
||||||
wallreel\-config \- configuration format for wallreel
|
wallreel\-config \- configuration format for wallreel
|
||||||
.SH SYNOPSIS
|
.SH SYNOPSIS
|
||||||
|
|||||||
@@ -26,8 +26,9 @@ Manager::Manager(
|
|||||||
const QDir& picturesDir,
|
const QDir& picturesDir,
|
||||||
const QStringList& searchDirs,
|
const QStringList& searchDirs,
|
||||||
const QString& configPath,
|
const QString& configPath,
|
||||||
|
bool disableActions,
|
||||||
QObject* parent)
|
QObject* parent)
|
||||||
: QObject(parent), m_configDir(configDir) {
|
: QObject(parent), m_configDir(configDir), m_disableActions(disableActions) {
|
||||||
connect(this, &Manager::stateCaptured, this, [this]() {
|
connect(this, &Manager::stateCaptured, this, [this]() {
|
||||||
m_stateCaptured = true;
|
m_stateCaptured = true;
|
||||||
WR_INFO("State capture completed");
|
WR_INFO("State capture completed");
|
||||||
@@ -398,6 +399,13 @@ void Manager::captureState() {
|
|||||||
if (m_stateCaptured) {
|
if (m_stateCaptured) {
|
||||||
WR_DEBUG("State already captured, skipping capture");
|
WR_DEBUG("State already captured, skipping capture");
|
||||||
emit stateCaptured();
|
emit stateCaptured();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (m_disableActions) {
|
||||||
|
WR_DEBUG("Actions are disabled, skipping state capture");
|
||||||
|
emit stateCaptured();
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (m_pendingCaptures > 0) {
|
if (m_pendingCaptures > 0) {
|
||||||
|
|||||||
@@ -27,6 +27,7 @@ class Manager : public QObject {
|
|||||||
* @param searchDirs Additional directories to search for wallpapers (not recursive)
|
* @param searchDirs Additional directories to search for wallpapers (not recursive)
|
||||||
* @param configPath Optional path to a specific configuration file (overrides the default config path)
|
* @param configPath Optional path to a specific configuration file (overrides the default config path)
|
||||||
* @param picturesDir The pictures directory (default location for user wallpapers)
|
* @param picturesDir The pictures directory (default location for user wallpapers)
|
||||||
|
* @param disableActions Whether to disable actions
|
||||||
* @param parent QObject parent
|
* @param parent QObject parent
|
||||||
*
|
*
|
||||||
* @note The constructor will load the configuration and scan for wallpapers immediately.
|
* @note The constructor will load the configuration and scan for wallpapers immediately.
|
||||||
@@ -36,6 +37,7 @@ class Manager : public QObject {
|
|||||||
const QDir& picturesDir,
|
const QDir& picturesDir,
|
||||||
const QStringList& searchDirs = {},
|
const QStringList& searchDirs = {},
|
||||||
const QString& configPath = "",
|
const QString& configPath = "",
|
||||||
|
bool disableActions = false,
|
||||||
QObject* parent = nullptr);
|
QObject* parent = nullptr);
|
||||||
|
|
||||||
~Manager();
|
~Manager();
|
||||||
@@ -88,6 +90,8 @@ class Manager : public QObject {
|
|||||||
|
|
||||||
private:
|
private:
|
||||||
const QDir m_configDir;
|
const QDir m_configDir;
|
||||||
|
bool m_disableActions = false;
|
||||||
|
|
||||||
WallpaperConfigItems m_wallpaperConfig;
|
WallpaperConfigItems m_wallpaperConfig;
|
||||||
ThemeConfigItems m_themeConfig;
|
ThemeConfigItems m_themeConfig;
|
||||||
ActionConfigItems m_actionConfig;
|
ActionConfigItems m_actionConfig;
|
||||||
|
|||||||
@@ -18,12 +18,13 @@ class Bootstrap {
|
|||||||
friend class Carousel;
|
friend class Carousel;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
Bootstrap(const AppOptions& options) {
|
Bootstrap(const AppOptions& options) : options(options) {
|
||||||
configMgr = new Config::Manager(
|
configMgr = new Config::Manager(
|
||||||
Utils::getConfigDir(),
|
Utils::getConfigDir(),
|
||||||
Utils::getPicturesDir(),
|
Utils::getPicturesDir(),
|
||||||
options.appendDirs,
|
options.appendDirs,
|
||||||
options.configPath);
|
options.configPath,
|
||||||
|
options.disableActions);
|
||||||
|
|
||||||
cacheMgr = new Cache::Manager(
|
cacheMgr = new Cache::Manager(
|
||||||
Utils::getCacheDir(),
|
Utils::getCacheDir(),
|
||||||
@@ -58,6 +59,11 @@ class Bootstrap {
|
|||||||
}
|
}
|
||||||
|
|
||||||
bool apply(const QString& path) {
|
bool apply(const QString& path) {
|
||||||
|
if (options.disableActions) {
|
||||||
|
Logger::warn("Bootstrap", "Actions are disabled, cannot apply wallpaper");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
QEventLoop loop;
|
QEventLoop loop;
|
||||||
bool successFlag = false;
|
bool successFlag = false;
|
||||||
|
|
||||||
@@ -122,6 +128,7 @@ class Bootstrap {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
const AppOptions& options;
|
||||||
Cache::Manager* cacheMgr{};
|
Cache::Manager* cacheMgr{};
|
||||||
Config::Manager* configMgr{};
|
Config::Manager* configMgr{};
|
||||||
Image::Manager* imageMgr{};
|
Image::Manager* imageMgr{};
|
||||||
|
|||||||
+1
-1
@@ -2,7 +2,7 @@
|
|||||||
title: WALLREEL
|
title: WALLREEL
|
||||||
section: 1
|
section: 1
|
||||||
header: User Commands
|
header: User Commands
|
||||||
footer: WallReel 2.0.1
|
footer: WallReel 2.0.2
|
||||||
date: 2026-03-24
|
date: 2026-03-24
|
||||||
---
|
---
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -2,7 +2,7 @@
|
|||||||
title: WALLREEL
|
title: WALLREEL
|
||||||
section: 5
|
section: 5
|
||||||
header: File Formats Manual
|
header: File Formats Manual
|
||||||
footer: WallReel 2.0.1
|
footer: WallReel 2.0.2
|
||||||
date: 2026-03-24
|
date: 2026-03-24
|
||||||
---
|
---
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user