Hello community, here is the log from the commit of package kdeclarative for openSUSE:Factory checked in at 2019-01-21 10:19:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdeclarative (Old) and /work/SRC/openSUSE:Factory/.kdeclarative.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdeclarative" Mon Jan 21 10:19:06 2019 rev:63 rq:665792 version:5.54.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kdeclarative/kdeclarative.changes 2018-12-19 13:40:12.292059334 +0100 +++ /work/SRC/openSUSE:Factory/.kdeclarative.new.28833/kdeclarative.changes 2019-01-21 10:19:10.610146032 +0100 @@ -1,0 +2,12 @@ +Mon Jan 14 06:08:44 UTC 2019 - [email protected] + +- Update to 5.54.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.54.0.php +- Changes since 5.53.0: + * don't show separators on mobile + * root.contentItem instead of just contentItem + * Add the missing api for multilevel KCMs to control the columns + +------------------------------------------------------------------- Old: ---- kdeclarative-5.53.0.tar.xz New: ---- kdeclarative-5.54.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdeclarative.spec ++++++ --- /var/tmp/diff_new_pack.5ycQxD/_old 2019-01-21 10:19:10.990145650 +0100 +++ /var/tmp/diff_new_pack.5ycQxD/_new 2019-01-21 10:19:10.990145650 +0100 @@ -1,7 +1,7 @@ # # spec file for package kdeclarative # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,14 +17,14 @@ %define lname libKF5Declarative5 -%define _tar_path 5.53 +%define _tar_path 5.54 # Full KF5 version (e.g. 5.33.0) %{!?_kf5_version: %global _kf5_version %{version}} # Last major and minor KF5 version (e.g. 5.33) %{!?_kf5_bugfix_version: %define _kf5_bugfix_version %(echo %{_kf5_version} | awk -F. '{print $1"."$2}')} %bcond_without lang Name: kdeclarative -Version: 5.53.0 +Version: 5.54.0 Release: 0 Summary: Integration of QML and KDE workspaces License: LGPL-2.1-or-later ++++++ kdeclarative-5.53.0.tar.xz -> kdeclarative-5.54.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.53.0/CMakeLists.txt new/kdeclarative-5.54.0/CMakeLists.txt --- old/kdeclarative-5.53.0/CMakeLists.txt 2018-12-01 15:53:53.000000000 +0100 +++ new/kdeclarative-5.54.0/CMakeLists.txt 2019-01-06 21:20:13.000000000 +0100 @@ -1,12 +1,12 @@ -cmake_minimum_required(VERSION 3.0) +cmake_minimum_required(VERSION 3.5) -set(KF5_VERSION "5.53.0") # handled by release scripts -set(KF5_DEP_VERSION "5.53.0") # handled by release scripts +set(KF5_VERSION "5.54.0") # handled by release scripts +set(KF5_DEP_VERSION "5.54.0") # handled by release scripts project(KDeclarative VERSION ${KF5_VERSION}) # Dependencies include(FeatureSummary) -find_package(ECM 5.53.0 NO_MODULE) +find_package(ECM 5.54.0 NO_MODULE) set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://projects.kde.org/projects/kdesupport/extra-cmake-modules";) feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.53.0/po/ca/kdeclarative5.po new/kdeclarative-5.54.0/po/ca/kdeclarative5.po --- old/kdeclarative-5.53.0/po/ca/kdeclarative5.po 2018-12-01 15:53:53.000000000 +0100 +++ new/kdeclarative-5.54.0/po/ca/kdeclarative5.po 2019-01-06 21:20:13.000000000 +0100 @@ -1,5 +1,5 @@ # Translation of kdeclarative5.po to Catalan -# Copyright (C) 2014-2016 This_file_is_part_of_KDE +# Copyright (C) 1998-2016 This_file_is_part_of_KDE # This file is distributed under the license LGPL version 2.1 or # version 3 or later versions approved by the membership of KDE e.V. # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.53.0/po/ca@valencia/kdeclarative5.po new/kdeclarative-5.54.0/po/ca@valencia/kdeclarative5.po --- old/kdeclarative-5.53.0/po/ca@valencia/kdeclarative5.po 2018-12-01 15:53:53.000000000 +0100 +++ new/kdeclarative-5.54.0/po/ca@valencia/kdeclarative5.po 2019-01-06 21:20:13.000000000 +0100 @@ -1,5 +1,5 @@ # Translation of kdeclarative5.po to Catalan (Valencian) -# Copyright (C) 2014-2016 This_file_is_part_of_KDE +# Copyright (C) 1998-2016 This_file_is_part_of_KDE # This file is distributed under the license LGPL version 2.1 or # version 3 or later versions approved by the membership of KDE e.V. # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.53.0/po/zh_CN/kdeclarative5.po new/kdeclarative-5.54.0/po/zh_CN/kdeclarative5.po --- old/kdeclarative-5.53.0/po/zh_CN/kdeclarative5.po 2018-12-01 15:53:53.000000000 +0100 +++ new/kdeclarative-5.54.0/po/zh_CN/kdeclarative5.po 2019-01-06 21:20:13.000000000 +0100 @@ -15,7 +15,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2018-08-16 09:05+0200\n" -"PO-Revision-Date: 2018-11-12 09:13\n" +"PO-Revision-Date: 2019-01-05 20:42\n" "Last-Translator: guoyunhe <[email protected]>\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.53.0/src/qmlcontrols/kcmcontrols/qml/ScrollViewKCM.qml new/kdeclarative-5.54.0/src/qmlcontrols/kcmcontrols/qml/ScrollViewKCM.qml --- old/kdeclarative-5.53.0/src/qmlcontrols/kcmcontrols/qml/ScrollViewKCM.qml 2018-12-01 15:53:53.000000000 +0100 +++ new/kdeclarative-5.54.0/src/qmlcontrols/kcmcontrols/qml/ScrollViewKCM.qml 2019-01-06 21:20:13.000000000 +0100 @@ -56,18 +56,28 @@ //NOTE: this should be smallspacing buit we need a pixel size in order to align with systemsettings widgets leftPadding: Kirigami.Settings.isMobile ? 0 : 4 - topPadding: headerParent.contentItem ? 0 : leftPadding - rightPadding: leftPadding - bottomPadding: footerParent.contentItem ? 0 : leftPadding + topPadding: headerParent.contentItem ? 0 : (Kirigami.Settings.isMobile ? 0 : 4) + rightPadding: (Kirigami.Settings.isMobile ? 0 : 4) + bottomPadding: footerParent.contentItem ? 0 : (Kirigami.Settings.isMobile ? 0 : 4) header: QtControls.Control { id: headerParent - padding: 4 + visible: root.contentItem && root.contentItem.visible + height: visible ? implicitHeight : 0 + leftPadding: 4 + topPadding: 4 + rightPadding: 4 + bottomPadding: 4 } footer: QtControls.Control { id: footerParent - padding: 4 + visible: root.contentItem && root.contentItem.visible + height: visible ? implicitHeight : 0 + leftPadding: 4 + topPadding: 4 + rightPadding: 4 + bottomPadding: 4 } Component.onCompleted: { if (footer && footer != footerParent) { @@ -80,12 +90,12 @@ } if (header && header != headerParent) { - var f = header + var h = header - headerParent.contentItem = f + headerParent.contentItem = h header = headerParent - f.visible = true - f.parent = headerParent + h.visible = true + h.parent = headerParent } } Priv.ScrollView { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.53.0/src/qmlcontrols/kcmcontrols/qml/SimpleKCM.qml new/kdeclarative-5.54.0/src/qmlcontrols/kcmcontrols/qml/SimpleKCM.qml --- old/kdeclarative-5.53.0/src/qmlcontrols/kcmcontrols/qml/SimpleKCM.qml 2018-12-01 15:53:53.000000000 +0100 +++ new/kdeclarative-5.54.0/src/qmlcontrols/kcmcontrols/qml/SimpleKCM.qml 2019-01-06 21:20:13.000000000 +0100 @@ -17,6 +17,7 @@ */ import QtQuick 2.7 +import QtQuick.Controls 2.2 as QtControls import org.kde.kirigami 2.2 as Kirigami import org.kde.kcm 1.1 as KCM @@ -49,6 +50,51 @@ implicitWidth: Kirigami.Units.gridUnit * 20 implicitHeight: Math.min(flickable.contentHeight, Kirigami.Units.gridUnit * 20) + leftPadding: Kirigami.Settings.isMobile ? 0 : 4 + topPadding: headerParent.contentItem ? 0 : (Kirigami.Settings.isMobile ? 0 : 4) + rightPadding: (Kirigami.Settings.isMobile ? 0 : 4) + bottomPadding: footerParent.contentItem ? 0 : (Kirigami.Settings.isMobile ? 0 : 4) + + header: QtControls.Control { + id: headerParent + visible: root.contentItem && root.contentItem.visible + height: visible ? implicitHeight : 0 + leftPadding: 4 + topPadding: 4 + rightPadding: 4 + bottomPadding: 4 + } + + footer: QtControls.Control { + id: footerParent + visible: root.contentItem && root.contentItem.visible + height: visible ? implicitHeight : 0 + leftPadding: 4 + topPadding: 4 + rightPadding: 4 + bottomPadding: 4 + } + + Component.onCompleted: { + if (footer && footer != footerParent) { + var f = footer + + footerParent.contentItem = f + footer = footerParent + f.visible = true + f.parent = footerParent + } + + if (header && header != headerParent) { + var h = header + + headerParent.contentItem = h + header = headerParent + h.visible = true + h.parent = headerParent + } + } + children: [ Kirigami.Separator { z: 999 @@ -58,7 +104,7 @@ top: parent.top topMargin: root.header ? root.header.height : 0 } - visible: !root.flickable.atYBeginning + visible: !root.flickable.atYBeginning && !Kirigami.Settings.isMobile }, Kirigami.Separator { z: 999 @@ -68,7 +114,7 @@ bottom: parent.bottom bottomMargin: root.footer ? root.footer.height : 0 } - visible: !root.flickable.atYEnd + visible: !root.flickable.atYEnd && !Kirigami.Settings.isMobile } ] } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.53.0/src/quickaddons/configmodule.cpp new/kdeclarative-5.54.0/src/quickaddons/configmodule.cpp --- old/kdeclarative-5.53.0/src/quickaddons/configmodule.cpp 2018-12-01 15:53:53.000000000 +0100 +++ new/kdeclarative-5.54.0/src/quickaddons/configmodule.cpp 2019-01-06 21:20:13.000000000 +0100 @@ -68,6 +68,7 @@ QString _quickHelp; QList<QQuickItem *> subPages; int _columnWidth = -1; + int currentIndex = 0; bool _useRootOnlyMessage : 1; bool _needsAuthorization : 1; @@ -200,6 +201,21 @@ d->subPages << item; emit pagePushed(item); + emit depthChanged(depth()); + setCurrentIndex(d->currentIndex + 1); +} + +void ConfigModule::push(QQuickItem *item) +{ + //ensure main ui is created + if (!mainUi()) { + return; + } + + d->subPages << item; + emit pagePushed(item); + emit depthChanged(depth()); + setCurrentIndex(d->currentIndex + 1); } void ConfigModule::pop() @@ -209,7 +225,10 @@ } QQuickItem *page = d->subPages.takeLast(); emit pageRemoved(); + emit depthChanged(depth()); page->deleteLater(); + + setCurrentIndex(qMin(d->currentIndex, depth() - 1)); } ConfigModule::Buttons ConfigModule::buttons() const @@ -276,6 +295,27 @@ emit columnWidthChanged(width); } +int ConfigModule::depth() const +{ + return d->subPages.count() + 1; +} + +void ConfigModule::setCurrentIndex(int index) +{ + if (index < 0 || index > d->subPages.count() || index == d->currentIndex) { + return; + } + + d->currentIndex = index; + + emit currentIndexChanged(index); +} + +int ConfigModule::currentIndex() const +{ + return d->currentIndex; +} + void ConfigModule::setAuthActionName(const QString &name) { if (d->_authActionName == name) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.53.0/src/quickaddons/configmodule.h new/kdeclarative-5.54.0/src/quickaddons/configmodule.h --- old/kdeclarative-5.53.0/src/quickaddons/configmodule.h 2018-12-01 15:53:53.000000000 +0100 +++ new/kdeclarative-5.54.0/src/quickaddons/configmodule.h 2019-01-06 21:20:13.000000000 +0100 @@ -148,6 +148,8 @@ Q_PROPERTY(bool useRootOnlyMessage READ useRootOnlyMessage WRITE setUseRootOnlyMessage NOTIFY useRootOnlyMessageChanged) Q_PROPERTY(bool needsAuthorization READ needsAuthorization WRITE setNeedsAuthorization NOTIFY needsAuthorizationChanged) Q_PROPERTY(int columnWidth READ columnWidth WRITE setColumnWidth NOTIFY columnWidthChanged) + Q_PROPERTY(int depth READ depth NOTIFY depthChanged) + Q_PROPERTY(int currentIndex READ currentIndex WRITE setCurrentIndex NOTIFY currentIndexChanged) public: @@ -402,6 +404,24 @@ */ void setColumnWidth(int width); + /** + * @returns how many pages this kcm has. + * It is guaranteed to be at least 1 9the main ui) plus how many times a new page has been pushed without pop + */ + int depth() const; + + /** + * Sets the current page index this kcm should display + * @since 5.53 + */ + void setCurrentIndex(int index); + + /** + * @returns the index of the page this kcm should display + * @since 5.53 + */ + int currentIndex() const; + static ConfigModule *qmlAttachedProperties(QObject *object); public Q_SLOTS: @@ -451,6 +471,11 @@ void push(const QString &fileName, const QVariantMap &propertyMap = QVariantMap()); /** + * + */ + void push(QQuickItem *item); + + /** * pop the last page of the KCM hyerarchy * @since 5.50 */ @@ -525,6 +550,18 @@ */ void columnWidthChanged(int width); + /** + * Emitted when the current page changed + * @since 5.53 + */ + void currentIndexChanged(int index); + + /** + * Emitted when the number of pages changed + * @since 5.53 + */ + void depthChanged(int index); + private: ConfigModulePrivate *const d; };
