Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package kde-gtk-config5 for openSUSE:Factory
checked in at 2021-02-15 23:12:35
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kde-gtk-config5 (Old)
and /work/SRC/openSUSE:Factory/.kde-gtk-config5.new.28504 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kde-gtk-config5"
Mon Feb 15 23:12:35 2021 rev:107 rq:872083 version:5.21.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/kde-gtk-config5/kde-gtk-config5.changes
2021-02-12 10:56:49.807725141 +0100
+++
/work/SRC/openSUSE:Factory/.kde-gtk-config5.new.28504/kde-gtk-config5.changes
2021-02-15 23:13:48.719172818 +0100
@@ -1,0 +2,6 @@
+Fri Feb 12 10:33:10 UTC 2021 - Fabian Vogt <[email protected]>
+
+- Drop patch, part of 5.20.90:
+ * 0001-Remove-debug-message-to-avoid-polute-to-stdout.patch
+
+-------------------------------------------------------------------
@@ -6,0 +13,32 @@
+
+-------------------------------------------------------------------
+Thu Feb 11 18:23:11 UTC 2021 - Fabian Vogt <[email protected]>
+
+- Update to 5.21.0
+ * New bugfix release
+ * For more details please see:
+ * https://kde.org/announcements/plasma/5/5.21.0
+- Changes since 5.20.90:
+ * Reset altered config in the decoration bridge
+ * Use the same configs for watching and reading (kde#421745)
+
+-------------------------------------------------------------------
+Thu Jan 21 21:31:33 UTC 2021 - Fabian Vogt <[email protected]>
+
+- Update to 5.20.90
+ * New feature release
+ * For more details please see:
+ * https://kde.org/announcements/plasma/5/20.90/
+- Changes since 5.20.5:
+ * Add .gitignore file to ignore generated .clang-format file.
+ * Remove debug message to avoid polute to stdout.
+ * Reference Plasma Workspace repo instead of Desktop
+ * Set correct installation directory for kconf_update script
+ * Use only GTK Module for managing window decorations CSS
(kde#428322,kde#428120,kde#428842)
+ * fix build
+ * Fix for cpp17 : Ld couldnt reach references when we use constexpr
+ * If include is define in .h remove it if it's defined in .cpp too (scripted)
+ * Begin writing out settings to GTK4
+ * Disable global animations for the time decoration is being rendered
(kde#426687)
+ * Fix default decoration fallback
+ * Remove kservice dependency
Old:
----
0001-Remove-debug-message-to-avoid-polute-to-stdout.patch
kde-gtk-config-5.20.5.tar.xz
kde-gtk-config-5.20.5.tar.xz.sig
New:
----
kde-gtk-config-5.21.0.tar.xz
kde-gtk-config-5.21.0.tar.xz.sig
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kde-gtk-config5.spec ++++++
--- /var/tmp/diff_new_pack.QLbXKp/_old 2021-02-15 23:13:49.491173971 +0100
+++ /var/tmp/diff_new_pack.QLbXKp/_new 2021-02-15 23:13:49.491173971 +0100
@@ -18,19 +18,17 @@
%bcond_without lang
Name: kde-gtk-config5
-Version: 5.20.5
+Version: 5.21.0
Release: 0
Summary: Daemon for GTK2 and GTK3 Applications Appearance Under KDE
License: LGPL-3.0-or-later AND GPL-3.0-or-later
Group: System/GUI/KDE
URL: http://projects.kde.org/kde-gtk-config
-Source:
https://download.kde.org/stable/plasma/%{version}/kde-gtk-config-%{version}.tar.xz
+Source: kde-gtk-config-%{version}.tar.xz
%if %{with lang}
-Source1:
https://download.kde.org/stable/plasma/%{version}/kde-gtk-config-%{version}.tar.xz.sig
+Source1: kde-gtk-config-%{version}.tar.xz.sig
Source2: plasma.keyring
%endif
-# PATCH-FIX-UPSTREAM
-Patch1: 0001-Remove-debug-message-to-avoid-polute-to-stdout.patch
BuildRequires: extra-cmake-modules >= 0.0.9
BuildRequires: kf5-filesystem
BuildRequires: sassc
++++++ kde-gtk-config-5.20.5.tar.xz -> kde-gtk-config-5.21.0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kde-gtk-config-5.20.5/.gitignore
new/kde-gtk-config-5.21.0/.gitignore
--- old/kde-gtk-config-5.20.5/.gitignore 1970-01-01 01:00:00.000000000
+0100
+++ new/kde-gtk-config-5.21.0/.gitignore 2021-02-11 13:00:32.000000000
+0100
@@ -0,0 +1,2 @@
+.clang-format
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kde-gtk-config-5.20.5/CMakeLists.txt
new/kde-gtk-config-5.21.0/CMakeLists.txt
--- old/kde-gtk-config-5.20.5/CMakeLists.txt 2021-01-05 12:51:34.000000000
+0100
+++ new/kde-gtk-config-5.21.0/CMakeLists.txt 2021-02-11 13:00:32.000000000
+0100
@@ -1,5 +1,5 @@
project(kde-gtk-config)
-set(PROJECT_VERSION "5.20.5")
+set(PROJECT_VERSION "5.21.0")
cmake_minimum_required(VERSION 3.10)
find_package(ECM REQUIRED NO_MODULE)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kde-gtk-config-5.20.5/README.md
new/kde-gtk-config-5.21.0/README.md
--- old/kde-gtk-config-5.20.5/README.md 2021-01-05 12:51:34.000000000 +0100
+++ new/kde-gtk-config-5.21.0/README.md 2021-02-11 13:00:32.000000000 +0100
@@ -41,4 +41,4 @@
##
-[^1]: The code for the UI part is located in the [Plasma
Desktop](https://invent.kde.org/plasma/plasma-desktop/-/tree/master/kcms/style)
+[^1]: The code for the UI part is located in the [Plasma
Workspace](https://invent.kde.org/plasma/plasma-workspace/-/tree/master/kcms/style)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kde-gtk-config-5.20.5/kconf_update/gtktheme.cpp
new/kde-gtk-config-5.21.0/kconf_update/gtktheme.cpp
--- old/kde-gtk-config-5.20.5/kconf_update/gtktheme.cpp 2021-01-05
12:51:34.000000000 +0100
+++ new/kde-gtk-config-5.21.0/kconf_update/gtktheme.cpp 2021-02-11
13:00:32.000000000 +0100
@@ -39,7 +39,7 @@
|| currentGtk3Theme == QStringLiteral("BreezyGTK")
|| currentGtk3Theme == QStringLiteral("Orion")
) {
- ConfigEditor::setGtk3ConfigValueGSettings(QStringLiteral("gtk-theme"),
QStringLiteral("Breeze"));
+ ConfigEditor::setGtkConfigValueGSettings(QStringLiteral("gtk-theme"),
QStringLiteral("Breeze"));
ConfigEditor::setGtk3ConfigValueSettingsIni(QStringLiteral("gtk-theme-name"),
QStringLiteral("Breeze"));
ConfigEditor::setGtk3ConfigValueXSettingsd(QStringLiteral("Net/ThemeName"),
QStringLiteral("Breeze"));
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kde-gtk-config-5.20.5/kded/configeditor.cpp
new/kde-gtk-config-5.21.0/kded/configeditor.cpp
--- old/kde-gtk-config-5.20.5/kded/configeditor.cpp 2021-01-05
12:51:34.000000000 +0100
+++ new/kde-gtk-config-5.21.0/kded/configeditor.cpp 2021-02-11
13:00:32.000000000 +0100
@@ -27,7 +27,7 @@
#include "configeditor.h"
-void ConfigEditor::setGtk3ConfigValueGSettings(const QString ¶mName, const
QVariant ¶mValue, const QString &category)
+void ConfigEditor::setGtkConfigValueGSettings(const QString ¶mName, const
QVariant ¶mValue, const QString &category)
{
g_autoptr(GSettings) gsettings =
g_settings_new(category.toUtf8().constData());
@@ -40,16 +40,16 @@
}
}
-void ConfigEditor::setGtk3ConfigValueGSettingsAsEnum(const QString& paramName,
int paramValue, const QString& category)
+void ConfigEditor::setGtkConfigValueGSettingsAsEnum(const QString& paramName,
int paramValue, const QString& category)
{
g_autoptr(GSettings) gsettings =
g_settings_new(category.toUtf8().constData());
g_settings_set_enum(gsettings, paramName.toUtf8().constData(), paramValue);
}
-void ConfigEditor::setGtk3ConfigValueSettingsIni(const QString ¶mName,
const QVariant ¶mValue)
+void ConfigEditor::setGtkConfigValueSettingsIni(const QString &versionString,
const QString ¶mName, const QVariant ¶mValue)
{
QString configLocation =
QStandardPaths::writableLocation(QStandardPaths::GenericConfigLocation);
- QString gtk3ConfigPath = configLocation +
QStringLiteral("/gtk-3.0/settings.ini");
+ QString gtk3ConfigPath = configLocation + QStringLiteral("/") +
versionString + QStringLiteral("/settings.ini");
KSharedConfig::Ptr gtk3Config = KSharedConfig::openConfig(gtk3ConfigPath,
KConfig::NoGlobals);
KConfigGroup group = gtk3Config->group(QStringLiteral("Settings"));
@@ -58,6 +58,17 @@
group.sync();
}
+QString ConfigEditor::gtkConfigValueSettingsIni(const QString &versionString,
const QString ¶mName)
+{
+ QString configLocation =
QStandardPaths::writableLocation(QStandardPaths::GenericConfigLocation);
+ QString gtk3ConfigPath = configLocation + QStringLiteral("/") +
versionString + QStringLiteral("/settings.ini");
+
+ KSharedConfig::Ptr gtk3Config = KSharedConfig::openConfig(gtk3ConfigPath,
KConfig::NoGlobals);
+ KConfigGroup group = gtk3Config->group(QStringLiteral("Settings"));
+
+ return group.readEntry(paramName);
+}
+
void ConfigEditor::setGtk3ConfigValueXSettingsd(const QString ¶mName,
const QVariant ¶mValue)
{
QString configLocation =
QStandardPaths::writableLocation(QStandardPaths::GenericConfigLocation);
@@ -111,17 +122,6 @@
addGtkModule(QStringLiteral("colorreload-gtk-module"));
}
-QString ConfigEditor::gtk3ConfigValueSettingsIni(const QString& paramName)
-{
- QString configLocation =
QStandardPaths::writableLocation(QStandardPaths::GenericConfigLocation);
- QString gtk3ConfigPath = configLocation +
QStringLiteral("/gtk-3.0/settings.ini");
-
- KSharedConfig::Ptr gtk3Config = KSharedConfig::openConfig(gtk3ConfigPath,
KConfig::NoGlobals);
- KConfigGroup group = gtk3Config->group(QStringLiteral("Settings"));
-
- return group.readEntry(paramName);
-}
-
void ConfigEditor::removeLegacyGtk2Strings()
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kde-gtk-config-5.20.5/kded/configeditor.h
new/kde-gtk-config-5.21.0/kded/configeditor.h
--- old/kde-gtk-config-5.20.5/kded/configeditor.h 2021-01-05
12:51:34.000000000 +0100
+++ new/kde-gtk-config-5.21.0/kded/configeditor.h 2021-02-11
13:00:32.000000000 +0100
@@ -7,6 +7,7 @@
#include <unistd.h>
#include <QString>
+#include <functional>
class QColor;
class QFile;
@@ -14,19 +15,26 @@
namespace ConfigEditor
{
+ using namespace std::placeholders;
+
void setGtk2ConfigValue(const QString ¶mName, const QVariant
¶mValue);
- void setGtk3ConfigValueGSettings(const QString ¶mName, const QVariant
¶mValue, const QString &category =
QStringLiteral("org.gnome.desktop.interface"));
- void setGtk3ConfigValueGSettingsAsEnum(const QString ¶mName, int
paramValue, const QString &category =
QStringLiteral("org.gnome.desktop.interface"));
- void setGtk3ConfigValueSettingsIni(const QString ¶mName, const
QVariant ¶mValue);
+ void setGtkConfigValueGSettings(const QString ¶mName, const QVariant
¶mValue, const QString &category =
QStringLiteral("org.gnome.desktop.interface"));
+ void setGtkConfigValueGSettingsAsEnum(const QString ¶mName, int
paramValue, const QString &category =
QStringLiteral("org.gnome.desktop.interface"));
void setGtk3ConfigValueXSettingsd(const QString ¶mName, const QVariant
¶mValue);
+ void setGtkConfigValueSettingsIni(const QString &versionString, const
QString ¶mName, const QVariant ¶mValue);
+ static auto setGtk4ConfigValueSettingsIni =
std::bind(setGtkConfigValueSettingsIni, QStringLiteral("gtk-4.0"), _1, _2);
+ static auto setGtk3ConfigValueSettingsIni =
std::bind(setGtkConfigValueSettingsIni, QStringLiteral("gtk-3.0"), _1, _2);
+
+ QString gtkConfigValueSettingsIni(const QString &versionString, const
QString ¶mName);
+ static auto gtk4ConfigValueSettingsIni =
std::bind(gtkConfigValueSettingsIni, QStringLiteral("gtk-4.0"), _1);
+ static auto gtk3ConfigValueSettingsIni =
std::bind(gtkConfigValueSettingsIni, QStringLiteral("gtk-3.0"), _1);
+
void setCustomClientSideDecorations(const QStringList
&windowDecorationsButtonsImages);
void disableCustomClientSideDecorations();
void setGtk3Colors(const QMap<QString, QColor> &colorsDefinitions);
- QString gtk3ConfigValueSettingsIni(const QString& paramName);
-
void removeLegacyGtk2Strings();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kde-gtk-config-5.20.5/kded/configvalueprovider.cpp
new/kde-gtk-config-5.21.0/kded/configvalueprovider.cpp
--- old/kde-gtk-config-5.20.5/kded/configvalueprovider.cpp 2021-01-05
12:51:34.000000000 +0100
+++ new/kde-gtk-config-5.21.0/kded/configvalueprovider.cpp 2021-02-11
13:00:32.000000000 +0100
@@ -13,7 +13,6 @@
#include <QDir>
#include <KConfig>
-#include <KSharedConfig>
#include <KConfigGroup>
#include <KColorScheme>
#include <KColorUtils>
@@ -24,7 +23,7 @@
#include "configvalueprovider.h"
ConfigValueProvider::ConfigValueProvider() :
- kdeglobalsConfig(KSharedConfig::openConfig(QStringLiteral("kdeglobals"))),
+ kdeglobalsConfig(KSharedConfig::openConfig()),
inputConfig(KSharedConfig::openConfig(QStringLiteral("kcminputrc"))),
kwinConfig(KSharedConfig::openConfig(QStringLiteral("kwinrc")))
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kde-gtk-config-5.20.5/kded/gtkconfig.cpp
new/kde-gtk-config-5.21.0/kded/gtkconfig.cpp
--- old/kde-gtk-config-5.20.5/kded/gtkconfig.cpp 2021-01-05
12:51:34.000000000 +0100
+++ new/kde-gtk-config-5.21.0/kded/gtkconfig.cpp 2021-02-11
13:00:32.000000000 +0100
@@ -11,12 +11,9 @@
#include <QGuiApplication>
#include <KPluginFactory>
-#include <KConfigWatcher>
#include <KColorScheme>
#include "gtkconfig.h"
-#include "configvalueprovider.h"
-#include "themepreviewer.h"
K_PLUGIN_CLASS_WITH_JSON(GtkConfig, "gtkconfig.json")
@@ -24,7 +21,7 @@
KDEDModule(parent),
configValueProvider(new ConfigValueProvider()),
themePreviewer(new ThemePreviewer(this)),
-
kdeglobalsConfigWatcher(KConfigWatcher::create(KSharedConfig::openConfig(QStringLiteral("kdeglobals")))),
+
kdeglobalsConfigWatcher(KConfigWatcher::create(KSharedConfig::openConfig())),
kwinConfigWatcher(KConfigWatcher::create(KSharedConfig::openConfig(QStringLiteral("kwinrc")))),
kcminputConfigWatcher(KConfigWatcher::create(KSharedConfig::openConfig(QStringLiteral("kcminputrc")))),
breezeConfigWatcher(KConfigWatcher::create(KSharedConfig::openConfig(QStringLiteral("breezerc"))))
@@ -52,8 +49,9 @@
void GtkConfig::setGtkTheme(const QString &themeName) const
{
ConfigEditor::setGtk2ConfigValue(QStringLiteral("gtk-theme-name"),
themeName);
- ConfigEditor::setGtk3ConfigValueGSettings(QStringLiteral("gtk-theme"),
themeName);
+ ConfigEditor::setGtkConfigValueGSettings(QStringLiteral("gtk-theme"),
themeName);
ConfigEditor::setGtk3ConfigValueSettingsIni(QStringLiteral("gtk-theme-name"),
themeName);
+
ConfigEditor::setGtk4ConfigValueSettingsIni(QStringLiteral("gtk-theme-name"),
themeName);
ConfigEditor::setGtk3ConfigValueXSettingsd(QStringLiteral("Net/ThemeName"),
themeName);
// Window decorations are part of the theme, in case of Breeze we inject
custom ones from KWin
@@ -74,8 +72,9 @@
{
const QString configFontName = configValueProvider->fontName();
ConfigEditor::setGtk2ConfigValue(QStringLiteral("gtk-font-name"),
configFontName);
- ConfigEditor::setGtk3ConfigValueGSettings(QStringLiteral("font-name"),
configFontName);
+ ConfigEditor::setGtkConfigValueGSettings(QStringLiteral("font-name"),
configFontName);
ConfigEditor::setGtk3ConfigValueSettingsIni(QStringLiteral("gtk-font-name"),
configFontName);
+
ConfigEditor::setGtk4ConfigValueSettingsIni(QStringLiteral("gtk-font-name"),
configFontName);
ConfigEditor::setGtk3ConfigValueXSettingsd(QStringLiteral("Gtk/FontName"),
configFontName);
}
@@ -83,8 +82,9 @@
{
const QString iconThemeName = configValueProvider->iconThemeName();
ConfigEditor::setGtk2ConfigValue(QStringLiteral("gtk-icon-theme-name"),
iconThemeName);
- ConfigEditor::setGtk3ConfigValueGSettings(QStringLiteral("icon-theme"),
iconThemeName);
+ ConfigEditor::setGtkConfigValueGSettings(QStringLiteral("icon-theme"),
iconThemeName);
ConfigEditor::setGtk3ConfigValueSettingsIni(QStringLiteral("gtk-icon-theme-name"),
iconThemeName);
+
ConfigEditor::setGtk4ConfigValueSettingsIni(QStringLiteral("gtk-icon-theme-name"),
iconThemeName);
ConfigEditor::setGtk3ConfigValueXSettingsd(QStringLiteral("Net/IconThemeName"),
iconThemeName);
}
@@ -92,8 +92,9 @@
{
const QString cursorThemeName = configValueProvider->cursorThemeName();
ConfigEditor::setGtk2ConfigValue(QStringLiteral("gtk-cursor-theme-name"),
cursorThemeName);
- ConfigEditor::setGtk3ConfigValueGSettings(QStringLiteral("cursor-theme"),
cursorThemeName);
+ ConfigEditor::setGtkConfigValueGSettings(QStringLiteral("cursor-theme"),
cursorThemeName);
ConfigEditor::setGtk3ConfigValueSettingsIni(QStringLiteral("gtk-cursor-theme-name"),
cursorThemeName);
+
ConfigEditor::setGtk4ConfigValueSettingsIni(QStringLiteral("gtk-cursor-theme-name"),
cursorThemeName);
ConfigEditor::setGtk3ConfigValueXSettingsd(QStringLiteral("Gtk/CursorThemeName"),
cursorThemeName);
}
@@ -101,8 +102,9 @@
{
const int cursorSize = configValueProvider->cursorSize();
ConfigEditor::setGtk2ConfigValue(QStringLiteral("gtk-cursor-theme-size"),
cursorSize);
- ConfigEditor::setGtk3ConfigValueGSettings(QStringLiteral("cursor-size"),
cursorSize);
+ ConfigEditor::setGtkConfigValueGSettings(QStringLiteral("cursor-size"),
cursorSize);
ConfigEditor::setGtk3ConfigValueSettingsIni(QStringLiteral("gtk-cursor-theme-size"),
cursorSize);
+
ConfigEditor::setGtk4ConfigValueSettingsIni(QStringLiteral("gtk-cursor-theme-size"),
cursorSize);
ConfigEditor::setGtk3ConfigValueXSettingsd(QStringLiteral("Gtk/CursorThemeSize"),
cursorSize);
}
@@ -111,6 +113,7 @@
const bool iconsOnButtonsConfigValue =
configValueProvider->iconsOnButtons();
ConfigEditor::setGtk2ConfigValue(QStringLiteral("gtk-button-images"),
iconsOnButtonsConfigValue);
ConfigEditor::setGtk3ConfigValueSettingsIni(QStringLiteral("gtk-button-images"),
iconsOnButtonsConfigValue);
+
ConfigEditor::setGtk4ConfigValueSettingsIni(QStringLiteral("gtk-button-images"),
iconsOnButtonsConfigValue);
ConfigEditor::setGtk3ConfigValueXSettingsd(QStringLiteral("Gtk/ButtonImages"),
iconsOnButtonsConfigValue);
}
@@ -119,6 +122,7 @@
const bool iconsInMenusConfigValue = configValueProvider->iconsInMenus();
ConfigEditor::setGtk2ConfigValue(QStringLiteral("gtk-menu-images"),
iconsInMenusConfigValue);
ConfigEditor::setGtk3ConfigValueSettingsIni(QStringLiteral("gtk-menu-images"),
iconsInMenusConfigValue);
+
ConfigEditor::setGtk4ConfigValueSettingsIni(QStringLiteral("gtk-menu-images"),
iconsInMenusConfigValue);
ConfigEditor::setGtk3ConfigValueXSettingsd(QStringLiteral("Gtk/MenuImages"),
iconsInMenusConfigValue);
}
@@ -126,8 +130,9 @@
{
const int toolbarStyle = configValueProvider->toolbarStyle();
ConfigEditor::setGtk2ConfigValue(QStringLiteral("gtk-toolbar-style"),
toolbarStyle);
-
ConfigEditor::setGtk3ConfigValueGSettingsAsEnum(QStringLiteral("toolbar-style"),
toolbarStyle);
+
ConfigEditor::setGtkConfigValueGSettingsAsEnum(QStringLiteral("toolbar-style"),
toolbarStyle);
ConfigEditor::setGtk3ConfigValueSettingsIni(QStringLiteral("gtk-toolbar-style"),
toolbarStyle);
+
ConfigEditor::setGtk4ConfigValueSettingsIni(QStringLiteral("gtk-toolbar-style"),
toolbarStyle);
ConfigEditor::setGtk3ConfigValueXSettingsd(QStringLiteral("Gtk/ToolbarStyle"),
toolbarStyle);
}
@@ -136,6 +141,7 @@
const bool scrollbarBehavior = configValueProvider->scrollbarBehavior();
ConfigEditor::setGtk2ConfigValue(QStringLiteral("gtk-primary-button-warps-slider"),
scrollbarBehavior);
ConfigEditor::setGtk3ConfigValueSettingsIni(QStringLiteral("gtk-primary-button-warps-slider"),
scrollbarBehavior);
+
ConfigEditor::setGtk4ConfigValueSettingsIni(QStringLiteral("gtk-primary-button-warps-slider"),
scrollbarBehavior);
ConfigEditor::setGtk3ConfigValueXSettingsd(QStringLiteral("Gtk/PrimaryButtonWarpsSlider"),
scrollbarBehavior);
}
@@ -143,6 +149,7 @@
{
const bool preferDarkTheme = configValueProvider->preferDarkTheme();
ConfigEditor::setGtk3ConfigValueSettingsIni(QStringLiteral("gtk-application-prefer-dark-theme"),
preferDarkTheme);
+
ConfigEditor::setGtk4ConfigValueSettingsIni(QStringLiteral("gtk-application-prefer-dark-theme"),
preferDarkTheme);
}
void GtkConfig::setWindowDecorationsAppearance() const
@@ -158,8 +165,9 @@
void GtkConfig::setWindowDecorationsButtonsOrder() const
{
const QString windowDecorationsButtonOrder =
configValueProvider->windowDecorationsButtonsOrder();
- ConfigEditor::setGtk3ConfigValueGSettings(QStringLiteral("button-layout"),
windowDecorationsButtonOrder,
QStringLiteral("org.gnome.desktop.wm.preferences"));
+ ConfigEditor::setGtkConfigValueGSettings(QStringLiteral("button-layout"),
windowDecorationsButtonOrder,
QStringLiteral("org.gnome.desktop.wm.preferences"));
ConfigEditor::setGtk3ConfigValueSettingsIni(QStringLiteral("gtk-decoration-layout"),
windowDecorationsButtonOrder);
+
ConfigEditor::setGtk4ConfigValueSettingsIni(QStringLiteral("gtk-decoration-layout"),
windowDecorationsButtonOrder);
ConfigEditor::setGtk3ConfigValueXSettingsd(QStringLiteral("Gtk/DecorationLayout"),
windowDecorationsButtonOrder);
}
@@ -167,8 +175,9 @@
{
const bool enableAnimations = configValueProvider->enableAnimations();
ConfigEditor::setGtk2ConfigValue(QStringLiteral("gtk-enable-animations"),
enableAnimations);
-
ConfigEditor::setGtk3ConfigValueGSettings(QStringLiteral("enable-animations"),
enableAnimations);
+
ConfigEditor::setGtkConfigValueGSettings(QStringLiteral("enable-animations"),
enableAnimations);
ConfigEditor::setGtk3ConfigValueSettingsIni(QStringLiteral("gtk-enable-animations"),
enableAnimations);
+
ConfigEditor::setGtk4ConfigValueSettingsIni(QStringLiteral("gtk-enable-animations"),
enableAnimations);
ConfigEditor::setGtk3ConfigValueXSettingsd(QStringLiteral("Gtk/EnableAnimations"),
enableAnimations);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kde-gtk-config-5.20.5/kded/gtkconfig.json
new/kde-gtk-config-5.21.0/kded/gtkconfig.json
--- old/kde-gtk-config-5.20.5/kded/gtkconfig.json 2021-01-05
12:51:34.000000000 +0100
+++ new/kde-gtk-config-5.21.0/kded/gtkconfig.json 2021-02-11
13:00:32.000000000 +0100
@@ -1,11 +1,13 @@
{
"KPlugin": {
"Description": "Automatically applies settings to GNOME/GTK
applications",
+ "Description[ast]": "Aplica autom??ticamente los axustes
n'aplicaciones de GNOME/GTK",
"Description[az]": "Ayarlar?? avtomatik GNOME/GTK t??tbiql??rin??
t??tbiq etm??k",
"Description[ca@valencia]": "Aplica autom??ticament la configuraci?? a
les aplicacions GNOME/GTK",
"Description[ca]": "Aplica autom??ticament la configuraci?? a les
aplicacions GNOME/GTK",
"Description[cs]": "Automaticky aplikuje nastaven?? na aplikace
GNOME/GTK",
"Description[da]": "Anvender automatisk indstillinger p??
GNOME-/GTK-programmer",
+ "Description[de]": "Einstellungen werden automatisch f??r
GNOME/GTK-Anwendungen angewandt",
"Description[el]": "?????????????????? ???????????????? ??????
?????????????????? ???? GNOME/GTK ??????????????????",
"Description[en_GB]": "Automatically applies settings to GNOME/GTK
applications",
"Description[es]": "Aplica preferencias autom??ticamente a las
aplicaciones de GNOME/GTK",
@@ -19,6 +21,7 @@
"Description[lt]": "Automati??kai taiko nuostatas GNOME/GTK
programoms",
"Description[nl]": "Automatisch toegepaste instellingen op GNOME/GTK
toepassingen",
"Description[nn]": "Tek automatisk i bruk innstillingane p??
GNOME-/GTK-program",
+ "Description[pa]": "????????????//GTK ??????????????????????????????
?????? ???????????????????????? ????????????-?????? ????????????
????????????????????? ??????",
"Description[pl]": "Sama nak??ada ustawienia na aplikacje GNOME/GTK",
"Description[pt]": "Aplica automaticamente as configura????es nas
aplica????es do GNOME/GTK",
"Description[pt_BR]": "Aplica automaticamente as configura????es aos
aplicativos GNOME/GTK",
@@ -26,17 +29,20 @@
"Description[ru]": "???????????????????????????? ????????????????????
?????????????????? ?????? ???????????????????? GNOME/GTK",
"Description[sk]": "Automaticky pou??ije nastavenia pre GNOME/GTK
aplik??cie",
"Description[sl]": "Samodejno uveljavi nastavitve za vse programe
GNOME/GTK",
+ "Description[sv]": "Verkst??ller automatiskt inst??llningar f??r
GNOME/GTK-program",
"Description[uk]": "?????????????????????? ????????????????????
?????????????????? ???? ?????????????? GNOME/GTK",
"Description[x-test]": "xxAutomatically applies settings to GNOME/GTK
applicationsxx",
"Description[zh_CN]": "???????????????????????? GNOME/GTK ??????",
"Description[zh_TW]": "????????????????????? GNOME/GTK ????????????",
"Icon": "gtkconfig",
"Name": "GNOME/GTK Settings Synchronization Service",
+ "Name[ast]": "Serviciu de la sincronizaci??n d'axustes de GNOME/GTK",
"Name[az]": "GNOME/GTK Ayarlar?? Sinxronizasiya Xidm??ti",
"Name[ca@valencia]": "Servei de sincronitzaci?? de la configuraci??
del GNOME/GTK",
"Name[ca]": "Servei de sincronitzaci?? de la configuraci?? del
GNOME/GTK",
"Name[cs]": "Slu??ba synchronizace nastaven?? GNOME/GTK",
"Name[da]": "Synkroniseringstjeneste til GNOME-/GTK-indstillinger",
+ "Name[de]": "Dienst zum Abgleich von Einstellungen f??r GNOME/GTK",
"Name[el]": "???????????????? ????????????????????????
?????????????????? GNOME/GTK",
"Name[en_GB]": "GNOME/GTK Settings Synchronisation Service",
"Name[es]": "Servicio de sincronizaci??n de preferencias de GNOME/GTK",
@@ -50,6 +56,7 @@
"Name[lt]": "GNOME/GTK nuostat?? sinchronizavimo tarnyba",
"Name[nl]": "GNOME/GTK instellingen synchronisatieservice",
"Name[nn]": "GNOME/GTK-oppsettsynkronisering",
+ "Name[pa]": "????????????/GTK ????????????????????????
???????????????????????????????????? ????????????",
"Name[pl]": "Us??uga synchronizacji ustawie?? GNOME/GTK",
"Name[pt]": "Servi??o de Sincroniza????o das Configura????es do
GNOME/GTK",
"Name[pt_BR]": "Configura????o do servi??o de sincroniza????o
GNOME/GTK",
@@ -57,6 +64,7 @@
"Name[ru]": "???????????? ??????????????????????????
???????????????????? GNOME/GTK",
"Name[sk]": "Slu??ba na synchroniz??ciu nastaven?? GNOME/GTK",
"Name[sl]": "Nastavitve storitve sinhronizacije GNOME/GTK",
+ "Name[sv]": "Synkroniseringstj??nst av GNOME/GTK inst??llningar",
"Name[uk]": "???????????? ??????????????????????????
???????????????????? GNOME/GTK",
"Name[x-test]": "xxGNOME/GTK Settings Synchronization Servicexx",
"Name[zh_CN]": "GNOME/GTK ??????????????????",
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kde-gtk-config-5.20.5/kded/kwin_bridge/decorationpainter.cpp
new/kde-gtk-config-5.21.0/kded/kwin_bridge/decorationpainter.cpp
--- old/kde-gtk-config-5.20.5/kded/kwin_bridge/decorationpainter.cpp
2021-01-05 12:51:34.000000000 +0100
+++ new/kde-gtk-config-5.21.0/kded/kwin_bridge/decorationpainter.cpp
2021-02-11 13:00:32.000000000 +0100
@@ -12,7 +12,7 @@
#include "standarddecorationpainter.h"
#include "auroraedecorationpainter.h"
-constexpr const QRect DecorationPainter::ButtonGeometry {0, 0, 50, 50};
+const QRect DecorationPainter::ButtonGeometry {0, 0, 50, 50};
std::unique_ptr<DecorationPainter> DecorationPainter::fromThemeName(const
QString& themeName)
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kde-gtk-config-5.20.5/kded/kwin_bridge/decorationpalette.cpp
new/kde-gtk-config-5.21.0/kded/kwin_bridge/decorationpalette.cpp
--- old/kde-gtk-config-5.20.5/kded/kwin_bridge/decorationpalette.cpp
2021-01-05 12:51:34.000000000 +0100
+++ new/kde-gtk-config-5.21.0/kded/kwin_bridge/decorationpalette.cpp
2021-02-11 13:00:32.000000000 +0100
@@ -15,7 +15,6 @@
#include <KSharedConfig>
#include <KColorScheme>
-#include <QPalette>
#include <QFileInfo>
#include <QStandardPaths>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kde-gtk-config-5.20.5/kded/kwin_bridge/dummydecoratedclient.cpp
new/kde-gtk-config-5.21.0/kded/kwin_bridge/dummydecoratedclient.cpp
--- old/kde-gtk-config-5.20.5/kded/kwin_bridge/dummydecoratedclient.cpp
2021-01-05 12:51:34.000000000 +0100
+++ new/kde-gtk-config-5.21.0/kded/kwin_bridge/dummydecoratedclient.cpp
2021-02-11 13:00:32.000000000 +0100
@@ -195,8 +195,9 @@
{
}
-void DummyDecoratedClient::requestShowWindowMenu()
+void DummyDecoratedClient::requestShowWindowMenu(const QRect &rect)
{
+ Q_UNUSED(rect)
}
void DummyDecoratedClient::setMaximized(bool maximized)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kde-gtk-config-5.20.5/kded/kwin_bridge/dummydecoratedclient.h
new/kde-gtk-config-5.21.0/kded/kwin_bridge/dummydecoratedclient.h
--- old/kde-gtk-config-5.20.5/kded/kwin_bridge/dummydecoratedclient.h
2021-01-05 12:51:34.000000000 +0100
+++ new/kde-gtk-config-5.21.0/kded/kwin_bridge/dummydecoratedclient.h
2021-02-11 13:00:32.000000000 +0100
@@ -61,7 +61,7 @@
void requestToggleShade() override;
void requestToggleKeepAbove() override;
void requestToggleKeepBelow() override;
- void requestShowWindowMenu() override;
+ void requestShowWindowMenu(const QRect &rect) override;
void setMaximized(bool maximized);
void setActive(bool active);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kde-gtk-config-5.20.5/kded/kwin_bridge/dummydecorationbridge.cpp
new/kde-gtk-config-5.21.0/kded/kwin_bridge/dummydecorationbridge.cpp
--- old/kde-gtk-config-5.20.5/kded/kwin_bridge/dummydecorationbridge.cpp
2021-01-05 12:51:34.000000000 +0100
+++ new/kde-gtk-config-5.21.0/kded/kwin_bridge/dummydecorationbridge.cpp
2021-02-11 13:00:32.000000000 +0100
@@ -7,7 +7,6 @@
#include <QCoreApplication>
#include <QMouseEvent>
-#include <KDecoration2/Decoration>
#include <KDecoration2/DecorationSettings>
#include <KDecoration2/DecoratedClient>
#include <KDecoration2/Private/DecoratedClientPrivate>
@@ -46,12 +45,13 @@
} else { // for Breeze window decorations and its forks
m_decorationsConfigFileName = QStringLiteral("breezerc");
}
- disableAnimations();
const QString pluginPath = windowDecorationPluginPath(decorationTheme);
m_loader = std::unique_ptr<KPluginLoader>(new KPluginLoader {pluginPath});
m_factory = m_loader->factory();
+ disableAnimations();
+
QVariantMap args({ {QStringLiteral("bridge"), QVariant::fromValue(this)}
});
m_decoration = m_factory->create<KDecoration2::Decoration>(m_factory,
QVariantList({args}));
@@ -63,6 +63,7 @@
if (m_settings) {
Q_EMIT m_settings->decorationSettings()->reconfigured();
}
+ enableAnimations();
}
DummyDecorationBridge::~DummyDecorationBridge()
@@ -92,6 +93,7 @@
void DummyDecorationBridge::paintButton(QPainter &painter, const QString
&buttonType, const QString &buttonState)
{
+ disableAnimations();
std::unique_ptr<KDecoration2::DecorationButton> button
{m_factory->create<KDecoration2::DecorationButton>(
QStringLiteral("button"),
m_decoration,
@@ -134,6 +136,7 @@
}
button->paint(&painter, DecorationPainter::ButtonGeometry);
+ enableAnimations();
}
void DummyDecorationBridge::disableAnimations()
@@ -148,10 +151,20 @@
KSharedConfig::Ptr globalConfig = KSharedConfig::openConfig();
if (globalConfig) {
auto group = globalConfig->group(QStringLiteral("KDE"));
+ globalAnimationEntryValue =
group.readEntry(QStringLiteral("AnimationDurationFactor"), 1.0);
group.writeEntry(QStringLiteral("AnimationDurationFactor"), 0,
KConfig::WriteConfigFlags());
}
}
+void DummyDecorationBridge::enableAnimations()
+{
+ KSharedConfig::Ptr globalConfig = KSharedConfig::openConfig();
+ if (globalConfig) {
+ auto group = globalConfig->group(QStringLiteral("KDE"));
+ group.writeEntry(QStringLiteral("AnimationDurationFactor"),
globalAnimationEntryValue, KConfig::WriteConfigFlags());
+ }
+}
+
QString DummyDecorationBridge::windowDecorationPluginPath(const QString
&decorationTheme) const
{
const auto decorationPlugins =
KPluginLoader::findPlugins(QStringLiteral("org.kde.kdecoration2"));
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kde-gtk-config-5.20.5/kded/kwin_bridge/dummydecorationbridge.h
new/kde-gtk-config-5.21.0/kded/kwin_bridge/dummydecorationbridge.h
--- old/kde-gtk-config-5.20.5/kded/kwin_bridge/dummydecorationbridge.h
2021-01-05 12:51:34.000000000 +0100
+++ new/kde-gtk-config-5.21.0/kded/kwin_bridge/dummydecorationbridge.h
2021-02-11 13:00:32.000000000 +0100
@@ -40,6 +40,7 @@
private:
void disableAnimations();
+ void enableAnimations();
QString windowDecorationPluginPath(const QString &decorationTheme) const;
@@ -49,6 +50,7 @@
KDecoration2::DecorationButtonType strToButtonType(const QString &type)
const;
QString m_decorationsConfigFileName;
+ QString globalAnimationEntryValue;
std::unique_ptr<KPluginLoader> m_loader;
KPluginFactory *m_factory;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kde-gtk-config-5.20.5/kded/themepreviewer.cpp
new/kde-gtk-config-5.21.0/kded/themepreviewer.cpp
--- old/kde-gtk-config-5.20.5/kded/themepreviewer.cpp 2021-01-05
12:51:34.000000000 +0100
+++ new/kde-gtk-config-5.21.0/kded/themepreviewer.cpp 2021-02-11
13:00:32.000000000 +0100
@@ -4,7 +4,6 @@
* SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR
LicenseRef-KDE-Accepted-GPL
*/
-#include <QProcess>
#include <QProcessEnvironment>
#include <QStandardPaths>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kde-gtk-config-5.20.5/window-decorations-reload-module/reloader.c
new/kde-gtk-config-5.21.0/window-decorations-reload-module/reloader.c
--- old/kde-gtk-config-5.20.5/window-decorations-reload-module/reloader.c
2021-01-05 12:51:34.000000000 +0100
+++ new/kde-gtk-config-5.21.0/window-decorations-reload-module/reloader.c
2021-02-11 13:00:32.000000000 +0100
@@ -55,7 +55,6 @@
void reload_css_provider()
{
- printf("WINDOW DECORATIONS RELOADED\n");
if (css_provider != NULL) {
remove_css_provider();
}
