Hello community, here is the log from the commit of package kdeclarative for openSUSE:Factory checked in at 2020-11-19 11:50:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdeclarative (Old) and /work/SRC/openSUSE:Factory/.kdeclarative.new.5913 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdeclarative" Thu Nov 19 11:50:18 2020 rev:86 rq:848541 version:5.76.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kdeclarative/kdeclarative.changes 2020-10-12 13:55:48.342128396 +0200 +++ /work/SRC/openSUSE:Factory/.kdeclarative.new.5913/kdeclarative.changes 2020-11-23 10:31:57.177457469 +0100 @@ -1,0 +2,19 @@ +Sat Nov 7 21:34:32 UTC 2020 - Christophe Giboudeaux <[email protected]> + +- Update to 5.76.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/kde-frameworks-5.76.0 +- Changes since 5.75.0: + * [abstractkcm] Set explicit padding + * [abstractkcm] Don't remove padding on mobile + * [simplekcm] Remove custom padding handling + * [kcmcontrols] Remove duplicated code + * Add source to KDeclarativeMouseEvent + * If include is define in .h remove it if it's defined in .cpp too (scripted) + * reparent overlaysheets to the root + * Make GridViewKCM and ScrollVieKCM inherit from AbstractKCM + * Use consistent margins + * Add getter method for subPages + +------------------------------------------------------------------- Old: ---- kdeclarative-5.75.0.tar.xz kdeclarative-5.75.0.tar.xz.sig New: ---- kdeclarative-5.76.0.tar.xz kdeclarative-5.76.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdeclarative.spec ++++++ --- /var/tmp/diff_new_pack.P8JRaW/_old 2020-11-23 10:31:57.777458127 +0100 +++ /var/tmp/diff_new_pack.P8JRaW/_new 2020-11-23 10:31:57.781458131 +0100 @@ -17,14 +17,14 @@ %define lname libKF5Declarative5 -%define _tar_path 5.75 +%define _tar_path 5.76 # 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.75.0 +Version: 5.76.0 Release: 0 Summary: Integration of QML and KDE workspaces License: LGPL-2.1-or-later ++++++ kdeclarative-5.75.0.tar.xz -> kdeclarative-5.76.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.75.0/CMakeLists.txt new/kdeclarative-5.76.0/CMakeLists.txt --- old/kdeclarative-5.75.0/CMakeLists.txt 2020-10-04 20:42:01.000000000 +0200 +++ new/kdeclarative-5.76.0/CMakeLists.txt 2020-11-07 13:02:53.000000000 +0100 @@ -1,12 +1,12 @@ cmake_minimum_required(VERSION 3.5) -set(KF5_VERSION "5.75.0") # handled by release scripts -set(KF5_DEP_VERSION "5.75.0") # handled by release scripts +set(KF5_VERSION "5.76.0") # handled by release scripts +set(KF5_DEP_VERSION "5.76.0") # handled by release scripts project(KDeclarative VERSION ${KF5_VERSION}) # Dependencies include(FeatureSummary) -find_package(ECM 5.75.0 NO_MODULE) +find_package(ECM 5.76.0 NO_MODULE) set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://commits.kde.org/extra-cmake-modules";) feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES) @@ -33,7 +33,7 @@ ######################################################################### add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050d00) -add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x054900) +add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x054B00) #add_definitions(-Wno-deprecated) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.75.0/docs/Doxyfile.local new/kdeclarative-5.76.0/docs/Doxyfile.local --- old/kdeclarative-5.75.0/docs/Doxyfile.local 2020-10-04 20:42:01.000000000 +0200 +++ new/kdeclarative-5.76.0/docs/Doxyfile.local 2020-11-07 13:02:53.000000000 +0100 @@ -5,6 +5,7 @@ "KDECLARATIVE_ENABLE_DEPRECATED_SINCE(x, y)=1" \ "KDECLARATIVE_BUILD_DEPRECATED_SINCE(x, y)=1" \ "KDECLARATIVE_DEPRECATED_VERSION(x, y, t)=" \ + "KDECLARATIVE_DEPRECATED_VERSION_BELATED(x, y, xt, yt, t)=" \ "QUICKADDONS_ENABLE_DEPRECATED_SINCE(x, y)=1" \ "QUICKADDONS_BUILD_DEPRECATED_SINCE(x, y)=1" \ "QUICKADDONS_DEPRECATED_VERSION(x, y, t)=" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.75.0/po/vi/kdeclarative5.po new/kdeclarative-5.76.0/po/vi/kdeclarative5.po --- old/kdeclarative-5.75.0/po/vi/kdeclarative5.po 2020-10-04 20:42:01.000000000 +0200 +++ new/kdeclarative-5.76.0/po/vi/kdeclarative5.po 2020-11-07 13:02:53.000000000 +0100 @@ -4,59 +4,57 @@ # Clytie Siddall <[email protected]>, 2006-2007. # Hoàng Đức Hiếu <[email protected]>, 2008, 2011. # Lê Hoàng Phương <[email protected]>, 2011, 2012. +# Phu Hung Nguyen <[email protected]>, 2020. msgid "" msgstr "" "Project-Id-Version: kdelibs4\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2020-09-22 02:06+0200\n" -"PO-Revision-Date: 2012-09-23 18:43+0800\n" -"Last-Translator: Lê Hoàng Phương <[email protected]>\n" -"Language-Team: American English <[email protected]>\n" +"PO-Revision-Date: 2020-10-23 22:24+0200\n" +"Last-Translator: Phu Hung Nguyen <[email protected]>\n" +"Language-Team: Vietnamese <[email protected]>\n" "Language: vi\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Lokalize 1.5\n" +"X-Generator: Lokalize 19.12.2\n" #, kde-format msgctxt "NAME OF TRANSLATORS" msgid "Your names" -msgstr "Nhóm Việt hoá KDE" +msgstr "Clytie Siddall,Hoàng Đức Hiếu,Lê Hoàng Phương,Nguyễn Hùng Phú" #, kde-format msgctxt "EMAIL OF TRANSLATORS" msgid "Your emails" -msgstr "[email protected]" +msgstr "" +"[email protected],[email protected],[email protected]," +"[email protected]" #: kpackagelauncherqml/main.cpp:30 #, kde-format msgid "KPackage QML application shell" -msgstr "" +msgstr "Hệ vỏ ứng dụng QML KPackage" #: kpackagelauncherqml/main.cpp:37 -#, fuzzy, kde-format -#| msgid "defines the application font" +#, kde-format msgid "The unique name of the application (mandatory)" -msgstr "định nghĩa phông chữ cho ứng dụng đó" +msgstr "Tên riêng biệt của ứng dụng (bắt buộc)" #: qmlcontrols/kquickcontrols/KeySequenceItem.qml:70 -#, fuzzy, 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." +#, 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 "" -"Nhấn vào nút, sau đó nhập phím tắt bạn muốn dùng.\n" -"Ví dụ cho Ctrl + a: nhấn phím Ctrl và nhấn a." +"Bấm nút, sau đó nhập phím tắt bạn muốn dùng.\n" +"Ví dụ cho Ctrl+A: giữ phím Ctrl và nhấn A." #: qmlcontrols/kquickcontrols/private/keysequencehelper.cpp:302 #, kde-format msgid "Reserved Shortcut" -msgstr "Phím tắt dự trữ" +msgstr "Phím tắt được đặt trước" #: qmlcontrols/kquickcontrols/private/keysequencehelper.cpp:303 #, kde-format @@ -65,14 +63,14 @@ "shortcut.\n" "Please choose another one." msgstr "" -"Phím F12 được dự trữ cho cửa sổ, vì vậy không thể dùng làm phím tắt toàn hệ " -"thống.\n" -"Hãy chọn phím khác." +"Phím F12 được đặt trước trên Windows, nên không thể dùng cho một phím tắt " +"toàn cục được.\n" +"Vui lòng chọn một phím khác." #: qmlcontrols/kquickcontrols/private/keysequencehelper.cpp:359 #, kde-format msgid "Conflict with Standard Application Shortcut" -msgstr "Xung đột với phím tắt ứng dụng chuẩn" +msgstr "Xung đột với phím tắt ứng dụng tiêu chuẩn" #: qmlcontrols/kquickcontrols/private/keysequencehelper.cpp:360 #, kde-format @@ -81,9 +79,9 @@ "some applications use.\n" "Do you really want to use it as a global shortcut as well?" msgstr "" -"Tổ hợp phím '%1' cũng được dùng cho hành động chuẩn \"%2\" do nhiều ứng dụng " -"sử dụng.\n" -"Bạn có muốn sử dụng nó như một phím tắt toàn hệ thống không?" +"Tổ hợp phím '%1' cũng được dùng cho hành động tiêu chuẩn \"%2\" mà một số " +"ứng dụng sử dụng.\n" +"Bạn có thật sự muốn cũng dùng nó như một phím tắt toàn cục?" #: qmlcontrols/kquickcontrols/private/keysequencehelper.cpp:365 #, kde-format @@ -94,7 +92,7 @@ #, kde-format msgctxt "What the user inputs now will be taken as the new shortcut" msgid "Input" -msgstr "Gõ" +msgstr "Nhập" #: qmlcontrols/kquickcontrols/private/keysequencehelper.cpp:414 #, kde-format @@ -105,20 +103,19 @@ #: qmlcontrols/kquickcontrols/private/keysequencehelper.cpp:435 #, kde-format msgid "The key you just pressed is not supported by Qt." -msgstr "Phím bạn vừa nhấn không được hỗ trợ bởi Qt." +msgstr "Phím bạn vừa nhấn không được Qt hỗ trợ." #: qmlcontrols/kquickcontrols/private/keysequencehelper.cpp:436 #, kde-format msgid "Unsupported Key" -msgstr "Phím không hỗ trợ" +msgstr "Phím không được hỗ trợ" #: quickaddons/configmodule.cpp:164 -#, fuzzy, kde-format -#| msgid "Invalid certificate" +#, kde-format msgid "Invalid KPackage '%1'" -msgstr "Chứng nhận không hợp lệ" +msgstr "KPackage không hợp lệ '%1'" #: quickaddons/configmodule.cpp:170 #, kde-format msgid "No QML file provided" -msgstr "" +msgstr "Không nhận được tệp QML nào" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.75.0/po/zh_CN/kdeclarative5.po new/kdeclarative-5.76.0/po/zh_CN/kdeclarative5.po --- old/kdeclarative-5.75.0/po/zh_CN/kdeclarative5.po 2020-10-04 20:42:01.000000000 +0200 +++ new/kdeclarative-5.76.0/po/zh_CN/kdeclarative5.po 2020-11-07 13:02:53.000000000 +0100 @@ -15,7 +15,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2020-09-22 02:06+0200\n" -"PO-Revision-Date: 2020-09-23 12:18\n" +"PO-Revision-Date: 2020-10-08 19:21\n" "Last-Translator: \n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.75.0/src/CMakeLists.txt new/kdeclarative-5.76.0/src/CMakeLists.txt --- old/kdeclarative-5.75.0/src/CMakeLists.txt 2020-10-04 20:42:01.000000000 +0200 +++ new/kdeclarative-5.76.0/src/CMakeLists.txt 2020-11-07 13:02:53.000000000 +0100 @@ -30,6 +30,7 @@ KDECLARATIVE_DEPRECATED KDECLARATIVE_DEPRECATED_EXPORT "KDECLARATIVE_DEPRECATED_VERSION(x, y, t)" + "KDECLARATIVE_DEPRECATED_VERSION_BELATED(x, y, xt, yt, t)" QUICKADDONS_EXPORT QUICKADDONS_DEPRECATED QUICKADDONS_DEPRECATED_EXPORT diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.75.0/src/kdeclarative/kdeclarative.cpp new/kdeclarative-5.76.0/src/kdeclarative/kdeclarative.cpp --- old/kdeclarative-5.75.0/src/kdeclarative/kdeclarative.cpp 2020-10-04 20:42:01.000000000 +0200 +++ new/kdeclarative-5.76.0/src/kdeclarative/kdeclarative.cpp 2020-11-07 13:02:53.000000000 +0100 @@ -11,7 +11,6 @@ #include "qmlobject.h" #include <QCoreApplication> -#include <QQmlEngine> #include <QQmlDebuggingEnabler> #include <QQmlContext> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.75.0/src/kdeclarative/kdeclarative.h new/kdeclarative-5.76.0/src/kdeclarative/kdeclarative.h --- old/kdeclarative-5.75.0/src/kdeclarative/kdeclarative.h 2020-10-04 20:42:01.000000000 +0200 +++ new/kdeclarative-5.76.0/src/kdeclarative/kdeclarative.h 2020-11-07 13:02:53.000000000 +0100 @@ -26,22 +26,31 @@ * the application and to get some informations about the platform, * that influences the behavior of the QML components. * - * In order to use it, create an instance of KDeclarative. You will need a - * pointer to a QQmlEngine, and call **both** `setDeclarativeEngine(engine)` and - * `setupContext()` on your instance. You need to call `setupEngine(engine)` - * at least once on the engine as well. - * - * KDeclarative::setupEngine(engine); // if not done elsewhere + * In order to use it, you will need a pointer to a QQmlEngine, and call + * `setupEngine(engine)` at least once on the engine. + * @code + * KDeclarative::KDeclarative::setupEngine(engine); // if not done elsewhere + * @endcode + * + * To setup integration with KI18n's translation methods and thus being able to call + * i18n() from anywhere in your QML code., you set a KLocalizedContext from Ki18n + * directly like this (since KF 5.17): + * @code + * KLocalizedContext *localizedContextObject = new KLocalizedContext(engine); + * // if not using the global application domain, set custom domain name + * localizedContextObject->setTranslationDomain(QStringLiteral("mydomainname")); + * engine->rootContext()->setContextObject(localizedContextObject); + * @endcode + * + * In case your code should work with KF versions before 5.17, use these deprecated + * calls instead: + * @code * KDeclarative::KDeclarative decl; * decl.setDeclarativeEngine(engine); + * // if not using the global application domain, set custom domain name + * decl.setTranslationDomain(QStringLiteral("mydomainname")); * decl.setupContext(); - * - * This will add the following things to the engine: - * - Use a KIOAccessManagerFactory instead of the stock QQmlNetworkAccessManagerFactory - * - Add a QML icon provider, that makes possible for the Image {} element to load images using the scheme "image:/" - * - Use the given engine for this context. - * - Set a new rootContextObject() that exposes all the i18n() functions from the KI18n framework. - * They will be available in the global QML context: just call i18n() from anywhere in your QML code. + * @endcode * */ class KDECLARATIVE_EXPORT KDeclarative @@ -77,9 +86,9 @@ * * @sa setupEngine * @since 5.45 - * @deprecated since 5.75 set KLocalizedContext directly, see documentation in KI18n::KLocalizedContext + * @deprecated Since 5.17 set KLocalizedContext directly, see documentation in KI18n::KLocalizedContext */ - KDECLARATIVE_DEPRECATED_VERSION(5, 75, "set KLocalizedContext directly, see documentation in KI18n::KLocalizedContext") + KDECLARATIVE_DEPRECATED_VERSION_BELATED(5, 75, 5, 17, "set KLocalizedContext directly, see documentation in KI18n::KLocalizedContext") void setupContext(); #endif @@ -122,9 +131,9 @@ * * @param translationDomain The translation domain to be used for i18n calls. * @since 5.0 - * @deprecated since 5.75 use KLocalizedContext::setTranslationDomain + * @deprecated Since 5.17 use KLocalizedContext::setTranslationDomain */ - KDECLARATIVE_DEPRECATED_VERSION(5, 75, "set via KLocalizedContext::setTranslationDomain") + KDECLARATIVE_DEPRECATED_VERSION_BELATED(5, 75, 5, 17, "set via KLocalizedContext::setTranslationDomain") void setTranslationDomain(const QString &translationDomain); #endif @@ -132,9 +141,9 @@ /** * @return the translation domain for the i18n calls done in this QML engine * @since 5.0 - * @deprecated since 5.75 use KLocalizedContext::translationDomain + * @deprecated Since 5.17 use KLocalizedContext::translationDomain */ - KDECLARATIVE_DEPRECATED_VERSION(5, 75, "available via KLocalizedContext::translationDomain") + KDECLARATIVE_DEPRECATED_VERSION_BELATED(5, 75, 5, 17, "available via KLocalizedContext::translationDomain") QString translationDomain() const; #endif @@ -182,7 +191,9 @@ * engine that is shared between KDeclarative objects only needs * to be setup once. The engine is setup for the component target * (runtime platform) that is configured at the time setupEngine() - * is called. + * is called. The following things are added to the engine: + * - a KIOAccessManagerFactory, replacing any existing stock QQmlNetworkAccessManagerFactory + * - a QML icon provider, enabling the Image {} element to load images using the scheme "image:/" * * @param engine the engine to setup * @sa setupContext(), componentsTarget() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.75.0/src/kdeclarative/qmlobject.cpp new/kdeclarative-5.76.0/src/kdeclarative/qmlobject.cpp --- old/kdeclarative-5.75.0/src/kdeclarative/qmlobject.cpp 2020-10-04 20:42:01.000000000 +0200 +++ new/kdeclarative-5.76.0/src/kdeclarative/qmlobject.cpp 2020-11-07 13:02:53.000000000 +0100 @@ -7,7 +7,6 @@ #include "qmlobject.h" #include "private/kdeclarative_p.h" -#include <QQmlComponent> #include <QQmlEngine> #include <QQmlContext> #include <QQuickItem> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.75.0/src/qmlcontrols/draganddrop/DeclarativeDragDropEvent.cpp new/kdeclarative-5.76.0/src/qmlcontrols/draganddrop/DeclarativeDragDropEvent.cpp --- old/kdeclarative-5.75.0/src/qmlcontrols/draganddrop/DeclarativeDragDropEvent.cpp 2020-10-04 20:42:01.000000000 +0200 +++ new/kdeclarative-5.76.0/src/qmlcontrols/draganddrop/DeclarativeDragDropEvent.cpp 2020-11-07 13:02:53.000000000 +0100 @@ -7,7 +7,6 @@ */ #include "DeclarativeDragDropEvent.h" -#include "DeclarativeMimeData.h" DeclarativeDragDropEvent::DeclarativeDragDropEvent(QDropEvent* e, DeclarativeDropArea* parent) : QObject(parent), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.75.0/src/qmlcontrols/kcmcontrols/qml/AbstractKCM.qml new/kdeclarative-5.76.0/src/qmlcontrols/kcmcontrols/qml/AbstractKCM.qml --- old/kdeclarative-5.75.0/src/qmlcontrols/kcmcontrols/qml/AbstractKCM.qml 2020-10-04 20:42:01.000000000 +0200 +++ new/kdeclarative-5.76.0/src/qmlcontrols/kcmcontrols/qml/AbstractKCM.qml 2020-11-07 13:02:53.000000000 +0100 @@ -37,29 +37,27 @@ title: kcm.name - 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) + leftPadding: 6 // Layout_ChildMarginWidth from Breeze + topPadding: headerParent.contentItem ? 0 : leftPadding + rightPadding: leftPadding + bottomPadding: footerParent.contentItem ? 0 : leftPadding header: QtControls.Control { id: headerParent - visible: contentItem ? contentItem.visible : false - height: visible ? implicitHeight : 0 - leftPadding: 4 - topPadding: 4 - rightPadding: 4 - bottomPadding: 4 + height: contentItem ? implicitHeight : 0 + leftPadding: 6 // Layout_ChildMarginWidth from Breeze + topPadding: leftPadding + rightPadding: leftPadding + bottomPadding: leftPadding } footer: QtControls.Control { id: footerParent - visible: contentItem ? contentItem.visible : false - height: visible ? implicitHeight : 0 - leftPadding: 4 - topPadding: 4 - rightPadding: 4 - bottomPadding: 4 + height: contentItem ? implicitHeight : 0 + leftPadding: 6 // Layout_ChildMarginWidth from Breeze + topPadding: leftPadding + rightPadding: leftPadding + bottomPadding: leftPadding } Component.onCompleted: { @@ -80,5 +78,16 @@ header.visible = true h.parent = headerParent } + + //Search overlaysheets in contentItem, parent to root if found + for (let i in contentItem.data) { + let child = contentItem.data[i]; + if (child instanceof Kirigami.OverlaySheet) { + if (!child.parent) { + child.parent = root; + } + root.data.push(child); + } + } } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.75.0/src/qmlcontrols/kcmcontrols/qml/GridViewKCM.qml new/kdeclarative-5.76.0/src/qmlcontrols/kcmcontrols/qml/GridViewKCM.qml --- old/kdeclarative-5.75.0/src/qmlcontrols/kcmcontrols/qml/GridViewKCM.qml 2020-10-04 20:42:01.000000000 +0200 +++ new/kdeclarative-5.76.0/src/qmlcontrols/kcmcontrols/qml/GridViewKCM.qml 2020-11-07 13:02:53.000000000 +0100 @@ -24,9 +24,8 @@ * footer: Item {...} * } * @endcode - * @inherits org.kde.kirigami.Page */ -Kirigami.Page { +AbstractKCM { id: root /** @@ -45,7 +44,6 @@ */ property alias view: scroll.view - title: kcm.name implicitWidth: { var width = 0; @@ -64,39 +62,6 @@ flickable: scroll.view - //NOTE: this should be smallspacing buit we need a pixel size in order to align with systemsettings widgets - leftPadding: Kirigami.Settings.isMobile ? 0 : headerParent.leftPadding - topPadding: headerParent.contentItem ? 0 : leftPadding - rightPadding: leftPadding - bottomPadding: footerParent.contentItem ? 0 : leftPadding - - header: QtControls.Control { - id: headerParent - height: contentItem ? implicitHeight : 0 - } - - footer: QtControls.Control { - id: footerParent - height: contentItem ? implicitHeight : 0 - } - Component.onCompleted: { - if (footer && footer != footerParent) { - var f = footer - - footerParent.contentItem = f - footer = footerParent - f.parent = footerParent - } - - if (header && header != headerParent) { - var f = header - - headerParent.contentItem = f - header = headerParent - f.parent = headerParent - } - } - KCM.GridView { id: scroll anchors.fill: parent diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.75.0/src/qmlcontrols/kcmcontrols/qml/ScrollViewKCM.qml new/kdeclarative-5.76.0/src/qmlcontrols/kcmcontrols/qml/ScrollViewKCM.qml --- old/kdeclarative-5.75.0/src/qmlcontrols/kcmcontrols/qml/ScrollViewKCM.qml 2020-10-04 20:42:01.000000000 +0200 +++ new/kdeclarative-5.76.0/src/qmlcontrols/kcmcontrols/qml/ScrollViewKCM.qml 2020-11-07 13:02:53.000000000 +0100 @@ -25,64 +25,16 @@ * footer: Item {...} * } * @endcode - * @inherits org.kde.kirigami.Page */ -Kirigami.Page { +AbstractKCM { id: root /** - * view: GridView + * view: ScrollView * Exposes the internal flickable */ property alias view: scroll.view - title: kcm.name - implicitWidth: Kirigami.Units.gridUnit * 20 - implicitHeight: view && view.contentHeight > 0 ? Math.min(view.contentHeight, Kirigami.Units.gridUnit * 20) : Kirigami.Units.gridUnit * 20 - //flickable: scroll.view - - //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 : (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.parent = footerParent - } - - if (header && header != headerParent) { - var h = header - - headerParent.contentItem = h - header = headerParent - h.parent = headerParent - } - } Priv.ScrollView { id: scroll anchors.fill: parent diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.75.0/src/qmlcontrols/kcmcontrols/qml/SimpleKCM.qml new/kdeclarative-5.76.0/src/qmlcontrols/kcmcontrols/qml/SimpleKCM.qml --- old/kdeclarative-5.75.0/src/qmlcontrols/kcmcontrols/qml/SimpleKCM.qml 2020-10-04 20:42:01.000000000 +0200 +++ new/kdeclarative-5.76.0/src/qmlcontrols/kcmcontrols/qml/SimpleKCM.qml 2020-11-07 13:02:53.000000000 +0100 @@ -36,29 +36,14 @@ title: kcm.name - 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: contentItem ? contentItem.visible : false - height: visible ? implicitHeight : 0 - leftPadding: 4 - topPadding: 4 - rightPadding: 4 - bottomPadding: 4 + height: contentItem ? implicitHeight : 0 } footer: QtControls.Control { id: footerParent - visible: contentItem ? contentItem.visible : false - height: visible ? implicitHeight : 0 - leftPadding: 4 - topPadding: 4 - rightPadding: 4 - bottomPadding: 4 + height: contentItem ? implicitHeight : 0 } Component.onCompleted: { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.75.0/src/qmlcontrols/kcoreaddons/kuserproxy.cpp new/kdeclarative-5.76.0/src/qmlcontrols/kcoreaddons/kuserproxy.cpp --- old/kdeclarative-5.75.0/src/qmlcontrols/kcoreaddons/kuserproxy.cpp 2020-10-04 20:42:01.000000000 +0200 +++ new/kdeclarative-5.76.0/src/qmlcontrols/kcoreaddons/kuserproxy.cpp 2020-11-07 13:02:53.000000000 +0100 @@ -12,7 +12,6 @@ #include <QTextStream> #include <QUrl> -#include <KDirWatch> const QString etcPasswd = QStringLiteral("/etc/passwd"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.75.0/src/qmlcontrols/kquickcontrolsaddons/mouseeventlistener.cpp new/kdeclarative-5.76.0/src/qmlcontrols/kquickcontrolsaddons/mouseeventlistener.cpp --- old/kdeclarative-5.75.0/src/qmlcontrols/kquickcontrolsaddons/mouseeventlistener.cpp 2020-10-04 20:42:01.000000000 +0200 +++ new/kdeclarative-5.76.0/src/qmlcontrols/kquickcontrolsaddons/mouseeventlistener.cpp 2020-11-07 13:02:53.000000000 +0100 @@ -123,7 +123,7 @@ screenPos = w->mapToGlobal(event->pos()); } - KDeclarativeMouseEvent dme(event->pos().x(), event->pos().y(), screenPos.x(), screenPos.y(), Qt::NoButton, Qt::NoButton, event->modifiers(), nullptr); + KDeclarativeMouseEvent dme(event->pos().x(), event->pos().y(), screenPos.x(), screenPos.y(), Qt::NoButton, Qt::NoButton, event->modifiers(), nullptr, Qt::MouseEventNotSynthesized); emit positionChanged(&dme); } @@ -153,9 +153,9 @@ } m_buttonDownPos = me->screenPos(); - KDeclarativeMouseEvent dme(me->pos().x(), me->pos().y(), me->screenPos().x(), me->screenPos().y(), me->button(), me->buttons(), me->modifiers(), screenForGlobalPos(me->globalPos())); + KDeclarativeMouseEvent dme(me->pos().x(), me->pos().y(), me->screenPos().x(), me->screenPos().y(), me->button(), me->buttons(), me->modifiers(), screenForGlobalPos(me->globalPos()), me->source()); if (!m_pressAndHoldEvent) { - m_pressAndHoldEvent = new KDeclarativeMouseEvent(me->pos().x(), me->pos().y(), me->screenPos().x(), me->screenPos().y(), me->button(), me->buttons(), me->modifiers(), screenForGlobalPos(me->globalPos())); + m_pressAndHoldEvent = new KDeclarativeMouseEvent(me->pos().x(), me->pos().y(), me->screenPos().x(), me->screenPos().y(), me->button(), me->buttons(), me->modifiers(), screenForGlobalPos(me->globalPos()), me->source()); } m_pressed = true; @@ -181,7 +181,7 @@ m_pressAndHoldTimer->stop(); } - KDeclarativeMouseEvent dme(me->pos().x(), me->pos().y(), me->screenPos().x(), me->screenPos().y(), me->button(), me->buttons(), me->modifiers(), screenForGlobalPos(me->globalPos())); + KDeclarativeMouseEvent dme(me->pos().x(), me->pos().y(), me->screenPos().x(), me->screenPos().y(), me->button(), me->buttons(), me->modifiers(), screenForGlobalPos(me->globalPos()), me->source()); emit positionChanged(&dme); if (dme.isAccepted()) { @@ -196,7 +196,7 @@ return; } - KDeclarativeMouseEvent dme(me->pos().x(), me->pos().y(), me->screenPos().x(), me->screenPos().y(), me->button(), me->buttons(), me->modifiers(), screenForGlobalPos(me->globalPos())); + KDeclarativeMouseEvent dme(me->pos().x(), me->pos().y(), me->screenPos().x(), me->screenPos().y(), me->button(), me->buttons(), me->modifiers(), screenForGlobalPos(me->globalPos()), me->source()); m_pressed = false; emit released(&dme); emit pressedChanged(); @@ -258,9 +258,9 @@ //the parent will receive events in its own coordinates const QPointF myPos = mapFromScene(me->windowPos()); - KDeclarativeMouseEvent dme(myPos.x(), myPos.y(), me->screenPos().x(), me->screenPos().y(), me->button(), me->buttons(), me->modifiers(), screenForGlobalPos(me->globalPos())); + KDeclarativeMouseEvent dme(myPos.x(), myPos.y(), me->screenPos().x(), me->screenPos().y(), me->button(), me->buttons(), me->modifiers(), screenForGlobalPos(me->globalPos()), me->source()); delete m_pressAndHoldEvent; - m_pressAndHoldEvent = new KDeclarativeMouseEvent(myPos.x(), myPos.y(), me->screenPos().x(), me->screenPos().y(), me->button(), me->buttons(), me->modifiers(), screenForGlobalPos(me->globalPos())); + m_pressAndHoldEvent = new KDeclarativeMouseEvent(myPos.x(), myPos.y(), me->screenPos().x(), me->screenPos().y(), me->button(), me->buttons(), me->modifiers(), screenForGlobalPos(me->globalPos()), me->source()); //qDebug() << "pressed in sceneEventFilter"; m_buttonDownPos = me->screenPos(); @@ -290,7 +290,7 @@ screenPos = w->mapToGlobal(myPos.toPoint()); } - KDeclarativeMouseEvent dme(myPos.x(), myPos.y(), screenPos.x(), screenPos.y(), Qt::NoButton, Qt::NoButton, he->modifiers(), nullptr); + KDeclarativeMouseEvent dme(myPos.x(), myPos.y(), screenPos.x(), screenPos.y(), Qt::NoButton, Qt::NoButton, he->modifiers(), nullptr, Qt::MouseEventNotSynthesized); //qDebug() << "positionChanged..." << dme.x() << dme.y(); emit positionChanged(&dme); @@ -307,7 +307,7 @@ } const QPointF myPos = mapFromScene(me->windowPos()); - KDeclarativeMouseEvent dme(myPos.x(), myPos.y(), me->screenPos().x(), me->screenPos().y(), me->button(), me->buttons(), me->modifiers(), screenForGlobalPos(me->globalPos())); + KDeclarativeMouseEvent dme(myPos.x(), myPos.y(), me->screenPos().x(), me->screenPos().y(), me->button(), me->buttons(), me->modifiers(), screenForGlobalPos(me->globalPos()), me->source()); //qDebug() << "positionChanged..." << dme.x() << dme.y(); //stop the pressandhold if mouse moved enough @@ -318,7 +318,7 @@ //as there is no update function, delete the old event and create a new one } else if (m_pressAndHoldEvent) { delete m_pressAndHoldEvent; - m_pressAndHoldEvent = new KDeclarativeMouseEvent(myPos.x(), myPos.y(), me->screenPos().x(), me->screenPos().y(), me->button(), me->buttons(), me->modifiers(), screenForGlobalPos(me->globalPos())); + m_pressAndHoldEvent = new KDeclarativeMouseEvent(myPos.x(), myPos.y(), me->screenPos().x(), me->screenPos().y(), me->button(), me->buttons(), me->modifiers(), screenForGlobalPos(me->globalPos()), me->source()); } emit positionChanged(&dme); @@ -332,7 +332,7 @@ QMouseEvent *me = static_cast<QMouseEvent *>(event); const QPointF myPos = mapFromScene(me->windowPos()); - KDeclarativeMouseEvent dme(myPos.x(), myPos.y(), me->screenPos().x(), me->screenPos().y(), me->button(), me->buttons(), me->modifiers(), screenForGlobalPos(me->globalPos())); + KDeclarativeMouseEvent dme(myPos.x(), myPos.y(), me->screenPos().x(), me->screenPos().y(), me->button(), me->buttons(), me->modifiers(), screenForGlobalPos(me->globalPos()), me->source()); m_pressed = false; emit released(&dme); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.75.0/src/qmlcontrols/kquickcontrolsaddons/mouseeventlistener.h new/kdeclarative-5.76.0/src/qmlcontrols/kquickcontrolsaddons/mouseeventlistener.h --- old/kdeclarative-5.75.0/src/qmlcontrols/kquickcontrolsaddons/mouseeventlistener.h 2020-10-04 20:42:01.000000000 +0200 +++ new/kdeclarative-5.76.0/src/qmlcontrols/kquickcontrolsaddons/mouseeventlistener.h 2020-11-07 13:02:53.000000000 +0100 @@ -31,13 +31,15 @@ Q_PROPERTY(Qt::KeyboardModifiers modifiers READ modifiers) Q_PROPERTY(QScreen* screen READ screen CONSTANT) Q_PROPERTY(bool accepted READ isAccepted WRITE setAccepted NOTIFY acceptedChanged) + Q_PROPERTY(int source READ source) public: KDeclarativeMouseEvent(int x, int y, int screenX, int screenY, Qt::MouseButton button, Qt::MouseButtons buttons, Qt::KeyboardModifiers modifiers, - QScreen* screen) + QScreen* screen, + Qt::MouseEventSource source) : m_x(x), m_y(y), m_screenX(screenX), @@ -45,9 +47,11 @@ m_button(button), m_buttons(buttons), m_modifiers(modifiers), - m_screen(screen) + m_screen(screen), + m_source(source) {} + int x() const { return m_x; } int y() const { return m_y; } int screenX() const { return m_screenX; } @@ -56,6 +60,7 @@ Qt::MouseButtons buttons() const { return m_buttons; } Qt::KeyboardModifiers modifiers() const { return m_modifiers; } QScreen* screen() const { return m_screen; } + int source() const { return m_source; } bool isAccepted() const { return m_accepted; } void setAccepted(bool accepted) { @@ -82,6 +87,7 @@ Qt::KeyboardModifiers m_modifiers; QScreen *m_screen; bool m_accepted = false; + int m_source; }; class KDeclarativeWheelEvent : public QObject diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.75.0/src/qmlcontrols/kquickcontrolsaddons/plotter.cpp new/kdeclarative-5.76.0/src/qmlcontrols/kquickcontrolsaddons/plotter.cpp --- old/kdeclarative-5.75.0/src/qmlcontrols/kquickcontrolsaddons/plotter.cpp 2020-10-04 20:42:01.000000000 +0200 +++ new/kdeclarative-5.76.0/src/qmlcontrols/kquickcontrolsaddons/plotter.cpp 2020-11-07 13:02:53.000000000 +0100 @@ -23,8 +23,6 @@ #include <QSGTexture> #include <QSGSimpleTextureNode> -#include <QQuickWindow> -#include <QQuickItem> #include <QDebug> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.75.0/src/quickaddons/configmodule.cpp new/kdeclarative-5.76.0/src/quickaddons/configmodule.cpp --- old/kdeclarative-5.75.0/src/quickaddons/configmodule.cpp 2020-10-04 20:42:01.000000000 +0200 +++ new/kdeclarative-5.76.0/src/quickaddons/configmodule.cpp 2020-11-07 13:02:53.000000000 +0100 @@ -429,6 +429,11 @@ return d->_useRootOnlyMessage; } +QQuickItem *ConfigModule::subPage(int index) const +{ + return d->subPages[index]; +} + void ConfigModule::setQuickHelp(const QString &help) { if (d->_quickHelp == help) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.75.0/src/quickaddons/configmodule.h new/kdeclarative-5.76.0/src/quickaddons/configmodule.h --- old/kdeclarative-5.75.0/src/quickaddons/configmodule.h 2020-10-04 20:42:01.000000000 +0200 +++ new/kdeclarative-5.76.0/src/quickaddons/configmodule.h 2020-11-07 13:02:53.000000000 +0100 @@ -240,6 +240,13 @@ */ QQuickItem *mainUi(); + /* + * @return a subpage at a given depth + * @note This does not include the mainUi. i.e a depth of 2 is a mainUi and one subPage + * at index 0 + */ + QQuickItem *subPage(int index) const; + /** * Sets the quick help. */ @@ -408,7 +415,7 @@ /** * @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 + * It is guaranteed to be at least 1 (the main ui) plus how many times a new page has been pushed without pop */ int depth() const; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.75.0/src/quickaddons/quickviewsharedengine.cpp new/kdeclarative-5.76.0/src/quickaddons/quickviewsharedengine.cpp --- old/kdeclarative-5.75.0/src/quickaddons/quickviewsharedengine.cpp 2020-10-04 20:42:01.000000000 +0200 +++ new/kdeclarative-5.76.0/src/quickaddons/quickviewsharedengine.cpp 2020-11-07 13:02:53.000000000 +0100 @@ -7,7 +7,6 @@ #include "quickviewsharedengine.h" -#include <QUrl> #include <QQmlEngine> #include <QQmlContext> #include <QQuickItem> _______________________________________________ openSUSE Commits mailing list -- [email protected] To unsubscribe, email [email protected] List Netiquette: https://en.opensuse.org/openSUSE:Mailing_list_netiquette List Archives: https://lists.opensuse.org/archives/list/[email protected]
