Hello community, here is the log from the commit of package kirigami2 for openSUSE:Factory checked in at 2017-11-16 14:38:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kirigami2 (Old) and /work/SRC/openSUSE:Factory/.kirigami2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kirigami2" Thu Nov 16 14:38:48 2017 rev:7 rq:541666 version:5.40.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kirigami2/kirigami2.changes 2017-10-27 13:55:52.119590925 +0200 +++ /work/SRC/openSUSE:Factory/.kirigami2.new/kirigami2.changes 2017-11-16 14:38:48.399474304 +0100 @@ -0,0 +1,30 @@ +------------------------------------------------------------------- +Mon Nov 13 22:40:33 CET 2017 - [email protected] + +- Update to 5.40.0 + * New bugfix release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.40.0.php +- Changes since 5.39.0: + * syntax working on older Qt 5.7 (kde#385785) + * stack the overlaysheet differently (kde#386470) + * Show the delegate highlighted property as well when there's no focus + * preferred size hints for the separator + * correct Settings.isMobile usage + * Allow applications to be somewhat convergent on a desktop-y system + * Make sure the content of the SwipeListItem doesn't overlap the handle + * check page.actions for null + * use a Dialog + * Overlaysheet's scrollview is always ointeractive + * Add categories in gallery desktop file (kde#385430) + * Update the kirigami.pri file + * use the non installed plugin to do the tests + * partly revert 72c01208fe79 + * Deprecate Kirigami.Label + * Port gallery example use of Labels to be consistently QQC2 + * Port Kirigami.Controls uses of Kirigami.Label + * remove useless debug + * make the scrollarea interactive on touch events + * Move the git find_package call to where it's used + * default to transparent listview items + * Add 'Introduction' section to README.md - this is needed for inqlude script to create a proper manifest file for inqlude.org website, used information from metainfo.yaml/Mainpage.dox @@ -5 +35,6 @@ - * Update to 5.39.0 +- Update to 5.39.0 + * New bugfix release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.39.0.php +- Changes since 5.38.0: + * Too many changes to list here Old: ---- kirigami2-5.39.0.tar.xz New: ---- kirigami2-5.40.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kirigami2.spec ++++++ --- /var/tmp/diff_new_pack.lN3WwB/_old 2017-11-16 14:38:49.223444433 +0100 +++ /var/tmp/diff_new_pack.lN3WwB/_new 2017-11-16 14:38:49.227444288 +0100 @@ -18,9 +18,9 @@ %define lname libKF5Kirigami2-5 %bcond_without lang -%define _tar_path 5.39 +%define _tar_path 5.40 Name: kirigami2 -Version: 5.39.0 +Version: 5.40.0 Release: 0 Summary: Set of QtQuick components License: LGPL-2.1+ ++++++ kirigami2-5.39.0.tar.xz -> kirigami2-5.40.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.39.0/CMakeLists.txt new/kirigami2-5.40.0/CMakeLists.txt --- old/kirigami2-5.39.0/CMakeLists.txt 2017-10-07 21:17:51.000000000 +0200 +++ new/kirigami2-5.40.0/CMakeLists.txt 2017-11-05 09:33:30.000000000 +0100 @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 3.0) -set(KF5_VERSION "5.39.0") # handled by release scripts -set(KF5_DEP_VERSION "5.39.0") # handled by release scripts +set(KF5_VERSION "5.40.0") # handled by release scripts +set(KF5_DEP_VERSION "5.40.0") # handled by release scripts project(kirigami2 VERSION ${KF5_VERSION}) @@ -34,7 +34,7 @@ ################# set KDE specific information ################# -find_package(ECM 5.39.0 NO_MODULE) +find_package(ECM 5.40.0 NO_MODULE) set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://projects.kde.org/projects/kdesupport/extra-cmake-modules";) # where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is checked diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.39.0/KF5Kirigami2Macros.cmake new/kirigami2-5.40.0/KF5Kirigami2Macros.cmake --- old/kirigami2-5.39.0/KF5Kirigami2Macros.cmake 2017-10-07 21:17:51.000000000 +0200 +++ new/kirigami2-5.40.0/KF5Kirigami2Macros.cmake 2017-11-05 09:33:30.000000000 +0100 @@ -1,7 +1,6 @@ include(CMakeParseArguments) include(ExternalProject) -find_package(Git) function(kirigami_package_breeze_icons) @@ -52,6 +51,7 @@ # replacement for ExternalProject_Add not yet working # first time config? if (NOT EXISTS ${_BREEZEICONS_DIR}) + find_package(Git) execute_process(COMMAND ${GIT_EXECUTABLE} clone --depth 1 git://anongit.kde.org/breeze-icons.git ${_BREEZEICONS_DIR}) endif() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.39.0/README.md new/kirigami2-5.40.0/README.md --- old/kirigami2-5.39.0/README.md 2017-10-07 21:17:51.000000000 +0200 +++ new/kirigami2-5.40.0/README.md 2017-11-05 09:33:30.000000000 +0100 @@ -1,5 +1,11 @@ # Kirigami +QtQuick plugins to build user interfaces based on the KDE UX guidelines + +## Introduction + +Kirigami is a set of QtQuick components at the moment targeted for mobile use (in the future desktop as well) targeting both Plasma Mobile and Android. It’s not a whole set of components, all the “Primitive” ones like buttons and textboxes are a job for QtQuickControls (soon QtQuickControls2) but it’s a set of high level components to make the creation of applications that look and feel great on mobile as well as desktop devices and follow the Kirigami Human Interface Guidelines. + ## Build examples to desktop Build all examples available ```sh diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.39.0/autotests/CMakeLists.txt new/kirigami2-5.40.0/autotests/CMakeLists.txt --- old/kirigami2-5.39.0/autotests/CMakeLists.txt 2017-10-07 21:17:51.000000000 +0200 +++ new/kirigami2-5.40.0/autotests/CMakeLists.txt 2017-11-05 09:33:30.000000000 +0100 @@ -1 +1,4 @@ add_test(NAME qmltests COMMAND qmltestrunner WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) + +set_property(TEST qmltests PROPERTY ENVIRONMENT +"QML2_IMPORT_PATH=${CMAKE_BINARY_DIR}/bin") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.39.0/examples/gallerydata/contents/ui/gallery/ButtonGallery.qml new/kirigami2-5.40.0/examples/gallerydata/contents/ui/gallery/ButtonGallery.qml --- old/kirigami2-5.39.0/examples/gallerydata/contents/ui/gallery/ButtonGallery.qml 2017-10-07 21:17:51.000000000 +0200 +++ new/kirigami2-5.40.0/examples/gallerydata/contents/ui/gallery/ButtonGallery.qml 2017-11-05 09:33:30.000000000 +0100 @@ -110,7 +110,7 @@ id: sheet onSheetOpenChanged: page.actions.main.checked = sheetOpen ColumnLayout { - Label { + Controls.Label { Layout.fillWidth: true wrapMode: Text.WordWrap text: " @@ -121,7 +121,7 @@ Layout.alignment: Qt.AlignHCenter } - Label { + Controls.Label { Layout.fillWidth: true wrapMode: Text.WordWrap text: " diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.39.0/examples/gallerydata/contents/ui/gallery/CheckBoxGallery.qml new/kirigami2-5.40.0/examples/gallerydata/contents/ui/gallery/CheckBoxGallery.qml --- old/kirigami2-5.39.0/examples/gallerydata/contents/ui/gallery/CheckBoxGallery.qml 2017-10-07 21:17:51.000000000 +0200 +++ new/kirigami2-5.40.0/examples/gallerydata/contents/ui/gallery/CheckBoxGallery.qml 2017-11-05 09:33:30.000000000 +0100 @@ -49,7 +49,7 @@ OverlaySheet { id: sheet - Label { + Controls.Label { property int implicitWidth: Units.gridUnit * 45 wrapMode: Text.WordWrap text: "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nullam id risus id augue euismod accumsan. Nunc vestibulum placerat bibendum. Morbi commodo auctor varius. Donec molestie euismod ultrices. Sed facilisis augue nec eros auctor, vitae mattis quam rhoncus. Nam ut erat diam. Curabitur iaculis accumsan magna, eget fermentum massa scelerisque eu. Cras elementum erat non erat euismod accumsan. Vestibulum ac mi sed dui finibus pulvinar. Vivamus dictum, leo sed lobortis porttitor, nisl magna faucibus orci, sit amet euismod arcu elit eget est. Duis et vehicula nibh. In arcu sapien, laoreet sit amet porttitor non, rhoncus vel magna. Suspendisse imperdiet consectetur est nec ornare. Pellentesque bibendum sapien at erat efficitur vehicula. Morbi sed porta nibh. Vestibulum ut urna ut dolor sagittis mattis." @@ -74,14 +74,14 @@ width: 1 height: 1 } - Label { + Controls.Label { text: "Normal" } - Label { + Controls.Label { text: "Disabled" enabled: false } - Label { + Controls.Label { text: "On" } Controls.CheckBox { @@ -93,7 +93,7 @@ checked: true enabled: false } - Label { + Controls.Label { text: "Off" } Controls.CheckBox { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.39.0/examples/gallerydata/contents/ui/gallery/ColorSetGallery.qml new/kirigami2-5.40.0/examples/gallerydata/contents/ui/gallery/ColorSetGallery.qml --- old/kirigami2-5.39.0/examples/gallerydata/contents/ui/gallery/ColorSetGallery.qml 2017-10-07 21:17:51.000000000 +0200 +++ new/kirigami2-5.40.0/examples/gallerydata/contents/ui/gallery/ColorSetGallery.qml 2017-11-05 09:33:30.000000000 +0100 @@ -32,7 +32,7 @@ ColumnLayout { GridLayout { columns: 2 - Kirigami.Label { + Controls.Label { text: "Global Drawer color set:" Layout.alignment: Qt.AlignRight } @@ -43,7 +43,7 @@ onCurrentTextChanged: applicationWindow().globalDrawer.Kirigami.Theme.colorSet = currentText } - Kirigami.Label { + Controls.Label { text: "Page color set:" Layout.alignment: Qt.AlignRight } @@ -66,7 +66,7 @@ } contentItem: ColumnLayout { width: parent.width - Kirigami.Label { + Controls.Label { text: "Set inherited from parent Item" } Kirigami.BasicListItem { @@ -93,7 +93,7 @@ } contentItem: ColumnLayout { width: parent.width - Kirigami.Label { + Controls.Label { text: "Window Set" } Kirigami.BasicListItem { @@ -120,7 +120,7 @@ } contentItem: ColumnLayout { width: parent.width - Kirigami.Label { + Controls.Label { text: "View Set" } Kirigami.BasicListItem { @@ -146,7 +146,7 @@ color: Kirigami.Theme.backgroundColor } contentItem: ColumnLayout { - Kirigami.Label { + Controls.Label { text: "Complementary Set" } Kirigami.BasicListItem { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.39.0/examples/gallerydata/contents/ui/gallery/ColorsGallery.qml new/kirigami2-5.40.0/examples/gallerydata/contents/ui/gallery/ColorsGallery.qml --- old/kirigami2-5.39.0/examples/gallerydata/contents/ui/gallery/ColorsGallery.qml 2017-10-07 21:17:51.000000000 +0200 +++ new/kirigami2-5.40.0/examples/gallerydata/contents/ui/gallery/ColorsGallery.qml 2017-11-05 09:33:30.000000000 +0100 @@ -20,6 +20,7 @@ import QtQuick 2.0 import QtQuick.Layouts 1.2 import org.kde.kirigami 2.2 +import QtQuick.Controls 2.0 as Controls ScrollablePage { id: page @@ -99,7 +100,7 @@ color: "black" } } - Label { + Controls.Label { Theme.colorSet: Theme.Window Theme.inherit: false Layout.alignment: Qt.AlignVCenter | Qt.AlignHCenter diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.39.0/examples/gallerydata/contents/ui/gallery/LayersGallery.qml new/kirigami2-5.40.0/examples/gallerydata/contents/ui/gallery/LayersGallery.qml --- old/kirigami2-5.39.0/examples/gallerydata/contents/ui/gallery/LayersGallery.qml 2017-10-07 21:17:51.000000000 +0200 +++ new/kirigami2-5.40.0/examples/gallerydata/contents/ui/gallery/LayersGallery.qml 2017-11-05 09:33:30.000000000 +0100 @@ -63,7 +63,7 @@ width: page.width spacing: Units.smallSpacing - Label { + Controls.Label { Layout.fillWidth: true wrapMode: Text.WordWrap text: "This page is used to test multiple layers: it will cover all the columns" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.39.0/examples/gallerydata/contents/ui/gallery/ListViewGallery.qml new/kirigami2-5.40.0/examples/gallerydata/contents/ui/gallery/ListViewGallery.qml --- old/kirigami2-5.39.0/examples/gallerydata/contents/ui/gallery/ListViewGallery.qml 2017-10-07 21:17:51.000000000 +0200 +++ new/kirigami2-5.40.0/examples/gallerydata/contents/ui/gallery/ListViewGallery.qml 2017-11-05 09:33:30.000000000 +0100 @@ -19,6 +19,7 @@ import QtQuick 2.4 import QtQuick.Layouts 1.2 +import QtQuick.Controls 2.0 as Controls import org.kde.kirigami 2.2 as Kirigami Kirigami.ScrollablePage { @@ -77,7 +78,7 @@ model: 200 delegate: Kirigami.SwipeListItem { id: listItem - contentItem: Kirigami.Label { + contentItem: Controls.Label { height: Math.max(implicitHeight, Kirigami.Units.iconSizes.smallMedium) anchors.verticalCenter: parent.verticalCenter text: "Item " + modelData diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.39.0/examples/gallerydata/contents/ui/gallery/MiscGallery.qml new/kirigami2-5.40.0/examples/gallerydata/contents/ui/gallery/MiscGallery.qml --- old/kirigami2-5.39.0/examples/gallerydata/contents/ui/gallery/MiscGallery.qml 2017-10-07 21:17:51.000000000 +0200 +++ new/kirigami2-5.40.0/examples/gallerydata/contents/ui/gallery/MiscGallery.qml 2017-11-05 09:33:30.000000000 +0100 @@ -17,8 +17,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import QtQuick 2.0 -import QtQuick.Controls 2.0 as Controls +import QtQuick 2.6 +import QtQuick.Controls 2.1 as Controls import QtQuick.Layouts 1.2 import org.kde.kirigami 2.2 @@ -107,30 +107,22 @@ } } - Controls.Popup { + Controls.Dialog { id: dialog modal: true focus: true x: (page.width - width) / 2 y: page.height / 2 - height width: Math.min(page.width - Units.gridUnit * 4, Units.gridUnit * 20) - contentHeight: popupColumn.height + standardButtons: Controls.Dialog.Ok + title: "Title" - Column { - id: popupColumn - spacing: 20 - - Controls.Label { - width: dialog.availableWidth - text: "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nullam id risus id augue euismod accumsan. Nunc vestibulum placerat bibendum. Morbi commodo auctor varius. Donec molestie euismod ultrices. Sed facilisis augue nec eros auctor." - wrapMode: Label.Wrap - } - Controls.Button { - anchors.right: parent.right - text: "Ok" - onClicked: dialog.close() - } + Controls.Label { + width: dialog.availableWidth + text: "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nullam id risus id augue euismod accumsan. Nunc vestibulum placerat bibendum. Morbi commodo auctor varius. Donec molestie euismod ultrices. Sed facilisis augue nec eros auctor." + wrapMode: Label.Wrap } + } ColumnLayout { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.39.0/examples/gallerydata/contents/ui/gallery/MultipleColumnsGallery.qml new/kirigami2-5.40.0/examples/gallerydata/contents/ui/gallery/MultipleColumnsGallery.qml --- old/kirigami2-5.39.0/examples/gallerydata/contents/ui/gallery/MultipleColumnsGallery.qml 2017-10-07 21:17:51.000000000 +0200 +++ new/kirigami2-5.40.0/examples/gallerydata/contents/ui/gallery/MultipleColumnsGallery.qml 2017-11-05 09:33:30.000000000 +0100 @@ -70,7 +70,7 @@ width: page.width spacing: Units.smallSpacing - Label { + Controls.Label { Layout.fillWidth: true wrapMode: Text.WordWrap text: "This page is used to test multiple columns: you can push and pop an arbitrary number of pages, each new page will have a random implicit width between 8 and 35 grid units.\nIf you enlarge the window enough, you can test how the application behaves with multiple columns." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.39.0/examples/gallerydata/contents/ui/gallery/NonScrollableGallery.qml new/kirigami2-5.40.0/examples/gallerydata/contents/ui/gallery/NonScrollableGallery.qml --- old/kirigami2-5.39.0/examples/gallerydata/contents/ui/gallery/NonScrollableGallery.qml 2017-10-07 21:17:51.000000000 +0200 +++ new/kirigami2-5.40.0/examples/gallerydata/contents/ui/gallery/NonScrollableGallery.qml 2017-11-05 09:33:30.000000000 +0100 @@ -19,6 +19,7 @@ import QtQuick 2.0 import QtQuick.Layouts 1.2 +import QtQuick.Controls 2.0 as Controls import org.kde.kirigami 2.2 Page { @@ -38,7 +39,7 @@ Rectangle { anchors.fill: parent color: "red" - Label { + Controls.Label { anchors.centerIn: parent text: "Rectangle with automatic margins" } @@ -47,7 +48,7 @@ OverlaySheet { id: sheet onSheetOpenChanged: page.actions.main.checked = sheetOpen; - Label { + Controls.Label { property int implicitWidth: Units.gridUnit * 30 wrapMode: Text.WordWrap text: "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nullam id risus id augue euismod accumsan. Nunc vestibulum placerat bibendum. Morbi commodo auctor varius. Donec molestie euismod ultrices. Sed facilisis augue nec eros auctor, vitae mattis quam rhoncus. Nam ut erat diam. Curabitur iaculis accumsan magna, eget fermentum massa scelerisque eu. Cras elementum erat non erat euismod accumsan. Vestibulum ac mi sed dui finibus pulvinar. Vivamus dictum, leo sed lobortis porttitor, nisl magna faucibus orci, sit amet euismod arcu elit eget est. Duis et vehicula nibh. In arcu sapien, laoreet sit amet porttitor non, rhoncus vel magna. Suspendisse imperdiet consectetur est nec ornare. Pellentesque bibendum sapien at erat efficitur vehicula. Morbi sed porta nibh. Vestibulum ut urna ut dolor sagittis mattis." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.39.0/examples/gallerydata/contents/ui/gallery/ProgressBarGallery.qml new/kirigami2-5.40.0/examples/gallerydata/contents/ui/gallery/ProgressBarGallery.qml --- old/kirigami2-5.39.0/examples/gallerydata/contents/ui/gallery/ProgressBarGallery.qml 2017-10-07 21:17:51.000000000 +0200 +++ new/kirigami2-5.40.0/examples/gallerydata/contents/ui/gallery/ProgressBarGallery.qml 2017-11-05 09:33:30.000000000 +0100 @@ -64,7 +64,7 @@ columns: 2 width: parent.width - Units.gridUnit*2 - Label { + Controls.Label { text: "Determinate:" Layout.alignment: Qt.AlignRight } @@ -74,7 +74,7 @@ value: timer.value Layout.maximumWidth: Units.gridUnit * 10 } - Label { + Controls.Label { text: "Indeterminate:" Layout.alignment: Qt.AlignRight } @@ -84,21 +84,21 @@ indeterminate: true Layout.maximumWidth: Units.gridUnit * 10 } - Label { + Controls.Label { text: "Busy indicator:" Layout.alignment: Qt.AlignRight } Controls.BusyIndicator { } - Label { + Controls.Label { text: "Inactive indicator:" Layout.alignment: Qt.AlignRight } Controls.BusyIndicator { running: false } - Label { + Controls.Label { text: "Custom size:" Layout.alignment: Qt.AlignRight } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.39.0/examples/gallerydata/contents/ui/gallery/RadioButtonGallery.qml new/kirigami2-5.40.0/examples/gallerydata/contents/ui/gallery/RadioButtonGallery.qml --- old/kirigami2-5.39.0/examples/gallerydata/contents/ui/gallery/RadioButtonGallery.qml 2017-10-07 21:17:51.000000000 +0200 +++ new/kirigami2-5.40.0/examples/gallerydata/contents/ui/gallery/RadioButtonGallery.qml 2017-11-05 09:33:30.000000000 +0100 @@ -63,18 +63,18 @@ height: 1 Layout.fillHeight: true } - Label { + Controls.Label { text: "On" Layout.preferredHeight: radio1.height } - Label { + Controls.Label { text: "Off" Layout.preferredHeight: radio1.height } } ColumnLayout { id: column1 - Label { + Controls.Label { text: "Normal" } Controls.RadioButton { @@ -90,7 +90,7 @@ ColumnLayout { id: column2 enabled: false - Label { + Controls.Label { text: "Disabled" } Controls.RadioButton { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.39.0/examples/gallerydata/contents/ui/gallery/SwitchGallery.qml new/kirigami2-5.40.0/examples/gallerydata/contents/ui/gallery/SwitchGallery.qml --- old/kirigami2-5.39.0/examples/gallerydata/contents/ui/gallery/SwitchGallery.qml 2017-10-07 21:17:51.000000000 +0200 +++ new/kirigami2-5.40.0/examples/gallerydata/contents/ui/gallery/SwitchGallery.qml 2017-11-05 09:33:30.000000000 +0100 @@ -43,14 +43,14 @@ width: 1 height: 1 } - Label { + Controls.Label { text: "Normal" } - Label { + Controls.Label { text: "Disabled" enabled: false } - Label { + Controls.Label { text: "On" } Controls.Switch { @@ -62,7 +62,7 @@ enabled: false text: "On" } - Label { + Controls.Label { text: "Off" } Controls.Switch { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.39.0/examples/gallerydata/contents/ui/gallery/TabBarGallery.qml new/kirigami2-5.40.0/examples/gallerydata/contents/ui/gallery/TabBarGallery.qml --- old/kirigami2-5.39.0/examples/gallerydata/contents/ui/gallery/TabBarGallery.qml 2017-10-07 21:17:51.000000000 +0200 +++ new/kirigami2-5.40.0/examples/gallerydata/contents/ui/gallery/TabBarGallery.qml 2017-11-05 09:33:30.000000000 +0100 @@ -52,9 +52,9 @@ model: 3 Item { - Label { + Controls.Label { width: parent.width - wrapMode: Label.Wrap + wrapMode: Controls.Label.Wrap horizontalAlignment: Qt.AlignHCenter text: "Page " + modelData } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.39.0/examples/gallerydata/contents/ui/gallery/TextFieldGallery.qml new/kirigami2-5.40.0/examples/gallerydata/contents/ui/gallery/TextFieldGallery.qml --- old/kirigami2-5.39.0/examples/gallerydata/contents/ui/gallery/TextFieldGallery.qml 2017-10-07 21:17:51.000000000 +0200 +++ new/kirigami2-5.40.0/examples/gallerydata/contents/ui/gallery/TextFieldGallery.qml 2017-11-05 09:33:30.000000000 +0100 @@ -33,14 +33,14 @@ width: page.width spacing: Units.smallSpacing - Label { + Controls.Label { text: "Placeholder text:" } Controls.TextField { placeholderText: "Search..." Layout.alignment: Qt.AlignHCenter } - Label { + Controls.Label { text: "Disabled field:" } Controls.TextField { @@ -48,14 +48,14 @@ enabled: false Layout.alignment: Qt.AlignHCenter } - Label { + Controls.Label { text: "Password:" } Controls.TextField { echoMode: TextInput.Password Layout.alignment: Qt.AlignHCenter } - Label { + Controls.Label { text: "Numbers:" } Controls.TextField { @@ -63,7 +63,7 @@ inputMethodHints: Qt.ImhDigitsOnly Layout.alignment: Qt.AlignHCenter } - Label { + Controls.Label { text: "Text area:" } //this to make text selection work on Android diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.39.0/examples/gallerydata/metadata.desktop new/kirigami2-5.40.0/examples/gallerydata/metadata.desktop --- old/kirigami2-5.39.0/examples/gallerydata/metadata.desktop 2017-10-07 21:17:51.000000000 +0200 +++ new/kirigami2-5.40.0/examples/gallerydata/metadata.desktop 2017-11-05 09:33:30.000000000 +0100 @@ -5,6 +5,7 @@ Name[ca]=Galeria del Kirigami Name[ca@valencia]=Galeria del Kirigami Name[cs]=Galerie Kirigami +Name[da]=Kirigami-galleri Name[de]=Kirigami-Galerie Name[el]=Kirigami Gallery Name[en_GB]=Kirigami Gallery @@ -39,7 +40,10 @@ Comment=Shows examples of Kirigami components and allows you to play with them Comment[ca]=Mostra exemples de components del Kirigami i permet jugar-hi Comment[ca@valencia]=Mostra exemples de components del Kirigami i permet jugar-hi +Comment[da]=Viser eksempler på Kirigami-komponenter og lader dig lege med dem Comment[es]=Muestra ejemplos de componentes de Kirigami y le permite jugar con ellos +Comment[eu]=Kirigami osagaien adibideak erakusten ditu eta haiekin jolasten uzten dizu +Comment[it]=Mostra esempi di componenti Kirigami e ti permette di giocare con essi Comment[nl]=Toont voorbeelden van Kirigami componenten en laat u met ze spelen Comment[pl]=Pokazuje przykłady składników Kirigami i umożliwia zabawę nimi Comment[pt]=Mostra exemplos dos componentes do Kirigami e permite-lhe jogar com eles @@ -49,13 +53,16 @@ Comment[sr@ijekavianlatin]=Primer Kirigamijevih komponenata sa kojima se možete i igrati Comment[sr@latin]=Primer Kirigamijevih komponenata sa kojima se možete i igrati Comment[sv]=Visar exempel på Kirigami-komponenter och låter dig leka med dem +Comment[tr]=Kirigami bileşenlerinin örneklerini gösterir ve onlarla oynamanıza izin verir Comment[uk]=Показує приклади компонентів Kirigami і надає вам змогу попрацювати з ними Comment[x-test]=xxShows examples of Kirigami components and allows you to play with themxx +Comment[zh_CN]=显示 Kirigami 组件并允许您试玩它们 Encoding=UTF-8 Type=Application Exec=kpackagelauncherqml -a org.kde.kirigami2.gallery Icon=preferences-desktop-theme +Categories=Qt;KDE;Development; X-KDE-ParentApp= X-KDE-PluginInfo-Author=Marco Martin [email protected] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.39.0/kirigami.pri new/kirigami2-5.40.0/kirigami.pri --- old/kirigami2-5.39.0/kirigami.pri 2017-10-07 21:17:51.000000000 +0200 +++ new/kirigami2-5.40.0/kirigami.pri 2017-11-05 09:33:30.000000000 +0100 @@ -5,13 +5,13 @@ $$PWD/src/settings.h \ $$PWD/src/libkirigami/basictheme_p.h \ $$PWD/src/libkirigami/platformtheme.h \ - $$PWD/src/libkirigami/platformthemefactory.h + $$PWD/src/libkirigami/kirigamipluginfactory.h SOURCES += $$PWD/src/kirigamiplugin.cpp \ $$PWD/src/enums.cpp \ $$PWD/src/settings.cpp \ $$PWD/src/libkirigami/basictheme.cpp \ $$PWD/src/libkirigami/platformtheme.cpp \ - $$PWD/src/libkirigami/platformthemefactory.cpp + $$PWD/src/libkirigami/kirigamipluginfactory.cpp INCLUDEPATH += $$PWD/src DEFINES += KIRIGAMI_BUILD_TYPE_STATIC diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.39.0/po/ca/libkirigami2plugin_qt.po new/kirigami2-5.40.0/po/ca/libkirigami2plugin_qt.po --- old/kirigami2-5.39.0/po/ca/libkirigami2plugin_qt.po 2017-10-07 21:17:51.000000000 +0200 +++ new/kirigami2-5.40.0/po/ca/libkirigami2plugin_qt.po 2017-11-05 09:33:30.000000000 +0100 @@ -1,5 +1,5 @@ # Translation of libkirigami2plugin_qt.po to Catalan -# Copyright (C) 2016 This_file_is_part_of_KDE +# Copyright (C) 2016-2017 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/kirigami2-5.39.0/po/ca@valencia/libkirigami2plugin_qt.po new/kirigami2-5.40.0/po/ca@valencia/libkirigami2plugin_qt.po --- old/kirigami2-5.39.0/po/ca@valencia/libkirigami2plugin_qt.po 2017-10-07 21:17:51.000000000 +0200 +++ new/kirigami2-5.40.0/po/ca@valencia/libkirigami2plugin_qt.po 2017-11-05 09:33:30.000000000 +0100 @@ -1,14 +1,15 @@ # Translation of libkirigami2plugin_qt.po to Catalan (Valencian) -# Copyright (C) 2016 This_file_is_part_of_KDE +# Copyright (C) 2016-2017 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. # # Antoni Bella Pérez <[email protected]>, 2016. +# Josep Ma. Ferrer <[email protected]>, 2017. msgid "" msgstr "" "Project-Id-Version: libkirigami2plugin_qt\n" -"PO-Revision-Date: 2016-08-05 21:04+0100\n" -"Last-Translator: Antoni Bella Pérez <[email protected]>\n" +"PO-Revision-Date: 2017-10-06 17:19+0100\n" +"Last-Translator: Josep Ma. Ferrer <[email protected]>\n" "Language-Team: Catalan <[email protected]>\n" "Language: ca@valencia\n" "MIME-Version: 1.0\n" @@ -32,9 +33,9 @@ #: controls/templates/private/BackButton.qml:54 msgctxt "BackButton|" msgid "Navigate Back" -msgstr "" +msgstr "Navega arrere" #: controls/templates/private/ForwardButton.qml:50 msgctxt "ForwardButton|" msgid "Navigate Forward" -msgstr "" +msgstr "Navega avant" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.39.0/po/da/libkirigami2plugin_qt.po new/kirigami2-5.40.0/po/da/libkirigami2plugin_qt.po --- old/kirigami2-5.39.0/po/da/libkirigami2plugin_qt.po 1970-01-01 01:00:00.000000000 +0100 +++ new/kirigami2-5.40.0/po/da/libkirigami2plugin_qt.po 2017-11-05 09:33:30.000000000 +0100 @@ -0,0 +1,34 @@ +# Martin Schlander <[email protected]>, 2017. +msgid "" +msgstr "" +"Project-Id-Version: \n" +"PO-Revision-Date: 2017-10-28 20:35+0100\n" +"Last-Translator: Martin Schlander <[email protected]>\n" +"Language-Team: Danish <[email protected]>\n" +"Language: da\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Qt-Contexts: true\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Lokalize 2.0\n" + +#: controls/ContextDrawer.qml:77 +msgctxt "ContextDrawer|" +msgid "Actions" +msgstr "Handlinger" + +#: controls/GlobalDrawer.qml:396 +msgctxt "GlobalDrawer|" +msgid "Back" +msgstr "Tilbage" + +#: controls/templates/private/BackButton.qml:54 +msgctxt "BackButton|" +msgid "Navigate Back" +msgstr "Navigér tilbage" + +#: controls/templates/private/ForwardButton.qml:50 +msgctxt "ForwardButton|" +msgid "Navigate Forward" +msgstr "Navigér fremad" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.39.0/po/es/libkirigami2plugin_qt.po new/kirigami2-5.40.0/po/es/libkirigami2plugin_qt.po --- old/kirigami2-5.39.0/po/es/libkirigami2plugin_qt.po 2017-10-07 21:17:51.000000000 +0200 +++ new/kirigami2-5.40.0/po/es/libkirigami2plugin_qt.po 2017-11-05 09:33:30.000000000 +0100 @@ -1,8 +1,8 @@ -# Eloy Cuadra <[email protected]>, 2016. +# Eloy Cuadra <[email protected]>, 2016, 2017. msgid "" msgstr "" "Project-Id-Version: libkirigamiplugin_qt\n" -"PO-Revision-Date: 2016-08-07 11:27+0200\n" +"PO-Revision-Date: 2017-10-10 12:32+0100\n" "Last-Translator: Eloy Cuadra <[email protected]>\n" "Language-Team: Spanish <[email protected]>\n" "Language: es\n" @@ -11,7 +11,7 @@ "Content-Transfer-Encoding: 8bit\n" "X-Qt-Contexts: true\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Lokalize 1.5\n" +"X-Generator: Lokalize 2.0\n" #: controls/ContextDrawer.qml:77 msgctxt "ContextDrawer|" @@ -26,9 +26,9 @@ #: controls/templates/private/BackButton.qml:54 msgctxt "BackButton|" msgid "Navigate Back" -msgstr "" +msgstr "Retroceder una página" #: controls/templates/private/ForwardButton.qml:50 msgctxt "ForwardButton|" msgid "Navigate Forward" -msgstr "" +msgstr "Avanzar una página" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.39.0/po/eu/libkirigami2plugin_qt.po new/kirigami2-5.40.0/po/eu/libkirigami2plugin_qt.po --- old/kirigami2-5.39.0/po/eu/libkirigami2plugin_qt.po 2017-10-07 21:17:51.000000000 +0200 +++ new/kirigami2-5.40.0/po/eu/libkirigami2plugin_qt.po 2017-11-05 09:33:30.000000000 +0100 @@ -4,11 +4,11 @@ # KDE Euskaratzeko proiektuaren arduraduna <[email protected]>. # # Translators: -# Iñigo Salvador Azurmendi <[email protected]>, 2017 +# Iñigo Salvador Azurmendi <[email protected]>, 2017. msgid "" msgstr "" "Project-Id-Version: libkirigami2plugin_qt\n" -"PO-Revision-Date: 2017-08-21 01:02+0100\n" +"PO-Revision-Date: 2017-10-17 21:45+0100\n" "Last-Translator: Iñigo Salvador Azurmendi <[email protected]>\n" "Language-Team: Basque <[email protected]>\n" "Language: eu\n" @@ -32,9 +32,9 @@ #: controls/templates/private/BackButton.qml:54 msgctxt "BackButton|" msgid "Navigate Back" -msgstr "" +msgstr "Nabigatu atzera" #: controls/templates/private/ForwardButton.qml:50 msgctxt "ForwardButton|" msgid "Navigate Forward" -msgstr "" +msgstr "Nabigatu aurrera" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.39.0/po/it/libkirigami2plugin_qt.po new/kirigami2-5.40.0/po/it/libkirigami2plugin_qt.po --- old/kirigami2-5.39.0/po/it/libkirigami2plugin_qt.po 2017-10-07 21:17:51.000000000 +0200 +++ new/kirigami2-5.40.0/po/it/libkirigami2plugin_qt.po 2017-11-05 09:33:30.000000000 +0100 @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"PO-Revision-Date: 2017-09-26 20:54+0100\n" +"PO-Revision-Date: 2017-10-13 21:12+0100\n" "Last-Translator: Vincenzo Reale <[email protected]>\n" "Language-Team: Italian <[email protected]>\n" "Language: it\n" @@ -26,9 +26,9 @@ #: controls/templates/private/BackButton.qml:54 msgctxt "BackButton|" msgid "Navigate Back" -msgstr "" +msgstr "Naviga indietro" #: controls/templates/private/ForwardButton.qml:50 msgctxt "ForwardButton|" msgid "Navigate Forward" -msgstr "" +msgstr "Naviga in avanti" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.39.0/po/pl/libkirigami2plugin_qt.po new/kirigami2-5.40.0/po/pl/libkirigami2plugin_qt.po --- old/kirigami2-5.39.0/po/pl/libkirigami2plugin_qt.po 2017-10-07 21:17:51.000000000 +0200 +++ new/kirigami2-5.40.0/po/pl/libkirigami2plugin_qt.po 2017-11-05 09:33:30.000000000 +0100 @@ -1,8 +1,8 @@ -# Łukasz Wojniłowicz <[email protected]>, 2016. +# Łukasz Wojniłowicz <[email protected]>, 2016, 2017. msgid "" msgstr "" "Project-Id-Version: \n" -"PO-Revision-Date: 2016-08-06 08:52+0100\n" +"PO-Revision-Date: 2017-10-14 06:31+0100\n" "Last-Translator: Łukasz Wojniłowicz <[email protected]>\n" "Language-Team: Polish <[email protected]>\n" "Language: pl\n" @@ -27,9 +27,9 @@ #: controls/templates/private/BackButton.qml:54 msgctxt "BackButton|" msgid "Navigate Back" -msgstr "" +msgstr "Przejdź wstecz" #: controls/templates/private/ForwardButton.qml:50 msgctxt "ForwardButton|" msgid "Navigate Forward" -msgstr "" +msgstr "Przejdź naprzód" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.39.0/po/pt/libkirigami2plugin_qt.po new/kirigami2-5.40.0/po/pt/libkirigami2plugin_qt.po --- old/kirigami2-5.39.0/po/pt/libkirigami2plugin_qt.po 2017-10-07 21:17:51.000000000 +0200 +++ new/kirigami2-5.40.0/po/pt/libkirigami2plugin_qt.po 2017-11-05 09:33:30.000000000 +0100 @@ -1,5 +1,14 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR Free Software Foundation, Inc. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# msgid "" msgstr "" +"Project-Id-Version: libkirigami2plugin_qt\n" +"PO-Revision-Date: 2017-10-08 10:15+0000\n" +"Last-Translator: José Nuno Coelho Pires <[email protected]>\n" +"Language-Team: Portuguese <[email protected]>\n" +"Language: pt\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -19,9 +28,9 @@ #: controls/templates/private/BackButton.qml:54 msgctxt "BackButton|" msgid "Navigate Back" -msgstr "" +msgstr "Navegar para Trás" #: controls/templates/private/ForwardButton.qml:50 msgctxt "ForwardButton|" msgid "Navigate Forward" -msgstr "" +msgstr "Navegar para a Frente" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.39.0/po/uk/libkirigami2plugin_qt.po new/kirigami2-5.40.0/po/uk/libkirigami2plugin_qt.po --- old/kirigami2-5.39.0/po/uk/libkirigami2plugin_qt.po 2017-10-07 21:17:51.000000000 +0200 +++ new/kirigami2-5.40.0/po/uk/libkirigami2plugin_qt.po 2017-11-05 09:33:30.000000000 +0100 @@ -1,5 +1,5 @@ # Translation of libkirigami2plugin_qt.po to Ukrainian -# Copyright (C) 2016 This_file_is_part_of_KDE +# Copyright (C) 2016-2017 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/kirigami2-5.39.0/po/zh_CN/libkirigami2plugin_qt.po new/kirigami2-5.40.0/po/zh_CN/libkirigami2plugin_qt.po --- old/kirigami2-5.39.0/po/zh_CN/libkirigami2plugin_qt.po 2017-10-07 21:17:51.000000000 +0200 +++ new/kirigami2-5.40.0/po/zh_CN/libkirigami2plugin_qt.po 2017-11-05 09:33:30.000000000 +0100 @@ -33,4 +33,4 @@ #: controls/templates/private/ForwardButton.qml:50 msgctxt "ForwardButton|" msgid "Navigate Forward" -msgstr "" +msgstr "前进" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.39.0/src/controls/ApplicationWindow.qml new/kirigami2-5.40.0/src/controls/ApplicationWindow.qml --- old/kirigami2-5.39.0/src/controls/ApplicationWindow.qml 2017-10-07 21:17:51.000000000 +0200 +++ new/kirigami2-5.40.0/src/controls/ApplicationWindow.qml 2017-11-05 09:33:30.000000000 +0100 @@ -110,7 +110,7 @@ property alias pageStack: __pageStack //redefines here as here we can know a pointer to PageRow - wideScreen: width >= applicationWindow().pageStack.defaultColumnWidth*2 + wideScreen: width >= applicationWindow().pageStack.defaultColumnWidth * 1.5 PageRow { id: __pageStack diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.39.0/src/controls/BasicListItem.qml new/kirigami2-5.40.0/src/controls/BasicListItem.qml --- old/kirigami2-5.39.0/src/controls/BasicListItem.qml 2017-10-07 21:17:51.000000000 +0200 +++ new/kirigami2-5.40.0/src/controls/BasicListItem.qml 2017-11-05 09:33:30.000000000 +0100 @@ -19,6 +19,7 @@ import QtQuick 2.1 import QtQuick.Layouts 1.2 +import QtQuick.Controls 2.0 as QQC2 import org.kde.kirigami 2.2 /** @@ -66,7 +67,7 @@ Layout.minimumWidth: height selected: layout.indicateActiveFocus && (listItem.checked || listItem.pressed) } - Label { + QQC2.Label { id: labelItem text: listItem.text Layout.fillWidth: true diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.39.0/src/controls/Label.qml new/kirigami2-5.40.0/src/controls/Label.qml --- old/kirigami2-5.39.0/src/controls/Label.qml 2017-10-07 21:17:51.000000000 +0200 +++ new/kirigami2-5.40.0/src/controls/Label.qml 2017-11-05 09:33:30.000000000 +0100 @@ -20,42 +20,28 @@ import QtQuick 2.1 import QtQuick.Window 2.2 import org.kde.kirigami 2.2 -import QtQuick.Templates 2.0 as T2 +import QtQuick.Controls 2.0 as Controls /** - * This is a label which uses the plasma Theme. + * This is a label which uses the current Theme. * * The characteristics of the text will be automatically set according to the - * plasma Theme. If you need a more customized text item use the Text component + * current Theme. If you need a more customized text item use the Text component * from QtQuick. * * You can use all elements of the QML Text component, in particular the "text" * property to define the label text. * * @inherit QtQuick.Templates.Label + * @deprecated use QtQuick.Templates.Label directly, it will be styled appropriately */ -T2.Label { - id: root - +Controls.Label { height: Math.round(Math.max(paintedHeight, Units.gridUnit * 1.6)) verticalAlignment: lineCount > 1 ? Text.AlignTop : Text.AlignVCenter activeFocusOnTab: false - renderType: Settings.isMobile || Window.devicePixelRatio % 2 != 0 ? Text.QtRendering : Text.NativeRendering - - font.capitalization: Theme.defaultFont.capitalization - font.family: Theme.defaultFont.family - font.italic: Theme.defaultFont.italic - font.letterSpacing: Theme.defaultFont.letterSpacing - font.pointSize: Theme.defaultFont.pointSize - font.strikeout: Theme.defaultFont.strikeout - font.underline: Theme.defaultFont.underline - font.weight: Theme.defaultFont.weight - font.wordSpacing: Theme.defaultFont.wordSpacing - color: Theme.textColor - - opacity: enabled? 1 : 0.6 - Accessible.role: Accessible.StaticText - Accessible.name: text + Component.onCompleted: { + console.warn("Kirigami.Label is deprecated. Use QtQuickControls2.Label instead") + } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.39.0/src/controls/Page.qml new/kirigami2-5.40.0/src/controls/Page.qml --- old/kirigami2-5.39.0/src/controls/Page.qml 2017-10-07 21:17:51.000000000 +0200 +++ new/kirigami2-5.40.0/src/controls/Page.qml 2017-11-05 09:33:30.000000000 +0100 @@ -225,7 +225,7 @@ */ signal backRequested(var event); - anchors.topMargin: (applicationWindow() && !applicationWindow().wideScreen && Settings.isMobile && applicationWindow().controlsVisible && applicationWindow().header ? applicationWindow().header.preferredHeight : 0) + anchors.topMargin: (applicationWindow() && !applicationWindow().wideScreen && Kirigami.Settings.isMobile && applicationWindow().controlsVisible && applicationWindow().header ? applicationWindow().header.preferredHeight : 0) //NOTE: This exists just because control instances require it contentItem: Item { @@ -256,7 +256,8 @@ right: parent.right bottom: parent.bottom } - property T2.Page page: root + //It should be T2.Page, Qt 5.7 doesn't like it + property Item page: root height: item ? item.height : 0 source: (applicationWindow().header && applicationWindow().header.toString().indexOf("ToolBarApplicationHeader") === 0) || (applicationWindow().footer && applicationWindow().footer.visible && applicationWindow().footer.toString().indexOf("ToolBarApplicationHeader") === 0) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.39.0/src/controls/Separator.qml new/kirigami2-5.40.0/src/controls/Separator.qml --- old/kirigami2-5.39.0/src/controls/Separator.qml 2017-10-07 21:17:51.000000000 +0200 +++ new/kirigami2-5.40.0/src/controls/Separator.qml 2017-11-05 09:33:30.000000000 +0100 @@ -19,6 +19,7 @@ */ import QtQuick 2.1 +import QtQuick.Layouts 1.2 import org.kde.kirigami 2.2 /** @@ -32,5 +33,7 @@ Rectangle { height: Units.devicePixelRatio width: Units.devicePixelRatio + Layout.preferredWidth: Units.devicePixelRatio + Layout.preferredHeight: Units.devicePixelRatio color: Qt.tint(Theme.textColor, Qt.rgba(Theme.backgroundColor.r, Theme.backgroundColor.g, Theme.backgroundColor.b, 0.7)) } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.39.0/src/controls/SwipeListItem.qml new/kirigami2-5.40.0/src/controls/SwipeListItem.qml --- old/kirigami2-5.39.0/src/controls/SwipeListItem.qml 2017-10-07 21:17:51.000000000 +0200 +++ new/kirigami2-5.40.0/src/controls/SwipeListItem.qml 2017-11-05 09:33:30.000000000 +0100 @@ -30,7 +30,7 @@ * ListView { * model: myModel * delegate: SwipeListItem { - * Label { + * QQC2.Label { * text: model.text * } * actions: [ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.39.0/src/controls/private/ActionButton.qml new/kirigami2-5.40.0/src/controls/private/ActionButton.qml --- old/kirigami2-5.39.0/src/controls/private/ActionButton.qml 2017-10-07 21:17:51.000000000 +0200 +++ new/kirigami2-5.40.0/src/controls/private/ActionButton.qml 2017-11-05 09:33:30.000000000 +0100 @@ -349,7 +349,7 @@ minimumX: contextDrawer && contextDrawer.enabled && contextDrawer.modal ? 0 : root.width/2 - button.width/2 maximumX: globalDrawer && globalDrawer.enabled && globalDrawer.modal ? root.width : root.width/2 - button.width/2 } - visible: root.page.actions.contextualActions.length > 0 && (applicationWindow === undefined || applicationWindow().wideScreen) + visible: root.page.actions && root.page.actions.contextualActions.length > 0 && (applicationWindow === undefined || applicationWindow().wideScreen) //using internal pagerow api && (root.page && root.page.parent ? root.page.parent.level < applicationWindow().pageStack.depth-1 : false) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.39.0/src/controls/private/DefaultListItemBackground.qml new/kirigami2-5.40.0/src/controls/private/DefaultListItemBackground.qml --- old/kirigami2-5.39.0/src/controls/private/DefaultListItemBackground.qml 2017-10-07 21:17:51.000000000 +0200 +++ new/kirigami2-5.40.0/src/controls/private/DefaultListItemBackground.qml 2017-11-05 09:33:30.000000000 +0100 @@ -31,7 +31,7 @@ anchors.fill: parent visible: !Settings.isMobile color: listItem.activeBackgroundColor - opacity: (listItem.hovered || (listItem.highlighted && indicateActiveFocus)) && !listItem.pressed ? 0.2 : 0 + opacity: (listItem.hovered || listItem.highlighted) && !listItem.pressed ? (indicateActiveFocus ? 0.2 : 0.1 ) : 0 Behavior on opacity { NumberAnimation { duration: Units.longDuration } } } Behavior on color { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.39.0/src/controls/templates/AbstractListItem.qml new/kirigami2-5.40.0/src/controls/templates/AbstractListItem.qml --- old/kirigami2-5.39.0/src/controls/templates/AbstractListItem.qml 2017-10-07 21:17:51.000000000 +0200 +++ new/kirigami2-5.40.0/src/controls/templates/AbstractListItem.qml 2017-11-05 09:33:30.000000000 +0100 @@ -77,7 +77,7 @@ * Color for the background of the item * It is advised to leave the default value (Theme.viewBackgroundColor) */ - property color backgroundColor: Theme.backgroundColor + property color backgroundColor: "transparent" /** * activeTextColor: color diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.39.0/src/controls/templates/OverlaySheet.qml new/kirigami2-5.40.0/src/controls/templates/OverlaySheet.qml --- old/kirigami2-5.39.0/src/controls/templates/OverlaySheet.qml 2017-10-07 21:17:51.000000000 +0200 +++ new/kirigami2-5.40.0/src/controls/templates/OverlaySheet.qml 2017-11-05 09:33:30.000000000 +0100 @@ -148,9 +148,9 @@ Theme.colorSet: root.Theme.colorSet Theme.inherit: root.Theme.inherit //we want to be over any possible OverlayDrawers, including handles - parent: root.parent == applicationWindow().overlay ? root.parent.parent : root.parent + parent: root.parent anchors.fill: parent - z: 2000000 + z: root.parent == applicationWindow().overlay ? 0 : 2000000 visible: false drag.filterChildren: true hoverEnabled: true @@ -347,6 +347,7 @@ ScrollView { id: scrollView anchors.fill: parent + alwaysInteractive: true horizontalScrollBarPolicy: Qt.ScrollBarAlwaysOff } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.39.0/src/controls/templates/SwipeListItem.qml new/kirigami2-5.40.0/src/controls/templates/SwipeListItem.qml --- old/kirigami2-5.39.0/src/controls/templates/SwipeListItem.qml 2017-10-07 21:17:51.000000000 +0200 +++ new/kirigami2-5.40.0/src/controls/templates/SwipeListItem.qml 2017-11-05 09:33:30.000000000 +0100 @@ -32,7 +32,7 @@ * ListView { * model: myModel * delegate: SwipeListItem { - * Label { + * QQC2.Label { * text: model.text * } * actions: [ @@ -133,7 +133,7 @@ leftPadding: Units.smallSpacing * 2 topPadding: Units.smallSpacing * 2 - rightPadding: Units.smallSpacing * 2 + rightPadding: Units.smallSpacing * 2 + handleMouse.width bottomPadding: Units.smallSpacing * 2 //END properties @@ -234,7 +234,7 @@ right: parent.right top: parent.top bottom: parent.bottom - rightMargin: listItem.rightPadding + rightMargin: Units.smallSpacing } preventStealing: true width: height diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.39.0/src/controls/templates/private/PassiveNotification.qml new/kirigami2-5.40.0/src/controls/templates/private/PassiveNotification.qml --- old/kirigami2-5.39.0/src/controls/templates/private/PassiveNotification.qml 2017-10-07 21:17:51.000000000 +0200 +++ new/kirigami2-5.40.0/src/controls/templates/private/PassiveNotification.qml 2017-11-05 09:33:30.000000000 +0100 @@ -119,7 +119,7 @@ RowLayout { id: mainLayout anchors.centerIn: parent - Label { + QQC2.Label { id: messageLabel Layout.maximumWidth: Math.min(root.parent.width - Units.largeSpacing*2, implicitWidth) elide: Text.ElideRight diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.39.0/src/controls/templates/private/ScrollView.qml new/kirigami2-5.40.0/src/controls/templates/private/ScrollView.qml --- old/kirigami2-5.39.0/src/controls/templates/private/ScrollView.qml 2017-10-07 21:17:51.000000000 +0200 +++ new/kirigami2-5.40.0/src/controls/templates/private/ScrollView.qml 2017-11-05 09:33:30.000000000 +0100 @@ -31,12 +31,27 @@ readonly property Item verticalScrollBar: flickableItem.ScrollBar.vertical ? flickableItem.ScrollBar.vertical : null + //FIXME: better api? + property bool alwaysInteractive: false + onVerticalScrollBarPolicyChanged: { flickableItem.ScrollBar.vertical.visible = verticalScrollBarPolicy == Qt.ScrollBarAlwaysOff } drag.filterChildren: !Settings.isMobile + onPressed: { + mouse.accepted = false; + if (alwaysInteractive) { + return; + } + + if (flickableParent.touchPressed) { + return; + } + flickableItem.interactive = Settings.isMobile || root.alwaysInteractive; + } onWheel: { + flickableItem.interactive = Settings.isMobile || root.alwaysInteractive; if (Settings.isMobile || flickableItem.contentHeight<flickableItem.height) { return; } @@ -71,7 +86,7 @@ contentItem.parent = flickableItem.contentItem; } //TODO: find a way to make flicking work on laptops with touch screen - flickableItem.interactive = Settings.isMobile; + flickableItem.interactive = Settings.isMobile || root.alwaysInteractive; flickableItem.anchors.fill = flickableParent; flickableItem.ScrollBar.vertical = scrollComponent.createObject(root); flickableItem.ScrollBar.vertical.anchors.right = root.right @@ -81,12 +96,21 @@ //NOTE: use this instead of anchors as crashes on some Qt 5.8 checkouts onHeightChanged: flickableItem.ScrollBar.vertical.height = root.height - Item { + MultiPointTouchArea { id: flickableParent anchors { fill: parent } clip: true + mouseEnabled: false + maximumTouchPoints: 1 + property bool touchPressed: false + onPressed: { + touchPressed = true; + flickableItem.interactive = true; + } + onReleased: touchPressed = false; + onCanceled: touchPressed = false; } Component { id: flickableComponent diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.39.0/src/styles/Material/Label.qml new/kirigami2-5.40.0/src/styles/Material/Label.qml --- old/kirigami2-5.39.0/src/styles/Material/Label.qml 2017-10-07 21:17:51.000000000 +0200 +++ new/kirigami2-5.40.0/src/styles/Material/Label.qml 2017-11-05 09:33:30.000000000 +0100 @@ -18,42 +18,29 @@ */ import QtQuick 2.1 +import QtQuick.Window 2.2 import org.kde.kirigami 2.2 -import QtQuick.Templates 2.0 as T2 +import QtQuick.Controls 2.0 as Controls /** - * This is a label which uses the plasma Theme. + * This is a label which uses the current Theme. * * The characteristics of the text will be automatically set according to the - * plasma Theme. If you need a more customized text item use the Text component + * current Theme. If you need a more customized text item use the Text component * from QtQuick. * * You can use all elements of the QML Text component, in particular the "text" * property to define the label text. * - * @inherit QtQuick.Text + * @inherit QtQuick.Templates.Label + * @deprecated use QtQuick.Templates.Label directly, it will be styled appropriately */ -T2.Label { - id: root - - height: Math.round(Math.max(paintedHeight, Units.gridUnit * 1.6)) +Controls.Label { verticalAlignment: lineCount > 1 ? Text.AlignTop : Text.AlignVCenter activeFocusOnTab: false - font.capitalization: Theme.defaultFont.capitalization - font.family: Theme.defaultFont.family - font.italic: Theme.defaultFont.italic - font.letterSpacing: Theme.defaultFont.letterSpacing - font.pointSize: Theme.defaultFont.pointSize - font.strikeout: Theme.defaultFont.strikeout - font.underline: Theme.defaultFont.underline - font.weight: Theme.defaultFont.weight - font.wordSpacing: Theme.defaultFont.wordSpacing - color: Theme.textColor - - opacity: enabled? 1 : 0.6 - - Accessible.role: Accessible.StaticText - Accessible.name: text + Component.onCompleted: { + console.warn("Kirigami.Label is deprecated. Use QtQuickControls2.Label instead") + } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.39.0/src/styles/org.kde.desktop/ApplicationWindow.qml new/kirigami2-5.40.0/src/styles/org.kde.desktop/ApplicationWindow.qml --- old/kirigami2-5.39.0/src/styles/org.kde.desktop/ApplicationWindow.qml 2017-10-07 21:17:51.000000000 +0200 +++ new/kirigami2-5.40.0/src/styles/org.kde.desktop/ApplicationWindow.qml 2017-11-05 09:33:30.000000000 +0100 @@ -26,5 +26,4 @@ id: root width: Units.gridUnit * 55 height: Units.gridUnit * 40 - wideScreen: true } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.39.0/src/styles/org.kde.desktop/SwipeListItem.qml new/kirigami2-5.40.0/src/styles/org.kde.desktop/SwipeListItem.qml --- old/kirigami2-5.39.0/src/styles/org.kde.desktop/SwipeListItem.qml 2017-10-07 21:17:51.000000000 +0200 +++ new/kirigami2-5.40.0/src/styles/org.kde.desktop/SwipeListItem.qml 2017-11-05 09:33:30.000000000 +0100 @@ -25,7 +25,6 @@ T.SwipeListItem { id: listItem - rightPadding: Units.gridUnit background: DefaultListItemBackground {} implicitHeight: contentItem.implicitHeight + Units.smallSpacing * 4 }
