From d101fdee54adc076c8e54dd4d6a6239aa1014901 Mon Sep 17 00:00:00 2001 From: Ken Moore Date: Tue, 15 Jan 2019 07:44:51 -0500 Subject: Track a Qt change with Qt 5.12: They added a new color to the QPalette class, which was throwing off the settings-load system. Make the settings-load system more robust by supporting files which had fewer colors specified (backwards compatible), while also updating the palette editor to add support for the new color. --- src-qt5/core/libLumina/LDesktopUtils.cpp | 2 +- .../lthemeengine-qtplugin/lthemeengineplatformtheme.cpp | 14 +++++++------- .../src/lthemeengine/appearancepage.cpp | 6 +++--- .../src/lthemeengine/paletteeditdialog.cpp | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src-qt5/core/libLumina/LDesktopUtils.cpp b/src-qt5/core/libLumina/LDesktopUtils.cpp index fa272e8e..79151273 100644 --- a/src-qt5/core/libLumina/LDesktopUtils.cpp +++ b/src-qt5/core/libLumina/LDesktopUtils.cpp @@ -14,7 +14,7 @@ #include "LuminaThemes.h" QString LDesktopUtils::LuminaDesktopVersion(){ - QString ver = "1.4.2"; + QString ver = "1.4.3"; #ifdef GIT_VERSION ver.append( QString(" (Git Revision: %1)").arg(GIT_VERSION) ); #endif diff --git a/src-qt5/core/lumina-theme-engine/src/lthemeengine-qtplugin/lthemeengineplatformtheme.cpp b/src-qt5/core/lumina-theme-engine/src/lthemeengine-qtplugin/lthemeengineplatformtheme.cpp index a6e05000..621aa0ac 100644 --- a/src-qt5/core/lumina-theme-engine/src/lthemeengine-qtplugin/lthemeengineplatformtheme.cpp +++ b/src-qt5/core/lumina-theme-engine/src/lthemeengine-qtplugin/lthemeengineplatformtheme.cpp @@ -310,13 +310,13 @@ QPalette lthemeenginePlatformTheme::loadColorScheme(QString filePath){ QStringList inactiveColors = settings.value("inactive_colors").toStringList(); QStringList disabledColors = settings.value("disabled_colors").toStringList(); settings.endGroup(); - if(activeColors.count() == QPalette::NColorRoles && inactiveColors.count() == QPalette::NColorRoles && disabledColors.count() == QPalette::NColorRoles){ - for (int i = 0; i < QPalette::NColorRoles; i++){ - QPalette::ColorRole role = QPalette::ColorRole(i); - customPalette.setColor(QPalette::Active, role, QColor(activeColors.at(i))); - customPalette.setColor(QPalette::Inactive, role, QColor(inactiveColors.at(i))); - customPalette.setColor(QPalette::Disabled, role, QColor(disabledColors.at(i))); - } + if(activeColors.count() <= QPalette::NColorRoles && inactiveColors.count() <= QPalette::NColorRoles && disabledColors.count() <= QPalette::NColorRoles){ + for (int i = 0; i < QPalette::NColorRoles && itableWidget->item(i,2)->setBackgroundColor(palette.color(QPalette::Disabled, QPalette::ColorRole(i))); } QStringList labels; - labels << tr("Window text") << tr("Button background") << tr("Bright") << tr("Less bright") << tr("Dark") << tr("Less dark") << tr("Normal text") << tr("Bright text") << tr("Button text") << tr("Normal background") << tr("Window") << tr("Shadow") << tr("Highlight") << tr("Highlighted text") << tr("Link") << tr("Visited link") << tr("Alternate background") << tr("Default") << tr("Tooltip background") << tr("Tooltip text"); + labels << tr("Window text") << tr("Button background") << tr("Bright") << tr("Less bright") << tr("Dark") << tr("Less dark") << tr("Normal text") << tr("Bright text") << tr("Button text") << tr("Normal background") << tr("Window") << tr("Shadow") << tr("Highlight") << tr("Highlighted text") << tr("Link") << tr("Visited link") << tr("Alternate background") << tr("Default") << tr("Tooltip background") << tr("Tooltip text") << tr("Placeholder text"); m_ui->tableWidget->setVerticalHeaderLabels(labels); } -- cgit