Hello community,
here is the log from the commit of package qqc2-desktop-style for openSUSE:Factory checked in at 2019-05-02 19:16:34
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/qqc2-desktop-style (Old)
and /work/SRC/openSUSE:Factory/.qqc2-desktop-style.new.5148 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qqc2-desktop-style"
Thu May 2 19:16:34 2019 rev:21 rq:695266 version:5.57.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/qqc2-desktop-style/qqc2-desktop-style.changes 2019-03-22 15:07:33.317484773 +0100
+++ /work/SRC/openSUSE:Factory/.qqc2-desktop-style.new.5148/qqc2-desktop-style.changes 2019-05-02 19:16:36.113339115 +0200
@@ -1,0 +2,15 @@
+Sun Apr 14 20:21:45 UTC 2019 - lbeltrame@kde.org
+
+- Update to 5.57.0
+ * New feature release
+ * For more details please see:
+ * https://www.kde.org/announcements/kde-frameworks-5.57.0.php
+- Changes since 5.56.0:
+ * the plasma desktop style supports icon coloring
+ * [SpinBox] Improve mouse wheel behavior
+ * add a bit of padding in ToolBars
+ * fix RoundButton icons
+ * scrollbar based padding on all delegates
+ * look for a scrollview to take its scrollbar for margins
+
+-------------------------------------------------------------------
Old:
----
qqc2-desktop-style-5.56.0.tar.xz
New:
----
qqc2-desktop-style-5.57.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ qqc2-desktop-style.spec ++++++
--- /var/tmp/diff_new_pack.dpIkxo/_old 2019-05-02 19:16:37.305341305 +0200
+++ /var/tmp/diff_new_pack.dpIkxo/_new 2019-05-02 19:16:37.309341311 +0200
@@ -16,9 +16,9 @@
#
-%define _tar_path 5.56
+%define _tar_path 5.57
Name: qqc2-desktop-style
-Version: 5.56.0
+Version: 5.57.0
Release: 0
Summary: A Qt Quick Controls 2 Style for Desktop UIs
License: GPL-2.0-or-later
++++++ qqc2-desktop-style-5.56.0.tar.xz -> qqc2-desktop-style-5.57.0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.56.0/.gitignore new/qqc2-desktop-style-5.57.0/.gitignore
--- old/qqc2-desktop-style-5.56.0/.gitignore 1970-01-01 01:00:00.000000000 +0100
+++ new/qqc2-desktop-style-5.57.0/.gitignore 2019-04-07 09:21:46.000000000 +0200
@@ -0,0 +1,21 @@
+# Ignore the following files
+*~
+*.[oa]
+*.diff
+*.kate-swp
+*.kdev4
+.kdev_include_paths
+*.kdevelop.pcs
+*.moc
+*.moc.cpp
+*.orig
+*.user
+.*.swp
+.swp.*
+Doxyfile
+Makefile
+avail
+random_seed
+/build*/
+CMakeLists.txt.user*
+*.unc-backup*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.56.0/CMakeLists.txt new/qqc2-desktop-style-5.57.0/CMakeLists.txt
--- old/qqc2-desktop-style-5.56.0/CMakeLists.txt 2019-03-02 14:31:26.000000000 +0100
+++ new/qqc2-desktop-style-5.57.0/CMakeLists.txt 2019-04-07 09:21:46.000000000 +0200
@@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 3.5)
-set(KF5_VERSION "5.56.0") # handled by release scripts
-set(KF5_DEP_VERSION "5.56.0") # handled by release scripts
+set(KF5_VERSION "5.57.0") # handled by release scripts
+set(KF5_DEP_VERSION "5.57.0") # handled by release scripts
project(qqc2-desktop-style VERSION ${KF5_VERSION})
@@ -21,7 +21,7 @@
################# set KDE specific information #################
-find_package(ECM 5.56.0 REQUIRED NO_MODULE)
+find_package(ECM 5.57.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} ${ECM_KDE_MODULE_DIR})
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.56.0/kirigami-plasmadesktop-integration/plasmadesktoptheme.cpp new/qqc2-desktop-style-5.57.0/kirigami-plasmadesktop-integration/plasmadesktoptheme.cpp
--- old/qqc2-desktop-style-5.56.0/kirigami-plasmadesktop-integration/plasmadesktoptheme.cpp 2019-03-02 14:31:26.000000000 +0100
+++ new/qqc2-desktop-style-5.57.0/kirigami-plasmadesktop-integration/plasmadesktoptheme.cpp 2019-04-07 09:21:46.000000000 +0200
@@ -144,7 +144,7 @@
PlasmaDesktopTheme::PlasmaDesktopTheme(QObject *parent)
: PlatformTheme(parent)
{
- // setHasCustomIconColoring(true);
+ setSupportsIconColoring(true);
m_parentItem = qobject_cast(parent);
//null in case parent is a normal QObject
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.56.0/org.kde.desktop/CheckDelegate.qml new/qqc2-desktop-style-5.57.0/org.kde.desktop/CheckDelegate.qml
--- old/qqc2-desktop-style-5.56.0/org.kde.desktop/CheckDelegate.qml 2019-03-02 14:31:26.000000000 +0100
+++ new/qqc2-desktop-style-5.57.0/org.kde.desktop/CheckDelegate.qml 2019-04-07 09:21:46.000000000 +0200
@@ -34,9 +34,13 @@
indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding
hoverEnabled: true
- padding: 4
- spacing: 4
- rightPadding: 20
+ padding: Kirigami.Settings.tabletMode ? Kirigami.Units.largeSpacing : Kirigami.Units.smallSpacing
+
+ leftPadding: LayoutMirroring.enabled && internal.scrollBar && internal.scrollBar.visible ? internal.scrollBar.width : padding*2
+ topPadding: padding
+
+ rightPadding: !LayoutMirroring.enabled && internal.scrollBar && internal.scrollBar.visible ? internal.scrollBar.width : padding*2
+ bottomPadding: padding
contentItem: Label {
leftPadding: controlRoot.mirrored ? (controlRoot.indicator ? controlRoot.indicator.width : 0) + controlRoot.spacing : 0
@@ -59,4 +63,21 @@
}
background: DefaultListItemBackground {}
+
+ QtObject {
+ id: internal
+ property T.ScrollBar scrollBar
+ }
+
+ Component.onCompleted: {
+ var candidate = controlRoot.ListView.view || (controlRoot.parent ? controlRoot.parent.ListView.view : null)
+ //Search for a ScrollView
+ while (candidate) {
+ if (candidate.T.ScrollBar.vertical) {
+ internal.scrollBar = candidate.T.ScrollBar.vertical
+ break;
+ }
+ candidate = candidate.parent
+ }
+ }
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.56.0/org.kde.desktop/ItemDelegate.qml new/qqc2-desktop-style-5.57.0/org.kde.desktop/ItemDelegate.qml
--- old/qqc2-desktop-style-5.56.0/org.kde.desktop/ItemDelegate.qml 2019-03-02 14:31:26.000000000 +0100
+++ new/qqc2-desktop-style-5.57.0/org.kde.desktop/ItemDelegate.qml 2019-04-07 09:21:46.000000000 +0200
@@ -34,9 +34,13 @@
indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding
hoverEnabled: true
- padding: 4
- spacing: 4
- rightPadding: 20
+ padding: Kirigami.Settings.tabletMode ? Kirigami.Units.largeSpacing : Kirigami.Units.smallSpacing
+
+ leftPadding: LayoutMirroring.enabled && internal.scrollBar && internal.scrollBar.visible ? internal.scrollBar.width : padding*2
+ topPadding: padding
+
+ rightPadding: !LayoutMirroring.enabled && internal.scrollBar && internal.scrollBar.visible ? internal.scrollBar.width : padding*2
+ bottomPadding: padding
contentItem: Label {
leftPadding: controlRoot.mirrored ? (controlRoot.indicator ? controlRoot.indicator.width : 0) + controlRoot.spacing : 0
@@ -51,5 +55,22 @@
verticalAlignment: Text.AlignVCenter
}
+ QtObject {
+ id: internal
+ property T.ScrollBar scrollBar
+ }
+
+ Component.onCompleted: {
+ var candidate = controlRoot.ListView.view || (controlRoot.parent ? controlRoot.parent.ListView.view : null)
+ //Search for a ScrollView
+ while (candidate) {
+ if (candidate.T.ScrollBar.vertical) {
+ internal.scrollBar = candidate.T.ScrollBar.vertical
+ break;
+ }
+ candidate = candidate.parent
+ }
+ }
+
background: DefaultListItemBackground {}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.56.0/org.kde.desktop/RadioDelegate.qml new/qqc2-desktop-style-5.57.0/org.kde.desktop/RadioDelegate.qml
--- old/qqc2-desktop-style-5.56.0/org.kde.desktop/RadioDelegate.qml 2019-03-02 14:31:26.000000000 +0100
+++ new/qqc2-desktop-style-5.57.0/org.kde.desktop/RadioDelegate.qml 2019-04-07 09:21:46.000000000 +0200
@@ -34,9 +34,13 @@
indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding
hoverEnabled: true
- padding: 4
- spacing: 4
- rightPadding: 20
+ padding: Kirigami.Settings.tabletMode ? Kirigami.Units.largeSpacing : Kirigami.Units.smallSpacing
+
+ leftPadding: LayoutMirroring.enabled && internal.scrollBar && internal.scrollBar.visible ? internal.scrollBar.width : padding*2
+ topPadding: padding
+
+ rightPadding: !LayoutMirroring.enabled && internal.scrollBar && internal.scrollBar.visible ? internal.scrollBar.width : padding*2
+ bottomPadding: padding
contentItem: Label {
leftPadding: controlRoot.mirrored ? (controlRoot.indicator ? controlRoot.indicator.width : 0) + controlRoot.spacing : 0
@@ -59,4 +63,21 @@
}
background: DefaultListItemBackground {}
+
+ QtObject {
+ id: internal
+ property T.ScrollBar scrollBar
+ }
+
+ Component.onCompleted: {
+ var candidate = controlRoot.ListView.view || (controlRoot.parent ? controlRoot.parent.ListView.view : null)
+ //Search for a ScrollView
+ while (candidate) {
+ if (candidate.T.ScrollBar.vertical) {
+ internal.scrollBar = candidate.T.ScrollBar.vertical
+ break;
+ }
+ candidate = candidate.parent
+ }
+ }
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.56.0/org.kde.desktop/RoundButton.qml new/qqc2-desktop-style-5.57.0/org.kde.desktop/RoundButton.qml
--- old/qqc2-desktop-style-5.56.0/org.kde.desktop/RoundButton.qml 2019-03-02 14:31:26.000000000 +0100
+++ new/qqc2-desktop-style-5.57.0/org.kde.desktop/RoundButton.qml 2019-04-07 09:21:46.000000000 +0200
@@ -29,7 +29,7 @@
T.RoundButton {
id: controlRoot
@DISABLE_UNDER_QQC2_2_4@ palette: Kirigami.Theme.palette
- Kirigami.Theme.colorSet: controlRoot.activeFocus ? Kirigami.Theme.Selection : Kirigami.Theme.Button
+ Kirigami.Theme.colorSet: !flat && controlRoot.activeFocus ? Kirigami.Theme.Selection : Kirigami.Theme.Button
Kirigami.Theme.inherit: false
implicitWidth: Math.max(background ? background.implicitWidth : 0,
@@ -50,8 +50,17 @@
RowLayout {
id: mainLayout
anchors.centerIn: parent
+ Kirigami.Icon {
+ Layout.preferredWidth: Kirigami.Units.iconSizes.smallMedium
+ Layout.preferredHeight: Kirigami.Units.iconSizes.smallMedium
+ Layout.fillWidth: true
+ Layout.fillHeight: true
+ visible: source.length > 0
+ source: controlRoot.icon ? (controlRoot.icon.name || controlRoot.icon.source) : ""
+ }
Controls.Label {
text: controlRoot.text
+ visible: text.length > 0
}
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.56.0/org.kde.desktop/SpinBox.qml new/qqc2-desktop-style-5.57.0/org.kde.desktop/SpinBox.qml
--- old/qqc2-desktop-style-5.56.0/org.kde.desktop/SpinBox.qml 2019-03-02 14:31:26.000000000 +0100
+++ new/qqc2-desktop-style-5.57.0/org.kde.desktop/SpinBox.qml 2019-04-07 09:21:46.000000000 +0200
@@ -66,13 +66,26 @@
MouseArea {
anchors.fill: parent
onPressed: mouse.accepted = false;
+
+ property int wheelDelta: 0
+
+ onExited: wheelDelta = 0
onWheel: {
- if (wheel.pixelDelta.y < 0 || wheel.angleDelta.y < 0) {
- controlRoot.decrease();
- } else {
+ wheelDelta += wheel.angleDelta.y;
+ // magic number 120 for common "one click"
+ // See: http://qt-project.org/doc/qt-5/qml-qtquick-wheelevent.html#angleDelta-prop
+ while (wheelDelta >= 120) {
+ wheelDelta -= 120;
controlRoot.increase();
+ controlRoot.valueModified();
+ }
+ while (wheelDelta <= -120) {
+ wheelDelta += 120;
+ controlRoot.decrease();
+ controlRoot.valueModified();
}
}
+
// Normally the TextInput does this automatically, but the MouseArea on
// top of it blocks that behavior, so we need to explicitly do it here
cursorShape: Qt.IBeamCursor
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.56.0/org.kde.desktop/SwitchDelegate.qml new/qqc2-desktop-style-5.57.0/org.kde.desktop/SwitchDelegate.qml
--- old/qqc2-desktop-style-5.56.0/org.kde.desktop/SwitchDelegate.qml 2019-03-02 14:31:26.000000000 +0100
+++ new/qqc2-desktop-style-5.57.0/org.kde.desktop/SwitchDelegate.qml 2019-04-07 09:21:46.000000000 +0200
@@ -34,9 +34,13 @@
indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding
hoverEnabled: true
- padding: 4
- spacing: 4
- rightPadding: 20
+ padding: Kirigami.Settings.tabletMode ? Kirigami.Units.largeSpacing : Kirigami.Units.smallSpacing
+
+ leftPadding: LayoutMirroring.enabled && internal.scrollBar && internal.scrollBar.visible ? internal.scrollBar.width : padding*2
+ topPadding: padding
+
+ rightPadding: !LayoutMirroring.enabled && internal.scrollBar && internal.scrollBar.visible ? internal.scrollBar.width : padding*2
+ bottomPadding: padding
contentItem: Label {
leftPadding: controlRoot.mirrored ? (controlRoot.indicator ? controlRoot.indicator.width : 0) + controlRoot.spacing : 0
@@ -59,4 +63,21 @@
}
background: DefaultListItemBackground {}
+
+ QtObject {
+ id: internal
+ property T.ScrollBar scrollBar
+ }
+
+ Component.onCompleted: {
+ var candidate = controlRoot.ListView.view || (controlRoot.parent ? controlRoot.parent.ListView.view : null)
+ //Search for a ScrollView
+ while (candidate) {
+ if (candidate.T.ScrollBar.vertical) {
+ internal.scrollBar = candidate.T.ScrollBar.vertical
+ break;
+ }
+ candidate = candidate.parent
+ }
+ }
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.56.0/org.kde.desktop/ToolBar.qml new/qqc2-desktop-style-5.57.0/org.kde.desktop/ToolBar.qml
--- old/qqc2-desktop-style-5.56.0/org.kde.desktop/ToolBar.qml 2019-03-02 14:31:26.000000000 +0100
+++ new/qqc2-desktop-style-5.57.0/org.kde.desktop/ToolBar.qml 2019-04-07 09:21:46.000000000 +0200
@@ -34,6 +34,7 @@
contentWidth: contentChildren[0].implicitWidth
contentHeight: contentChildren[0].implicitHeight
+ padding: Kirigami.Units.smallSpacing
contentItem: Item {}
position: controlRoot.parent.footer == controlRoot ? ToolBar.Footer : ToolBar.Header
background: Rectangle {
