Hello community, here is the log from the commit of package kdeclarative for openSUSE:Factory checked in at 2018-01-22 16:09:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdeclarative (Old) and /work/SRC/openSUSE:Factory/.kdeclarative.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdeclarative" Mon Jan 22 16:09:01 2018 rev:51 rq:567219 version:5.42.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kdeclarative/kdeclarative.changes 2018-01-09 14:46:44.561948176 +0100 +++ /work/SRC/openSUSE:Factory/.kdeclarative.new/kdeclarative.changes 2018-01-22 16:09:03.568484284 +0100 @@ -1,0 +2,14 @@ +Tue Jan 16 22:50:15 CET 2018 - [email protected] + +- Update to 5.42.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.42.0.php +- Changes since 5.41.0: + * Remove obsolete reviewboardrc file + * crash-- + * it was split + * fix build + * Qml controls for kcm creation + +------------------------------------------------------------------- Old: ---- kdeclarative-5.41.0.tar.xz New: ---- kdeclarative-5.42.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdeclarative.spec ++++++ --- /var/tmp/diff_new_pack.degan1/_old 2018-01-22 16:09:04.232453218 +0100 +++ /var/tmp/diff_new_pack.degan1/_new 2018-01-22 16:09:04.236453031 +0100 @@ -1,7 +1,7 @@ # # spec file for package kdeclarative # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 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 @@ -18,13 +18,13 @@ %bcond_without lang %define lname libKF5Declarative5 -%define _tar_path 5.41 +%define _tar_path 5.42 # 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: %global _kf5_bugfix_version %(echo %{_kf5_version} | awk -F. '{print $1"."$2}')} Name: kdeclarative -Version: 5.41.0 +Version: 5.42.0 Release: 0 %define kf5_version %{version} Summary: Integration of QML and KDE workspaces @@ -91,6 +91,7 @@ %package components Summary: KDeclarative QML components Group: System/GUI/KDE +Requires: kirigami2 >= %{_kf5_bugfix_version} %description components KDeclarative provides integration of QML and KDE workspaces. ++++++ kdeclarative-5.41.0.tar.xz -> kdeclarative-5.42.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.41.0/.reviewboardrc new/kdeclarative-5.42.0/.reviewboardrc --- old/kdeclarative-5.41.0/.reviewboardrc 2017-12-02 21:03:24.000000000 +0100 +++ new/kdeclarative-5.42.0/.reviewboardrc 1970-01-01 01:00:00.000000000 +0100 @@ -1,4 +0,0 @@ -REVIEWBOARD_URL = "https://git.reviewboard.kde.org"; -REPOSITORY = 'git://anongit.kde.org/kdeclarative' -BRANCH = 'master' -TARGET_GROUPS = 'kdeframeworks' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.41.0/CMakeLists.txt new/kdeclarative-5.42.0/CMakeLists.txt --- old/kdeclarative-5.41.0/CMakeLists.txt 2017-12-02 21:03:24.000000000 +0100 +++ new/kdeclarative-5.42.0/CMakeLists.txt 2018-01-07 17:16:58.000000000 +0100 @@ -1,12 +1,12 @@ cmake_minimum_required(VERSION 3.0) -set(KF5_VERSION "5.41.0") # handled by release scripts -set(KF5_DEP_VERSION "5.41.0") # handled by release scripts +set(KF5_VERSION "5.42.0") # handled by release scripts +set(KF5_DEP_VERSION "5.42.0") # handled by release scripts project(KDeclarative VERSION ${KF5_VERSION}) # Dependencies include(FeatureSummary) -find_package(ECM 5.41.0 NO_MODULE) +find_package(ECM 5.42.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) @@ -126,9 +126,7 @@ COMPONENT Devel ) -if ("${CMAKE_BINARY_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}") - feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) -endif() +feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) if(KF5Config_FOUND AND KF5I18n_FOUND AND KF5IconThemes_FOUND AND KF5KIO_FOUND) message("Dependencies for libkdeclarative found: it will be built") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.41.0/po/id/kdeclarative5.po new/kdeclarative-5.42.0/po/id/kdeclarative5.po --- old/kdeclarative-5.41.0/po/id/kdeclarative5.po 2017-12-02 21:03:24.000000000 +0100 +++ new/kdeclarative-5.42.0/po/id/kdeclarative5.po 2018-01-07 17:16:58.000000000 +0100 @@ -2,14 +2,15 @@ # Copyright (C) 2010 This_file_is_part_of_KDE # This file is distributed under the same license as the kdelibs4 package. # Andhika Padmawan <[email protected]>, 2010-2014. +# Wantoyo <[email protected]>, 2017. # msgid "" msgstr "" "Project-Id-Version: kdelibs4\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2017-11-30 03:07+0100\n" -"PO-Revision-Date: 2014-06-23 21:09+0700\n" -"Last-Translator: Andhika Padmawan <[email protected]>\n" +"PO-Revision-Date: 2017-12-11 22:03+0700\n" +"Last-Translator: Wantoyo <[email protected]>\n" "Language-Team: Indonesian <[email protected]>\n" "Language: id\n" "MIME-Version: 1.0\n" @@ -44,14 +45,14 @@ "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 "" -"Klik pada tombol, lalu masukkan jalan pintas seperti yang anda inginkan di " +"Klik pada tombol, lalu masukkan pintasan seperti yang anda inginkan di " "program.\n" "Misalnya untuk Ctrl+A: tahan tombol Ctrl lalu tekan A." #: qmlcontrols/kquickcontrols/private/keysequencehelper.cpp:276 #, kde-format msgid "Reserved Shortcut" -msgstr "Jalan Pintas Dipesan" +msgstr "Pintasan Dipesan" #: qmlcontrols/kquickcontrols/private/keysequencehelper.cpp:277 #, kde-format @@ -60,14 +61,14 @@ "shortcut.\n" "Please choose another one." msgstr "" -"Tombol F12 dipesan di Windows, sehingga tidak dapat digunakan untuk jalan " -"pintas global.\n" +"Tombol F12 dipesan di Windows, sehingga tidak dapat digunakan untuk pintasan " +"global.\n" "Silakan pilih yang lain" #: qmlcontrols/kquickcontrols/private/keysequencehelper.cpp:333 #, kde-format msgid "Conflict with Standard Application Shortcut" -msgstr "Konflik dengan Jalan Pintas Aplikasi Standar" +msgstr "Konflik dengan Pintasan Aplikasi Standar" #: qmlcontrols/kquickcontrols/private/keysequencehelper.cpp:334 #, kde-format @@ -78,7 +79,7 @@ msgstr "" "Kombinasi tombol '%1' digunakan pula untuk aksi standar \"%2\" yang " "digunakan oleh beberapa aplikasi.\n" -"Anda yakin ingin menggunakannya sebagai jalan pintas global juga?" +"Anda yakin ingin menggunakannya sebagai pintasan global juga?" #: qmlcontrols/kquickcontrols/private/keysequencehelper.cpp:339 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.41.0/po/sr/kdeclarative5.po new/kdeclarative-5.42.0/po/sr/kdeclarative5.po --- old/kdeclarative-5.41.0/po/sr/kdeclarative5.po 2017-12-02 21:03:24.000000000 +0100 +++ new/kdeclarative-5.42.0/po/sr/kdeclarative5.po 2018-01-07 17:16:58.000000000 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: kdeclarative5\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2017-06-30 03:05+0200\n" +"POT-Creation-Date: 2017-11-30 03:07+0100\n" "PO-Revision-Date: 2017-09-28 17:57+0200\n" "Last-Translator: Chusslove Illich <[email protected]>\n" "Language-Team: Serbian <[email protected]>\n" @@ -37,7 +37,7 @@ msgid "KPackage QML application shell" msgstr "КуМЛ програмска шкољка за KPackage" -#: kpackagelauncherqml/main.cpp:51 +#: kpackagelauncherqml/main.cpp:50 #, kde-format msgid "The unique name of the application (mandatory)" msgstr "Јединствено име програма (обавезно)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.41.0/po/sr@ijekavian/kdeclarative5.po new/kdeclarative-5.42.0/po/sr@ijekavian/kdeclarative5.po --- old/kdeclarative-5.41.0/po/sr@ijekavian/kdeclarative5.po 2017-12-02 21:03:24.000000000 +0100 +++ new/kdeclarative-5.42.0/po/sr@ijekavian/kdeclarative5.po 2018-01-07 17:16:58.000000000 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: kdeclarative5\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2017-06-30 03:05+0200\n" +"POT-Creation-Date: 2017-11-30 03:07+0100\n" "PO-Revision-Date: 2017-09-28 17:57+0200\n" "Last-Translator: Chusslove Illich <[email protected]>\n" "Language-Team: Serbian <[email protected]>\n" @@ -36,7 +36,7 @@ msgid "KPackage QML application shell" msgstr "КуМЛ програмска шкољка за KPackage" -#: kpackagelauncherqml/main.cpp:51 +#: kpackagelauncherqml/main.cpp:50 #, kde-format msgid "The unique name of the application (mandatory)" msgstr "Јединствено име програма (обавезно)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.41.0/po/sr@ijekavianlatin/kdeclarative5.po new/kdeclarative-5.42.0/po/sr@ijekavianlatin/kdeclarative5.po --- old/kdeclarative-5.41.0/po/sr@ijekavianlatin/kdeclarative5.po 2017-12-02 21:03:24.000000000 +0100 +++ new/kdeclarative-5.42.0/po/sr@ijekavianlatin/kdeclarative5.po 2018-01-07 17:16:58.000000000 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: kdeclarative5\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2017-06-30 03:05+0200\n" +"POT-Creation-Date: 2017-11-30 03:07+0100\n" "PO-Revision-Date: 2017-09-28 17:57+0200\n" "Last-Translator: Chusslove Illich <[email protected]>\n" "Language-Team: Serbian <[email protected]>\n" @@ -36,7 +36,7 @@ msgid "KPackage QML application shell" msgstr "QML programska školjka za KPackage" -#: kpackagelauncherqml/main.cpp:51 +#: kpackagelauncherqml/main.cpp:50 #, kde-format msgid "The unique name of the application (mandatory)" msgstr "Jedinstveno ime programa (obavezno)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.41.0/po/sr@latin/kdeclarative5.po new/kdeclarative-5.42.0/po/sr@latin/kdeclarative5.po --- old/kdeclarative-5.41.0/po/sr@latin/kdeclarative5.po 2017-12-02 21:03:24.000000000 +0100 +++ new/kdeclarative-5.42.0/po/sr@latin/kdeclarative5.po 2018-01-07 17:16:58.000000000 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: kdeclarative5\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2017-06-30 03:05+0200\n" +"POT-Creation-Date: 2017-11-30 03:07+0100\n" "PO-Revision-Date: 2017-09-28 17:57+0200\n" "Last-Translator: Chusslove Illich <[email protected]>\n" "Language-Team: Serbian <[email protected]>\n" @@ -36,7 +36,7 @@ msgid "KPackage QML application shell" msgstr "QML programska školjka za KPackage" -#: kpackagelauncherqml/main.cpp:51 +#: kpackagelauncherqml/main.cpp:50 #, kde-format msgid "The unique name of the application (mandatory)" msgstr "Jedinstveno ime programa (obavezno)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.41.0/po/zh_CN/kdeclarative5.po new/kdeclarative-5.42.0/po/zh_CN/kdeclarative5.po --- old/kdeclarative-5.41.0/po/zh_CN/kdeclarative5.po 2017-12-02 21:03:24.000000000 +0100 +++ new/kdeclarative-5.42.0/po/zh_CN/kdeclarative5.po 2018-01-07 17:16:58.000000000 +0100 @@ -15,7 +15,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2017-11-30 03:07+0100\n" -"PO-Revision-Date: 2017-11-09 08:34-0500\n" +"PO-Revision-Date: 2018-01-05 06:38-0500\n" "Last-Translator: guoyunhebrave <[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.41.0/src/qmlcontrols/CMakeLists.txt new/kdeclarative-5.42.0/src/qmlcontrols/CMakeLists.txt --- old/kdeclarative-5.41.0/src/qmlcontrols/CMakeLists.txt 2017-12-02 21:03:24.000000000 +0100 +++ new/kdeclarative-5.42.0/src/qmlcontrols/CMakeLists.txt 2018-01-07 17:16:58.000000000 +0100 @@ -1,6 +1,7 @@ add_subdirectory(draganddrop) add_subdirectory(kquickcontrolsaddons) +add_subdirectory(kcmcontrols) if(KF5I18n_FOUND AND KF5Config_FOUND AND KF5WidgetsAddons_FOUND AND KF5WindowSystem_FOUND AND KF5GlobalAccel_FOUND AND KF5KIO_FOUND AND KF5GuiAddons_FOUND) add_subdirectory(kquickcontrols) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.41.0/src/qmlcontrols/kcmcontrols/CMakeLists.txt new/kdeclarative-5.42.0/src/qmlcontrols/kcmcontrols/CMakeLists.txt --- old/kdeclarative-5.41.0/src/qmlcontrols/kcmcontrols/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/kdeclarative-5.42.0/src/qmlcontrols/kcmcontrols/CMakeLists.txt 2018-01-07 17:16:58.000000000 +0100 @@ -0,0 +1,19 @@ +project(draganddrop) + +set(declarativedragdrop_SRCS + kcmcontrolsplugin.cpp +) + +add_library(kcmcontrolsplugin SHARED ${declarativedragdrop_SRCS}) +target_link_libraries(kcmcontrolsplugin + Qt5::Core + Qt5::Quick + Qt5::Qml + Qt5::Gui + KF5::CoreAddons + KF5::QuickAddons +) + +install(TARGETS kcmcontrolsplugin DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/kcm) + +install(DIRECTORY qml/ DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/kcm) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.41.0/src/qmlcontrols/kcmcontrols/kcmcontrolsplugin.cpp new/kdeclarative-5.42.0/src/qmlcontrols/kcmcontrols/kcmcontrolsplugin.cpp --- old/kdeclarative-5.41.0/src/qmlcontrols/kcmcontrols/kcmcontrolsplugin.cpp 1970-01-01 01:00:00.000000000 +0100 +++ new/kdeclarative-5.42.0/src/qmlcontrols/kcmcontrols/kcmcontrolsplugin.cpp 2018-01-07 17:16:58.000000000 +0100 @@ -0,0 +1,36 @@ +/* + Copyright 2017 by Marco Martin <[email protected]> + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. +*/ + +#include "kcmcontrolsplugin.h" + +#include <QtQml> + +#include <KQuickAddons/ConfigModule> + + +void KCMControlsPlugin::registerTypes(const char *uri) +{ + Q_ASSERT(uri == QByteArray("org.kde.kcm")); + + qmlRegisterUncreatableType<KQuickAddons::ConfigModule>("org.kde.kcm", 1, 0, "ConfigModule", + QLatin1String("Do not create objects of type ConfigModule")); +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.41.0/src/qmlcontrols/kcmcontrols/kcmcontrolsplugin.h new/kdeclarative-5.42.0/src/qmlcontrols/kcmcontrols/kcmcontrolsplugin.h --- old/kdeclarative-5.41.0/src/qmlcontrols/kcmcontrols/kcmcontrolsplugin.h 1970-01-01 01:00:00.000000000 +0100 +++ new/kdeclarative-5.42.0/src/qmlcontrols/kcmcontrols/kcmcontrolsplugin.h 2018-01-07 17:16:58.000000000 +0100 @@ -0,0 +1,37 @@ +/* + Copyright 2011 by Marco Martin <[email protected]> + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. +*/ + +#ifndef KCMCONTROLSPLUGIN_H +#define KCMCONTROLSPLUGIN_H + +#include <QQmlExtensionPlugin> + +class KCMControlsPlugin : public QQmlExtensionPlugin +{ + Q_OBJECT + Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface") + +public: + void registerTypes(const char *uri) Q_DECL_OVERRIDE; +}; + +#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.41.0/src/qmlcontrols/kcmcontrols/qml/GridDelegate.qml new/kdeclarative-5.42.0/src/qmlcontrols/kcmcontrols/qml/GridDelegate.qml --- old/kdeclarative-5.41.0/src/qmlcontrols/kcmcontrols/qml/GridDelegate.qml 1970-01-01 01:00:00.000000000 +0100 +++ new/kdeclarative-5.42.0/src/qmlcontrols/kcmcontrols/qml/GridDelegate.qml 2018-01-07 17:16:58.000000000 +0100 @@ -0,0 +1,191 @@ +/* + Copyright (c) 2015 Marco Martin <[email protected]> + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License version 2 as published by the Free Software Foundation. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to + the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. +*/ + +import QtQuick 2.1 +import QtQuick.Layouts 1.1 +import QtQuick.Controls 2.2 as Controls +import QtQuick.Templates 2.2 as T2 +import QtGraphicalEffects 1.0 + +import org.kde.kirigami 2.2 as Kirigami + +/** + * Base delegate for KControlmodules based on Grid views of thumbnails + * Use the onClicked signal handler for managing the main action when + * the user clicks on the thumbnail + * @inherits QtQuick.Templates.ItemDelegate + */ +T2.ItemDelegate { + id: delegate + + /** + * toolTip: string + * string for a tooltip for the whole delegate + */ + property string toolTip + + /** + * thumbnail: Item + * the item actually implementing the thumbnail: the visualization is up to the implementation + */ + property alias thumbnail: thumbnailArea.data + + /** + * thumbnailAvailable: bool + * Set it to true when a thumbnail is actually available: when false, + * a default icon will be shown instead of the actual thumbnail. + */ + property bool thumbnailAvailable: false + + /** + * actions: list<Action> + * A list of extra actions for the thumbnails. They will be shown as + * icons on the bottom-right corner of the thumbnail on mouse over + */ + property list<QtObject> actions + + width: view.cellWidth + height: view.cellHeight + hoverEnabled: true + + Rectangle { + id: thumbnail + anchors { + left: parent.left + right: parent.right + top: parent.top + margins: Kirigami.Units.smallSpacing * 2 + } + height: width/1.6 + radius: Kirigami.Units.smallSpacing + Kirigami.Theme.inherit: false + Kirigami.Theme.colorSet: Kirigami.Theme.View + + color: { + if (delegate.GridView.isCurrentItem) { + return Kirigami.Theme.highlightColor; + } else if (parent.hovered) { + return Qt.tint(Kirigami.Theme.backgroundColor, Qt.rgba(Kirigami.Theme.highlightColor.r, Kirigami.Theme.highlightColor.g, Kirigami.Theme.highlightColor.b, 0.3)) + } else { + return Kirigami.Theme.backgroundColor + } + } + Behavior on color { + ColorAnimation { + duration: Kirigami.Units.longDuration + easing.type: Easing.OutQuad + } + } + + Rectangle { + id: thumbnailArea + radius: Kirigami.Units.smallSpacing/2 + anchors { + fill: parent + margins: Kirigami.Units.smallSpacing + } + + color: Kirigami.Theme.backgroundColor + Kirigami.Icon { + visible: !delegate.thumbnailAvailable + anchors.centerIn: parent + width: Kirigami.Units.iconSizes.large + height: width + source: "view-preview" + } + } + + Rectangle { + anchors.fill: parent + visible: actionsRow.children.length > 0 + opacity: delegate.hovered || (actionsScope.focus) ? 1 : 0 + radius: Kirigami.Units.smallSpacing + color: Qt.rgba(Kirigami.Theme.backgroundColor.r, Kirigami.Theme.backgroundColor.g, Kirigami.Theme.backgroundColor.b, 0.4) + + Kirigami.Theme.inherit: false + Kirigami.Theme.colorSet: Kirigami.Theme.Complementary + + Behavior on opacity { + PropertyAnimation { + duration: Kirigami.Units.longDuration + easing.type: Easing.OutQuad + } + } + + FocusScope { + id: actionsScope + anchors { + right: parent.right + bottom: parent.bottom + margins: Kirigami.Units.smallSpacing + } + width: actionsRow.width + height: actionsRow.height + RowLayout { + id: actionsRow + + Repeater { + model: delegate.actions + delegate: Controls.ToolButton { + Kirigami.Icon { + Kirigami.Theme.inherit: false + Kirigami.Theme.colorSet: Kirigami.Theme.Complementary + anchors.centerIn: parent + width: Kirigami.Units.iconSizes.smallMedium + height: width + source: modelData.iconName + } + activeFocusOnTab: focus || delegate.focus + onClicked: modelData.trigger() + enabled: modelData.enabled + //NOTE: there aren't any global settings where to take "official" tooltip timeouts + Controls.ToolTip.delay: 1000 + Controls.ToolTip.timeout: 5000 + Controls.ToolTip.visible: hovered + Controls.ToolTip.text: modelData.tooltip + } + } + } + } + } + layer.enabled: true + layer.effect: DropShadow { + horizontalOffset: 0 + verticalOffset: 2 + radius: 10 + samples: 32 + color: Qt.rgba(0, 0, 0, 0.3) + } + } + + Controls.Label { + anchors { + left: parent.left + right: parent.right + top: thumbnail.bottom + topMargin: Kirigami.Units.smallSpacing + } + text: delegate.text + horizontalAlignment: Text.AlignHCenter + elide: Text.ElideRight + } + Controls.ToolTip.delay: 1000 + Controls.ToolTip.timeout: 5000 + Controls.ToolTip.visible: hovered + Controls.ToolTip.text: toolTip +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.41.0/src/qmlcontrols/kcmcontrols/qml/GridView.qml new/kdeclarative-5.42.0/src/qmlcontrols/kcmcontrols/qml/GridView.qml --- old/kdeclarative-5.41.0/src/qmlcontrols/kcmcontrols/qml/GridView.qml 1970-01-01 01:00:00.000000000 +0100 +++ new/kdeclarative-5.42.0/src/qmlcontrols/kcmcontrols/qml/GridView.qml 2018-01-07 17:16:58.000000000 +0100 @@ -0,0 +1,83 @@ +/* + Copyright (c) 2017 Marco Martin <[email protected]> + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License version 2 as published by the Free Software Foundation. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to + the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. +*/ + +import QtQuick 2.7 +import QtQuick.Layouts 1.1 +import QtQuick.Controls 2.2 as QtControls +import org.kde.kirigami 2.3 as Kirigami + +/** + * A ScrollView containing a GridView, with the default behavior about + * sizing and background as recomended by the user interface guidelines + * For most KControl modules, it's recomended to use instead the GridViewKCM + * component as the root element of your module. + * @see GridViewKCM + */ +QtControls.ScrollView { + id: scroll + + /** + * view: GridView + * Exposes the internal GridView: in order to set a model or a delegate to it, + * use the following code: + * @code + * import org.kde.kcm 1.1 as KCM + * KCM.GridView { + * view.model: kcm.model + * view.delegate: KCM.GridDelegate {...} + * } + * @endcode + */ + property alias view: view + + + implicitWidth: Math.max(view.cellWidth * 2 + internal.scrollBarSpace + , Math.floor(internal.availableWidth / view.cellWidth) * view.cellWidth + internal.scrollBarSpace + 4) + activeFocusOnTab: false + Kirigami.Theme.colorSet: Kirigami.Theme.View + Kirigami.Theme.inherit: false + + Component.onCompleted: scroll.background.visible = true; + + GridView { + id: view + property int implicitCellWidth: Kirigami.Units.gridUnit * 10 + property int implicitCellHeight: Math.round(implicitCellWidth / 1.6) + Kirigami.Units.gridUnit + QtObject { + id: internal + readonly property int availableWidth: scroll.parent.width - internal.scrollBarSpace - 4 + readonly property int scrollBarSpace: scroll.QtControls.ScrollBar.vertical.width + } + anchors { + fill: parent + margins: 2 + leftMargin: contentHeight <= height ? internal.scrollBarSpace/2 : 2 + rightMargin: contentHeight <= height ? internal.scrollBarSpace/2 : internal.scrollBarSpace + 2 + } + clip: true + activeFocusOnTab: true + + cellWidth: Math.min(Math.floor(internal.availableWidth / 2), implicitCellWidth) + cellHeight: Math.round(cellWidth / 1.6) + Kirigami.Units.gridUnit + + keyNavigationEnabled: true + keyNavigationWraps: true + highlightMoveDuration: 0 + } + QtControls.ScrollBar.horizontal.visible: false +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.41.0/src/qmlcontrols/kcmcontrols/qml/GridViewKCM.qml new/kdeclarative-5.42.0/src/qmlcontrols/kcmcontrols/qml/GridViewKCM.qml --- old/kdeclarative-5.41.0/src/qmlcontrols/kcmcontrols/qml/GridViewKCM.qml 1970-01-01 01:00:00.000000000 +0100 +++ new/kdeclarative-5.42.0/src/qmlcontrols/kcmcontrols/qml/GridViewKCM.qml 2018-01-07 17:16:58.000000000 +0100 @@ -0,0 +1,79 @@ +/* + Copyright (c) 2017 Marco Martin <[email protected]> + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License version 2 as published by the Free Software Foundation. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to + the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. +*/ + +import QtQuick 2.7 +import QtQuick.Layouts 1.1 +import QtQuick.Controls 2.2 as QtControls +import org.kde.kirigami 2.2 as Kirigami +import org.kde.kcm 1.1 as KCM + +/** + * This component is intended to be used as the root item for most of the + * KControl modules which are based upon a grid view of thumbnails, such as theme + * or wallpaper selectors. + * It has a big GridView as its main item, the implementation is free to add extra + * content in the header or footer properties. + * @code + * import org.kde.kcm 1.1 as KCM + * KCM.GridViewKCM { + * header: Item {...} + * view.model: kcm.model + * view.delegate: KCM.GridDelegate {...} + * footer: Item {...} + * } + * @endcode + * @inherits org.kde.kirigami.Page + */ +Kirigami.Page { + id: root + + /** + * view: GridView + * Exposes the internal GridView: in order to set a model or a delegate to it, + * use the following code: + * @code + * import org.kde.kcm 1.1 as KCM + * KCM.GridViewKCM { + * ... + * view.model: kcm.model + * view.delegate: KCM.GridDelegate {...} + * ... + * } + * @endcode + */ + property alias view: scroll.view + + title: kcm.name + implicitWidth: view.implicitCellWidth * 3 + scroll.QtControls.ScrollBar.vertical.width + Kirigami.Units.gridUnit + implicitHeight: view.implicitCellHeight * 3 + (header ? header.height : 0) + (footer ? footer.height : 0) + Kirigami.Units.gridUnit + + topPadding: 0 + leftPadding: 0 + rightPadding: 0 + bottomPadding: footer ? Kirigami.Units.smallSpacing : 0 + + KCM.GridView { + id: scroll + width: Math.min(implicitWidth, root.width) + anchors { + top: parent.top + bottom: parent.bottom + horizontalCenter: parent.horizontalCenter + } + } +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.41.0/src/qmlcontrols/kcmcontrols/qml/SimpleKCM.qml new/kdeclarative-5.42.0/src/qmlcontrols/kcmcontrols/qml/SimpleKCM.qml --- old/kdeclarative-5.41.0/src/qmlcontrols/kcmcontrols/qml/SimpleKCM.qml 1970-01-01 01:00:00.000000000 +0100 +++ new/kdeclarative-5.42.0/src/qmlcontrols/kcmcontrols/qml/SimpleKCM.qml 2018-01-07 17:16:58.000000000 +0100 @@ -0,0 +1,72 @@ +/* + Copyright (c) 2017 Marco Martin <[email protected]> + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License version 2 as published by the Free Software Foundation. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to + the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. +*/ + +import QtQuick 2.7 +import org.kde.kirigami 2.2 as Kirigami +import org.kde.kcm 1.1 as KCM + +/** + * This component is intended to be used as root item for + * KControl modules with arbitrary content, as per the User interface guidelines, + * usually a Kirigami.FormLayout as its main component. + * header and footer properties can be used. + * @code + * import org.kde.kcm 1.1 as KCM + * import org.kde.kirigami 2.3 as Kirigami + * KCM.SimpleKCM { + * Kirigami.FormLayout { + * TextField { + * Kirigami.FormData.label: "Label:" + * } + * TextField { + * Kirigami.FormData.label: "Label:" + * } + * } + * footer: Item {...} + * } + * @endcode + * @inherits org.kde.kirigami.ScrollablePage + */ +Kirigami.ScrollablePage { + id: root + + title: kcm.name + implicitWidth: Kirigami.Units.gridUnit * 20 + implicitHeight: Math.min(flickable.contentHeight, Kirigami.Units.gridUnit * 20) + + children: [ + Kirigami.Separator { + z: 999 + anchors { + left: parent.left + right: parent.right + top: parent.top + } + visible: !root.flickable.atYBeginning + }, + Kirigami.Separator { + z: 999 + anchors { + left: parent.left + right: parent.right + bottom: parent.bottom + } + visible: !root.flickable.atYEnd + } + ] +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.41.0/src/qmlcontrols/kcmcontrols/qml/qmldir new/kdeclarative-5.42.0/src/qmlcontrols/kcmcontrols/qml/qmldir --- old/kdeclarative-5.41.0/src/qmlcontrols/kcmcontrols/qml/qmldir 1970-01-01 01:00:00.000000000 +0100 +++ new/kdeclarative-5.42.0/src/qmlcontrols/kcmcontrols/qml/qmldir 2018-01-07 17:16:58.000000000 +0100 @@ -0,0 +1,7 @@ +module org.kde.kcm +plugin kcmcontrolsplugin + +GridDelegate 1.1 GridDelegate.qml +GridViewKCM 1.1 GridViewKCM.qml +GridView 1.1 GridView.qml +SimpleKCM 1.1 SimpleKCM.qml diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.41.0/src/quickaddons/configmodule.cpp new/kdeclarative-5.42.0/src/quickaddons/configmodule.cpp --- old/kdeclarative-5.41.0/src/quickaddons/configmodule.cpp 2017-12-02 21:03:24.000000000 +0100 +++ new/kdeclarative-5.42.0/src/quickaddons/configmodule.cpp 2018-01-07 17:16:58.000000000 +0100 @@ -55,8 +55,6 @@ _needsAuthorization(false), _needsSave(false) { - qmlRegisterUncreatableType<ConfigModule>("org.kde.kcm", 1, 0, "ConfigModule", - QLatin1String("Do not create objects of type ConfigModule")); } void authStatusChanged(int status); @@ -103,7 +101,10 @@ ConfigModule::~ConfigModule() { - ConfigModulePrivate::s_rootObjects.remove(d->_qmlObject->rootContext()); + //in case mainUi was never called + if (d->_qmlObject) { + ConfigModulePrivate::s_rootObjects.remove(d->_qmlObject->rootContext()); + } delete d->_qmlObject; delete d->_about;
