Hello community, here is the log from the commit of package kdeclarative for openSUSE:Factory checked in at 2018-11-14 14:32:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdeclarative (Old) and /work/SRC/openSUSE:Factory/.kdeclarative.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdeclarative" Wed Nov 14 14:32:42 2018 rev:61 rq:648504 version:5.52.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kdeclarative/kdeclarative.changes 2018-10-22 11:10:26.403918735 +0200 +++ /work/SRC/openSUSE:Factory/.kdeclarative.new/kdeclarative.changes 2018-11-14 14:32:53.735355145 +0100 @@ -1,0 +2,13 @@ +Sun Nov 11 19:48:04 UTC 2018 - [email protected] + +- Update to 5.52.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.52.0.php +- Changes since 5.51.0: + * API dox QCH creation: fix "linking" to kconfig docs + * make push/pop part of ConfigModule API + * Use reserve() + * Use QVariant::toFoo() where possible + +------------------------------------------------------------------- Old: ---- kdeclarative-5.51.0.tar.xz New: ---- kdeclarative-5.52.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdeclarative.spec ++++++ --- /var/tmp/diff_new_pack.zY9gCx/_old 2018-11-14 14:32:55.843353095 +0100 +++ /var/tmp/diff_new_pack.zY9gCx/_new 2018-11-14 14:32:55.843353095 +0100 @@ -17,14 +17,14 @@ %define lname libKF5Declarative5 -%define _tar_path 5.51 +%define _tar_path 5.52 # 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.51.0 +Version: 5.52.0 Release: 0 Summary: Integration of QML and KDE workspaces License: LGPL-2.1-or-later ++++++ kdeclarative-5.51.0.tar.xz -> kdeclarative-5.52.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.51.0/CMakeLists.txt new/kdeclarative-5.52.0/CMakeLists.txt --- old/kdeclarative-5.51.0/CMakeLists.txt 2018-10-08 10:12:05.000000000 +0200 +++ new/kdeclarative-5.52.0/CMakeLists.txt 2018-11-03 18:59:30.000000000 +0100 @@ -1,12 +1,12 @@ cmake_minimum_required(VERSION 3.0) -set(KF5_VERSION "5.51.0") # handled by release scripts -set(KF5_DEP_VERSION "5.51.0") # handled by release scripts +set(KF5_VERSION "5.52.0") # handled by release scripts +set(KF5_DEP_VERSION "5.52.0") # handled by release scripts project(KDeclarative VERSION ${KF5_VERSION}) # Dependencies include(FeatureSummary) -find_package(ECM 5.51.0 NO_MODULE) +find_package(ECM 5.52.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.51.0/po/ast/kdeclarative5.po new/kdeclarative-5.52.0/po/ast/kdeclarative5.po --- old/kdeclarative-5.51.0/po/ast/kdeclarative5.po 2018-10-08 10:12:05.000000000 +0200 +++ new/kdeclarative-5.52.0/po/ast/kdeclarative5.po 1970-01-01 01:00:00.000000000 +0100 @@ -1,106 +0,0 @@ -# Copyright (C) YEAR This_file_is_part_of_KDE -# This file is distributed under the same license as the PACKAGE package. -# -# enolp <[email protected]>, 2016. -msgid "" -msgstr "" -"Project-Id-Version: \n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2018-08-16 09:05+0200\n" -"PO-Revision-Date: 2016-12-20 23:02+0100\n" -"Last-Translator: enolp <[email protected]>\n" -"Language-Team: Asturian <[email protected]>\n" -"Language: ast\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Lokalize 2.0\n" - -#, kde-format -msgctxt "NAME OF TRANSLATORS" -msgid "Your names" -msgstr "Softastur" - -#, kde-format -msgctxt "EMAIL OF TRANSLATORS" -msgid "Your emails" -msgstr "[email protected]" - -#: kpackagelauncherqml/main.cpp:43 -#, kde-format -msgid "KPackage QML application shell" -msgstr "Shell d'aplicaciones QML de KPackage " - -#: kpackagelauncherqml/main.cpp:50 -#, kde-format -msgid "The unique name of the application (mandatory)" -msgstr "El nome únicu de l'aplicación (obligatorio)" - -#: qmlcontrols/kquickcontrols/KeySequenceItem.qml:38 -#, kde-format -msgid "" -"Click on the button, then enter the shortcut like you would in the program.\n" -"Example for Ctrl+A: hold the Ctrl key and press A." -msgstr "" -"Primi nel menú, depués introduz l'atayu como te prestaría nel programa.\n" -"Exemplu pa Ctrl+A: ten primida la tecla Ctrl y dempués calca la A" - -#: qmlcontrols/kquickcontrols/private/keysequencehelper.cpp:276 -#, kde-format -msgid "Reserved Shortcut" -msgstr "Atayu acutáu" - -#: qmlcontrols/kquickcontrols/private/keysequencehelper.cpp:277 -#, kde-format -msgid "" -"The F12 key is reserved on Windows, so cannot be used for a global " -"shortcut.\n" -"Please choose another one." -msgstr "" -"La tecla F12 ta acutada en WIndows, asina que nun pue usase pa un atayu " -"global.\n" -"Escueyi otra, por favor." - -#: qmlcontrols/kquickcontrols/private/keysequencehelper.cpp:333 -#, kde-format -msgid "Conflict with Standard Application Shortcut" -msgstr "Conlfictu col atayu estándar d'aplicación" - -#: qmlcontrols/kquickcontrols/private/keysequencehelper.cpp:334 -#, kde-format -msgid "" -"The '%1' key combination is also used for the standard action \"%2\" that " -"some applications use.\n" -"Do you really want to use it as a global shortcut as well?" -msgstr "" -"La combinación de tecles «%1» tamién s'usa pa l'aición estándar «%2» que " -"delles aplicaciones usen.\n" -"¿De xuru que quies usala tamién como atayu global?" - -#: qmlcontrols/kquickcontrols/private/keysequencehelper.cpp:339 -#, kde-format -msgid "Reassign" -msgstr "Reasignar" - -#: qmlcontrols/kquickcontrols/private/keysequencehelper.cpp:381 -#, kde-format -msgctxt "What the user inputs now will be taken as the new shortcut" -msgid "Input" -msgstr "Entrada" - -#: qmlcontrols/kquickcontrols/private/keysequencehelper.cpp:388 -#, kde-format -msgctxt "No shortcut defined" -msgid "None" -msgstr "Nada" - -#: qmlcontrols/kquickcontrols/private/keysequencehelper.cpp:409 -#, kde-format -msgid "The key you just pressed is not supported by Qt." -msgstr "La tecla que tas acabante primi nun la sofita Qt." - -#: qmlcontrols/kquickcontrols/private/keysequencehelper.cpp:410 -#, kde-format -msgid "Unsupported Key" -msgstr "Tecla ensin sofitu" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.51.0/po/id/kdeclarative5.po new/kdeclarative-5.52.0/po/id/kdeclarative5.po --- old/kdeclarative-5.51.0/po/id/kdeclarative5.po 2018-10-08 10:12:05.000000000 +0200 +++ new/kdeclarative-5.52.0/po/id/kdeclarative5.po 2018-11-03 18:59:30.000000000 +0100 @@ -9,7 +9,7 @@ "Project-Id-Version: kdelibs4\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2018-08-16 09:05+0200\n" -"PO-Revision-Date: 2018-06-16 08:03+0700\n" +"PO-Revision-Date: 2018-10-10 22:36+0700\n" "Last-Translator: Wantoyo <[email protected]>\n" "Language-Team: Indonesian <[email protected]>\n" "Language: id\n" @@ -96,7 +96,7 @@ #, kde-format msgctxt "No shortcut defined" msgid "None" -msgstr "Tak Ada" +msgstr "Nihil" #: qmlcontrols/kquickcontrols/private/keysequencehelper.cpp:409 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.51.0/po/zh_CN/kdeclarative5.po new/kdeclarative-5.52.0/po/zh_CN/kdeclarative5.po --- old/kdeclarative-5.51.0/po/zh_CN/kdeclarative5.po 2018-10-08 10:12:05.000000000 +0200 +++ new/kdeclarative-5.52.0/po/zh_CN/kdeclarative5.po 2018-11-03 18:59:30.000000000 +0100 @@ -15,8 +15,8 @@ "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-09-28 19:47\n" -"Last-Translator: guoyunhe <[email protected]>\n" +"PO-Revision-Date: 2018-10-09 18:38\n" +"Last-Translator: guoyunhe <[email protected]>\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" "MIME-Version: 1.0\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.51.0/src/CMakeLists.txt new/kdeclarative-5.52.0/src/CMakeLists.txt --- old/kdeclarative-5.51.0/src/CMakeLists.txt 2018-10-08 10:12:05.000000000 +0200 +++ new/kdeclarative-5.52.0/src/CMakeLists.txt 2018-11-03 18:59:30.000000000 +0100 @@ -20,7 +20,7 @@ MD_MAINPAGE "${CMAKE_SOURCE_DIR}/README.md" LINK_QCHS Qt5Qml_QCH - KF5ConfigCore_QCH + KF5Config_QCH KF5Package_QCH BLANK_MACROS KDECLARATIVE_EXPORT diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.51.0/src/qmlcontrols/draganddrop/DeclarativeDragArea.cpp new/kdeclarative-5.52.0/src/qmlcontrols/draganddrop/DeclarativeDragArea.cpp --- old/kdeclarative-5.51.0/src/qmlcontrols/draganddrop/DeclarativeDragArea.cpp 2018-10-08 10:12:05.000000000 +0200 +++ new/kdeclarative-5.52.0/src/qmlcontrols/draganddrop/DeclarativeDragArea.cpp 2018-11-03 18:59:30.000000000 +0100 @@ -161,7 +161,7 @@ if (image.canConvert<QImage>()) { m_delegateImage = image.value<QImage>(); } else if (image.canConvert<QString>()) { - m_delegateImage = QIcon::fromTheme(image.value<QString>()).pixmap(QSize(48, 48)).toImage(); + m_delegateImage = QIcon::fromTheme(image.toString()).pixmap(QSize(48, 48)).toImage(); } else { m_delegateImage = image.value<QIcon>().pixmap(QSize(48, 48)).toImage(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.51.0/src/qmlcontrols/draganddrop/DeclarativeMimeData.cpp new/kdeclarative-5.52.0/src/qmlcontrols/draganddrop/DeclarativeMimeData.cpp --- old/kdeclarative-5.51.0/src/qmlcontrols/draganddrop/DeclarativeMimeData.cpp 2018-10-08 10:12:05.000000000 +0200 +++ new/kdeclarative-5.52.0/src/qmlcontrols/draganddrop/DeclarativeMimeData.cpp 2018-11-03 18:59:30.000000000 +0100 @@ -99,8 +99,9 @@ void DeclarativeMimeData::setUrls(const QJsonArray &urls) { QList<QUrl> urlList; + urlList.reserve(urls.size()); foreach (const QVariant &varUrl, urls) { - urlList << varUrl.value<QUrl>(); + urlList << varUrl.toUrl(); } QMimeData::setUrls(urlList); emit urlsChanged(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.51.0/src/quickaddons/configmodule.cpp new/kdeclarative-5.52.0/src/quickaddons/configmodule.cpp --- old/kdeclarative-5.51.0/src/quickaddons/configmodule.cpp 2018-10-08 10:12:05.000000000 +0200 +++ new/kdeclarative-5.52.0/src/quickaddons/configmodule.cpp 2018-11-03 18:59:30.000000000 +0100 @@ -66,6 +66,8 @@ const KAboutData *_about; QString _rootOnlyMessage; QString _quickHelp; + QList<QQuickItem *> subPages; + int _columnWidth = -1; bool _useRootOnlyMessage : 1; bool _needsAuthorization : 1; @@ -176,6 +178,40 @@ } } +void ConfigModule::push(const QString &fileName, const QVariantMap &propertyMap) +{ + //ensure main ui is created + if (!mainUi()) { + return; + } + + //TODO: package as member + KPackage::Package package = KPackage::PackageLoader::self()->loadPackage(QStringLiteral("KPackage/GenericQML")); + package.setDefaultPackageRoot(QStringLiteral("kpackage/kcms")); + package.setPath(aboutData()->componentName()); + + QObject *object = d->_qmlObject->createObjectFromSource(QUrl::fromLocalFile(package.filePath("ui", fileName)), d->_qmlObject->rootContext());//TODO:propertyMap + + QQuickItem *item = qobject_cast<QQuickItem *>(object); + if (!item) { + object->deleteLater(); + return; + } + + d->subPages << item; + emit pagePushed(item); +} + +void ConfigModule::pop() +{ + if (d->subPages.isEmpty()) { + return; + } + QQuickItem *page = d->subPages.takeLast(); + emit pageRemoved(); + page->deleteLater(); +} + ConfigModule::Buttons ConfigModule::buttons() const { return d->_buttons; @@ -225,6 +261,21 @@ return d->_about->shortDescription(); } +int ConfigModule::columnWidth() const +{ + return d->_columnWidth; +} + +void ConfigModule::setColumnWidth(int width) +{ + if (d->_columnWidth == width) { + return; + } + + d->_columnWidth = width; + emit columnWidthChanged(width); +} + void ConfigModule::setAuthActionName(const QString &name) { if (d->_authActionName == name) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.51.0/src/quickaddons/configmodule.h new/kdeclarative-5.52.0/src/quickaddons/configmodule.h --- old/kdeclarative-5.51.0/src/quickaddons/configmodule.h 2018-10-08 10:12:05.000000000 +0200 +++ new/kdeclarative-5.52.0/src/quickaddons/configmodule.h 2018-11-03 18:59:30.000000000 +0100 @@ -147,6 +147,7 @@ Q_PROPERTY(QString rootOnlyMessage READ rootOnlyMessage WRITE setRootOnlyMessage NOTIFY rootOnlyMessageChanged) 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) public: @@ -386,6 +387,21 @@ */ QString description() const; + /** + * returns the width the kcm wants in column mode. + * If a columnWidth is valid ( > 0 ) and less than the systemsettings' view width, + * more than one will be visible at once, and the first page will be a sidebar to the last page pushed. + * As default, this is -1 which will make the shell always show only one page at a time. + * @since 5.50 + */ + int columnWidth() const; + + /** + * Sets the column width we want. + * @since 5.50 + */ + void setColumnWidth(int width); + static ConfigModule *qmlAttachedProperties(QObject *object); public Q_SLOTS: @@ -428,6 +444,17 @@ */ virtual void defaults(); + /** + * Push a new sub page in the KCM hyerarchy: pages will be seen as a Kirigami PageRow + * @since 5.50 + */ + void push(const QString &fileName, const QVariantMap &propertyMap = QVariantMap()); + + /** + * pop the last page of the KCM hyerarchy + * @since 5.50 + */ + void pop(); Q_SIGNALS: @@ -479,6 +506,25 @@ */ void useRootOnlyMessageChanged(); + /** + * Emitted when a new sub page is pushed + * @since 5.50 + */ + void pagePushed(QQuickItem *page); + + /** + * Emitted when a sub page is popped + * @since 5.50 + */ + //RFC: page argument? + void pageRemoved(); + + /** + * Emitted when the wanted column width of the kcm changes + * @since 5.50 + */ + void columnWidthChanged(int width); + private: ConfigModulePrivate *const d; };
