Hello community,
here is the log from the commit of package qqc2-desktop-style for
openSUSE:Leap:15.2 checked in at 2020-06-17 12:48:54
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Leap:15.2/qqc2-desktop-style (Old)
and /work/SRC/openSUSE:Leap:15.2/.qqc2-desktop-style.new.3606 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qqc2-desktop-style"
Wed Jun 17 12:48:54 2020 rev:43 rq:814483 version:5.71.0
Changes:
--------
--- /work/SRC/openSUSE:Leap:15.2/qqc2-desktop-style/qqc2-desktop-style.changes
2020-05-13 03:53:55.236462100 +0200
+++
/work/SRC/openSUSE:Leap:15.2/.qqc2-desktop-style.new.3606/qqc2-desktop-style.changes
2020-06-17 12:48:54.353003264 +0200
@@ -1,0 +2,13 @@
+Sun Jun 7 08:07:12 UTC 2020 - Christophe Giboudeaux <[email protected]>
+
+- Update to 5.71.0
+ * New feature release
+ * For more details please see:
+ * https://kde.org/announcements/kde-frameworks-5.71.0
+- Changes since 5.70.0:
+ * Add ToolSeparator styling
+ * Remove "pressed" from CheckIndicator "on" state (kde#421695)
+ * support the Header group
+ * Implement smallFont in Kirigami plugin
+
+-------------------------------------------------------------------
Old:
----
qqc2-desktop-style-5.70.0.tar.xz
qqc2-desktop-style-5.70.0.tar.xz.sig
New:
----
qqc2-desktop-style-5.71.0.tar.xz
qqc2-desktop-style-5.71.0.tar.xz.sig
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ qqc2-desktop-style.spec ++++++
--- /var/tmp/diff_new_pack.2X1L8Z/_old 2020-06-17 12:48:54.665004217 +0200
+++ /var/tmp/diff_new_pack.2X1L8Z/_new 2020-06-17 12:48:54.665004217 +0200
@@ -16,11 +16,11 @@
#
-%define _tar_path 5.70
+%define _tar_path 5.71
# Only needed for the package signature condition
%bcond_without lang
Name: qqc2-desktop-style
-Version: 5.70.0
+Version: 5.71.0
Release: 0
Summary: A Qt Quick Controls 2 Style for Desktop UIs
License: GPL-2.0-or-later
@@ -37,7 +37,8 @@
BuildRequires: cmake(KF5ConfigWidgets)
BuildRequires: cmake(KF5IconThemes)
BuildRequires: cmake(KF5Kirigami2)
-BuildRequires: cmake(Qt5Core) >= 5.9.1
+BuildRequires: cmake(Qt5Core)
+BuildRequires: cmake(Qt5DBus)
BuildRequires: cmake(Qt5Gui)
BuildRequires: cmake(Qt5Network)
BuildRequires: cmake(Qt5Quick)
++++++ qqc2-desktop-style-5.70.0.tar.xz -> qqc2-desktop-style-5.71.0.tar.xz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qqc2-desktop-style-5.70.0/.arcconfig
new/qqc2-desktop-style-5.71.0/.arcconfig
--- old/qqc2-desktop-style-5.70.0/.arcconfig 2020-05-03 00:02:05.000000000
+0200
+++ new/qqc2-desktop-style-5.71.0/.arcconfig 1970-01-01 01:00:00.000000000
+0100
@@ -1,3 +0,0 @@
-{
- "phabricator.uri" : "https://phabricator.kde.org/";
-}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qqc2-desktop-style-5.70.0/CMakeLists.txt
new/qqc2-desktop-style-5.71.0/CMakeLists.txt
--- old/qqc2-desktop-style-5.70.0/CMakeLists.txt 2020-05-03
00:02:05.000000000 +0200
+++ new/qqc2-desktop-style-5.71.0/CMakeLists.txt 2020-06-06
21:36:41.000000000 +0200
@@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 3.5)
-set(KF5_VERSION "5.70.0") # handled by release scripts
-set(KF5_DEP_VERSION "5.70.0") # handled by release scripts
+set(KF5_VERSION "5.71.0") # handled by release scripts
+set(KF5_DEP_VERSION "5.71.0") # handled by release scripts
project(qqc2-desktop-style VERSION ${KF5_VERSION})
@@ -21,7 +21,7 @@
################# set KDE specific information #################
-find_package(ECM 5.70.0 REQUIRED NO_MODULE)
+find_package(ECM 5.71.0 REQUIRED NO_MODULE)
# where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is
checked
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH})
@@ -32,7 +32,7 @@
include(KDECMakeSettings)
include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
-find_package(Qt5 ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE COMPONENTS Core
Quick Gui Widgets QuickControls2)
+find_package(Qt5 ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE COMPONENTS Core
Quick Gui Widgets QuickControls2 DBus)
find_package(KF5 ${KF5_DEP_VERSION} REQUIRED COMPONENTS Config Kirigami2)
@@ -110,7 +110,7 @@
#########################################################################
add_definitions(-DQT_NO_FOREACH)
add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050d00)
-add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x054400)
+add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x054700)
add_subdirectory(plugin)
if (KF5IconThemes_FOUND AND KF5WidgetsAddons_FOUND)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qqc2-desktop-style-5.70.0/kirigami-plasmadesktop-integration/CMakeLists.txt
new/qqc2-desktop-style-5.71.0/kirigami-plasmadesktop-integration/CMakeLists.txt
---
old/qqc2-desktop-style-5.70.0/kirigami-plasmadesktop-integration/CMakeLists.txt
2020-05-03 00:02:05.000000000 +0200
+++
new/qqc2-desktop-style-5.71.0/kirigami-plasmadesktop-integration/CMakeLists.txt
2020-06-06 21:36:41.000000000 +0200
@@ -13,6 +13,7 @@
Qt5::Core
KF5::Kirigami2
PRIVATE
+ Qt5::DBus
Qt5::Qml
Qt5::Quick
KF5::ConfigWidgets
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qqc2-desktop-style-5.70.0/kirigami-plasmadesktop-integration/plasmadesktoptheme.cpp
new/qqc2-desktop-style-5.71.0/kirigami-plasmadesktop-integration/plasmadesktoptheme.cpp
---
old/qqc2-desktop-style-5.70.0/kirigami-plasmadesktop-integration/plasmadesktoptheme.cpp
2020-05-03 00:02:05.000000000 +0200
+++
new/qqc2-desktop-style-5.71.0/kirigami-plasmadesktop-integration/plasmadesktoptheme.cpp
2020-06-06 21:36:41.000000000 +0200
@@ -14,6 +14,8 @@
#include <KIconLoader>
#include <KColorScheme>
+#include <KConfigGroup>
+#include <QDBusConnection>
class IconLoaderSingleton
{
@@ -81,6 +83,9 @@
case PlatformTheme::Complementary:
set = KColorScheme::ColorSet::Complementary;
break;
+ case PlatformTheme::Header:
+ set = KColorScheme::ColorSet::Header;
+ break;
case PlatformTheme::Window:
default:
set = KColorScheme::ColorSet::Window;
@@ -156,8 +161,17 @@
});
}
+ // Use DBus in order to listen for kdeglobals changes directly, as the
+ // QApplication doesn't expose the font variants we're looking for,
+ // namely smallFont.
+ QDBusConnection::sessionBus().connect( QString(),
+ QStringLiteral( "/KGlobalSettings" ),
+ QStringLiteral( "org.kde.KGlobalSettings" ),
+ QStringLiteral( "notifyChange" ), this, SLOT(configurationChanged()));
+
//TODO: correct? depends from https://codereview.qt-project.org/206889
connect(qGuiApp, &QGuiApplication::fontDatabaseChanged, this, [this]()
{setDefaultFont(qApp->font());});
+ configurationChanged();
connect(this, &PlasmaDesktopTheme::colorSetChanged,
this, &PlasmaDesktopTheme::syncColors);
@@ -172,6 +186,21 @@
PlasmaDesktopTheme::~PlasmaDesktopTheme() = default;
+void PlasmaDesktopTheme::configurationChanged()
+{
+ KSharedConfigPtr ptr = KSharedConfig::openConfig();
+ KConfigGroup general( ptr->group("general") );
+ setSmallFont(general.readEntry("smallestReadableFont", []() {
+ auto smallFont = qApp->font();
+ if (smallFont.pixelSize() != -1) {
+ smallFont.setPixelSize(smallFont.pixelSize()-2);
+ } else {
+ smallFont.setPointSize(smallFont.pointSize()-2);
+ }
+ return smallFont;
+ }()));
+}
+
QIcon PlasmaDesktopTheme::iconFromTheme(const QString &name, const QColor
&customColor)
{
QPalette pal = palette();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qqc2-desktop-style-5.70.0/kirigami-plasmadesktop-integration/plasmadesktoptheme.h
new/qqc2-desktop-style-5.71.0/kirigami-plasmadesktop-integration/plasmadesktoptheme.h
---
old/qqc2-desktop-style-5.70.0/kirigami-plasmadesktop-integration/plasmadesktoptheme.h
2020-05-03 00:02:05.000000000 +0200
+++
new/qqc2-desktop-style-5.71.0/kirigami-plasmadesktop-integration/plasmadesktoptheme.h
2020-06-06 21:36:41.000000000 +0200
@@ -53,6 +53,9 @@
Q_SIGNALS:
void colorsChanged();
+protected Q_SLOTS:
+ void configurationChanged();
+
private:
QPointer<QQuickItem> m_parentItem;
QPointer<QWindow> m_window;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qqc2-desktop-style-5.70.0/org.kde.desktop/CheckIndicator.qml
new/qqc2-desktop-style-5.71.0/org.kde.desktop/CheckIndicator.qml
--- old/qqc2-desktop-style-5.70.0/org.kde.desktop/CheckIndicator.qml
2020-05-03 00:02:05.000000000 +0200
+++ new/qqc2-desktop-style-5.71.0/org.kde.desktop/CheckIndicator.qml
2020-06-06 21:36:41.000000000 +0200
@@ -13,7 +13,7 @@
id: styleitem
elementType: control.autoExclusive ? "radiobutton" : "checkbox"
sunken: control.pressed
- on: control.checked || control.pressed
+ on: control.checked
hover: control.hovered
enabled: control.enabled
properties: {"partiallyChecked": (control.checkState ===
Qt.PartiallyChecked) }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qqc2-desktop-style-5.70.0/org.kde.desktop/ToolSeparator.qml
new/qqc2-desktop-style-5.71.0/org.kde.desktop/ToolSeparator.qml
--- old/qqc2-desktop-style-5.70.0/org.kde.desktop/ToolSeparator.qml
1970-01-01 01:00:00.000000000 +0100
+++ new/qqc2-desktop-style-5.71.0/org.kde.desktop/ToolSeparator.qml
2020-06-06 21:36:41.000000000 +0200
@@ -0,0 +1,31 @@
+/*
+ SPDX-FileCopyrightText: 2020 Noah Davis <[email protected]>
+
+ SPDX-License-Identifier: LGPL-3.0-only OR GPL-2.0-or-later
+*/
+
+
+import QtQuick 2.6
+import QtQuick.Templates @QQC2_VERSION@ as T
+import org.kde.kirigami 2.4 as Kirigami
+
+T.ToolSeparator {
+ id: controlRoot
+
+ topPadding: 0
+ bottomPadding: 0
+ leftPadding: Kirigami.Units.smallSpacing
+ rightPadding: Kirigami.Units.smallSpacing
+
+ implicitWidth: separator.width + controlRoot.leftPadding +
controlRoot.rightPadding
+ implicitHeight: parent.height
+
+ background: Kirigami.Separator {
+ id: separator
+ anchors {
+ top: controlRoot.top
+ bottom: controlRoot.bottom
+ horizontalCenter: controlRoot.horizontalCenter
+ }
+ }
+}
