diff options
| -rw-r--r-- | lxqt-base/lxqt-config/Manifest | 2 | ||||
| -rw-r--r-- | lxqt-base/lxqt-config/files/lxqt-config-hide-unwanted-appearance-settings.patch | 55 | ||||
| -rw-r--r-- | lxqt-base/lxqt-config/lxqt-config-0.14.1.ebuild (renamed from lxqt-base/lxqt-config/lxqt-config-0.13.0.ebuild) | 2 |
3 files changed, 43 insertions, 16 deletions
diff --git a/lxqt-base/lxqt-config/Manifest b/lxqt-base/lxqt-config/Manifest index cf057c2d..703c2426 100644 --- a/lxqt-base/lxqt-config/Manifest +++ b/lxqt-base/lxqt-config/Manifest @@ -1 +1 @@ -DIST lxqt-config-0.13.0.tar.xz 201112 BLAKE2B 6a79c1f07e1cf055da09bb7dd8f7da2426891770b0e757ba3c4e5ef137f715ba3a579b2c05a4f1938c9d76b6dda0643119888be7dace2083a57a7dfe0df93aa5 SHA512 a5102794c4cf18a18e633cbc7d0b89653abf2612bc61e506ec169f4898903092f5201a09a2610642c641a17b59a992a6d6f59366ec61d54763e8b911d5220ca9 +DIST lxqt-config-0.14.1.tar.xz 293304 BLAKE2B f090d7878815edc4f3f0078301a099ffc8ff57865516a9097db75faa1627af33c60d76b75cef8a7da5e9e790869e6768f54c3b17c59b038578f22d645c3c22fd SHA512 747644f8e0623cb2e8eadda57c7307387423152a089d5b423b06650fbf235371764a26e82363cbee9db5c1145e3fdb754e6ecdcf0930dccec375dda424c8b13f diff --git a/lxqt-base/lxqt-config/files/lxqt-config-hide-unwanted-appearance-settings.patch b/lxqt-base/lxqt-config/files/lxqt-config-hide-unwanted-appearance-settings.patch index 872a41b3..ddfd7801 100644 --- a/lxqt-base/lxqt-config/files/lxqt-config-hide-unwanted-appearance-settings.patch +++ b/lxqt-base/lxqt-config/files/lxqt-config-hide-unwanted-appearance-settings.patch @@ -1,6 +1,6 @@ diff -Nur a/lxqt-config-appearance/main.cpp b/lxqt-config-appearance/main.cpp ---- a/lxqt-config-appearance/main.cpp 2017-10-21 20:10:53.000000000 +0100 -+++ b/lxqt-config-appearance/main.cpp 2017-12-17 10:18:16.454195148 +0000 +--- a/lxqt-config-appearance/main.cpp 2019-02-24 00:16:01.000000000 +0000 ++++ b/lxqt-config-appearance/main.cpp 2019-05-22 11:13:45.456936737 +0100 @@ -30,10 +30,7 @@ #include <LXQt/Settings> #include <LXQt/ConfigDialog> @@ -9,29 +9,56 @@ diff -Nur a/lxqt-config-appearance/main.cpp b/lxqt-config-appearance/main.cpp #include "lxqtthemeconfig.h" -#include "styleconfig.h" -#include "fontsconfig.h" + #include "configothertoolkits.h" #include "../liblxqt-config-cursor/selectwnd.h" - -@@ -59,22 +56,11 @@ - app.setActivationWindow(dialog); +@@ -66,23 +63,6 @@ QSettings& qtSettings = *settings; // use lxqt config file for Qt settings in Qt5. -- StyleConfig* stylePage = new StyleConfig(settings, &qtSettings, dialog); + +- /*** Widget Style ***/ +- StyleConfig* stylePage = new StyleConfig(settings, &qtSettings, &mConfigAppearanceSettings, configOtherToolKits, dialog); - dialog->addPage(stylePage, QObject::tr("Widget Style"), QStringList() << "preferences-desktop-theme" << "preferences-desktop"); -- QObject::connect(dialog, SIGNAL(reset()), stylePage, SLOT(initControls())); +- QObject::connect(dialog, &LXQt::ConfigDialog::reset, stylePage, &StyleConfig::initControls); +- QObject::connect(stylePage, &StyleConfig::settingsChanged, dialog, [dialog] { +- dialog->enableButton(QDialogButtonBox::Apply, true); // enable Apply button when something is changed +- }); - +- /*** Icon Theme ***/ - IconThemeConfig* iconPage = new IconThemeConfig(settings, dialog); - dialog->addPage(iconPage, QObject::tr("Icons Theme"), QStringList() << "preferences-desktop-icons" << "preferences-desktop"); -- QObject::connect(dialog, SIGNAL(reset()), iconPage, SLOT(initControls())); - +- QObject::connect(dialog, &LXQt::ConfigDialog::reset, iconPage, &IconThemeConfig::initControls); +- QObject::connect(iconPage, &IconThemeConfig::settingsChanged, dialog, [dialog] { +- dialog->enableButton(QDialogButtonBox::Apply, true); +- }); +- QObject::connect(iconPage, &IconThemeConfig::updateOtherSettings, configOtherToolKits, &ConfigOtherToolKits::setConfig); +- + /*** LXQt Theme ***/ LXQtThemeConfig* themePage = new LXQtThemeConfig(settings, dialog); dialog->addPage(themePage, QObject::tr("LXQt Theme"), QStringList() << "preferences-desktop-color" << "preferences-desktop"); - QObject::connect(dialog, SIGNAL(reset()), themePage, SLOT(initControls())); +@@ -91,14 +71,6 @@ + dialog->enableButton(QDialogButtonBox::Apply, true); + }); +- /*** Font ***/ - FontsConfig* fontsPage = new FontsConfig(settings, &qtSettings, dialog); - dialog->addPage(fontsPage, QObject::tr("Font"), QStringList() << "preferences-desktop-font" << "preferences-desktop"); -- QObject::connect(dialog, SIGNAL(reset()), fontsPage, SLOT(initControls())); -- +- QObject::connect(dialog, &LXQt::ConfigDialog::reset, fontsPage, &FontsConfig::initControls); +- QObject::connect(fontsPage, &FontsConfig::updateOtherSettings, configOtherToolKits, &ConfigOtherToolKits::setConfig); +- QObject::connect(fontsPage, &FontsConfig::settingsChanged, dialog, [dialog] { +- dialog->enableButton(QDialogButtonBox::Apply, true); +- }); + + /*** Cursor Theme ***/ SelectWnd* cursorPage = new SelectWnd(sessionSettings, dialog); - cursorPage->setCurrent(); - dialog->addPage(cursorPage, QObject::tr("Cursor"), QStringList() << "input-mouse" << "preferences-desktop"); +@@ -112,10 +84,7 @@ + QObject::connect(dialog, &LXQt::ConfigDialog::clicked, [=] (QDialogButtonBox::StandardButton btn) { + if (btn == QDialogButtonBox::Apply) + { +- stylePage->applyStyle(); +- iconPage->applyIconTheme(); + themePage->applyLxqtTheme(); +- fontsPage->updateQtFont(); + cursorPage->applyCusorTheme(); + // disable Apply button after changes are applied + dialog->enableButton(btn, false); diff --git a/lxqt-base/lxqt-config/lxqt-config-0.13.0.ebuild b/lxqt-base/lxqt-config/lxqt-config-0.14.1.ebuild index a410972c..2c0eafa5 100644 --- a/lxqt-base/lxqt-config/lxqt-config-0.13.0.ebuild +++ b/lxqt-base/lxqt-config/lxqt-config-0.14.1.ebuild @@ -41,7 +41,7 @@ RDEPEND="${CDEPEND} src_prepare() { if use gtk; then - # Redcore patch, to disable no longer working appearance settings when using qgtk2 platform plugin + # Redcore Linux patch : hide no longer working appearance settings when using qgtk2 platform plugin epatch "${FILESDIR}"/"${PN}"-hide-unwanted-appearance-settings.patch cmake-utils_src_prepare else |