Hello community,
here is the log from the commit of package qqc2-desktop-style for
openSUSE:Factory checked in at 2017-11-17 10:54:29
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/qqc2-desktop-style (Old)
and /work/SRC/openSUSE:Factory/.qqc2-desktop-style.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qqc2-desktop-style"
Fri Nov 17 10:54:29 2017 rev:3 rq:541783 version:5.40.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/qqc2-desktop-style/qqc2-desktop-style.changes
2017-10-27 13:59:56.600162859 +0200
+++
/work/SRC/openSUSE:Factory/.qqc2-desktop-style.new/qqc2-desktop-style.changes
2017-11-17 10:59:31.713766357 +0100
@@ -1,0 +2,25 @@
+Tue Nov 14 10:46:51 UTC 2017 - [email protected]
+
+- Fix QtQuickControls2 BuildRequires, it needs the devel package to
+ build
+
+-------------------------------------------------------------------
+Mon Nov 13 07:01:18 CET 2017 - [email protected]
+
+- Update to 5.40.0
+ * New feature release
+ * For more details please see:
+ * https://www.kde.org/announcements/kde-frameworks-5.40.0.php
+- Changes since 5.39.0:
+ * Improve compilation as a static plugin.
+ * make the radiobutton a radiobutton
+ * use qstyle to paint the Dial
+ * use a ColumnLayout for menus
+ * fix Dialog
+ * remove invalid group property
+ * Add .arcconfig
+ * Fix formatting of the md file so it matches the other modules
+ * behavior of combobox closer to qqc1
+ * workaround for QQuickWidgets
+
+-------------------------------------------------------------------
Old:
----
qqc2-desktop-style-5.39.0.tar.xz
New:
----
qqc2-desktop-style-5.40.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ qqc2-desktop-style.spec ++++++
--- /var/tmp/diff_new_pack.B1aB06/_old 2017-11-17 10:59:32.233747326 +0100
+++ /var/tmp/diff_new_pack.B1aB06/_new 2017-11-17 10:59:32.237747180 +0100
@@ -16,9 +16,9 @@
#
-%define _tar_path 5.39
+%define _tar_path 5.40
Name: qqc2-desktop-style
-Version: 5.39.0
+Version: 5.40.0
Release: 0
Summary: A Qt Quick Controls 2 Style for Desktop UIs
License: GPL-2.0+
@@ -31,11 +31,11 @@
BuildRequires: kconfigwidgets-devel
BuildRequires: kiconthemes-devel
BuildRequires: kirigami2-devel
-BuildRequires: libqt5-qtquickcontrols2
BuildRequires: cmake(Qt5Core) >= 5.9.1
BuildRequires: cmake(Qt5Gui)
BuildRequires: cmake(Qt5Network)
BuildRequires: cmake(Qt5Quick)
+BuildRequires: cmake(Qt5QuickControls2)
BuildRequires: cmake(Qt5Svg)
BuildRequires: cmake(Qt5Widgets)
# For KUA users
++++++ qqc2-desktop-style-5.39.0.tar.xz -> qqc2-desktop-style-5.40.0.tar.xz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qqc2-desktop-style-5.39.0/.arcconfig
new/qqc2-desktop-style-5.40.0/.arcconfig
--- old/qqc2-desktop-style-5.39.0/.arcconfig 1970-01-01 01:00:00.000000000
+0100
+++ new/qqc2-desktop-style-5.40.0/.arcconfig 2017-11-04 22:51:12.000000000
+0100
@@ -0,0 +1,3 @@
+{
+ "phabricator.uri" : "https://phabricator.kde.org/";
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qqc2-desktop-style-5.39.0/CMakeLists.txt
new/qqc2-desktop-style-5.40.0/CMakeLists.txt
--- old/qqc2-desktop-style-5.39.0/CMakeLists.txt 2017-10-07
19:35:04.000000000 +0200
+++ new/qqc2-desktop-style-5.40.0/CMakeLists.txt 2017-11-04
22:51:12.000000000 +0100
@@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 3.0)
-set(KF5_VERSION "5.39.0") # handled by release scripts
-set(KF5_DEP_VERSION "5.39.0") # handled by release scripts
+set(KF5_VERSION "5.40.0") # handled by release scripts
+set(KF5_DEP_VERSION "5.40.0") # handled by release scripts
project(qqc2-desktop-style VERSION ${KF5_VERSION})
@@ -21,7 +21,7 @@
################# set KDE specific information #################
-find_package(ECM 5.39.0 REQUIRED NO_MODULE)
+find_package(ECM 5.40.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})
@@ -32,7 +32,7 @@
include(KDECMakeSettings)
include(KDECompilerSettings NO_POLICY_SCOPE)
-find_package(Qt5 ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE COMPONENTS Core
Quick Gui Widgets)
+find_package(Qt5 ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE COMPONENTS Core
Quick Gui Widgets QuickControls2)
find_package(KF5 ${KF5_DEP_VERSION} REQUIRED COMPONENTS Kirigami2)
@@ -40,6 +40,18 @@
IconThemes #KIconLoader
ConfigWidgets #KColorScheme
)
+
+if (NOT APPLE AND NOT WIN32)
+ find_package(X11)
+endif()
+
+# When building as a static plugin, dependencies may add a -lQt5X11Extras
+# to the linker, in that case, it requires to have the proper variables
+# to exists.
+if(X11_FOUND)
+ find_package(Qt5X11Extras ${REQUIRED_QT_VERSION} NO_MODULE QUIET)
+endif()
+
set_package_properties(IconThemes PROPERTIES DESCRIPTION "KF5 IconThemes
framework"
TYPE OPTIONAL
PURPOSE "Optional integration of Kirigami with
KIconLoader icons handling for a better integration with Plasma Desktop"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qqc2-desktop-style-5.39.0/README.md
new/qqc2-desktop-style-5.40.0/README.md
--- old/qqc2-desktop-style-5.39.0/README.md 2017-10-07 19:35:04.000000000
+0200
+++ new/qqc2-desktop-style-5.40.0/README.md 2017-11-04 22:51:12.000000000
+0100
@@ -1,4 +1,9 @@
# QQC2StyleBridge
+QtQuickControls 2 style that uses QWidget's QStyle for painting
+
+## Introduction
+
This is a style for QtQuickControls 2 that uses QWidget's QStyle for painting,
making possible to achieve an higher deree of consistency between QWidget-based
and QML-based apps.
+
NOTE: the application must be a QApplication rather than a QGuiApplication
instance in order for this style to be used
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qqc2-desktop-style-5.39.0/kirigami-plasmadesktop-integration/plasmadesktoptheme.cpp
new/qqc2-desktop-style-5.40.0/kirigami-plasmadesktop-integration/plasmadesktoptheme.cpp
---
old/qqc2-desktop-style-5.39.0/kirigami-plasmadesktop-integration/plasmadesktoptheme.cpp
2017-10-07 19:35:04.000000000 +0200
+++
new/qqc2-desktop-style-5.40.0/kirigami-plasmadesktop-integration/plasmadesktoptheme.cpp
2017-11-04 22:51:12.000000000 +0100
@@ -128,7 +128,11 @@
if (m_parentItem) {
if (!m_parentItem->isEnabled()) {
group = QPalette::Disabled;
- } else if (m_parentItem->window() &&
!m_parentItem->window()->isActive()) {
+ //Why also checking the window is exposed?
+ //in the case of QQuickWidget the window() will never be active
+ //and the widgets will always have the inactive palette.
+ // better to always show it active than always show it inactive
+ } else if (m_parentItem->window() &&
!m_parentItem->window()->isActive() && m_parentItem->window()->isExposed()) {
group = QPalette::Inactive;
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qqc2-desktop-style-5.39.0/org.kde.desktop/ComboBox.qml
new/qqc2-desktop-style-5.40.0/org.kde.desktop/ComboBox.qml
--- old/qqc2-desktop-style-5.39.0/org.kde.desktop/ComboBox.qml 2017-10-07
19:35:04.000000000 +0200
+++ new/qqc2-desktop-style-5.40.0/org.kde.desktop/ComboBox.qml 2017-11-04
22:51:12.000000000 +0100
@@ -70,8 +70,12 @@
elementType: "combobox"
anchors.fill: parent
hover: controlRoot.hovered
+ sunken: controlRoot.pressed
+ raised: !sunken
hasFocus: controlRoot.activeFocus
enabled: controlRoot.enabled
+ // contentHeight as in QComboBox magic numbers taken from QQC1 style
+ contentHeight: Math.max(Math.ceil(textHeight("")), 14) + 2
text: controlRoot.displayText
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qqc2-desktop-style-5.39.0/org.kde.desktop/Dial.qml
new/qqc2-desktop-style-5.40.0/org.kde.desktop/Dial.qml
--- old/qqc2-desktop-style-5.39.0/org.kde.desktop/Dial.qml 2017-10-07
19:35:04.000000000 +0200
+++ new/qqc2-desktop-style-5.40.0/org.kde.desktop/Dial.qml 2017-11-04
22:51:12.000000000 +0100
@@ -22,30 +22,29 @@
import QtQuick 2.6
import QtQuick.Controls 2.0
-import QtQuick.Controls.impl 2.0
import QtQuick.Templates 2.0 as T
import org.kde.kirigami 2.2 as Kirigami
+import org.kde.qqc2desktopstyle.private 1.0 as StylePrivate
T.Dial {
- id: control
+ id: controlRoot
implicitWidth: 128
implicitHeight: 128
- background: DialRing {
- width: control.availableWidth
- height: control.availableHeight
- color: control.visualFocus ? Kirigami.Theme.highlightColor :
Kirigami.Theme.textColor
- progress: control.position
- opacity: control.enabled ? 0.5 : 0.3
- }
+ background: StylePrivate.StyleItem {
+ id: style
+ control: controlRoot
+ visible: true
+ elementType: "dial"
+ horizontal: false
+
+ maximum: controlRoot.to*100
+ minimum: controlRoot.from*100
+ step: controlRoot.stepSize*100
+ value: controlRoot.value*100
- handle: Rectangle {
- x: (control.width/2) + Math.cos((-(control.angle-90)*Math.PI)/180) *
(control.width/2-width/2) - width/2
- y: (control.height/2) + Math.sin(((control.angle-90)*Math.PI)/180) *
(control.height/2-height/2) - height/2
- width: 18
- height: width
- radius: 8
- color: control.visualFocus ? Kirigami.Theme.highlightColor :
Kirigami.Theme.textColor
+ hasFocus: controlRoot.activeFocus
+ hover: controlRoot.hovered
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qqc2-desktop-style-5.39.0/org.kde.desktop/Dialog.qml
new/qqc2-desktop-style-5.40.0/org.kde.desktop/Dialog.qml
--- old/qqc2-desktop-style-5.39.0/org.kde.desktop/Dialog.qml 2017-10-07
19:35:04.000000000 +0200
+++ new/qqc2-desktop-style-5.40.0/org.kde.desktop/Dialog.qml 2017-11-04
22:51:12.000000000 +0100
@@ -34,9 +34,9 @@
contentWidth > 0 ? contentHeight + topPadding +
bottomPadding : 0)
contentWidth: contentItem.implicitWidth || (contentChildren.length === 1 ?
contentChildren[0].implicitWidth : 0)
- contentHeight: contentItem.implicitHeight || (contentChildren.length === 1
? contentChildren[0].implicitHeight : 0)
+ contentHeight: contentItem.implicitHeight || (contentChildren.length === 1
? contentChildren[0].implicitHeight : 0) + header.implicitHeight +
footer.implicitHeight
- padding: 12
+ padding: Kirigami.Units.gridUnit
enter: Transition {
NumberAnimation {
@@ -58,7 +58,7 @@
}
}
- contentItem: Item { }
+ contentItem: Item {}
background: Rectangle {
radius: 2
@@ -77,7 +77,16 @@
}
}
- buttonBox: DialogButtonBox {
- position: DialogButtonBox.Footer
+ header: Kirigami.Heading {
+ text: control.title
+ level: 2
+ visible: control.title
+ elide: Label.ElideRight
+ padding: Kirigami.Units.gridUnit
+ bottomPadding: 0
+ }
+
+ footer: DialogButtonBox {
+ visible: count > 0
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qqc2-desktop-style-5.39.0/org.kde.desktop/DialogButtonBox.qml
new/qqc2-desktop-style-5.40.0/org.kde.desktop/DialogButtonBox.qml
--- old/qqc2-desktop-style-5.39.0/org.kde.desktop/DialogButtonBox.qml
2017-10-07 19:35:04.000000000 +0200
+++ new/qqc2-desktop-style-5.40.0/org.kde.desktop/DialogButtonBox.qml
2017-11-04 22:51:12.000000000 +0100
@@ -22,6 +22,7 @@
import QtQuick 2.6
import QtQuick.Templates 2.1 as T
+import org.kde.kirigami 2.2 as Kirigami
T.DialogButtonBox {
id: control
@@ -29,8 +30,8 @@
implicitWidth: contentItem.implicitWidth + leftPadding + rightPadding
implicitHeight: contentItem.implicitHeight + topPadding + bottomPadding
- spacing: 1
- padding: 6
+ spacing: Kirigami.Units.smallSpacing
+ padding: Kirigami.Units.smallSpacing
alignment: Qt.AlignRight
delegate: Button {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qqc2-desktop-style-5.39.0/org.kde.desktop/Menu.qml
new/qqc2-desktop-style-5.40.0/org.kde.desktop/Menu.qml
--- old/qqc2-desktop-style-5.39.0/org.kde.desktop/Menu.qml 2017-10-07
19:35:04.000000000 +0200
+++ new/qqc2-desktop-style-5.40.0/org.kde.desktop/Menu.qml 2017-11-04
22:51:12.000000000 +0100
@@ -21,6 +21,7 @@
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
@@ -36,15 +37,7 @@
margins: 0
- contentItem: ListView {
- implicitHeight: contentHeight
- model: control.contentModel
- clip: true
- keyNavigationWraps: false
- currentIndex: -1
-
- //ScrollBar.vertical: ScrollBar {}
- }
+ contentItem: ColumnLayout {}
enter: Transition {
NumberAnimation {
@@ -68,7 +61,7 @@
background: Rectangle {
radius: 2
- implicitWidth: 150
+ implicitWidth: Kirigami.Units.gridUnit * 8
implicitHeight: 40
color: Kirigami.Theme.backgroundColor
property color borderColor: Kirigami.Theme.textColor
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qqc2-desktop-style-5.39.0/org.kde.desktop/MenuItem.qml
new/qqc2-desktop-style-5.40.0/org.kde.desktop/MenuItem.qml
--- old/qqc2-desktop-style-5.39.0/org.kde.desktop/MenuItem.qml 2017-10-07
19:35:04.000000000 +0200
+++ new/qqc2-desktop-style-5.40.0/org.kde.desktop/MenuItem.qml 2017-11-04
22:51:12.000000000 +0100
@@ -21,6 +21,7 @@
import QtQuick 2.6
+import QtQuick.Layouts 1.2
import QtQuick.Templates 2.0 as T
import org.kde.kirigami 2.2 as Kirigami
@@ -34,6 +35,7 @@
indicator ? indicator.implicitHeight :
0) + topPadding + bottomPadding)
baselineOffset: contentItem.y + contentItem.baselineOffset
+ Layout.fillWidth: true
padding: 3
hoverEnabled: true
@@ -60,7 +62,8 @@
}
background: Item {
- implicitWidth: 150
+ anchors.fill: parent
+ implicitWidth: Kirigami.Units.gridUnit * 8
Rectangle {
anchors.fill: parent
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qqc2-desktop-style-5.39.0/org.kde.desktop/RadioButton.qml
new/qqc2-desktop-style-5.40.0/org.kde.desktop/RadioButton.qml
--- old/qqc2-desktop-style-5.39.0/org.kde.desktop/RadioButton.qml
2017-10-07 19:35:04.000000000 +0200
+++ new/qqc2-desktop-style-5.40.0/org.kde.desktop/RadioButton.qml
2017-11-04 22:51:12.000000000 +0100
@@ -25,7 +25,7 @@
import QtQuick.Controls 2.0
import org.kde.kirigami 2.2 as Kirigami
-T.CheckBox {
+T.RadioButton {
id: control
implicitWidth: Math.max(background ? background.implicitWidth : 0,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qqc2-desktop-style-5.39.0/org.kde.desktop/SpinBox.qml
new/qqc2-desktop-style-5.40.0/org.kde.desktop/SpinBox.qml
--- old/qqc2-desktop-style-5.39.0/org.kde.desktop/SpinBox.qml 2017-10-07
19:35:04.000000000 +0200
+++ new/qqc2-desktop-style-5.40.0/org.kde.desktop/SpinBox.qml 2017-11-04
22:51:12.000000000 +0100
@@ -104,9 +104,5 @@
(controlRoot.value != controlRoot.from ? (1<<3) : 0) |
(controlRoot.up.hovered ? 0x1 : 0) |
(controlRoot.down.hovered ? (1<<1) : 0)
- border {
- top: 6
- bottom: 6
- }
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qqc2-desktop-style-5.39.0/plugin/CMakeLists.txt
new/qqc2-desktop-style-5.40.0/plugin/CMakeLists.txt
--- old/qqc2-desktop-style-5.39.0/plugin/CMakeLists.txt 2017-10-07
19:35:04.000000000 +0200
+++ new/qqc2-desktop-style-5.40.0/plugin/CMakeLists.txt 2017-11-04
22:51:12.000000000 +0100
@@ -17,5 +17,11 @@
add_library(qqc2desktopstyleplugin SHARED ${qqc2desktopstyle_SRCS})
target_link_libraries(qqc2desktopstyleplugin Qt5::Core Qt5::Qml Qt5::Quick
Qt5::Gui Qt5::Widgets KF5::Kirigami2)
+if(KF5ConfigWidgets_FOUND)
+ target_link_libraries(qqc2desktopstyleplugin
+ KF5::ConfigWidgets
+ )
+endif()
+
install(TARGETS qqc2desktopstyleplugin DESTINATION
${KDE_INSTALL_QMLDIR}/org/kde/qqc2desktopstyle/private)
install(FILES qmldir DESTINATION
${KDE_INSTALL_QMLDIR}/org/kde/qqc2desktopstyle/private)
