From 1835ebfdd1fbe4b55fc95bec24d07f6857e84c10 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 26 Mar 2023 21:48:25 +0200 Subject: [PATCH] Apply Qt settings immediately --- CMakeLists.txt | 2 +- gui/initiate.cpp | 1 + gui/settingsdialog.cpp | 3 +-- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 436f661..e29abe3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -196,7 +196,7 @@ if (WIDGETS_GUI OR QUICK_GUI) set(CONFIGURATION_PACKAGE_SUFFIX_QTUTILITIES "${CONFIGURATION_PACKAGE_SUFFIX}" CACHE STRING "sets the suffix for qtutilities") - find_package(qtutilities${CONFIGURATION_PACKAGE_SUFFIX_QTUTILITIES} 6.11.0 REQUIRED) + find_package(qtutilities${CONFIGURATION_PACKAGE_SUFFIX_QTUTILITIES} 6.12.0 REQUIRED) use_qt_utilities() endif () diff --git a/gui/initiate.cpp b/gui/initiate.cpp index ce6d581..b032d9b 100644 --- a/gui/initiate.cpp +++ b/gui/initiate.cpp @@ -42,6 +42,7 @@ int runWidgetsGui(int argc, char *argv[], const QtConfigArguments &qtConfigArgs, // apply settings specified via command line args after the settings chosen in the GUI to give the CLI options precedence auto &settings = Settings::values(); + settings.qt.disableNotices(); settings.qt.apply(); qtConfigArgs.applySettings(settings.qt.hasCustomFont()); diff --git a/gui/settingsdialog.cpp b/gui/settingsdialog.cpp index 4d4819b..c500c8c 100644 --- a/gui/settingsdialog.cpp +++ b/gui/settingsdialog.cpp @@ -680,8 +680,7 @@ SettingsDialog::SettingsDialog(QWidget *parent) setWindowIcon(QIcon::fromTheme( QStringLiteral("preferences-other"), QIcon(QStringLiteral(":/tageditor/icons/hicolor/32x32/settingscategories/preferences-other.svg")))); - // some settings could be applied without restarting the application, good idea? - //connect(this, &Dialogs::SettingsDialog::applied, bind(&Dialogs::QtSettings::apply, &Settings::qtSettings())); + connect(this, &SettingsDialog::applied, std::bind(&QtSettings::apply, &::Settings::values().qt)); } SettingsDialog::~SettingsDialog()