Hello community,
here is the log from the commit of package qqc2-desktop-style for
openSUSE:Factory checked in at 2018-01-10 23:33:04
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/qqc2-desktop-style (Old)
and /work/SRC/openSUSE:Factory/.qqc2-desktop-style.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qqc2-desktop-style"
Wed Jan 10 23:33:04 2018 rev:4 rq:559481 version:5.41.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/qqc2-desktop-style/qqc2-desktop-style.changes
2017-11-17 10:59:31.713766357 +0100
+++
/work/SRC/openSUSE:Factory/.qqc2-desktop-style.new/qqc2-desktop-style.changes
2018-01-10 23:33:05.721858818 +0100
@@ -1,0 +2,12 @@
+Sun Dec 17 09:43:50 CET 2017 - [email protected]
+
+- Update to 5.41.0
+ * New feature release
+ * For more details please see:
+ * https://www.kde.org/announcements/kde-frameworks-5.41.0.php
+- Changes since 5.40.0:
+ * determine QQC2 version at build time (kde#386289)
+ * by default, keep the background invisible
+ * add a background in ScrollView
+
+-------------------------------------------------------------------
Old:
----
qqc2-desktop-style-5.40.0.tar.xz
New:
----
qqc2-desktop-style-5.41.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ qqc2-desktop-style.spec ++++++
--- /var/tmp/diff_new_pack.zbI9XG/_old 2018-01-10 23:33:06.313831038 +0100
+++ /var/tmp/diff_new_pack.zbI9XG/_new 2018-01-10 23:33:06.317830851 +0100
@@ -16,9 +16,9 @@
#
-%define _tar_path 5.40
+%define _tar_path 5.41
Name: qqc2-desktop-style
-Version: 5.40.0
+Version: 5.41.0
Release: 0
Summary: A Qt Quick Controls 2 Style for Desktop UIs
License: GPL-2.0+
++++++ qqc2-desktop-style-5.40.0.tar.xz -> qqc2-desktop-style-5.41.0.tar.xz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qqc2-desktop-style-5.40.0/CMakeLists.txt
new/qqc2-desktop-style-5.41.0/CMakeLists.txt
--- old/qqc2-desktop-style-5.40.0/CMakeLists.txt 2017-11-04
22:51:12.000000000 +0100
+++ new/qqc2-desktop-style-5.41.0/CMakeLists.txt 2017-12-02
11:22:43.000000000 +0100
@@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 3.0)
-set(KF5_VERSION "5.40.0") # handled by release scripts
-set(KF5_DEP_VERSION "5.40.0") # handled by release scripts
+set(KF5_VERSION "5.41.0") # handled by release scripts
+set(KF5_DEP_VERSION "5.41.0") # handled by release scripts
project(qqc2-desktop-style VERSION ${KF5_VERSION})
@@ -21,7 +21,7 @@
################# set KDE specific information #################
-find_package(ECM 5.40.0 REQUIRED NO_MODULE)
+find_package(ECM 5.41.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})
@@ -94,7 +94,26 @@
add_subdirectory(kirigami-plasmadesktop-integration)
endif(KF5IconThemes_FOUND AND KF5WidgetsAddons_FOUND)
-install(DIRECTORY org.kde.desktop DESTINATION
${KDE_INSTALL_QMLDIR}/QtQuick/Controls.2)
+#FIXME: this assumes there will always be a QQC2 release for each Qt release,
needs
+#something to discover what's the latest qqc2 version available
+math(EXPR QQC2_VERSION "${Qt5QuickControls2_VERSION_MINOR} - 7")
+set(QQC2_VERSION "2.${QQC2_VERSION}")
+
+# Find all the source qml files
+FILE(GLOB_RECURSE inFiles RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}"
+ "${CMAKE_CURRENT_SOURCE_DIR}/org.kde.desktop/*")
+
+ #for each file, replace @QQC2_VERSION@ with the version we found
+FOREACH(infileName ${inFiles})
+ configure_package_config_file(
+ "${CMAKE_CURRENT_SOURCE_DIR}/${infileName}"
+ "${CMAKE_CURRENT_BINARY_DIR}/${infileName}"
+ INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR}
+ PATH_VARS QQC2_VERSION
+ )
+ENDFOREACH(infileName)
+
+install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/org.kde.desktop DESTINATION
${KDE_INSTALL_QMLDIR}/QtQuick/Controls.2)
feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES
FATAL_ON_MISSING_REQUIRED_PACKAGES)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qqc2-desktop-style-5.40.0/org.kde.desktop/Button.qml
new/qqc2-desktop-style-5.41.0/org.kde.desktop/Button.qml
--- old/qqc2-desktop-style-5.40.0/org.kde.desktop/Button.qml 2017-11-04
22:51:12.000000000 +0100
+++ new/qqc2-desktop-style-5.41.0/org.kde.desktop/Button.qml 2017-12-02
11:22:43.000000000 +0100
@@ -20,7 +20,7 @@
*/
import QtQuick 2.6
-import QtQuick.Templates 2.0 as T
+import QtQuick.Templates @QQC2_VERSION@ as T
import org.kde.qqc2desktopstyle.private 1.0 as StylePrivate
import org.kde.kirigami 2.2 as Kirigami
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qqc2-desktop-style-5.40.0/org.kde.desktop/CheckBox.qml
new/qqc2-desktop-style-5.41.0/org.kde.desktop/CheckBox.qml
--- old/qqc2-desktop-style-5.40.0/org.kde.desktop/CheckBox.qml 2017-11-04
22:51:12.000000000 +0100
+++ new/qqc2-desktop-style-5.41.0/org.kde.desktop/CheckBox.qml 2017-12-02
11:22:43.000000000 +0100
@@ -21,8 +21,8 @@
import QtQuick 2.6
-import QtQuick.Templates 2.0 as T
-import QtQuick.Controls 2.0
+import QtQuick.Templates @QQC2_VERSION@ as T
+import QtQuick.Controls @QQC2_VERSION@
import org.kde.kirigami 2.2 as Kirigami
T.CheckBox {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qqc2-desktop-style-5.40.0/org.kde.desktop/CheckDelegate.qml
new/qqc2-desktop-style-5.41.0/org.kde.desktop/CheckDelegate.qml
--- old/qqc2-desktop-style-5.40.0/org.kde.desktop/CheckDelegate.qml
2017-11-04 22:51:12.000000000 +0100
+++ new/qqc2-desktop-style-5.41.0/org.kde.desktop/CheckDelegate.qml
2017-12-02 11:22:43.000000000 +0100
@@ -21,7 +21,7 @@
import QtQuick 2.5
-import QtQuick.Templates 2.0 as T
+import QtQuick.Templates @QQC2_VERSION@ as T
import org.kde.kirigami 2.2 as Kirigami
import "private"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qqc2-desktop-style-5.40.0/org.kde.desktop/ComboBox.qml
new/qqc2-desktop-style-5.41.0/org.kde.desktop/ComboBox.qml
--- old/qqc2-desktop-style-5.40.0/org.kde.desktop/ComboBox.qml 2017-11-04
22:51:12.000000000 +0100
+++ new/qqc2-desktop-style-5.41.0/org.kde.desktop/ComboBox.qml 2017-12-02
11:22:43.000000000 +0100
@@ -22,15 +22,16 @@
import QtQuick 2.6
import QtQuick.Window 2.2
-import QtQuick.Templates 2.0 as T
-import QtQuick.Controls 2.0 as Controls
+import QtQuick.Templates @QQC2_VERSION@ as T
+import QtQuick.Controls @QQC2_VERSION@ as Controls
import org.kde.qqc2desktopstyle.private 1.0 as StylePrivate
import QtGraphicalEffects 1.0
import org.kde.kirigami 2.2 as Kirigami
T.ComboBox {
id: controlRoot
- Kirigami.Theme.colorSet: Kirigami.Theme.Button
+ //NOTE: typeof necessary to not have warnings on Qt 5.7
+ Kirigami.Theme.colorSet: typeof(editable) != "undefined" && editable ?
Kirigami.Theme.View : Kirigami.Theme.Button
Kirigami.Theme.inherit: false
implicitWidth: background.implicitWidth + leftPadding + rightPadding
@@ -62,6 +63,30 @@
controlRoot.currentIndex = (controlRoot.currentIndex - 1 +
delegateModel.count) % delegateModel.count
}
}
+ T.TextField {
+ anchors {
+ fill: parent
+ leftMargin: controlRoot.mirrored ? 12 : 1
+ rightMargin: !controlRoot.mirrored ? 12 : 1
+ }
+
+ text: controlRoot.editText
+
+ visible: typeof(controlRoot.editable) != "undefined" &&
controlRoot.editable
+ readOnly: controlRoot.popup.visible
+ inputMethodHints: controlRoot.inputMethodHints
+ validator: controlRoot.validator
+ renderType: Window.devicePixelRatio % 1 !== 0 ? Text.QtRendering :
Text.NativeRendering
+ color: controlRoot.enabled ? Kirigami.Theme.textColor :
Kirigami.Theme.disabledTextColor
+ selectionColor: Kirigami.Theme.highlightColor
+ selectedTextColor: Kirigami.Theme.highlightedTextColor
+ selectByMouse: true
+
+ font: controlRoot.font
+ horizontalAlignment: Text.AlignLeft
+ verticalAlignment: Text.AlignVCenter
+ opacity: controlRoot.enabled ? 1 : 0.3
+ }
}
background: StylePrivate.StyleItem {
@@ -77,6 +102,9 @@
// contentHeight as in QComboBox magic numbers taken from QQC1 style
contentHeight: Math.max(Math.ceil(textHeight("")), 14) + 2
text: controlRoot.displayText
+ properties: {
+ "editable" : control.editable
+ }
}
popup: T.Popup {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qqc2-desktop-style-5.40.0/org.kde.desktop/Container.qml
new/qqc2-desktop-style-5.41.0/org.kde.desktop/Container.qml
--- old/qqc2-desktop-style-5.40.0/org.kde.desktop/Container.qml 2017-11-04
22:51:12.000000000 +0100
+++ new/qqc2-desktop-style-5.41.0/org.kde.desktop/Container.qml 2017-12-02
11:22:43.000000000 +0100
@@ -21,7 +21,7 @@
import QtQuick 2.6
-import QtQuick.Templates 2.0 as T
+import QtQuick.Templates @QQC2_VERSION@ as T
T.Container {
id: control
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qqc2-desktop-style-5.40.0/org.kde.desktop/Control.qml
new/qqc2-desktop-style-5.41.0/org.kde.desktop/Control.qml
--- old/qqc2-desktop-style-5.40.0/org.kde.desktop/Control.qml 2017-11-04
22:51:12.000000000 +0100
+++ new/qqc2-desktop-style-5.41.0/org.kde.desktop/Control.qml 2017-12-02
11:22:43.000000000 +0100
@@ -21,7 +21,7 @@
import QtQuick 2.6
-import QtQuick.Templates 2.0 as T
+import QtQuick.Templates @QQC2_VERSION@ as T
T.Control {
id: control
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qqc2-desktop-style-5.40.0/org.kde.desktop/Dial.qml
new/qqc2-desktop-style-5.41.0/org.kde.desktop/Dial.qml
--- old/qqc2-desktop-style-5.40.0/org.kde.desktop/Dial.qml 2017-11-04
22:51:12.000000000 +0100
+++ new/qqc2-desktop-style-5.41.0/org.kde.desktop/Dial.qml 2017-12-02
11:22:43.000000000 +0100
@@ -21,8 +21,8 @@
import QtQuick 2.6
-import QtQuick.Controls 2.0
-import QtQuick.Templates 2.0 as T
+import QtQuick.Controls @QQC2_VERSION@
+import QtQuick.Templates @QQC2_VERSION@ as T
import org.kde.kirigami 2.2 as Kirigami
import org.kde.qqc2desktopstyle.private 1.0 as StylePrivate
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qqc2-desktop-style-5.40.0/org.kde.desktop/Dialog.qml
new/qqc2-desktop-style-5.41.0/org.kde.desktop/Dialog.qml
--- old/qqc2-desktop-style-5.40.0/org.kde.desktop/Dialog.qml 2017-11-04
22:51:12.000000000 +0100
+++ new/qqc2-desktop-style-5.41.0/org.kde.desktop/Dialog.qml 2017-12-02
11:22:43.000000000 +0100
@@ -22,7 +22,7 @@
import QtQuick 2.6
import QtGraphicalEffects 1.0
-import QtQuick.Templates 2.1 as T
+import QtQuick.Templates @QQC2_VERSION@ as T
import org.kde.kirigami 2.2 as Kirigami
T.Dialog {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qqc2-desktop-style-5.40.0/org.kde.desktop/DialogButtonBox.qml
new/qqc2-desktop-style-5.41.0/org.kde.desktop/DialogButtonBox.qml
--- old/qqc2-desktop-style-5.40.0/org.kde.desktop/DialogButtonBox.qml
2017-11-04 22:51:12.000000000 +0100
+++ new/qqc2-desktop-style-5.41.0/org.kde.desktop/DialogButtonBox.qml
2017-12-02 11:22:43.000000000 +0100
@@ -21,7 +21,7 @@
import QtQuick 2.6
-import QtQuick.Templates 2.1 as T
+import QtQuick.Templates @QQC2_VERSION@ as T
import org.kde.kirigami 2.2 as Kirigami
T.DialogButtonBox {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qqc2-desktop-style-5.40.0/org.kde.desktop/Drawer.qml
new/qqc2-desktop-style-5.41.0/org.kde.desktop/Drawer.qml
--- old/qqc2-desktop-style-5.40.0/org.kde.desktop/Drawer.qml 2017-11-04
22:51:12.000000000 +0100
+++ new/qqc2-desktop-style-5.41.0/org.kde.desktop/Drawer.qml 2017-12-02
11:22:43.000000000 +0100
@@ -21,8 +21,8 @@
import QtQuick 2.6
-import QtQuick.Controls 2.0
-import QtQuick.Templates 2.0 as T
+import QtQuick.Controls @QQC2_VERSION@
+import QtQuick.Templates @QQC2_VERSION@ as T
import org.kde.kirigami 2.2 as Kirigami
T.Drawer {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qqc2-desktop-style-5.40.0/org.kde.desktop/Frame.qml
new/qqc2-desktop-style-5.41.0/org.kde.desktop/Frame.qml
--- old/qqc2-desktop-style-5.40.0/org.kde.desktop/Frame.qml 2017-11-04
22:51:12.000000000 +0100
+++ new/qqc2-desktop-style-5.41.0/org.kde.desktop/Frame.qml 2017-12-02
11:22:43.000000000 +0100
@@ -21,8 +21,8 @@
import QtQuick 2.6
-import QtQuick.Controls 2.0
-import QtQuick.Templates 2.0 as T
+import QtQuick.Controls @QQC2_VERSION@
+import QtQuick.Templates @QQC2_VERSION@ as T
import org.kde.kirigami 2.2 as Kirigami
T.Frame {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qqc2-desktop-style-5.40.0/org.kde.desktop/GroupBox.qml
new/qqc2-desktop-style-5.41.0/org.kde.desktop/GroupBox.qml
--- old/qqc2-desktop-style-5.40.0/org.kde.desktop/GroupBox.qml 2017-11-04
22:51:12.000000000 +0100
+++ new/qqc2-desktop-style-5.41.0/org.kde.desktop/GroupBox.qml 2017-12-02
11:22:43.000000000 +0100
@@ -21,8 +21,8 @@
import QtQuick 2.6
-import QtQuick.Controls 2.0
-import QtQuick.Templates 2.0 as T
+import QtQuick.Controls @QQC2_VERSION@
+import QtQuick.Templates @QQC2_VERSION@ as T
import org.kde.kirigami 2.2 as Kirigami
T.GroupBox {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qqc2-desktop-style-5.40.0/org.kde.desktop/ItemDelegate.qml
new/qqc2-desktop-style-5.41.0/org.kde.desktop/ItemDelegate.qml
--- old/qqc2-desktop-style-5.40.0/org.kde.desktop/ItemDelegate.qml
2017-11-04 22:51:12.000000000 +0100
+++ new/qqc2-desktop-style-5.41.0/org.kde.desktop/ItemDelegate.qml
2017-12-02 11:22:43.000000000 +0100
@@ -21,7 +21,7 @@
import QtQuick 2.5
-import QtQuick.Templates 2.0 as T
+import QtQuick.Templates @QQC2_VERSION@ as T
import org.kde.kirigami 2.2 as Kirigami
import "private"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qqc2-desktop-style-5.40.0/org.kde.desktop/Label.qml
new/qqc2-desktop-style-5.41.0/org.kde.desktop/Label.qml
--- old/qqc2-desktop-style-5.40.0/org.kde.desktop/Label.qml 2017-11-04
22:51:12.000000000 +0100
+++ new/qqc2-desktop-style-5.41.0/org.kde.desktop/Label.qml 2017-12-02
11:22:43.000000000 +0100
@@ -22,7 +22,7 @@
import QtQuick 2.1
import QtQuick.Window 2.2
-import QtQuick.Templates 2.0 as T
+import QtQuick.Templates @QQC2_VERSION@ as T
import org.kde.qqc2desktopstyle.private 1.0 as StylePrivate
import org.kde.kirigami 2.2 as Kirigami
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qqc2-desktop-style-5.40.0/org.kde.desktop/Menu.qml
new/qqc2-desktop-style-5.41.0/org.kde.desktop/Menu.qml
--- old/qqc2-desktop-style-5.40.0/org.kde.desktop/Menu.qml 2017-11-04
22:51:12.000000000 +0100
+++ new/qqc2-desktop-style-5.41.0/org.kde.desktop/Menu.qml 2017-12-02
11:22:43.000000000 +0100
@@ -23,8 +23,8 @@
import QtQuick 2.6
import QtQuick.Layouts 1.2
import QtGraphicalEffects 1.0
-import QtQuick.Controls 2.0
-import QtQuick.Templates 2.0 as T
+import QtQuick.Controls @QQC2_VERSION@
+import QtQuick.Templates @QQC2_VERSION@ as T
import org.kde.kirigami 2.2 as Kirigami
T.Menu {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qqc2-desktop-style-5.40.0/org.kde.desktop/MenuItem.qml
new/qqc2-desktop-style-5.41.0/org.kde.desktop/MenuItem.qml
--- old/qqc2-desktop-style-5.40.0/org.kde.desktop/MenuItem.qml 2017-11-04
22:51:12.000000000 +0100
+++ new/qqc2-desktop-style-5.41.0/org.kde.desktop/MenuItem.qml 2017-12-02
11:22:43.000000000 +0100
@@ -22,7 +22,7 @@
import QtQuick 2.6
import QtQuick.Layouts 1.2
-import QtQuick.Templates 2.0 as T
+import QtQuick.Templates @QQC2_VERSION@ as T
import org.kde.kirigami 2.2 as Kirigami
T.MenuItem {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qqc2-desktop-style-5.40.0/org.kde.desktop/Popup.qml
new/qqc2-desktop-style-5.41.0/org.kde.desktop/Popup.qml
--- old/qqc2-desktop-style-5.40.0/org.kde.desktop/Popup.qml 2017-11-04
22:51:12.000000000 +0100
+++ new/qqc2-desktop-style-5.41.0/org.kde.desktop/Popup.qml 2017-12-02
11:22:43.000000000 +0100
@@ -22,7 +22,7 @@
import QtQuick 2.6
import QtGraphicalEffects 1.0
-import QtQuick.Templates 2.0 as T
+import QtQuick.Templates @QQC2_VERSION@ as T
import org.kde.kirigami 2.2 as Kirigami
T.Popup {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qqc2-desktop-style-5.40.0/org.kde.desktop/ProgressBar.qml
new/qqc2-desktop-style-5.41.0/org.kde.desktop/ProgressBar.qml
--- old/qqc2-desktop-style-5.40.0/org.kde.desktop/ProgressBar.qml
2017-11-04 22:51:12.000000000 +0100
+++ new/qqc2-desktop-style-5.41.0/org.kde.desktop/ProgressBar.qml
2017-12-02 11:22:43.000000000 +0100
@@ -22,7 +22,7 @@
import QtQuick 2.6
import org.kde.qqc2desktopstyle.private 1.0 as StylePrivate
-import QtQuick.Templates 2.0 as T
+import QtQuick.Templates @QQC2_VERSION@ as T
T.ProgressBar {
id: controlRoot
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qqc2-desktop-style-5.40.0/org.kde.desktop/RadioButton.qml
new/qqc2-desktop-style-5.41.0/org.kde.desktop/RadioButton.qml
--- old/qqc2-desktop-style-5.40.0/org.kde.desktop/RadioButton.qml
2017-11-04 22:51:12.000000000 +0100
+++ new/qqc2-desktop-style-5.41.0/org.kde.desktop/RadioButton.qml
2017-12-02 11:22:43.000000000 +0100
@@ -21,8 +21,8 @@
import QtQuick 2.6
-import QtQuick.Templates 2.0 as T
-import QtQuick.Controls 2.0
+import QtQuick.Templates @QQC2_VERSION@ as T
+import QtQuick.Controls @QQC2_VERSION@
import org.kde.kirigami 2.2 as Kirigami
T.RadioButton {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qqc2-desktop-style-5.40.0/org.kde.desktop/RadioDelegate.qml
new/qqc2-desktop-style-5.41.0/org.kde.desktop/RadioDelegate.qml
--- old/qqc2-desktop-style-5.40.0/org.kde.desktop/RadioDelegate.qml
2017-11-04 22:51:12.000000000 +0100
+++ new/qqc2-desktop-style-5.41.0/org.kde.desktop/RadioDelegate.qml
2017-12-02 11:22:43.000000000 +0100
@@ -21,7 +21,7 @@
import QtQuick 2.5
-import QtQuick.Templates 2.0 as T
+import QtQuick.Templates @QQC2_VERSION@ as T
import org.kde.kirigami 2.2 as Kirigami
import "private"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qqc2-desktop-style-5.40.0/org.kde.desktop/RangeSlider.qml
new/qqc2-desktop-style-5.41.0/org.kde.desktop/RangeSlider.qml
--- old/qqc2-desktop-style-5.40.0/org.kde.desktop/RangeSlider.qml
2017-11-04 22:51:12.000000000 +0100
+++ new/qqc2-desktop-style-5.41.0/org.kde.desktop/RangeSlider.qml
2017-12-02 11:22:43.000000000 +0100
@@ -21,8 +21,8 @@
import QtQuick 2.6
-import QtQuick.Controls 2.0
-import QtQuick.Templates 2.0 as T
+import QtQuick.Controls @QQC2_VERSION@
+import QtQuick.Templates @QQC2_VERSION@ as T
import org.kde.kirigami 2.2 as Kirigami
T.RangeSlider {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qqc2-desktop-style-5.40.0/org.kde.desktop/ScrollBar.qml
new/qqc2-desktop-style-5.41.0/org.kde.desktop/ScrollBar.qml
--- old/qqc2-desktop-style-5.40.0/org.kde.desktop/ScrollBar.qml 2017-11-04
22:51:12.000000000 +0100
+++ new/qqc2-desktop-style-5.41.0/org.kde.desktop/ScrollBar.qml 2017-12-02
11:22:43.000000000 +0100
@@ -22,7 +22,7 @@
import QtQuick 2.6
import org.kde.qqc2desktopstyle.private 1.0 as StylePrivate
-import QtQuick.Templates 2.0 as T
+import QtQuick.Templates @QQC2_VERSION@ as T
T.ScrollBar {
id: controlRoot
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qqc2-desktop-style-5.40.0/org.kde.desktop/ScrollView.qml
new/qqc2-desktop-style-5.41.0/org.kde.desktop/ScrollView.qml
--- old/qqc2-desktop-style-5.40.0/org.kde.desktop/ScrollView.qml
2017-11-04 22:51:12.000000000 +0100
+++ new/qqc2-desktop-style-5.41.0/org.kde.desktop/ScrollView.qml
2017-12-02 11:22:43.000000000 +0100
@@ -21,12 +21,13 @@
import QtQuick 2.9
-import QtQuick.Controls 2.2
-//import QtQuick.Controls.impl 2.2
-import QtQuick.Templates 2.2 as T
+import QtQuick.Controls @QQC2_VERSION@
+import QtQuick.Templates @QQC2_VERSION@ as T
+import org.kde.kirigami 2.2 as Kirigami
+import org.kde.qqc2desktopstyle.private 1.0 as StylePrivate
T.ScrollView {
- id: control
+ id: controlRoot
clip: true
@@ -36,11 +37,23 @@
contentWidth: scrollHelper.flickableItem ?
scrollHelper.flickableItem.contentWidth : 0
contentHeight: scrollHelper.flickableItem ?
scrollHelper.flickableItem.contentHeight : 0
- onChildrenChanged: {
- if (control.children[control.children.length -
1].hasOwnProperty("contentY")) {
- scrollHelper.flickableItem =
control.children[control.children.length - 1];
+ Kirigami.Theme.colorSet: Kirigami.Theme.View
+ Kirigami.Theme.inherit: !background || !background.visible
+
+ //create a background only after Component.onCompleted, see on the
component creation below for explanation
+ Component.onCompleted: {
+ if (!controlRoot.background) {
+ controlRoot.background =
backgroundComponent.createObject(controlRoot);
+ print(controlRoot.background.width);
}
}
+
+ onChildrenChanged: {
+ if (controlRoot.children[controlRoot.children.length -
1].hasOwnProperty("contentY")) {
+ scrollHelper.flickableItem =
controlRoot.children[controlRoot.children.length - 1];
+ }
+ }
+
children: [
MouseArea {
id: scrollHelper
@@ -54,8 +67,13 @@
property Flickable flickableItem
onFlickableItemChanged: {
flickableItem.parent = scrollHelper;
- flickableItem.boundsBehavior = scrollHelper.isMobile ?
Flickable.DragAndOvershootBounds : Flickable.StopAtBounds;
- flickableItem.interactive = scrollHelper.isMobile;
+ flickableItem.boundsBehavior = Qt.binding(function() { return
scrollHelper.isMobile ? Flickable.DragAndOvershootBounds :
Flickable.StopAtBounds; });
+ flickableItem.interactive = Qt.binding(function() { return
scrollHelper.isMobile; });
+
+ flickableItem.anchors.fill = scrollHelper;
+ //don't make the scrolling items overlap the background
borders.
+ flickableItem.anchors.margins = Qt.binding(function() { return
controlRoot.background && controlRoot.background.visible ? 2 : 0; });
+ flickableItem.clip = true;
}
onWheel: {
if (isMobile || flickableItem.contentHeight <
flickableItem.height) {
@@ -82,22 +100,38 @@
interval: 150
onTriggered: scrollHelper.flickableItem.cancelFlick()
}
+ /*create a background only after Component.onCompleted because:
+ * implementations can set their own background in a declarative
way
+ * ScrollView {background.visible: true} must *not* work, becasue
all upstream styles don't have a background so applications using this would
break with other styles
+ * This is child of scrollHelper as it would break native
scrollview finding of the flickable if it was a direct child
+ */
+ Component {
+ id: backgroundComponent
+ StylePrivate.StyleItem {
+ control: controlRoot
+ elementType: "edit"
+ visible: false
+ sunken: true
+ hasFocus: controlRoot.activeFocus ||
scrollHelper.flickableItem.activeFocus
+ hover: controlRoot.hovered
+ }
+ }
}
]
ScrollBar.vertical: ScrollBar {
id: verticalScrollBar
- parent: control
- x: control.mirrored ? 0 : control.width - width
- y: control.topPadding
- height: control.availableHeight
- active: control.ScrollBar.horizontal ||
control.ScrollBar.horizontal.active
+ parent: controlRoot
+ x: controlRoot.mirrored ? 0 : controlRoot.width - width
+ y: controlRoot.topPadding
+ height: controlRoot.availableHeight
+ active: controlRoot.ScrollBar.horizontal ||
controlRoot.ScrollBar.horizontal.active
}
ScrollBar.horizontal: ScrollBar {
- parent: control
- x: control.leftPadding
- y: control.height - height
- width: control.availableWidth
- active: control.ScrollBar.vertical || control.ScrollBar.vertical.active
+ parent: controlRoot
+ x: controlRoot.leftPadding
+ y: controlRoot.height - height
+ width: controlRoot.availableWidth
+ active: controlRoot.ScrollBar.vertical ||
controlRoot.ScrollBar.vertical.active
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qqc2-desktop-style-5.40.0/org.kde.desktop/Slider.qml
new/qqc2-desktop-style-5.41.0/org.kde.desktop/Slider.qml
--- old/qqc2-desktop-style-5.40.0/org.kde.desktop/Slider.qml 2017-11-04
22:51:12.000000000 +0100
+++ new/qqc2-desktop-style-5.41.0/org.kde.desktop/Slider.qml 2017-12-02
11:22:43.000000000 +0100
@@ -22,7 +22,7 @@
import QtQuick 2.6
import org.kde.qqc2desktopstyle.private 1.0 as StylePrivate
-import QtQuick.Templates 2.0 as T
+import QtQuick.Templates @QQC2_VERSION@ as T
import org.kde.kirigami 2.2 as Kirigami
T.Slider {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qqc2-desktop-style-5.40.0/org.kde.desktop/SpinBox.qml
new/qqc2-desktop-style-5.41.0/org.kde.desktop/SpinBox.qml
--- old/qqc2-desktop-style-5.40.0/org.kde.desktop/SpinBox.qml 2017-11-04
22:51:12.000000000 +0100
+++ new/qqc2-desktop-style-5.41.0/org.kde.desktop/SpinBox.qml 2017-12-02
11:22:43.000000000 +0100
@@ -21,7 +21,7 @@
import QtQuick 2.6
-import QtQuick.Templates 2.0 as T
+import QtQuick.Templates @QQC2_VERSION@ as T
import org.kde.kirigami 2.2 as Kirigami
import org.kde.qqc2desktopstyle.private 1.0 as StylePrivate
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qqc2-desktop-style-5.40.0/org.kde.desktop/Switch.qml
new/qqc2-desktop-style-5.41.0/org.kde.desktop/Switch.qml
--- old/qqc2-desktop-style-5.40.0/org.kde.desktop/Switch.qml 2017-11-04
22:51:12.000000000 +0100
+++ new/qqc2-desktop-style-5.41.0/org.kde.desktop/Switch.qml 2017-12-02
11:22:43.000000000 +0100
@@ -21,7 +21,7 @@
import QtQuick 2.6
-import QtQuick.Templates 2.0 as T
+import QtQuick.Templates @QQC2_VERSION@ as T
import org.kde.kirigami 2.2 as Kirigami
T.CheckBox {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qqc2-desktop-style-5.40.0/org.kde.desktop/SwitchDelegate.qml
new/qqc2-desktop-style-5.41.0/org.kde.desktop/SwitchDelegate.qml
--- old/qqc2-desktop-style-5.40.0/org.kde.desktop/SwitchDelegate.qml
2017-11-04 22:51:12.000000000 +0100
+++ new/qqc2-desktop-style-5.41.0/org.kde.desktop/SwitchDelegate.qml
2017-12-02 11:22:43.000000000 +0100
@@ -22,7 +22,7 @@
import QtQuick 2.5
import org.kde.kirigami 2.2 as Kirigami
-import QtQuick.Templates 2.0 as T
+import QtQuick.Templates @QQC2_VERSION@ as T
import "private"
T.SwitchDelegate {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qqc2-desktop-style-5.40.0/org.kde.desktop/TabBar.qml
new/qqc2-desktop-style-5.41.0/org.kde.desktop/TabBar.qml
--- old/qqc2-desktop-style-5.40.0/org.kde.desktop/TabBar.qml 2017-11-04
22:51:12.000000000 +0100
+++ new/qqc2-desktop-style-5.41.0/org.kde.desktop/TabBar.qml 2017-12-02
11:22:43.000000000 +0100
@@ -23,7 +23,7 @@
import QtQuick 2.6
import org.kde.qqc2desktopstyle.private 1.0 as StylePrivate
import org.kde.kirigami 2.2 as Kirigami
-import QtQuick.Templates 2.0 as T
+import QtQuick.Templates @QQC2_VERSION@ as T
T.TabBar {
id: controlRoot
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qqc2-desktop-style-5.40.0/org.kde.desktop/TabButton.qml
new/qqc2-desktop-style-5.41.0/org.kde.desktop/TabButton.qml
--- old/qqc2-desktop-style-5.40.0/org.kde.desktop/TabButton.qml 2017-11-04
22:51:12.000000000 +0100
+++ new/qqc2-desktop-style-5.41.0/org.kde.desktop/TabButton.qml 2017-12-02
11:22:43.000000000 +0100
@@ -23,9 +23,9 @@
import QtQuick 2.6
import QtQml.Models 2.1
//for TabBar.*
-import QtQuick.Controls 2.0
+import QtQuick.Controls @QQC2_VERSION@
import org.kde.qqc2desktopstyle.private 1.0 as StylePrivate
-import QtQuick.Templates 2.0 as T
+import QtQuick.Templates @QQC2_VERSION@ as T
T.TabButton {
id: controlRoot
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qqc2-desktop-style-5.40.0/org.kde.desktop/TextArea.qml
new/qqc2-desktop-style-5.41.0/org.kde.desktop/TextArea.qml
--- old/qqc2-desktop-style-5.40.0/org.kde.desktop/TextArea.qml 2017-11-04
22:51:12.000000000 +0100
+++ new/qqc2-desktop-style-5.41.0/org.kde.desktop/TextArea.qml 2017-12-02
11:22:43.000000000 +0100
@@ -22,7 +22,7 @@
import QtQuick 2.6
import QtQuick.Window 2.1
-import QtQuick.Templates 2.0 as T
+import QtQuick.Templates @QQC2_VERSION@ as T
import org.kde.kirigami 2.2 as Kirigami
import org.kde.qqc2desktopstyle.private 1.0 as StylePrivate
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qqc2-desktop-style-5.40.0/org.kde.desktop/TextField.qml
new/qqc2-desktop-style-5.41.0/org.kde.desktop/TextField.qml
--- old/qqc2-desktop-style-5.40.0/org.kde.desktop/TextField.qml 2017-11-04
22:51:12.000000000 +0100
+++ new/qqc2-desktop-style-5.41.0/org.kde.desktop/TextField.qml 2017-12-02
11:22:43.000000000 +0100
@@ -22,8 +22,8 @@
import QtQuick 2.6
import QtQuick.Window 2.1
-import QtQuick.Controls 2.0 as Controls
-import QtQuick.Templates 2.0 as T
+import QtQuick.Controls @QQC2_VERSION@ as Controls
+import QtQuick.Templates @QQC2_VERSION@ as T
import org.kde.kirigami 2.2 as Kirigami
import org.kde.qqc2desktopstyle.private 1.0 as StylePrivate
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qqc2-desktop-style-5.40.0/org.kde.desktop/ToolBar.qml
new/qqc2-desktop-style-5.41.0/org.kde.desktop/ToolBar.qml
--- old/qqc2-desktop-style-5.40.0/org.kde.desktop/ToolBar.qml 2017-11-04
22:51:12.000000000 +0100
+++ new/qqc2-desktop-style-5.41.0/org.kde.desktop/ToolBar.qml 2017-12-02
11:22:43.000000000 +0100
@@ -21,7 +21,7 @@
import QtQuick 2.6
-import QtQuick.Templates 2.0 as T
+import QtQuick.Templates @QQC2_VERSION@ as T
import org.kde.kirigami 2.2 as Kirigami
T.ToolBar {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qqc2-desktop-style-5.40.0/org.kde.desktop/ToolButton.qml
new/qqc2-desktop-style-5.41.0/org.kde.desktop/ToolButton.qml
--- old/qqc2-desktop-style-5.40.0/org.kde.desktop/ToolButton.qml
2017-11-04 22:51:12.000000000 +0100
+++ new/qqc2-desktop-style-5.41.0/org.kde.desktop/ToolButton.qml
2017-12-02 11:22:43.000000000 +0100
@@ -21,7 +21,7 @@
import QtQuick 2.6
-import QtQuick.Templates 2.0 as T
+import QtQuick.Templates @QQC2_VERSION@ as T
import org.kde.kirigami 2.2 as Kirigami
import org.kde.qqc2desktopstyle.private 1.0 as StylePrivate
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qqc2-desktop-style-5.40.0/org.kde.desktop/ToolTip.qml
new/qqc2-desktop-style-5.41.0/org.kde.desktop/ToolTip.qml
--- old/qqc2-desktop-style-5.40.0/org.kde.desktop/ToolTip.qml 2017-11-04
22:51:12.000000000 +0100
+++ new/qqc2-desktop-style-5.41.0/org.kde.desktop/ToolTip.qml 2017-12-02
11:22:43.000000000 +0100
@@ -22,8 +22,8 @@
import QtQuick 2.6
import QtGraphicalEffects 1.0
-import QtQuick.Controls 2.0 as Controls
-import QtQuick.Templates 2.0 as T
+import QtQuick.Controls @QQC2_VERSION@ as Controls
+import QtQuick.Templates @QQC2_VERSION@ as T
import org.kde.kirigami 2.2 as Kirigami
T.ToolTip {
