diff --git a/kcms/colors/colors.cpp b/kcms/colors/colors.cpp --- a/kcms/colors/colors.cpp +++ b/kcms/colors/colors.cpp @@ -456,9 +456,7 @@ m_config->sync(); - runRdb(KRdbExportQtColors | KRdbExportGtkTheme | KRdbExportGtkColors | (m_applyToAlien ? KRdbExportColors : 0)); - - saveGtkColors(config); + runRdb(KRdbExportQtColors | KRdbExportGtkTheme | (m_applyToAlien ? KRdbExportColors : 0)); QDBusMessage message = QDBusMessage::createSignal(QStringLiteral("/KGlobalSettings"), QStringLiteral("org.kde.KGlobalSettings"), diff --git a/kcms/krdb/krdb.h b/kcms/krdb/krdb.h --- a/kcms/krdb/krdb.h +++ b/kcms/krdb/krdb.h @@ -28,11 +28,8 @@ KRdbExportQtSettings = 0x0004, // Export all possible qtrc settings, excluding colors KRdbExportXftSettings = 0x0008, // Export KDE's Xft (anti-alias) settings KRdbExportGtkTheme = 0x0010, // Export KDE's widget style to Gtk if possible - KRdbExportGtkColors = 0x0020 // Export KDE's colors to Gtk if possible }; void runRdb( uint flags ); -void saveGtkColors(); -void saveGtkColors(KSharedConfigPtr& config); #endif diff --git a/kcms/krdb/krdb.cpp b/kcms/krdb/krdb.cpp --- a/kcms/krdb/krdb.cpp +++ b/kcms/krdb/krdb.cpp @@ -399,270 +399,6 @@ saveFile.commit(); } -// --------------------------------------------------------------------- - -QString gtkColorsHelper(const QString &name, const QString &color) -{ - return QStringLiteral("@define-color %1 %2;\n").arg(name, color); -} -void checkGtkCss() -{ - QFile gtkCss(QStandardPaths::writableLocation(QStandardPaths::GenericConfigLocation) + "/gtk-3.0/gtk.css"); - if (gtkCss.open(QIODevice::ReadWrite)) { - QTextStream gtkStream(>kCss); - bool hasImport = false; - while (!gtkStream.atEnd()) { - QString line = gtkStream.readLine(); - if (line.contains("@import 'colors.css';")) { - hasImport = true; - } - } - if (!hasImport) { - gtkStream << "@import 'colors.css';"; - } - } -} -void exportGtkColors(QList activeColorSchemes, QList inactiveColorSchemes, QList disabledColorSchemes, KConfigGroup groupWMTheme, QTextStream& colorsStream) -{ - /* - Normal (Non Backdrop, Non Insensitive) - */ - - // General Colors - - colorsStream << gtkColorsHelper("theme_fg_color_breeze", activeColorSchemes[1].foreground(KColorScheme::NormalText).color().name()); - colorsStream << gtkColorsHelper("theme_bg_color_breeze", activeColorSchemes[1].background(KColorScheme::NormalBackground).color().name()); - colorsStream << gtkColorsHelper("theme_text_color_breeze", activeColorSchemes[0].foreground(KColorScheme::NormalText).color().name()); - colorsStream << gtkColorsHelper("theme_base_color_breeze", activeColorSchemes[0].background(KColorScheme::NormalBackground).color().name()); - colorsStream << gtkColorsHelper("theme_view_hover_decoration_color_breeze", activeColorSchemes[0].decoration(KColorScheme::HoverColor).color().name()); - colorsStream << gtkColorsHelper("theme_hovering_selected_bg_color_breeze", activeColorSchemes[3].decoration(KColorScheme::HoverColor).color().name()); - colorsStream << gtkColorsHelper("theme_selected_bg_color_breeze", activeColorSchemes[3].background(KColorScheme::NormalBackground).color().name()); - colorsStream << gtkColorsHelper("theme_selected_fg_color_breeze", activeColorSchemes[3].foreground(KColorScheme::NormalText).color().name()); - colorsStream << gtkColorsHelper("theme_view_active_decoration_color_breeze", activeColorSchemes[0].decoration(KColorScheme::HoverColor).color().name()); - - // Button Colors - colorsStream << gtkColorsHelper("theme_button_background_normal_breeze", activeColorSchemes[2].background(KColorScheme::NormalBackground).color().name()); - colorsStream << gtkColorsHelper("theme_button_decoration_hover_breeze", activeColorSchemes[2].decoration(KColorScheme::HoverColor).color().name()); - colorsStream << gtkColorsHelper("theme_button_decoration_focus_breeze", activeColorSchemes[2].decoration(KColorScheme::FocusColor).color().name()); - colorsStream << gtkColorsHelper("theme_button_foreground_normal_breeze", activeColorSchemes[2].foreground(KColorScheme::NormalText).color().name()); - colorsStream << gtkColorsHelper("theme_button_foreground_active_breeze", activeColorSchemes[3].foreground(KColorScheme::NormalText).color().name()); - - // Misc Colors - QColor windowForegroundColor = activeColorSchemes[1].foreground(KColorScheme::NormalText).color(); - QColor windowBackgroundColor = activeColorSchemes[1].background(KColorScheme::NormalBackground).color(); - QColor bordersColor = KColorUtils::mix(windowBackgroundColor,windowForegroundColor, 0.25); - - colorsStream << gtkColorsHelper("borders_breeze", bordersColor.name()); - colorsStream << gtkColorsHelper("warning_color_breeze", activeColorSchemes[0].foreground(KColorScheme::NeutralText).color().name()); - colorsStream << gtkColorsHelper("success_color_breeze", activeColorSchemes[0].foreground(KColorScheme::PositiveText).color().name()); - colorsStream << gtkColorsHelper("error_color_breeze", activeColorSchemes[0].foreground(KColorScheme::NegativeText).color().name()); - - /* - Backdrop (Inactive) - */ - - // General - colorsStream << gtkColorsHelper("theme_unfocused_fg_color_breeze",inactiveColorSchemes[1].foreground(KColorScheme::NormalText).color().name()); - colorsStream << gtkColorsHelper("theme_unfocused_text_color_breeze", inactiveColorSchemes[0].foreground(KColorScheme::NormalText).color().name()); - colorsStream << gtkColorsHelper("theme_unfocused_bg_color_breeze", inactiveColorSchemes[1].background(KColorScheme::NormalBackground).color().name()); - colorsStream << gtkColorsHelper("theme_unfocused_base_color_breeze", inactiveColorSchemes[0].background(KColorScheme::NormalBackground).color().name()); - colorsStream << gtkColorsHelper("theme_unfocused_selected_bg_color_alt_breeze", inactiveColorSchemes[3].background(KColorScheme::NormalBackground).color().name()); - colorsStream << gtkColorsHelper("theme_unfocused_selected_bg_color_breeze", inactiveColorSchemes[3].background(KColorScheme::NormalBackground).color().name()); - colorsStream << gtkColorsHelper("theme_unfocused_selected_fg_color_breeze", inactiveColorSchemes[3].foreground(KColorScheme::NormalText).color().name()); - - // Button - colorsStream << gtkColorsHelper("theme_button_background_backdrop_breeze", inactiveColorSchemes[2].background(KColorScheme::NormalBackground).color().name()); - colorsStream << gtkColorsHelper("theme_button_decoration_hover_backdrop_breeze", inactiveColorSchemes[2].decoration(KColorScheme::HoverColor).color().name()); - colorsStream << gtkColorsHelper("theme_button_decoration_focus_backdrop_breeze", inactiveColorSchemes[2].decoration(KColorScheme::FocusColor).color().name()); - colorsStream << gtkColorsHelper("theme_button_foreground_backdrop_breeze", inactiveColorSchemes[2].foreground(KColorScheme::NormalText).color().name()); - colorsStream << gtkColorsHelper("theme_button_foreground_active_backdrop_breeze", inactiveColorSchemes[3].foreground(KColorScheme::NormalText).color().name()); - - // Misc Colors - QColor inactiveWindowForegroundColor = inactiveColorSchemes[1].foreground(KColorScheme::NormalText).color(); - QColor inactiveWindowBackgroundColor = inactiveColorSchemes[1].background(KColorScheme::NormalBackground).color(); - QColor inactiveBordersColor = KColorUtils::mix(inactiveWindowBackgroundColor,inactiveWindowForegroundColor, 0.25); - - colorsStream << gtkColorsHelper("unfocused_borders_breeze", inactiveBordersColor.name()); - colorsStream << gtkColorsHelper("warning_color_backdrop_breeze", inactiveColorSchemes[0].foreground(KColorScheme::NeutralText).color().name()); - colorsStream << gtkColorsHelper("success_color_backdrop_breeze", inactiveColorSchemes[0].foreground(KColorScheme::PositiveText).color().name()); - colorsStream << gtkColorsHelper("error_color_backdrop_breeze", inactiveColorSchemes[0].foreground(KColorScheme::NegativeText).color().name()); - - /* - Insensitive (Disabled) - */ - - // General - colorsStream << gtkColorsHelper("insensitive_fg_color_breeze",disabledColorSchemes[1].foreground(KColorScheme::NormalText).color().name()); - colorsStream << gtkColorsHelper("insensitive_base_fg_color_breeze", disabledColorSchemes[0].foreground(KColorScheme::NormalText).color().name()); - colorsStream << gtkColorsHelper("insensitive_bg_color_breeze", disabledColorSchemes[1].background(KColorScheme::NormalBackground).color().name()); - colorsStream << gtkColorsHelper("insensitive_base_color_breeze", disabledColorSchemes[0].background(KColorScheme::NormalBackground).color().name()); - colorsStream << gtkColorsHelper("insensitive_selected_bg_color_breeze", disabledColorSchemes[3].background(KColorScheme::NormalBackground).color().name()); - colorsStream << gtkColorsHelper("insensitive_selected_fg_color_breeze", disabledColorSchemes[3].foreground(KColorScheme::NormalText).color().name()); - - // Button - colorsStream << gtkColorsHelper("theme_button_background_insensitive_breeze", disabledColorSchemes[2].background(KColorScheme::NormalBackground).color().name()); - colorsStream << gtkColorsHelper("theme_button_decoration_hover_insensitive_breeze", disabledColorSchemes[2].decoration(KColorScheme::HoverColor).color().name()); - colorsStream << gtkColorsHelper("theme_button_decoration_focus_insensitive_breeze", disabledColorSchemes[2].decoration(KColorScheme::FocusColor).color().name()); - colorsStream << gtkColorsHelper("theme_button_foreground_insensitive_breeze", disabledColorSchemes[2].foreground(KColorScheme::NormalText).color().name()); - colorsStream << gtkColorsHelper("theme_button_foreground_active_insensitive_breeze", disabledColorSchemes[3].foreground(KColorScheme::NormalText).color().name()); - - // Misc Colors - QColor disabledWindowForegroundColor = disabledColorSchemes[1].foreground(KColorScheme::NormalText).color(); - QColor disabledWindowBackgroundColor = disabledColorSchemes[1].background(KColorScheme::NormalBackground).color(); - QColor disabledBordersColor = KColorUtils::mix(disabledWindowBackgroundColor,disabledWindowForegroundColor, 0.25); - - colorsStream << gtkColorsHelper("insensitive_borders_breeze", disabledBordersColor.name()); - colorsStream << gtkColorsHelper("warning_color_insensitive_breeze", disabledColorSchemes[0].foreground(KColorScheme::NeutralText).color().name()); - colorsStream << gtkColorsHelper("success_color_insensitive_breeze", disabledColorSchemes[0].foreground(KColorScheme::PositiveText).color().name()); - colorsStream << gtkColorsHelper("error_color_insensitive_breeze", disabledColorSchemes[0].foreground(KColorScheme::NegativeText).color().name()); - - /* - Insensitive Backdrop (Inactive Disabled) These pretty much have the same appearance as regular inactive colors, but they're separate in case we decide to make - them different in the future. - */ - - // General - colorsStream << gtkColorsHelper("insensitive_unfocused_fg_color_breeze",disabledColorSchemes[1].foreground(KColorScheme::NormalText).color().name()); - colorsStream << gtkColorsHelper("theme_unfocused_view_text_color_breeze", disabledColorSchemes[0].foreground(KColorScheme::NormalText).color().name()); - colorsStream << gtkColorsHelper("insensitive_unfocused_bg_color_breeze", disabledColorSchemes[1].background(KColorScheme::NormalBackground).color().name()); - colorsStream << gtkColorsHelper("theme_unfocused_view_bg_color_breeze", disabledColorSchemes[0].background(KColorScheme::NormalBackground).color().name()); - colorsStream << gtkColorsHelper("insensitive_unfocused_selected_bg_color_breeze", disabledColorSchemes[3].background(KColorScheme::NormalBackground).color().name()); - colorsStream << gtkColorsHelper("insensitive_unfocused_selected_fg_color_breeze", disabledColorSchemes[3].foreground(KColorScheme::NormalText).color().name()); - - // Button - colorsStream << gtkColorsHelper("theme_button_background_backdrop_insensitive_breeze", disabledColorSchemes[2].background(KColorScheme::NormalBackground).color().name()); - colorsStream << gtkColorsHelper("theme_button_decoration_hover_backdrop_insensitive_breeze", disabledColorSchemes[2].decoration(KColorScheme::HoverColor).color().name()); - colorsStream << gtkColorsHelper("theme_button_decoration_focus_backdrop_insensitive_breeze", disabledColorSchemes[2].decoration(KColorScheme::FocusColor).color().name()); - colorsStream << gtkColorsHelper("theme_button_foreground_backdrop_insensitive_breeze", disabledColorSchemes[2].foreground(KColorScheme::NormalText).color().name()); - colorsStream << gtkColorsHelper("theme_button_foreground_active_backdrop_insensitive_breeze", disabledColorSchemes[3].foreground(KColorScheme::NormalText).color().name()); - - // Misc Colors - QColor unfocusedDisabledWindowForegroundColor = disabledColorSchemes[1].foreground(KColorScheme::NormalText).color(); - QColor unfocusedDisabledWindowBackgroundColor = disabledColorSchemes[1].background(KColorScheme::NormalBackground).color(); - QColor unfocusedDisabledBordersColor = KColorUtils::mix(unfocusedDisabledWindowBackgroundColor,unfocusedDisabledWindowForegroundColor, 0.25); - - colorsStream << gtkColorsHelper("unfocused_insensitive_borders_breeze", unfocusedDisabledBordersColor.name()); - colorsStream << gtkColorsHelper("warning_color_insensitive_backdrop_breeze", disabledColorSchemes[0].foreground(KColorScheme::NeutralText).color().name()); - colorsStream << gtkColorsHelper("success_color_insensitive_backdrop_breeze", disabledColorSchemes[0].foreground(KColorScheme::PositiveText).color().name()); - colorsStream << gtkColorsHelper("error_color_insensitive_backdrop_breeze", disabledColorSchemes[0].foreground(KColorScheme::NegativeText).color().name()); - - /* - Ignorant Colors (These colors do not care about backdrop or insensitive states) - */ - - colorsStream << gtkColorsHelper("link_color_breeze", activeColorSchemes[0].foreground(KColorScheme::LinkText).color().name()); - colorsStream << gtkColorsHelper("link_visited_color_breeze", activeColorSchemes[0].foreground(KColorScheme::VisitedText).color().name()); - - QColor tooltipForegroundColor = activeColorSchemes[4].foreground(KColorScheme::NormalText).color(); - QColor tooltipBackgroundColor = activeColorSchemes[4].background(KColorScheme::NormalBackground).color(); - QColor tooltipBorderColor = KColorUtils::mix(tooltipBackgroundColor, tooltipForegroundColor, 0.25); - - colorsStream << gtkColorsHelper("tooltip_text_breeze", tooltipForegroundColor.name()); - colorsStream << gtkColorsHelper("tooltip_background_breeze", tooltipBackgroundColor.name()); - colorsStream << gtkColorsHelper("tooltip_border_breeze", tooltipBorderColor.name()); - - colorsStream << gtkColorsHelper("content_view_bg_breeze", activeColorSchemes[0].background(KColorScheme::NormalBackground).color().name()); - - // Titlebar colors - colorsStream << gtkColorsHelper("theme_titlebar_background_breeze", "rgb(" + groupWMTheme.readEntry("activeBackground", "") + QLatin1Char(')')); - colorsStream << gtkColorsHelper("theme_titlebar_foreground_breeze", "rgb(" + groupWMTheme.readEntry("activeForeground", "") + QLatin1Char(')')); - colorsStream << gtkColorsHelper("theme_titlebar_background_light_breeze", activeColorSchemes[1].background(KColorScheme::NormalBackground).color().name()); - colorsStream << gtkColorsHelper("theme_titlebar_foreground_backdrop_breeze", "rgb(" + groupWMTheme.readEntry("inactiveForeground", "") + QLatin1Char(')')); - colorsStream << gtkColorsHelper("theme_titlebar_background_backdrop_breeze", "rgb(" + groupWMTheme.readEntry("inactiveBackground", "") + QLatin1Char(')')); - colorsStream << gtkColorsHelper("theme_titlebar_foreground_insensitive_breeze", "rgb(" + groupWMTheme.readEntry("inactiveForeground", "") + QLatin1Char(')')); - colorsStream << gtkColorsHelper("theme_titlebar_foreground_insensitive_backdrop_breeze", "rgb(" + groupWMTheme.readEntry("inactiveForeground", "") + QLatin1Char(')')); -} -void saveGtkColors(KSharedConfigPtr& config) -{ - checkGtkCss(); - QFile colorsCss(QStandardPaths::writableLocation(QStandardPaths::GenericConfigLocation) + "/gtk-3.0/colors.css"); - - if (colorsCss.open(QIODevice::WriteOnly | QIODevice::Truncate)) { - QTextStream colorsStream(&colorsCss); - /* - 0 Active View - 1 Active Window - 2 Active Button - 3 Active Selection - 4 Active Tooltip - 5 Active Complimentary - */ - - QList activeColorSchemes{ - KColorScheme(QPalette::Active, KColorScheme::View, config), - KColorScheme(QPalette::Active, KColorScheme::Window, config), - KColorScheme(QPalette::Active, KColorScheme::Button, config), - KColorScheme(QPalette::Active, KColorScheme::Selection, config), - KColorScheme(QPalette::Active, KColorScheme::Tooltip, config), - KColorScheme(QPalette::Active, KColorScheme::Complementary, config) - }; - QList inactiveColorSchemes{ - KColorScheme(QPalette::Inactive, KColorScheme::View, config), - KColorScheme(QPalette::Inactive, KColorScheme::Window, config), - KColorScheme(QPalette::Inactive, KColorScheme::Button, config), - KColorScheme(QPalette::Inactive, KColorScheme::Selection, config), - KColorScheme(QPalette::Inactive, KColorScheme::Tooltip, config), - KColorScheme(QPalette::Inactive, KColorScheme::Complementary, config) - }; - QList disabledColorSchemes{ - KColorScheme(QPalette::Disabled, KColorScheme::View, config), - KColorScheme(QPalette::Disabled, KColorScheme::Window, config), - KColorScheme(QPalette::Disabled, KColorScheme::Button, config), - KColorScheme(QPalette::Disabled, KColorScheme::Selection, config), - KColorScheme(QPalette::Disabled, KColorScheme::Tooltip, config), - KColorScheme(QPalette::Disabled, KColorScheme::Complementary, config) - }; - KConfigGroup groupWMTheme(config, "WM"); - exportGtkColors(activeColorSchemes, inactiveColorSchemes, disabledColorSchemes, groupWMTheme, colorsStream); - } -} - -void saveGtkColors() -{ - checkGtkCss(); - QFile colorsCss(QStandardPaths::writableLocation(QStandardPaths::GenericConfigLocation) + "/gtk-3.0/colors.css"); - KConfigGroup groupWMTheme(KSharedConfig::openConfig(), "WM"); - - if (colorsCss.open(QIODevice::WriteOnly | QIODevice::Truncate)) { - QTextStream colorsStream(&colorsCss); - /* - 0 Active View - 1 Active Window - 2 Active Button - 3 Active Selection - 4 Active Tooltip - 5 Active Complimentary - */ - - QList activeColorSchemes{ - KColorScheme(QPalette::Active, KColorScheme::View), - KColorScheme(QPalette::Active, KColorScheme::Window), - KColorScheme(QPalette::Active, KColorScheme::Button), - KColorScheme(QPalette::Active, KColorScheme::Selection), - KColorScheme(QPalette::Active, KColorScheme::Tooltip), - KColorScheme(QPalette::Active, KColorScheme::Complementary) - }; - QList inactiveColorSchemes{ - KColorScheme(QPalette::Inactive, KColorScheme::View), - KColorScheme(QPalette::Inactive, KColorScheme::Window), - KColorScheme(QPalette::Inactive, KColorScheme::Button), - KColorScheme(QPalette::Inactive, KColorScheme::Selection), - KColorScheme(QPalette::Inactive, KColorScheme::Tooltip), - KColorScheme(QPalette::Inactive, KColorScheme::Complementary) - }; - QList disabledColorSchemes{ - KColorScheme(QPalette::Disabled, KColorScheme::View), - KColorScheme(QPalette::Disabled, KColorScheme::Window), - KColorScheme(QPalette::Disabled, KColorScheme::Button), - KColorScheme(QPalette::Disabled, KColorScheme::Selection), - KColorScheme(QPalette::Disabled, KColorScheme::Tooltip), - KColorScheme(QPalette::Disabled, KColorScheme::Complementary) - }; - - exportGtkColors(activeColorSchemes, inactiveColorSchemes, disabledColorSchemes, groupWMTheme, colorsStream); - } -} - // ----------------------------------------------------------------------------- void runRdb( uint flags ) @@ -673,7 +409,6 @@ bool exportQtSettings = flags & KRdbExportQtSettings; bool exportXftSettings = flags & KRdbExportXftSettings; bool exportGtkTheme = flags & KRdbExportGtkTheme; - bool exportGtkColors = flags & KRdbExportGtkColors; KSharedConfigPtr kglobalcfg = KSharedConfig::openConfig( QStringLiteral("kdeglobals") ); KConfigGroup kglobals(kglobalcfg, "KDE"); @@ -978,8 +713,4 @@ KConfigGroup toolbars5(kglobalcfg, "Toolbar style"); toolbars4.writeEntry("ToolButtonStyle", toolbars5.readEntry("ToolButtonStyle", "TextBesideIcon")); toolbars4.writeEntry("ToolButtonStyleOtherToolbars", toolbars5.readEntry("ToolButtonStyleOtherToolbars", "TextBesideIcon")); - - if (exportGtkColors) { - saveGtkColors(); - } } diff --git a/kcms/style/kcmstyle.cpp b/kcms/style/kcmstyle.cpp --- a/kcms/style/kcmstyle.cpp +++ b/kcms/style/kcmstyle.cpp @@ -64,7 +64,7 @@ { Q_DECL_EXPORT void kcminit_style() { - uint flags = KRdbExportQtSettings | KRdbExportGtkColors | KRdbExportQtColors | KRdbExportXftSettings | KRdbExportGtkTheme; + uint flags = KRdbExportQtSettings | KRdbExportQtColors | KRdbExportXftSettings | KRdbExportGtkTheme; KConfig _config( QStringLiteral("kcmdisplayrc"), KConfig::NoGlobals ); KConfigGroup config(&_config, "X11");