Hello community, here is the log from the commit of package kirigami2 for openSUSE:Factory checked in at 2018-06-22 13:20:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kirigami2 (Old) and /work/SRC/openSUSE:Factory/.kirigami2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kirigami2" Fri Jun 22 13:20:54 2018 rev:14 rq:616768 version:5.47.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kirigami2/kirigami2.changes 2018-05-18 14:22:01.971297361 +0200 +++ /work/SRC/openSUSE:Factory/.kirigami2.new/kirigami2.changes 2018-06-22 13:20:56.638669614 +0200 @@ -1,0 +2,40 @@ +Wed Jun 13 17:03:25 UTC 2018 - [email protected] + +- Add fix-build-with-gcc48.patch to make it compile with gcc 4.8 on + Leap 42.3 + +------------------------------------------------------------------- +Tue Jun 12 21:26:05 UTC 2018 - [email protected] + +- Update to 5.47.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.47.0.php +- Changes since 5.46.0: + * Show action.main more prominently on the ToolBarApplicationHeader + * Allow Kirigami build without KWin tablet mode dependency + * correct swipefilter on RTL + * correct resizing of contentItem + * fix --reverse behavior + * share contextobject to always access i18n + * make sure tooltip is hidden + * make sure to not assign invalid variants to the tracked proeprties + * fix a couple of warnings + * handle not a MouseArea, dropped() signal + * no hover effects on mobile + * proper icons overflow-menu-left and right + * remove useless debug + * not hoverenabled + * Drag handle to reorder items in a ListView + * Add Settings class to API documentation + * Use Mnemonics on the toolbar buttons + * Use override + * Added missing files in QMake's .pri + * [API dox] Fix Kirigami.InlineMessageType -> Kirigami.MessageType + * fix applicationheaders in applicationitem + * fix build on macos/ios + * Fix warnings + * Remove wrong warning + * Don't allow showing/hiding the drawer when there's no handle (kde#393776) + +------------------------------------------------------------------- Old: ---- kirigami2-5.46.0.tar.xz New: ---- fix-build-with-gcc48.patch kirigami2-5.47.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kirigami2.spec ++++++ --- /var/tmp/diff_new_pack.OB2AZk/_old 2018-06-22 13:20:57.762628084 +0200 +++ /var/tmp/diff_new_pack.OB2AZk/_new 2018-06-22 13:20:57.766627936 +0200 @@ -17,16 +17,22 @@ %define lname libKF5Kirigami2-5 +%define _tar_path 5.47 %bcond_without lang -%define _tar_path 5.46 Name: kirigami2 -Version: 5.46.0 +Version: 5.47.0 Release: 0 +# 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}')} Summary: Set of QtQuick components License: LGPL-2.1-or-later Group: Development/Libraries/KDE Url: http://www.kde.org/ Source: https://download.kde.org/stable/frameworks/%{_tar_path}/%{name}-%{version}.tar.xz +# PATCH-FIX-OPENSUSE +Patch: fix-build-with-gcc48.patch BuildRequires: extra-cmake-modules >= %{_tar_path} BuildRequires: kf5-filesystem BuildRequires: cmake(Qt5Core) >= 5.7.0 @@ -36,13 +42,12 @@ BuildRequires: cmake(Qt5QuickControls2) >= 5.7.0 BuildRequires: cmake(Qt5Svg) >= 5.7.0 BuildRequires: cmake(Qt5Test) >= 5.7.0 -Requires: libqt5-qtgraphicaleffects -Requires: libqt5-qtquickcontrols2 -BuildRoot: %{_tmppath}/%{name}-%{version}-build %if %{with lang} BuildRequires: cmake(Qt5LinguistTools) >= 5.7.0 -Recommends: %{name}-lang = %{version} %endif +Requires: libqt5-qtgraphicaleffects +Requires: libqt5-qtquickcontrols2 +Recommends: %{name}-lang = %{version} %description QtQuick plugins to build user interfaces based on the KDE UX guidelines. @@ -69,6 +74,9 @@ %prep %setup -q +%if 0%{?suse_version} < 1500 +%patch -p1 +%endif %build %cmake_kf5 -d build @@ -89,11 +97,10 @@ %postun -n %{lname} -p /sbin/ldconfig %files -%doc LICENSE* %{_kf5_qmldir}/ %files -n %{lname} -%doc LICENSE* +%license LICENSE* %{_kf5_libdir}/libKF5Kirigami2.so.* %files devel ++++++ fix-build-with-gcc48.patch ++++++ >From 4f92428600aa0bcee9a300884941803383f1da41 Mon Sep 17 00:00:00 2001 From: Wolfgang Bauer <[email protected]> Date: Wed, 13 Jun 2018 12:11:25 +0200 Subject: [PATCH] Fix build with gcc 4.8 See https://bugreports.qt.io/browse/QTBUG-48988 --- src/delegaterecycler.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/delegaterecycler.cpp b/src/delegaterecycler.cpp index f648fc7..b51b5dd 100644 --- a/src/delegaterecycler.cpp +++ b/src/delegaterecycler.cpp @@ -213,7 +213,7 @@ void DelegateRecycler::setSourceComponent(QQmlComponent *component) if (!m_item) { obj->deleteLater(); } else { - connect(m_item, &QObject::destroyed, ctx, &QObject::deleteLater); + connect(m_item.data(), &QObject::destroyed, ctx, &QObject::deleteLater); } } else { QQmlContext *ctx = QQmlEngine::contextForObject(m_item)->parentContext(); -- 2.13.7 ++++++ kirigami2-5.46.0.tar.xz -> kirigami2-5.47.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.46.0/CMakeLists.txt new/kirigami2-5.47.0/CMakeLists.txt --- old/kirigami2-5.46.0/CMakeLists.txt 2018-05-05 14:58:44.000000000 +0200 +++ new/kirigami2-5.47.0/CMakeLists.txt 2018-06-02 19:59:49.000000000 +0200 @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 3.0) -set(KF5_VERSION "5.46.0") # handled by release scripts -set(KF5_DEP_VERSION "5.46.0") # handled by release scripts +set(KF5_VERSION "5.47.0") # handled by release scripts +set(KF5_DEP_VERSION "5.47.0") # handled by release scripts project(kirigami2 VERSION ${KF5_VERSION}) @@ -19,6 +19,7 @@ option(DESKTOP_ENABLED "Build and install The Desktop style" ON) option(STATIC_LIBRARY "Build as a static library (deprecated, use BUILD_SHARED_LIBS instead)" OFF) option(BUILD_EXAMPLES "Build and install examples" OFF) +option(DISABLE_DBUS "Build without D-Bus support" OFF) if(NOT BUILD_SHARED_LIBS) set(STATIC_LIBRARY 1) @@ -47,7 +48,7 @@ ################# set KDE specific information ################# -find_package(ECM 5.46.0 NO_MODULE) +find_package(ECM 5.47.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 @@ -100,8 +101,9 @@ ) #use dbus on linux, bsd etc, but not andoid and apple stuff -if (UNIX AND NOT CMAKE_SYSTEM_NAME STREQUAL "Android" AND NOT(APPLE)) +if (UNIX AND NOT CMAKE_SYSTEM_NAME STREQUAL "Android" AND NOT(APPLE) AND NOT(DISABLE_DBUS)) find_package(Qt5DBus) + add_definitions(-DKIRIGAMI_ENABLE_DBUS) endif() if(BUILD_EXAMPLES AND CMAKE_SYSTEM_NAME STREQUAL "Android") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.46.0/KF5Kirigami2Macros.cmake new/kirigami2-5.47.0/KF5Kirigami2Macros.cmake --- old/kirigami2-5.46.0/KF5Kirigami2Macros.cmake 2018-05-05 14:58:44.000000000 +0200 +++ new/kirigami2-5.47.0/KF5Kirigami2Macros.cmake 2018-06-02 19:59:49.000000000 +0200 @@ -12,7 +12,7 @@ endif() #include icons used by Kirigami components themselves - set(ARG_ICONS ${ARG_ICONS} go-next go-previous go-up handle-left handle-right go-next-symbolic go-next-symbolic-rtl go-previous-symbolic go-previous-symbolic-rtl overflow-menu) + set(ARG_ICONS ${ARG_ICONS} go-next go-previous go-up handle-sort overflow-menu-left overflow-menu-right go-next-symbolic go-next-symbolic-rtl go-previous-symbolic go-previous-symbolic-rtl overflow-menu) function(_find_breeze_icon icon varName) #HACKY diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.46.0/examples/gallerydata/contents/ui/gallery/ListViewGallery.qml new/kirigami2-5.47.0/examples/gallerydata/contents/ui/gallery/ListViewGallery.qml --- old/kirigami2-5.46.0/examples/gallerydata/contents/ui/gallery/ListViewGallery.qml 2018-05-05 14:58:44.000000000 +0200 +++ new/kirigami2-5.47.0/examples/gallerydata/contents/ui/gallery/ListViewGallery.qml 2018-06-02 19:59:49.000000000 +0200 @@ -20,7 +20,7 @@ import QtQuick 2.4 import QtQuick.Layouts 1.2 import QtQuick.Controls 2.0 as Controls -import org.kde.kirigami 2.4 as Kirigami +import org.kde.kirigami 2.5 as Kirigami Kirigami.ScrollablePage { id: page @@ -81,20 +81,23 @@ } } - ListView { - Timer { - id: refreshRequestTimer - interval: 3000 - onTriggered: page.refreshing = false - } - model: 200 - delegate: Kirigami.SwipeListItem { + Component { + id: delegateComponent + Kirigami.SwipeListItem { id: listItem - contentItem: Controls.Label { - height: Math.max(implicitHeight, Kirigami.Units.iconSizes.smallMedium) - anchors.verticalCenter: parent.verticalCenter - text: "Item " + modelData - color: listItem.checked || (listItem.pressed && !listItem.checked && !listItem.sectionDelegate) ? listItem.activeTextColor : listItem.textColor + contentItem: RowLayout { + Kirigami.ListItemDragHandle { + listItem: listItem + listView: mainList + onMoveRequested: listModel.move(oldIndex, newIndex, 1) + } + + Controls.Label { + Layout.fillWidth: true + height: Math.max(implicitHeight, Kirigami.Units.iconSizes.smallMedium) + text: model.title + color: listItem.checked || (listItem.pressed && !listItem.checked && !listItem.sectionDelegate) ? listItem.activeTextColor : listItem.textColor + } } actions: [ Kirigami.Action { @@ -109,4 +112,34 @@ }] } } + ListView { + id: mainList + Timer { + id: refreshRequestTimer + interval: 3000 + onTriggered: page.refreshing = false + } + model: ListModel { + id: listModel + + Component.onCompleted: { + for (var i = 0; i < 200; ++i) { + listModel.append({"title": "Item " + i, + "actions": [{text: "Action 1", icon: "document-decrypt"}, + {text: "Action 2", icon: "mail-reply-sender"}] + }) + } + } + } + moveDisplaced: Transition { + YAnimator { + duration: Kirigami.Units.longDuration + easing.type: Easing.InOutQuad + } + } + delegate: Kirigami.DelegateRecycler { + width: parent ? parent.width : implicitWidth + sourceComponent: delegateComponent + } + } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.46.0/kirigami.pri new/kirigami2-5.47.0/kirigami.pri --- old/kirigami2-5.46.0/kirigami.pri 2018-05-05 14:58:44.000000000 +0200 +++ new/kirigami2-5.47.0/kirigami.pri 2018-06-02 19:59:49.000000000 +0200 @@ -8,6 +8,7 @@ $$PWD/src/libkirigami/basictheme_p.h \ $$PWD/src/libkirigami/platformtheme.h \ $$PWD/src/libkirigami/kirigamipluginfactory.h \ + $$PWD/src/libkirigami/tabletmodewatcher.h \ $$PWD/src/desktopicon.h \ $$PWD/src/delegaterecycler.h SOURCES += $$PWD/src/kirigamiplugin.cpp \ @@ -18,6 +19,8 @@ $$PWD/src/libkirigami/basictheme.cpp \ $$PWD/src/libkirigami/platformtheme.cpp \ $$PWD/src/libkirigami/kirigamipluginfactory.cpp \ + $$PWD/src/libkirigami/tabletmodewatcher.cpp \ + $$PWD/src/desktopicon.h \ $$PWD/src/desktopicon.cpp \ $$PWD/src/delegaterecycler.cpp INCLUDEPATH += $$PWD/src $$PWD/src/libkirigami diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.46.0/kirigami.qrc new/kirigami2-5.47.0/kirigami.qrc --- old/kirigami2-5.46.0/kirigami.qrc 2018-05-05 14:58:44.000000000 +0200 +++ new/kirigami2-5.47.0/kirigami.qrc 2018-06-02 19:59:49.000000000 +0200 @@ -38,6 +38,7 @@ <file alias="templates/private/ContextIcon.qml">src/controls/templates/private/ContextIcon.qml</file> <file alias="templates/private/ScrollView.qml">src/controls/templates/private/ScrollView.qml</file> <file alias="templates/private/BackButton.qml">src/controls/templates/private/BackButton.qml</file> + <file alias="templates/private/IconPropertiesGroup.qml">src/controls/templates/private/IconPropertiesGroup.qml</file> <file alias="templates/private/ForwardButton.qml">src/controls/templates/private/ForwardButton.qml</file> <file alias="templates/OverlayDrawer.qml">src/controls/templates/OverlayDrawer.qml</file> <file alias="templates/OverlaySheet.qml">src/controls/templates/OverlaySheet.qml</file> @@ -56,6 +57,7 @@ <file alias="BasicListItem.qml">src/controls/BasicListItem.qml</file> <file alias="AbstractApplicationHeader.qml">src/controls/AbstractApplicationHeader.qml</file> <file alias="FormLayout.qml">src/controls/FormLayout.qml</file> + <file alias="ListItemDragHandle.qml">src/controls/ListItemDragHandle.qml</file> <file alias="styles/Material/AbstractListItem.qml">src/styles/Material/AbstractListItem.qml</file> <file alias="styles/Material/Theme.qml">src/styles/Material/Theme.qml</file> <file alias="styles/Material/SwipeListItem.qml">src/styles/Material/SwipeListItem.qml</file> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.46.0/po/ar/libkirigami2plugin_qt.po new/kirigami2-5.47.0/po/ar/libkirigami2plugin_qt.po --- old/kirigami2-5.46.0/po/ar/libkirigami2plugin_qt.po 2018-05-05 14:58:44.000000000 +0200 +++ new/kirigami2-5.47.0/po/ar/libkirigami2plugin_qt.po 2018-06-02 19:59:49.000000000 +0200 @@ -34,7 +34,7 @@ msgid "Navigate Forward" msgstr "" -#: controls/ToolBarApplicationHeader.qml:123 +#: controls/ToolBarApplicationHeader.qml:125 #, fuzzy #| msgctxt "ContextDrawer|" #| msgid "Actions" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.46.0/po/ast/libkirigami2plugin_qt.po new/kirigami2-5.47.0/po/ast/libkirigami2plugin_qt.po --- old/kirigami2-5.46.0/po/ast/libkirigami2plugin_qt.po 2018-05-05 14:58:44.000000000 +0200 +++ new/kirigami2-5.47.0/po/ast/libkirigami2plugin_qt.po 2018-06-02 19:59:49.000000000 +0200 @@ -33,7 +33,7 @@ msgid "Navigate Forward" msgstr "" -#: controls/ToolBarApplicationHeader.qml:123 +#: controls/ToolBarApplicationHeader.qml:125 #, fuzzy #| msgctxt "ContextDrawer|" #| msgid "Actions" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.46.0/po/ca/libkirigami2plugin_qt.po new/kirigami2-5.47.0/po/ca/libkirigami2plugin_qt.po --- old/kirigami2-5.46.0/po/ca/libkirigami2plugin_qt.po 2018-05-05 14:58:44.000000000 +0200 +++ new/kirigami2-5.47.0/po/ca/libkirigami2plugin_qt.po 2018-06-02 19:59:49.000000000 +0200 @@ -40,7 +40,7 @@ msgid "Navigate Forward" msgstr "Navega endavant" -#: controls/ToolBarApplicationHeader.qml:123 +#: controls/ToolBarApplicationHeader.qml:125 msgctxt "ToolBarApplicationHeader|" msgid "More Actions" msgstr "Més accions" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.46.0/po/ca@valencia/libkirigami2plugin_qt.po new/kirigami2-5.47.0/po/ca@valencia/libkirigami2plugin_qt.po --- old/kirigami2-5.46.0/po/ca@valencia/libkirigami2plugin_qt.po 2018-05-05 14:58:44.000000000 +0200 +++ new/kirigami2-5.47.0/po/ca@valencia/libkirigami2plugin_qt.po 2018-06-02 19:59:49.000000000 +0200 @@ -40,7 +40,7 @@ msgid "Navigate Forward" msgstr "Navega avant" -#: controls/ToolBarApplicationHeader.qml:123 +#: controls/ToolBarApplicationHeader.qml:125 msgctxt "ToolBarApplicationHeader|" msgid "More Actions" msgstr "Més accions" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.46.0/po/cs/libkirigami2plugin_qt.po new/kirigami2-5.47.0/po/cs/libkirigami2plugin_qt.po --- old/kirigami2-5.46.0/po/cs/libkirigami2plugin_qt.po 2018-05-05 14:58:44.000000000 +0200 +++ new/kirigami2-5.47.0/po/cs/libkirigami2plugin_qt.po 2018-06-02 19:59:49.000000000 +0200 @@ -33,7 +33,7 @@ msgid "Navigate Forward" msgstr "Přejít vpřed" -#: controls/ToolBarApplicationHeader.qml:123 +#: controls/ToolBarApplicationHeader.qml:125 msgctxt "ToolBarApplicationHeader|" msgid "More Actions" msgstr "Další činnosti" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.46.0/po/da/libkirigami2plugin_qt.po new/kirigami2-5.47.0/po/da/libkirigami2plugin_qt.po --- old/kirigami2-5.46.0/po/da/libkirigami2plugin_qt.po 2018-05-05 14:58:44.000000000 +0200 +++ new/kirigami2-5.47.0/po/da/libkirigami2plugin_qt.po 2018-06-02 19:59:49.000000000 +0200 @@ -33,7 +33,7 @@ msgid "Navigate Forward" msgstr "Navigér fremad" -#: controls/ToolBarApplicationHeader.qml:123 +#: controls/ToolBarApplicationHeader.qml:125 #, fuzzy #| msgctxt "ContextDrawer|" #| msgid "Actions" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.46.0/po/de/libkirigami2plugin_qt.po new/kirigami2-5.47.0/po/de/libkirigami2plugin_qt.po --- old/kirigami2-5.46.0/po/de/libkirigami2plugin_qt.po 2018-05-05 14:58:44.000000000 +0200 +++ new/kirigami2-5.47.0/po/de/libkirigami2plugin_qt.po 2018-06-02 19:59:49.000000000 +0200 @@ -34,7 +34,7 @@ msgid "Navigate Forward" msgstr "Vorwärts gehen" -#: controls/ToolBarApplicationHeader.qml:123 +#: controls/ToolBarApplicationHeader.qml:125 msgctxt "ToolBarApplicationHeader|" msgid "More Actions" msgstr "Weitere Aktionen" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.46.0/po/el/libkirigami2plugin_qt.po new/kirigami2-5.47.0/po/el/libkirigami2plugin_qt.po --- old/kirigami2-5.46.0/po/el/libkirigami2plugin_qt.po 2018-05-05 14:58:44.000000000 +0200 +++ new/kirigami2-5.47.0/po/el/libkirigami2plugin_qt.po 2018-06-02 19:59:49.000000000 +0200 @@ -33,7 +33,7 @@ msgid "Navigate Forward" msgstr "" -#: controls/ToolBarApplicationHeader.qml:123 +#: controls/ToolBarApplicationHeader.qml:125 #, fuzzy #| msgctxt "ContextDrawer|" #| msgid "Actions" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.46.0/po/en_GB/libkirigami2plugin_qt.po new/kirigami2-5.47.0/po/en_GB/libkirigami2plugin_qt.po --- old/kirigami2-5.46.0/po/en_GB/libkirigami2plugin_qt.po 2018-05-05 14:58:44.000000000 +0200 +++ new/kirigami2-5.47.0/po/en_GB/libkirigami2plugin_qt.po 2018-06-02 19:59:49.000000000 +0200 @@ -33,7 +33,7 @@ msgid "Navigate Forward" msgstr "Navigate Forward" -#: controls/ToolBarApplicationHeader.qml:123 +#: controls/ToolBarApplicationHeader.qml:125 msgctxt "ToolBarApplicationHeader|" msgid "More Actions" msgstr "More Actions" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.46.0/po/es/libkirigami2plugin_qt.po new/kirigami2-5.47.0/po/es/libkirigami2plugin_qt.po --- old/kirigami2-5.46.0/po/es/libkirigami2plugin_qt.po 2018-05-05 14:58:44.000000000 +0200 +++ new/kirigami2-5.47.0/po/es/libkirigami2plugin_qt.po 2018-06-02 19:59:49.000000000 +0200 @@ -33,7 +33,7 @@ msgid "Navigate Forward" msgstr "Avanzar una página" -#: controls/ToolBarApplicationHeader.qml:123 +#: controls/ToolBarApplicationHeader.qml:125 msgctxt "ToolBarApplicationHeader|" msgid "More Actions" msgstr "Más acciones" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.46.0/po/eu/libkirigami2plugin_qt.po new/kirigami2-5.47.0/po/eu/libkirigami2plugin_qt.po --- old/kirigami2-5.46.0/po/eu/libkirigami2plugin_qt.po 2018-05-05 14:58:44.000000000 +0200 +++ new/kirigami2-5.47.0/po/eu/libkirigami2plugin_qt.po 2018-06-02 19:59:49.000000000 +0200 @@ -1,14 +1,14 @@ # Translation of libkirigami2plugin_qt.po to Euskara/Basque (eu). -# Copyright (C) 2017, Free Software Foundation, Inc. +# Copyright (C) 2017-2018, Free Software Foundation. # This file is distributed under the same license as the frameworks package. # KDE Euskaratzeko proiektuaren arduraduna <[email protected]>. # # Translators: -# Iñigo Salvador Azurmendi <[email protected]>, 2017. +# Iñigo Salvador Azurmendi <[email protected]>, 2017, 2018. msgid "" msgstr "" "Project-Id-Version: libkirigami2plugin_qt\n" -"PO-Revision-Date: 2017-10-17 21:45+0100\n" +"PO-Revision-Date: 2018-05-08 18:57+0100\n" "Last-Translator: Iñigo Salvador Azurmendi <[email protected]>\n" "Language-Team: Basque <[email protected]>\n" "Language: eu\n" @@ -39,10 +39,7 @@ msgid "Navigate Forward" msgstr "Nabigatu aurrera" -#: controls/ToolBarApplicationHeader.qml:123 -#, fuzzy -#| msgctxt "ContextDrawer|" -#| msgid "Actions" +#: controls/ToolBarApplicationHeader.qml:125 msgctxt "ToolBarApplicationHeader|" msgid "More Actions" -msgstr "Ekintzak" +msgstr "Ekintza gehiago" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.46.0/po/fi/libkirigami2plugin_qt.po new/kirigami2-5.47.0/po/fi/libkirigami2plugin_qt.po --- old/kirigami2-5.46.0/po/fi/libkirigami2plugin_qt.po 2018-05-05 14:58:44.000000000 +0200 +++ new/kirigami2-5.47.0/po/fi/libkirigami2plugin_qt.po 2018-06-02 19:59:49.000000000 +0200 @@ -34,7 +34,7 @@ msgid "Navigate Forward" msgstr "Siirry eteenpäin" -#: controls/ToolBarApplicationHeader.qml:123 +#: controls/ToolBarApplicationHeader.qml:125 msgctxt "ToolBarApplicationHeader|" msgid "More Actions" msgstr "Lisää toimintoja" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.46.0/po/fr/libkirigami2plugin_qt.po new/kirigami2-5.47.0/po/fr/libkirigami2plugin_qt.po --- old/kirigami2-5.46.0/po/fr/libkirigami2plugin_qt.po 2018-05-05 14:58:44.000000000 +0200 +++ new/kirigami2-5.47.0/po/fr/libkirigami2plugin_qt.po 2018-06-02 19:59:49.000000000 +0200 @@ -36,7 +36,7 @@ msgid "Navigate Forward" msgstr "Navigation avant" -#: controls/ToolBarApplicationHeader.qml:123 +#: controls/ToolBarApplicationHeader.qml:125 #, fuzzy #| msgctxt "ContextDrawer|" #| msgid "Actions" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.46.0/po/gl/libkirigami2plugin_qt.po new/kirigami2-5.47.0/po/gl/libkirigami2plugin_qt.po --- old/kirigami2-5.46.0/po/gl/libkirigami2plugin_qt.po 2018-05-05 14:58:44.000000000 +0200 +++ new/kirigami2-5.47.0/po/gl/libkirigami2plugin_qt.po 2018-06-02 19:59:49.000000000 +0200 @@ -34,7 +34,7 @@ msgid "Navigate Forward" msgstr "Continuar" -#: controls/ToolBarApplicationHeader.qml:123 +#: controls/ToolBarApplicationHeader.qml:125 msgctxt "ToolBarApplicationHeader|" msgid "More Actions" msgstr "Máis accións" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.46.0/po/hu/libkirigami2plugin_qt.po new/kirigami2-5.47.0/po/hu/libkirigami2plugin_qt.po --- old/kirigami2-5.46.0/po/hu/libkirigami2plugin_qt.po 2018-05-05 14:58:44.000000000 +0200 +++ new/kirigami2-5.47.0/po/hu/libkirigami2plugin_qt.po 2018-06-02 19:59:49.000000000 +0200 @@ -33,7 +33,7 @@ msgid "Navigate Forward" msgstr "" -#: controls/ToolBarApplicationHeader.qml:123 +#: controls/ToolBarApplicationHeader.qml:125 #, fuzzy #| msgctxt "ContextDrawer|" #| msgid "Actions" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.46.0/po/ia/libkirigami2plugin_qt.po new/kirigami2-5.47.0/po/ia/libkirigami2plugin_qt.po --- old/kirigami2-5.46.0/po/ia/libkirigami2plugin_qt.po 2018-05-05 14:58:44.000000000 +0200 +++ new/kirigami2-5.47.0/po/ia/libkirigami2plugin_qt.po 2018-06-02 19:59:49.000000000 +0200 @@ -33,7 +33,7 @@ msgid "Navigate Forward" msgstr "" -#: controls/ToolBarApplicationHeader.qml:123 +#: controls/ToolBarApplicationHeader.qml:125 #, fuzzy #| msgctxt "ContextDrawer|" #| msgid "Actions" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.46.0/po/id/libkirigami2plugin_qt.po new/kirigami2-5.47.0/po/id/libkirigami2plugin_qt.po --- old/kirigami2-5.46.0/po/id/libkirigami2plugin_qt.po 2018-05-05 14:58:44.000000000 +0200 +++ new/kirigami2-5.47.0/po/id/libkirigami2plugin_qt.po 2018-06-02 19:59:49.000000000 +0200 @@ -33,7 +33,7 @@ msgid "Navigate Forward" msgstr "Navigasi Maju" -#: controls/ToolBarApplicationHeader.qml:123 +#: controls/ToolBarApplicationHeader.qml:125 msgctxt "ToolBarApplicationHeader|" msgid "More Actions" msgstr "Tindakan Selebihnya" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.46.0/po/it/libkirigami2plugin_qt.po new/kirigami2-5.47.0/po/it/libkirigami2plugin_qt.po --- old/kirigami2-5.46.0/po/it/libkirigami2plugin_qt.po 2018-05-05 14:58:44.000000000 +0200 +++ new/kirigami2-5.47.0/po/it/libkirigami2plugin_qt.po 2018-06-02 19:59:49.000000000 +0200 @@ -33,7 +33,7 @@ msgid "Navigate Forward" msgstr "Naviga in avanti" -#: controls/ToolBarApplicationHeader.qml:123 +#: controls/ToolBarApplicationHeader.qml:125 msgctxt "ToolBarApplicationHeader|" msgid "More Actions" msgstr "Altre azioni" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.46.0/po/ja/libkirigami2plugin_qt.po new/kirigami2-5.47.0/po/ja/libkirigami2plugin_qt.po --- old/kirigami2-5.46.0/po/ja/libkirigami2plugin_qt.po 2018-05-05 14:58:44.000000000 +0200 +++ new/kirigami2-5.47.0/po/ja/libkirigami2plugin_qt.po 2018-06-02 19:59:49.000000000 +0200 @@ -31,7 +31,7 @@ msgid "Navigate Forward" msgstr "" -#: controls/ToolBarApplicationHeader.qml:123 +#: controls/ToolBarApplicationHeader.qml:125 msgctxt "ToolBarApplicationHeader|" msgid "More Actions" msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.46.0/po/ko/libkirigami2plugin_qt.po new/kirigami2-5.47.0/po/ko/libkirigami2plugin_qt.po --- old/kirigami2-5.46.0/po/ko/libkirigami2plugin_qt.po 2018-05-05 14:58:44.000000000 +0200 +++ new/kirigami2-5.47.0/po/ko/libkirigami2plugin_qt.po 2018-06-02 19:59:49.000000000 +0200 @@ -33,7 +33,7 @@ msgid "Navigate Forward" msgstr "다음 탐색" -#: controls/ToolBarApplicationHeader.qml:123 +#: controls/ToolBarApplicationHeader.qml:125 #, fuzzy #| msgctxt "ContextDrawer|" #| msgid "Actions" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.46.0/po/nl/libkirigami2plugin_qt.po new/kirigami2-5.47.0/po/nl/libkirigami2plugin_qt.po --- old/kirigami2-5.46.0/po/nl/libkirigami2plugin_qt.po 2018-05-05 14:58:44.000000000 +0200 +++ new/kirigami2-5.47.0/po/nl/libkirigami2plugin_qt.po 2018-06-02 19:59:49.000000000 +0200 @@ -33,7 +33,7 @@ msgid "Navigate Forward" msgstr "Naar voren navigeren" -#: controls/ToolBarApplicationHeader.qml:123 +#: controls/ToolBarApplicationHeader.qml:125 msgctxt "ToolBarApplicationHeader|" msgid "More Actions" msgstr "Meer acties" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.46.0/po/nn/libkirigami2plugin_qt.po new/kirigami2-5.47.0/po/nn/libkirigami2plugin_qt.po --- old/kirigami2-5.46.0/po/nn/libkirigami2plugin_qt.po 2018-05-05 14:58:44.000000000 +0200 +++ new/kirigami2-5.47.0/po/nn/libkirigami2plugin_qt.po 2018-06-02 19:59:49.000000000 +0200 @@ -35,7 +35,7 @@ msgid "Navigate Forward" msgstr "Naviger fram" -#: controls/ToolBarApplicationHeader.qml:123 +#: controls/ToolBarApplicationHeader.qml:125 msgctxt "ToolBarApplicationHeader|" msgid "More Actions" msgstr "Fleire handlingar" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.46.0/po/pl/libkirigami2plugin_qt.po new/kirigami2-5.47.0/po/pl/libkirigami2plugin_qt.po --- old/kirigami2-5.46.0/po/pl/libkirigami2plugin_qt.po 2018-05-05 14:58:44.000000000 +0200 +++ new/kirigami2-5.47.0/po/pl/libkirigami2plugin_qt.po 2018-06-02 19:59:49.000000000 +0200 @@ -34,7 +34,7 @@ msgid "Navigate Forward" msgstr "Przejdź naprzód" -#: controls/ToolBarApplicationHeader.qml:123 +#: controls/ToolBarApplicationHeader.qml:125 msgctxt "ToolBarApplicationHeader|" msgid "More Actions" msgstr "Więcej działań" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.46.0/po/pt/libkirigami2plugin_qt.po new/kirigami2-5.47.0/po/pt/libkirigami2plugin_qt.po --- old/kirigami2-5.46.0/po/pt/libkirigami2plugin_qt.po 2018-05-05 14:58:44.000000000 +0200 +++ new/kirigami2-5.47.0/po/pt/libkirigami2plugin_qt.po 2018-06-02 19:59:49.000000000 +0200 @@ -35,7 +35,7 @@ msgid "Navigate Forward" msgstr "Navegar para a Frente" -#: controls/ToolBarApplicationHeader.qml:123 +#: controls/ToolBarApplicationHeader.qml:125 msgctxt "ToolBarApplicationHeader|" msgid "More Actions" msgstr "Mais Acções" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.46.0/po/pt_BR/libkirigami2plugin_qt.po new/kirigami2-5.47.0/po/pt_BR/libkirigami2plugin_qt.po --- old/kirigami2-5.46.0/po/pt_BR/libkirigami2plugin_qt.po 2018-05-05 14:58:44.000000000 +0200 +++ new/kirigami2-5.47.0/po/pt_BR/libkirigami2plugin_qt.po 2018-06-02 19:59:49.000000000 +0200 @@ -1,8 +1,8 @@ -# Luiz Fernando Ranghetti <[email protected]>, 2016, 2017. +# Luiz Fernando Ranghetti <[email protected]>, 2016, 2017, 2018. msgid "" msgstr "" "Project-Id-Version: \n" -"PO-Revision-Date: 2017-12-12 15:14-0300\n" +"PO-Revision-Date: 2018-06-02 00:41-0300\n" "Last-Translator: Luiz Fernando Ranghetti <[email protected]>\n" "Language-Team: Portuguese <[email protected]>\n" "Language: pt_BR\n" @@ -33,10 +33,9 @@ msgid "Navigate Forward" msgstr "Avançar" -#: controls/ToolBarApplicationHeader.qml:123 -#, fuzzy +#: controls/ToolBarApplicationHeader.qml:125 #| msgctxt "ContextDrawer|" #| msgid "Actions" msgctxt "ToolBarApplicationHeader|" msgid "More Actions" -msgstr "Ações" +msgstr "Mais ações" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.46.0/po/ru/libkirigami2plugin_qt.po new/kirigami2-5.47.0/po/ru/libkirigami2plugin_qt.po --- old/kirigami2-5.46.0/po/ru/libkirigami2plugin_qt.po 2018-05-05 14:58:44.000000000 +0200 +++ new/kirigami2-5.47.0/po/ru/libkirigami2plugin_qt.po 2018-06-02 19:59:49.000000000 +0200 @@ -34,7 +34,7 @@ msgid "Navigate Forward" msgstr "Перейти вперёд" -#: controls/ToolBarApplicationHeader.qml:123 +#: controls/ToolBarApplicationHeader.qml:125 #, fuzzy #| msgctxt "ContextDrawer|" #| msgid "Actions" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.46.0/po/sk/libkirigami2plugin_qt.po new/kirigami2-5.47.0/po/sk/libkirigami2plugin_qt.po --- old/kirigami2-5.46.0/po/sk/libkirigami2plugin_qt.po 2018-05-05 14:58:44.000000000 +0200 +++ new/kirigami2-5.47.0/po/sk/libkirigami2plugin_qt.po 2018-06-02 19:59:49.000000000 +0200 @@ -36,7 +36,7 @@ msgid "Navigate Forward" msgstr "" -#: controls/ToolBarApplicationHeader.qml:123 +#: controls/ToolBarApplicationHeader.qml:125 #, fuzzy #| msgctxt "ContextDrawer|" #| msgid "Actions" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.46.0/po/sl/libkirigami2plugin_qt.po new/kirigami2-5.47.0/po/sl/libkirigami2plugin_qt.po --- old/kirigami2-5.46.0/po/sl/libkirigami2plugin_qt.po 2018-05-05 14:58:44.000000000 +0200 +++ new/kirigami2-5.47.0/po/sl/libkirigami2plugin_qt.po 2018-06-02 19:59:49.000000000 +0200 @@ -34,7 +34,7 @@ msgid "Navigate Forward" msgstr "Krmari naprej" -#: controls/ToolBarApplicationHeader.qml:123 +#: controls/ToolBarApplicationHeader.qml:125 #, fuzzy #| msgctxt "ContextDrawer|" #| msgid "Actions" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.46.0/po/sr/libkirigami2plugin_qt.po new/kirigami2-5.47.0/po/sr/libkirigami2plugin_qt.po --- old/kirigami2-5.46.0/po/sr/libkirigami2plugin_qt.po 2018-05-05 14:58:44.000000000 +0200 +++ new/kirigami2-5.47.0/po/sr/libkirigami2plugin_qt.po 2018-06-02 19:59:49.000000000 +0200 @@ -27,17 +27,17 @@ msgid "Back" msgstr "Назад" -#: controls/templates/private/BackButton.qml:56 +#: controls/templates/private/BackButton.qml:51 msgctxt "BackButton|" msgid "Navigate Back" msgstr "Иди назад" -#: controls/templates/private/ForwardButton.qml:51 +#: controls/templates/private/ForwardButton.qml:48 msgctxt "ForwardButton|" msgid "Navigate Forward" msgstr "Иди напред" -#: controls/ToolBarApplicationHeader.qml:125 +#: controls/ToolBarApplicationHeader.qml:123 #, fuzzy #| msgctxt "ContextDrawer|" #| msgid "Actions" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.46.0/po/sr@ijekavian/libkirigami2plugin_qt.po new/kirigami2-5.47.0/po/sr@ijekavian/libkirigami2plugin_qt.po --- old/kirigami2-5.46.0/po/sr@ijekavian/libkirigami2plugin_qt.po 2018-05-05 14:58:44.000000000 +0200 +++ new/kirigami2-5.47.0/po/sr@ijekavian/libkirigami2plugin_qt.po 2018-06-02 19:59:49.000000000 +0200 @@ -27,17 +27,17 @@ msgid "Back" msgstr "Назад" -#: controls/templates/private/BackButton.qml:56 +#: controls/templates/private/BackButton.qml:51 msgctxt "BackButton|" msgid "Navigate Back" msgstr "Иди назад" -#: controls/templates/private/ForwardButton.qml:51 +#: controls/templates/private/ForwardButton.qml:48 msgctxt "ForwardButton|" msgid "Navigate Forward" msgstr "Иди напред" -#: controls/ToolBarApplicationHeader.qml:125 +#: controls/ToolBarApplicationHeader.qml:123 #, fuzzy #| msgctxt "ContextDrawer|" #| msgid "Actions" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.46.0/po/sr@ijekavianlatin/libkirigami2plugin_qt.po new/kirigami2-5.47.0/po/sr@ijekavianlatin/libkirigami2plugin_qt.po --- old/kirigami2-5.46.0/po/sr@ijekavianlatin/libkirigami2plugin_qt.po 2018-05-05 14:58:44.000000000 +0200 +++ new/kirigami2-5.47.0/po/sr@ijekavianlatin/libkirigami2plugin_qt.po 2018-06-02 19:59:49.000000000 +0200 @@ -27,17 +27,17 @@ msgid "Back" msgstr "Nazad" -#: controls/templates/private/BackButton.qml:56 +#: controls/templates/private/BackButton.qml:51 msgctxt "BackButton|" msgid "Navigate Back" msgstr "Idi nazad" -#: controls/templates/private/ForwardButton.qml:51 +#: controls/templates/private/ForwardButton.qml:48 msgctxt "ForwardButton|" msgid "Navigate Forward" msgstr "Idi napred" -#: controls/ToolBarApplicationHeader.qml:125 +#: controls/ToolBarApplicationHeader.qml:123 #, fuzzy #| msgctxt "ContextDrawer|" #| msgid "Actions" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.46.0/po/sr@latin/libkirigami2plugin_qt.po new/kirigami2-5.47.0/po/sr@latin/libkirigami2plugin_qt.po --- old/kirigami2-5.46.0/po/sr@latin/libkirigami2plugin_qt.po 2018-05-05 14:58:44.000000000 +0200 +++ new/kirigami2-5.47.0/po/sr@latin/libkirigami2plugin_qt.po 2018-06-02 19:59:49.000000000 +0200 @@ -27,17 +27,17 @@ msgid "Back" msgstr "Nazad" -#: controls/templates/private/BackButton.qml:56 +#: controls/templates/private/BackButton.qml:51 msgctxt "BackButton|" msgid "Navigate Back" msgstr "Idi nazad" -#: controls/templates/private/ForwardButton.qml:51 +#: controls/templates/private/ForwardButton.qml:48 msgctxt "ForwardButton|" msgid "Navigate Forward" msgstr "Idi napred" -#: controls/ToolBarApplicationHeader.qml:125 +#: controls/ToolBarApplicationHeader.qml:123 #, fuzzy #| msgctxt "ContextDrawer|" #| msgid "Actions" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.46.0/po/sv/libkirigami2plugin_qt.po new/kirigami2-5.47.0/po/sv/libkirigami2plugin_qt.po --- old/kirigami2-5.46.0/po/sv/libkirigami2plugin_qt.po 2018-05-05 14:58:44.000000000 +0200 +++ new/kirigami2-5.47.0/po/sv/libkirigami2plugin_qt.po 2018-06-02 19:59:49.000000000 +0200 @@ -33,7 +33,7 @@ msgid "Navigate Forward" msgstr "Navigera framåt" -#: controls/ToolBarApplicationHeader.qml:123 +#: controls/ToolBarApplicationHeader.qml:125 msgctxt "ToolBarApplicationHeader|" msgid "More Actions" msgstr "Fler åtgärder" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.46.0/po/tr/libkirigami2plugin_qt.po new/kirigami2-5.47.0/po/tr/libkirigami2plugin_qt.po --- old/kirigami2-5.46.0/po/tr/libkirigami2plugin_qt.po 2018-05-05 14:58:44.000000000 +0200 +++ new/kirigami2-5.47.0/po/tr/libkirigami2plugin_qt.po 2018-06-02 19:59:49.000000000 +0200 @@ -31,7 +31,7 @@ msgid "Navigate Forward" msgstr "İleri Git" -#: controls/ToolBarApplicationHeader.qml:123 +#: controls/ToolBarApplicationHeader.qml:125 #, fuzzy #| msgctxt "ContextDrawer|" #| msgid "Actions" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.46.0/po/uk/libkirigami2plugin_qt.po new/kirigami2-5.47.0/po/uk/libkirigami2plugin_qt.po --- old/kirigami2-5.46.0/po/uk/libkirigami2plugin_qt.po 2018-05-05 14:58:44.000000000 +0200 +++ new/kirigami2-5.47.0/po/uk/libkirigami2plugin_qt.po 2018-06-02 19:59:49.000000000 +0200 @@ -39,7 +39,7 @@ msgid "Navigate Forward" msgstr "Перейти далі" -#: controls/ToolBarApplicationHeader.qml:123 +#: controls/ToolBarApplicationHeader.qml:125 msgctxt "ToolBarApplicationHeader|" msgid "More Actions" msgstr "Інші дії" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.46.0/po/zh_CN/libkirigami2plugin_qt.po new/kirigami2-5.47.0/po/zh_CN/libkirigami2plugin_qt.po --- old/kirigami2-5.46.0/po/zh_CN/libkirigami2plugin_qt.po 2018-05-05 14:58:44.000000000 +0200 +++ new/kirigami2-5.47.0/po/zh_CN/libkirigami2plugin_qt.po 2018-06-02 19:59:49.000000000 +0200 @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: kdeorg\n" -"PO-Revision-Date: 2018-04-26 05:22-0400\n" +"PO-Revision-Date: 2018-05-18 06:23-0400\n" "Last-Translator: guoyunhebrave <[email protected]>\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" @@ -36,7 +36,7 @@ msgid "Navigate Forward" msgstr "前进" -#: controls/ToolBarApplicationHeader.qml:123 +#: controls/ToolBarApplicationHeader.qml:125 msgctxt "ToolBarApplicationHeader|" msgid "More Actions" msgstr "更多动作" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.46.0/po/zh_TW/libkirigami2plugin_qt.po new/kirigami2-5.47.0/po/zh_TW/libkirigami2plugin_qt.po --- old/kirigami2-5.46.0/po/zh_TW/libkirigami2plugin_qt.po 2018-05-05 14:58:44.000000000 +0200 +++ new/kirigami2-5.47.0/po/zh_TW/libkirigami2plugin_qt.po 2018-06-02 19:59:49.000000000 +0200 @@ -37,7 +37,7 @@ msgid "Navigate Forward" msgstr "往前" -#: controls/ToolBarApplicationHeader.qml:123 +#: controls/ToolBarApplicationHeader.qml:125 msgctxt "ToolBarApplicationHeader|" msgid "More Actions" msgstr "更多動作" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.46.0/src/controls/AbstractApplicationItem.qml new/kirigami2-5.47.0/src/controls/AbstractApplicationItem.qml --- old/kirigami2-5.46.0/src/controls/AbstractApplicationItem.qml 2018-05-05 14:58:44.000000000 +0200 +++ new/kirigami2-5.47.0/src/controls/AbstractApplicationItem.qml 2018-06-02 19:59:49.000000000 +0200 @@ -312,7 +312,7 @@ anchors.left: contentItem.parent.left anchors.right: contentItem.parent.right - anchors.topMargin: root.wideScreen && header && controlsVisible ? header.height : 0 + anchors.topMargin: header && controlsVisible ? header.height : 0 anchors.leftMargin: root.globalDrawer && (root.globalDrawer.modal === false) ? root.globalDrawer.contentItem.width * root.globalDrawer.position : 0 anchors.rightMargin: root.contextDrawer && root.contextDrawer.modal === false ? root.contextDrawer.contentItem.width * root.contextDrawer.position : 0 transform: Translate { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.46.0/src/controls/CardsListView.qml new/kirigami2-5.47.0/src/controls/CardsListView.qml --- old/kirigami2-5.46.0/src/controls/CardsListView.qml 2018-05-05 14:58:44.000000000 +0200 +++ new/kirigami2-5.47.0/src/controls/CardsListView.qml 2018-06-02 19:59:49.000000000 +0200 @@ -44,11 +44,4 @@ property alias delegate: root._delegateComponent headerPositioning: ListView.OverlayHeader - - onContentHeightChanged: { - var item = contentItem.children[0]; - if (item && !item.hasOwnProperty("header") && !item.hasOwnProperty("_contentItem")) { - print("Warning: only AbstractCard items are supported in CardsListView") - } - } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.46.0/src/controls/ListItemDragHandle.qml new/kirigami2-5.47.0/src/controls/ListItemDragHandle.qml --- old/kirigami2-5.46.0/src/controls/ListItemDragHandle.qml 1970-01-01 01:00:00.000000000 +0100 +++ new/kirigami2-5.47.0/src/controls/ListItemDragHandle.qml 2018-06-02 19:59:49.000000000 +0200 @@ -0,0 +1,207 @@ +/* +* Copyright (C) 2018 by Marco Martin <[email protected]> +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU Library General Public License as +* published by the Free Software Foundation; either version 2, or +* (at your option) any later version. +* +* This program 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 program; if not, write to the +* Free Software Foundation, Inc., +* 51 Franklin Street, Fifth Floor, Boston, MA 2.010-1301, USA. +*/ + +import QtQuick 2.6 +import QtQuick.Layouts 1.2 +import org.kde.kirigami 2.4 as Kirigami + +/** + * Implements a drag handle supposed to be in items in ListViews to reorder items + * The ListView must visualize a model which supports item reordering, + * such as ListModel.move() or QAbstractItemModel instances with moveRows() correctly implemented. + * In order for ListItemDragHandle to work correctly, the listItem that is being dragged + * should not directly be the delegate of the ListView, but a child of it. + * + * It is recomended to use DelagateRecycler as base delegate like the following code: + * @code + * ... + * Component { + * id: delegateComponent + * Kirigami.AbstractListItem { + * id: listItem + * contentItem: RowLayout { + * Kirigami.ListItemDragHandle { + * listItem: listItem + * listView: mainList + * onMoveRequested: listModel.move(oldIndex, newIndex, 1) + * } + * Controls.Label { + * text: model.label + * } + * } + * } + * } + * ListView { + * id: mainList + * + * model: ListModel { + * id: listModel + * ListItem { + * lablel: "Item 1" + * } + * ListItem { + * lablel: "Item 2" + * } + * ListItem { + * lablel: "Item 3" + * } + * } + * //this is optional to make list items animated when reordered + * moveDisplaced: Transition { + * YAnimator { + * duration: Kirigami.Units.longDuration + * easing.type: Easing.InOutQuad + * } + * } + * delegate: Kirigami.DelegateRecycler { + * width: mainList.width + * sourceComponent: delegateComponent + * } + * } + * ... + * @endcode + * + * @inherits Item + * @since 2.5 + */ +Item { + id: root + + /** + * listItem: Item + * The id of the delegate that we want to drag around, which *must* + * be a child of the actual ListView's delegate + */ + property Item listItem + + /** + * listView: Listview + * The id of the ListView the delegates belong to. + */ + property ListView listView + + /** + * Emitted when the drag handle wants to move the item in the model + * The following example does the move in the case a ListModel is used + * @code + * onMoveRequested: listModel.move(oldIndex, newIndex, 1) + * @endcode + * @param oldIndex the index the item is currently at + * @param newIndex the index we want to move the item to + */ + signal moveRequested(int oldIndex, int newIndex) + + /** + * Emitted when the drag operation is complete and the item has been + * droppped in the new final position + */ + signal dropped() + + implicitWidth: Kirigami.Units.iconSizes.smallMedium + implicitHeight: implicitWidth + + MouseArea { + id: mouseArea + anchors.fill: parent + drag { + target: listItem + axis: Drag.YAxis + minimumY: 0 + maximumY: listView.height - listItem.height + } + Kirigami.Icon { + id: internal + source: "handle-sort" + property int startY + property int mouseDownY + property Item originalParent + property int autoScrollThreshold: listItem.height * 3 + opacity: mouseArea.pressed || (!Kirigami.Settings.tabletMode && listItem.hovered) ? 1 : 0.6 + + function arrangeItem() { + var newIndex = listView.indexAt(1, listView.contentItem.mapFromItem(listItem, 0, 0).y + internal.mouseDownY); + + if (Math.abs(listItem.y - internal.startY) > height && newIndex > -1 && newIndex != index) { + root.moveRequested(index, newIndex); + } + } + + anchors.fill: parent + } + preventStealing: true + + + onPressed: { + internal.originalParent = listItem.parent; + listItem.parent = listView; + listItem.y = internal.originalParent.mapToItem(listItem.parent, listItem.x, listItem.y).y; + internal.originalParent.z = 99; + internal.startY = listItem.y; + internal.mouseDownY = mouse.y; + } + + onPositionChanged: { + if (!pressed) { + return; + } + internal.arrangeItem(); + + scrollTimer.interval = 500 * Math.max(0.1, (1-Math.max(internal.autoScrollThreshold - listItem.y, listItem.y - listView.height + internal.autoScrollThreshold + listItem.height) / internal.autoScrollThreshold)); + scrollTimer.running = (listItem.y < internal.autoScrollThreshold || + listItem.y > listView.height - internal.autoScrollThreshold); + } + onReleased: { + listItem.y = internal.originalParent.mapFromItem(listItem, 0, 0).y; + listItem.parent = internal.originalParent; + dropAnimation.running = true; + scrollTimer.running = false; + root.dropped(); + } + onCanceled: released() + SequentialAnimation { + id: dropAnimation + YAnimator { + target: listItem + from: listItem.y + to: 0 + duration: Kirigami.Units.longDuration + easing.type: Easing.InOutQuad + } + PropertyAction { + target: listItem.parent + property: "z" + value: 0 + } + } + Timer { + id: scrollTimer + interval: 500 + repeat: true + onTriggered: { + if (listItem.y < internal.autoScrollThreshold) { + listView.contentY = Math.max(0, listView.contentY - Kirigami.Units.gridUnit) + } else { + listView.contentY = Math.min(listView.contentHeight - listView.height, listView.contentY + Kirigami.Units.gridUnit) + } + internal.arrangeItem(); + } + } + } +} + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.46.0/src/controls/ToolBarApplicationHeader.qml new/kirigami2-5.47.0/src/controls/ToolBarApplicationHeader.qml --- old/kirigami2-5.46.0/src/controls/ToolBarApplicationHeader.qml 2018-05-05 14:58:44.000000000 +0200 +++ new/kirigami2-5.47.0/src/controls/ToolBarApplicationHeader.qml 2018-06-02 19:59:49.000000000 +0200 @@ -99,8 +99,10 @@ } PrivateActionToolButton { Layout.alignment: Qt.AlignVCenter + Layout.rightMargin: Units.smallSpacing kirigamiAction: page && page.actions ? page.actions.main : null showText: !parent.toobig + flat: false } PrivateActionToolButton { Layout.alignment: Qt.AlignVCenter diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.46.0/src/controls/private/DefaultListItemBackground.qml new/kirigami2-5.47.0/src/controls/private/DefaultListItemBackground.qml --- old/kirigami2-5.46.0/src/controls/private/DefaultListItemBackground.qml 2018-05-05 14:58:44.000000000 +0200 +++ new/kirigami2-5.47.0/src/controls/private/DefaultListItemBackground.qml 2018-06-02 19:59:49.000000000 +0200 @@ -38,22 +38,15 @@ ColorAnimation { duration: Units.longDuration } } - readonly property bool _firstElement: typeof(index) !== "undefined" && index == 0 + readonly property bool __separatorVisible: listItem.separatorVisible - on_FirstElementChanged: { - if (_firstElement) { + on__SeparatorVisibleChanged: { + if (__separatorVisible) { var newObject = Qt.createQmlObject('import QtQuick 2.0; import org.kde.kirigami 2.4; Separator {anchors {left: parent.left; right: parent.right; bottom: parent.top} visible: listItem.separatorVisible}', background); + newObject = Qt.createQmlObject('import QtQuick 2.0; import org.kde.kirigami 2.4; Separator {anchors {left: parent.left; right: parent.right; bottom: parent.bottom} visible: listItem.separatorVisible}', + background); } } - - Separator { - anchors { - left: parent.left - right: parent.right - bottom: parent.bottom - } - visible: listItem.separatorVisible - } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.46.0/src/controls/private/PrivateActionToolButton.qml new/kirigami2-5.47.0/src/controls/private/PrivateActionToolButton.qml --- old/kirigami2-5.46.0/src/controls/private/PrivateActionToolButton.qml 2018-05-05 14:58:44.000000000 +0200 +++ new/kirigami2-5.47.0/src/controls/private/PrivateActionToolButton.qml 2018-06-02 19:59:49.000000000 +0200 @@ -59,7 +59,11 @@ } } - flat: true + Component.onCompleted: { + //NOTE: Make it a proper property when we depend on Qt 5.10 + if (palette) + palette.button = Qt.binding(function() { return control.kirigamiAction ? control.kirigamiAction.icon.color : undefined}); + } contentItem: MouseArea { hoverEnabled: true onPressed: mouse.accepted = false @@ -75,10 +79,15 @@ Layout.minimumHeight: Units.iconSizes.smallMedium source: control.kirigamiAction ? (control.kirigamiAction.icon ? control.kirigamiAction.icon.name : control.kirigamiAction.iconName) : "" visible: control.kirigamiAction && control.kirigamiAction.iconName != "" - color: control.kirigamiAction && control.kirigamiAction.icon && control.kirigamiAction.icon.color.a > 0 ? control.kirigamiAction.icon.color : Qt.rgba(0, 0, 0, 0) + color: control.flat && control.kirigamiAction && control.kirigamiAction.icon && control.kirigamiAction.icon.color.a > 0 ? control.kirigamiAction.icon.color : label.color } Controls.Label { - text: kirigamiAction ? kirigamiAction.text : "" + id: label + MnemonicData.enabled: control.enabled + MnemonicData.controlType: MnemonicData.ActionElement + MnemonicData.label: control.kirigamiAction ? control.kirigamiAction.text : "" + + text: MnemonicData.richTextLabel visible: control.showText && text.length > 0 } Icon { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.46.0/src/controls/templates/InlineMessage.qml new/kirigami2-5.47.0/src/controls/templates/InlineMessage.qml --- old/kirigami2-5.46.0/src/controls/templates/InlineMessage.qml 2018-05-05 14:58:44.000000000 +0200 +++ new/kirigami2-5.47.0/src/controls/templates/InlineMessage.qml 2018-06-02 19:59:49.000000000 +0200 @@ -45,7 +45,7 @@ * Example: * @code * InlineMessage { - * type: Kirigami.InlineMessageType.Error + * type: Kirigami.MessageType.Error * * text: "My error message" * @@ -92,7 +92,7 @@ * type: int * The message type. One of Information, Positive, Warning or Error. * - * The default is Kirigami.InlineMessageType.Information. + * The default is Kirigami.MessageType.Information. */ property int type: Kirigami.MessageType.Information diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.46.0/src/controls/templates/OverlayDrawer.qml new/kirigami2-5.47.0/src/controls/templates/OverlayDrawer.qml --- old/kirigami2-5.46.0/src/controls/templates/OverlayDrawer.qml 2018-05-05 14:58:44.000000000 +0200 +++ new/kirigami2-5.47.0/src/controls/templates/OverlayDrawer.qml 2018-06-02 19:59:49.000000000 +0200 @@ -111,7 +111,8 @@ property int startX property int mappedStartX - property bool desktopMode: applicationWindow() && applicationWindow().header.toString().indexOf("ToolBarApplicationHeader") !== -1 + property bool desktopMode: applicationWindow() && applicationWindow().header && applicationWindow().header.toString().indexOf("ToolBarApplicationHeader") !== -1 + enabled: root.handleVisible && root.modal onPressed: { root.peeking = true; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.46.0/src/controls/templates/OverlaySheet.qml new/kirigami2-5.47.0/src/controls/templates/OverlaySheet.qml --- old/kirigami2-5.46.0/src/controls/templates/OverlaySheet.qml 2018-05-05 14:58:44.000000000 +0200 +++ new/kirigami2-5.47.0/src/controls/templates/OverlaySheet.qml 2018-06-02 19:59:49.000000000 +0200 @@ -382,8 +382,8 @@ //* the bottom screen controls are visible //* the sheet is disaplayed *under* the controls property int extraMargin: (!root.parent || - applicationWindow === "undefined" || - (root.parent === applicationWindow().overlay && root.parent.action.main) || + typeof applicationWindow === "undefined" || + (root.parent === applicationWindow().overlay && root.parent.action && root.parent.action.main) || !applicationWindow().controlsVisible || !applicationWindow().header || applicationWindow().header.toString().indexOf("ToolBarApplicationHeader") === 0) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.46.0/src/controls/templates/SwipeListItem.qml new/kirigami2-5.47.0/src/controls/templates/SwipeListItem.qml --- old/kirigami2-5.46.0/src/controls/templates/SwipeListItem.qml 2018-05-05 14:58:44.000000000 +0200 +++ new/kirigami2-5.47.0/src/controls/templates/SwipeListItem.qml 2018-06-02 19:59:49.000000000 +0200 @@ -135,9 +135,11 @@ width: parent ? parent.width : implicitWidth implicitHeight: contentItem.implicitHeight + Units.smallSpacing * 5 - leftPadding: Units.smallSpacing * 2 + (LayoutMirroring.enabled ? (handleMouse.visible ? handleMouse.width : 0) + handleMouse.anchors.rightMargin : 0) + leftPadding: Units.smallSpacing * 2 + + rightPadding: Units.smallSpacing * 2 + (handleMouse.visible ? handleMouse.width : hovered * actionsLayout.width) + handleMouse.anchors.rightMargin + topPadding: Units.smallSpacing * 2 - rightPadding: Units.smallSpacing * 2 + (LayoutMirroring.enabled ? 0 : (handleMouse.visible ? handleMouse.width : 0) + handleMouse.anchors.rightMargin) bottomPadding: Units.smallSpacing * 2 //END properties @@ -149,7 +151,14 @@ //TODO: a global "open" state enabled: background.x !== 0 property bool indicateActiveFocus: listItem.pressed || Settings.tabletMode || listItem.activeFocus || (view ? view.activeFocus : false) - property Flickable view: listItem.ListView.view || listItem.parent.ListView.view + property Flickable view: listItem.ListView.view || (listItem.parent ? (listItem.parent.ListView.view || listItem.parent) : null) + onViewChanged: { + if (view && Settings.tabletMode && !behindItem.view.parent.parent._swipeFilter) { + var component = Qt.createComponent(Qt.resolvedUrl("../private/SwipeItemEventFilter.qml")); + behindItem.view.parent.parent._swipeFilter = component.createObject(behindItem.view.parent.parent); + } + } + anchors { fill: parent } @@ -198,7 +207,7 @@ anchors { right: parent.right verticalCenter: parent.verticalCenter - rightMargin: LayoutMirroring.enabled ? listItem.leftPadding : listItem.rightPadding + rightMargin: handleMouse.anchors.rightMargin } height: Math.min( parent.height / 1.5, Units.iconSizes.medium) width: childrenRect.width @@ -240,7 +249,7 @@ } Controls.ToolTip.delay: 1000 Controls.ToolTip.timeout: 5000 - Controls.ToolTip.visible: (Settings.tabletMode ? actionMouse.pressed : actionMouse.containsMouse) && Controls.ToolTip.text.length > 0 + Controls.ToolTip.visible: listItem.visible && (Settings.tabletMode ? actionMouse.pressed : actionMouse.containsMouse) && Controls.ToolTip.text.length > 0 Controls.ToolTip.text: modelData.tooltip || modelData.text } @@ -252,16 +261,17 @@ MouseArea { id: handleMouse parent: listItem.background - visible: Settings.tabletMode + visible: Settings.tabletMode && actions.length > 0 z: 99 anchors { right: parent.right - top: parent.top - bottom: parent.bottom - rightMargin: behindItem.view && behindItem.view.T2.ScrollBar && behindItem.view.T2.ScrollBar.vertical && behindItem.view.T2.ScrollBar.vertical.interactive ? behindItem.view.T2.ScrollBar.vertical.width : Units.smallSpacing + verticalCenter: parent.verticalCenter + rightMargin: behindItem.view && behindItem.view.T2.ScrollBar && behindItem.view.T2.ScrollBar.vertical ? behindItem.view.T2.ScrollBar.vertical.width : Units.smallSpacing } + preventStealing: true - width: height + width: Units.iconSizes.smallMedium + height: width property var downTimestamp; property int startX property int startMouseX @@ -306,12 +316,9 @@ } Icon { id: handleIcon - anchors.verticalCenter: parent.verticalCenter + anchors.fill: parent selected: listItem.checked || (listItem.pressed && !listItem.checked && !listItem.sectionDelegate) - width: Units.iconSizes.smallMedium - height: width - x: y - source: (LayoutMirroring.enabled ? (listItem.background.x < listItem.background.width/2 ? "handle-right" : "handle-left") : (listItem.background.x < -listItem.background.width/2 ? "handle-right" : "handle-left")) + source: (LayoutMirroring.enabled ? (listItem.background.x < listItem.background.width/2 ? "overflow-menu-right" : "overflow-menu-left") : (listItem.background.x < -listItem.background.width/2 ? "overflow-menu-right" : "overflow-menu-left")) } } @@ -339,17 +346,13 @@ } Component.onCompleted: { //this will happen only once - if (Settings.tabletMode && !swipeFilterConnection.swipeFilterItem) { - var component = Qt.createComponent(Qt.resolvedUrl("../private/SwipeItemEventFilter.qml")); - behindItem.view.parent.parent._swipeFilter = component.createObject(behindItem.view.parent.parent); - } listItem.contentItemChanged(); } Connections { target: Settings onTabletModeChanged: { if (Settings.tabletMode) { - if (!swipeFilterConnection.swipeFilterItem) { + if (!internal.swipeFilterItem) { var component = Qt.createComponent(Qt.resolvedUrl("../private/SwipeItemEventFilter.qml")); listItem.ListView.view.parent.parent._swipeFilter = component.createObject(listItem.ListView.view.parent.parent); } @@ -363,20 +366,33 @@ } } } + QtObject { + id: internal + readonly property QtObject swipeFilterItem: (behindItem.view && behindItem.view.parent && behindItem.view.parent.parent && behindItem.view.parent.parent._swipeFilter) ? behindItem.view.parent.parent._swipeFilter : null + + readonly property bool edgeEnabled: swipeFilterItem ? swipeFilterItem.currentItem === listItem || swipeFilterItem.currentItem === listItem.parent : false + } + Connections { id: swipeFilterConnection - readonly property QtObject swipeFilterItem: (behindItem.view && behindItem.view && behindItem.view.parent && behindItem.view.parent.parent) ? behindItem.view.parent.parent._swipeFilter : null - readonly property bool enabled: swipeFilterItem ? swipeFilterItem.currentItem === listItem : false - target: enabled ? swipeFilterItem : null - onPeekChanged: listItem.background.x = -(listItem.background.width - listItem.background.height) * swipeFilterItem.peek + + target: internal.edgeEnabled ? internal.swipeFilterItem : null + onPeekChanged: { + if (listItem.LayoutMirroring.enabled) { + listItem.background.x = (listItem.background.width - listItem.background.height) * (1 - internal.swipeFilterItem.peek); + } else { + listItem.background.x = -(listItem.background.width - listItem.background.height) * internal.swipeFilterItem.peek; + } + } onCurrentItemChanged: { - if (!enabled) { + if (!internal.edgeEnabled) { positionAnimation.to = 0; positionAnimation.from = background.x; positionAnimation.running = true; } } } + //END signal handlers Accessible.role: Accessible.ListItem diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.46.0/src/delegaterecycler.cpp new/kirigami2-5.47.0/src/delegaterecycler.cpp --- old/kirigami2-5.46.0/src/delegaterecycler.cpp 2018-05-05 14:58:44.000000000 +0200 +++ new/kirigami2-5.47.0/src/delegaterecycler.cpp 2018-06-02 19:59:49.000000000 +0200 @@ -115,6 +115,36 @@ } } +void DelegateRecycler::syncIndex() +{ + const QVariant newIndex = m_propertiesTracker->property("trackedIndex"); + if (!newIndex.isValid()) { + return; + } + QQmlContext *ctx = QQmlEngine::contextForObject(m_item)->parentContext(); + ctx->setContextProperty(QStringLiteral("index"), newIndex); +} + +void DelegateRecycler::syncModel() +{ + const QVariant newModel = m_propertiesTracker->property("trackedModel"); + if (!newModel.isValid()) { + return; + } + QQmlContext *ctx = QQmlEngine::contextForObject(m_item)->parentContext(); + ctx->setContextProperty(QStringLiteral("model"), newModel); +} + +void DelegateRecycler::syncModelData() +{ + const QVariant newModelData = m_propertiesTracker->property("trackedModelData"); + if (!newModelData.isValid()) { + return; + } + QQmlContext *ctx = QQmlEngine::contextForObject(m_item)->parentContext(); + ctx->setContextProperty(QStringLiteral("modelData"), newModelData); +} + QQmlComponent *DelegateRecycler::sourceComponent() const { return m_sourceComponent; @@ -129,6 +159,18 @@ if (m_sourceComponent == component) { return; } + + if (!m_propertiesTracker) { + QQmlComponent *propertiesTrackerComponent = new QQmlComponent(qmlEngine(this), this); + + propertiesTrackerComponent->setData(QByteArrayLiteral("import QtQuick 2.3\nQtObject{property int trackedIndex: index; property var trackedModel: typeof model != 'undefined' ? model : null; property var trackedModelData: typeof modelData != 'undefined' ? modelData : null}"), QUrl()); + m_propertiesTracker = propertiesTrackerComponent->create(QQmlEngine::contextForObject(this)); + + connect(m_propertiesTracker, SIGNAL(trackedIndexChanged()), this, SLOT(syncIndex())); + connect(m_propertiesTracker, SIGNAL(trackedModelChanged()), this, SLOT(syncModel())); + connect(m_propertiesTracker, SIGNAL(trackedModelDataChanged()), this, SLOT(syncModelData())); + } + if (m_sourceComponent) { if (m_item) { disconnect(m_item.data(), &QQuickItem::implicitWidthChanged, this, &DelegateRecycler::updateHints); @@ -156,24 +198,29 @@ } } - QQmlContext *myCtx = QQmlEngine::contextForObject(this); - ctx->setContextProperty(QStringLiteral("model"), myCtx->contextProperty(QStringLiteral("model"))); - ctx->setContextProperty(QStringLiteral("modelData"), myCtx->contextProperty(QStringLiteral("modelData"))); - ctx->setContextProperty(QStringLiteral("index"), myCtx->contextProperty(QStringLiteral("index"))); + Q_ASSERT(ctx); + + if (QQmlEngine *eng = qmlEngine(this)) { + //share context object in order to never lose track of global i18n() + ctx->setContextObject(eng->rootContext()->contextObject()); + } + ctx->setContextProperty(QStringLiteral("model"), m_propertiesTracker->property("trackedModel")); + ctx->setContextProperty(QStringLiteral("modelData"), m_propertiesTracker->property("trackedModelData")); + ctx->setContextProperty(QStringLiteral("index"), m_propertiesTracker->property("trackedIndex")); QObject * obj = component->create(ctx); m_item = qobject_cast<QQuickItem *>(obj); if (!m_item) { obj->deleteLater(); + } else { + connect(m_item, &QObject::destroyed, ctx, &QObject::deleteLater); } } else { - QQmlContext *myCtx = QQmlEngine::contextForObject(this); QQmlContext *ctx = QQmlEngine::contextForObject(m_item)->parentContext(); - QObject *model = myCtx->contextProperty(QStringLiteral("model")).value<QObject*>(); - ctx->setContextProperty(QStringLiteral("model"), QVariant::fromValue(model)); - ctx->setContextProperty(QStringLiteral("modelData"), myCtx->contextProperty(QStringLiteral("modelData"))); - ctx->setContextProperty(QStringLiteral("index"), myCtx->contextProperty(QStringLiteral("index"))); + ctx->setContextProperty(QStringLiteral("model"), m_propertiesTracker->property("trackedModel")); + ctx->setContextProperty(QStringLiteral("modelData"), m_propertiesTracker->property("trackedModelData")); + ctx->setContextProperty(QStringLiteral("index"), m_propertiesTracker->property("trackedIndex")); } if (m_item) { @@ -194,7 +241,7 @@ void DelegateRecycler::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) { - if (m_item && newGeometry != oldGeometry) { + if (m_item && newGeometry.size() != oldGeometry.size()) { updateSize(true); } QQuickItem::geometryChanged(newGeometry, oldGeometry); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.46.0/src/delegaterecycler.h new/kirigami2-5.47.0/src/delegaterecycler.h --- old/kirigami2-5.46.0/src/delegaterecycler.h 2018-05-05 14:58:44.000000000 +0200 +++ new/kirigami2-5.47.0/src/delegaterecycler.h 2018-06-02 19:59:49.000000000 +0200 @@ -72,9 +72,15 @@ Q_SIGNALS: void sourceComponentChanged(); +private Q_SLOTS: + void syncIndex(); + void syncModel(); + void syncModelData(); + private: QPointer<QQmlComponent> m_sourceComponent; QPointer<QQuickItem> m_item; + QObject *m_propertiesTracker = nullptr; bool m_updatingSize = false; }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.46.0/src/desktopicon.h new/kirigami2-5.47.0/src/desktopicon.h --- old/kirigami2-5.46.0/src/desktopicon.h 2018-05-05 14:58:44.000000000 +0200 +++ new/kirigami2-5.47.0/src/desktopicon.h 2018-06-02 19:59:49.000000000 +0200 @@ -77,7 +77,7 @@ void setColor(const QColor &color); QColor color() const; - QSGNode* updatePaintNode(QSGNode* node, UpdatePaintNodeData* data) Q_DECL_OVERRIDE; + QSGNode* updatePaintNode(QSGNode* node, UpdatePaintNodeData* data) override; //HACKY but we need the base path for internal icons registered by kirigamiplugin itself static QString s_internalIconPath; @@ -93,7 +93,7 @@ void colorChanged(); protected: - void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) Q_DECL_OVERRIDE; + void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) override; QImage findIcon(const QSize& size); void handleFinished(QNetworkAccessManager* qnam, QNetworkReply* reply); void handleReadyRead(QNetworkReply* reply); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.46.0/src/kirigamiplugin.cpp new/kirigami2-5.47.0/src/kirigamiplugin.cpp --- old/kirigami2-5.46.0/src/kirigamiplugin.cpp 2018-05-05 14:58:44.000000000 +0200 +++ new/kirigami2-5.47.0/src/kirigamiplugin.cpp 2018-06-02 19:59:49.000000000 +0200 @@ -166,9 +166,11 @@ qmlRegisterType(componentUrl(QStringLiteral("CardsLayout.qml")), uri, 2, 4, "CardsLayout"); qmlRegisterType(componentUrl(QStringLiteral("InlineMessage.qml")), uri, 2, 4, "InlineMessage"); qmlRegisterUncreatableType<MessageType>(uri, 2, 4, "MessageType", "Cannot create objects of type MessageType"); - qmlRegisterType<DelegateRecycler>(uri, 2, 4, "DelegateRecycler"); + //2.5 + qmlRegisterType(componentUrl(QStringLiteral("ListItemDragHandle.qml")), uri, 2, 5, "ListItemDragHandle"); + qmlProtectModule(uri, 2); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.46.0/src/kirigamiplugin.h new/kirigami2-5.47.0/src/kirigamiplugin.h --- old/kirigami2-5.46.0/src/kirigamiplugin.h 2018-05-05 14:58:44.000000000 +0200 +++ new/kirigami2-5.47.0/src/kirigamiplugin.h 2018-06-02 19:59:49.000000000 +0200 @@ -33,7 +33,7 @@ Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface") public: - void registerTypes(const char *uri) Q_DECL_OVERRIDE; + void registerTypes(const char *uri) override; #ifdef KIRIGAMI_BUILD_TYPE_STATIC static KirigamiPlugin& getInstance() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.46.0/src/libkirigami/CMakeLists.txt new/kirigami2-5.47.0/src/libkirigami/CMakeLists.txt --- old/kirigami2-5.46.0/src/libkirigami/CMakeLists.txt 2018-05-05 14:58:44.000000000 +0200 +++ new/kirigami2-5.47.0/src/libkirigami/CMakeLists.txt 2018-06-02 19:59:49.000000000 +0200 @@ -8,7 +8,7 @@ ) #use dbus on linux, bsd etc, but not andoid and apple stuff -if (UNIX AND NOT CMAKE_SYSTEM_NAME STREQUAL "Android" AND NOT(APPLE)) +if (UNIX AND NOT CMAKE_SYSTEM_NAME STREQUAL "Android" AND NOT(APPLE) AND NOT(DISABLE_DBUS)) qt5_add_dbus_interface(libkirigami_SRCS org.kde.KWin.TabletModeManager.xml tabletmodemanager_interface) set(LIBKIRIGAMKI_EXTRA_LIBS Qt5::DBus) endif() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.46.0/src/libkirigami/tabletmodewatcher.cpp new/kirigami2-5.47.0/src/libkirigami/tabletmodewatcher.cpp --- old/kirigami2-5.46.0/src/libkirigami/tabletmodewatcher.cpp 2018-05-05 14:58:44.000000000 +0200 +++ new/kirigami2-5.47.0/src/libkirigami/tabletmodewatcher.cpp 2018-06-02 19:59:49.000000000 +0200 @@ -21,7 +21,7 @@ #include "tabletmodewatcher.h" -#if defined(Q_OS_UNIX) && !defined(Q_OS_ANDROID) && !defined(Q_OS_IOS) && !defined(Q_OS_MACOS) +#if defined(KIRIGAMI_ENABLE_DBUS) #include "tabletmodemanager_interface.h" #include <QDBusConnection> #endif @@ -45,13 +45,11 @@ TabletModeWatcherPrivate(TabletModeWatcher *watcher) : q(watcher) { -#if defined(Q_OS_ANDROID) || defined(Q_OS_IOS) + +#if !defined(KIRIGAMI_ENABLE_DBUS) && (defined(Q_OS_ANDROID) || defined(Q_OS_IOS)) isTabletModeAvailable = true; isTabletMode = true; -#elif defined(Q_OS_MACOS) - isTabletModeAvailable = false; - isTabletMode = false; -#elif defined(Q_OS_LINUX) || defined(Q_OS_UNIX) +#elif defined(KIRIGAMI_ENABLE_DBUS) //Mostly for debug purposes and for platforms which are always mobile, //such as Plasma Mobile if (qEnvironmentVariableIsSet("QT_QUICK_CONTROLS_MOBILE") || @@ -92,7 +90,7 @@ void setIsTablet(bool tablet); TabletModeWatcher *q; -#if (defined(Q_OS_LINUX) || defined(Q_OS_UNIX)) && !defined(Q_OS_ANDROID) +#if defined(KIRIGAMI_ENABLE_DBUS) OrgKdeKWinTabletModeManagerInterface *m_interface = nullptr; #endif bool isTabletModeAvailable = false; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.46.0/src/qmldir new/kirigami2-5.47.0/src/qmldir --- old/kirigami2-5.46.0/src/qmldir 2018-05-05 14:58:44.000000000 +0200 +++ new/kirigami2-5.47.0/src/qmldir 2018-06-02 19:59:49.000000000 +0200 @@ -42,3 +42,5 @@ CardsListView 2.4 CardsListView.qml CardsGridView 2.4 CardsGridView.qml InlineMessage 2.4 InlineMessage.qml +ListItemDragHandle 2.5 ListItemDragHandle.qml + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.46.0/src/settings.h new/kirigami2-5.47.0/src/settings.h --- old/kirigami2-5.46.0/src/settings.h 2018-05-05 14:58:44.000000000 +0200 +++ new/kirigami2-5.47.0/src/settings.h 2018-06-02 19:59:49.000000000 +0200 @@ -21,6 +21,10 @@ #include <QObject> +/** + * This class contains global kirigami settings about the current device setup + * It is exposed to QML as the singleton "Settings" + */ class Settings : public QObject { Q_OBJECT diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.46.0/src/styles/Material/SwipeListItem.qml new/kirigami2-5.47.0/src/styles/Material/SwipeListItem.qml --- old/kirigami2-5.46.0/src/styles/Material/SwipeListItem.qml 2018-05-05 14:58:44.000000000 +0200 +++ new/kirigami2-5.47.0/src/styles/Material/SwipeListItem.qml 2018-06-02 19:59:49.000000000 +0200 @@ -60,7 +60,6 @@ } } background: DefaultListItemBackground { - clip: true //TODO: this will have to reuse QQC2.1 Ripple Rectangle { id: ripple
