Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kirigami2 for openSUSE:Factory checked in at 2021-07-15 23:59:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kirigami2 (Old) and /work/SRC/openSUSE:Factory/.kirigami2.new.2625 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kirigami2" Thu Jul 15 23:59:46 2021 rev:56 rq:905507 version:5.84.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kirigami2/kirigami2.changes 2021-06-16 20:35:37.075199736 +0200 +++ /work/SRC/openSUSE:Factory/.kirigami2.new.2625/kirigami2.changes 2021-07-16 00:01:33.737010533 +0200 @@ -1,0 +2,20 @@ +Sun Jul 4 07:45:34 UTC 2021 - Christophe Giboudeaux <christo...@krop.fr> + +- Update to 5.84.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/frameworks/5/5.84.0 +- Changes since 5.83.0: + * Improve Page documentation generation + * Improve documentation for the OverlaySheet component + * Allow static link without sources + * Bundle plugins on Android + * Only emit sync signal if we have finished construction (kde#438682) + * Port CardsListView to use reuseItems instead of the DelegateRecycler + * Expose Labels of BasicListItem for greater end-user control + * [OverlaySheet] Add side margins when trying to span window width + * Respect an Action's visible property in GlobalDrawer even when collapsed (kde#438365) + * Add documentation for IconPropertiesGroup +- Only install the license files once + +------------------------------------------------------------------- Old: ---- kirigami2-5.83.0.tar.xz kirigami2-5.83.0.tar.xz.sig New: ---- kirigami2-5.84.0.tar.xz kirigami2-5.84.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kirigami2.spec ++++++ --- /var/tmp/diff_new_pack.99DkrS/_old 2021-07-16 00:01:34.233006404 +0200 +++ /var/tmp/diff_new_pack.99DkrS/_new 2021-07-16 00:01:34.237006370 +0200 @@ -17,14 +17,14 @@ %define lname libKF5Kirigami2-5 -%define _tar_path 5.83 +%define _tar_path 5.84 # Full KF5 version (e.g. 5.33.0) %{!?_kf5_version: %global _kf5_version %{version}} # Last major and minor KF5 version (e.g. 5.33) %{!?_kf5_bugfix_version: %define _kf5_bugfix_version %(echo %{_kf5_version} | awk -F. '{print $1"."$2}')} %bcond_without lang Name: kirigami2 -Version: 5.83.0 +Version: 5.84.0 Release: 0 Summary: Set of QtQuick components License: LGPL-2.1-or-later @@ -94,7 +94,6 @@ %postun -n %{lname} -p /sbin/ldconfig %files -%license LICENSES/* %dir %{_kf5_sharedir}/kdevappwizard/ %{_kf5_qmldir}/ %{_kf5_sharedir}/kdevappwizard/templates/ @@ -104,7 +103,6 @@ %{_kf5_libdir}/libKF5Kirigami2.so.* %files devel -%license LICENSES/* %dir %{_kf5_includedir}/Kirigami2/ %{_kf5_includedir}/Kirigami2/* %{_kf5_libdir}/libKF5Kirigami2.so ++++++ kirigami2-5.83.0.tar.xz -> kirigami2-5.84.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.83.0/CMakeLists.txt new/kirigami2-5.84.0/CMakeLists.txt --- old/kirigami2-5.83.0/CMakeLists.txt 2021-06-05 11:20:11.000000000 +0200 +++ new/kirigami2-5.84.0/CMakeLists.txt 2021-07-03 14:14:03.000000000 +0200 @@ -1,14 +1,12 @@ cmake_minimum_required(VERSION 3.16) -set(KF_VERSION "5.83.0") # handled by release scripts -set(KF_DEP_VERSION "5.83.0") # handled by release scripts +set(KF_VERSION "5.84.0") # handled by release scripts +set(KF_DEP_VERSION "5.84.0") # handled by release scripts project(kirigami2 VERSION ${KF_VERSION}) set(REQUIRED_QT_VERSION 5.15.0) -SET(CMAKE_CXX_STANDARD 11) - ################# Disallow in-source build ################# if("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}") @@ -44,7 +42,7 @@ ################# set KDE specific information ################# -find_package(ECM 5.83.0 NO_MODULE) +find_package(ECM 5.84.0 NO_MODULE) set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://commits.kde.org/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.83.0/Mainpage.dox new/kirigami2-5.84.0/Mainpage.dox --- old/kirigami2-5.83.0/Mainpage.dox 2021-06-05 11:20:11.000000000 +0200 +++ new/kirigami2-5.84.0/Mainpage.dox 2021-07-03 14:14:03.000000000 +0200 @@ -25,7 +25,7 @@ - \link org::kde::kirigami::OverlayDrawer OverlayDrawer \endlink - \link org::kde::kirigami::Page Page \endlink - \link org::kde::kirigami::ScrollablePage ScrollablePage \endlink -- \link org::kde::kirigami::OverlaySheet OverlaySheet \endlink +- \link org::kde::kirigami::templates::OverlaySheet OverlaySheet \endlink - \link PageRouter PageRouter \endlink - \link PageRoute PageRoute \endlink - \link org::kde::kirigami::Theme Theme \endlink diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.83.0/kirigami.qrc new/kirigami2-5.84.0/kirigami.qrc --- old/kirigami2-5.83.0/kirigami.qrc 2021-06-05 11:20:11.000000000 +0200 +++ new/kirigami2-5.84.0/kirigami.qrc 2021-07-03 14:14:03.000000000 +0200 @@ -46,7 +46,6 @@ <file alias="private/ActionsMenu.qml">src/controls/private/ActionsMenu.qml</file> <file alias="private/ActionMenuItem.qml">src/controls/private/ActionMenuItem.qml</file> <file alias="private/CardsGridViewPrivate.qml">src/controls/private/CardsGridViewPrivate.qml</file> - <file alias="private/CardsListViewPrivate.qml">src/controls/private/CardsListViewPrivate.qml</file> <file alias="Separator.qml">src/controls/Separator.qml</file> <file alias="OverlayDrawer.qml">src/controls/OverlayDrawer.qml</file> <file alias="OverlaySheet.qml">src/controls/OverlaySheet.qml</file> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.83.0/kirigami.qrc.in new/kirigami2-5.84.0/kirigami.qrc.in --- old/kirigami2-5.83.0/kirigami.qrc.in 2021-06-05 11:20:11.000000000 +0200 +++ new/kirigami2-5.84.0/kirigami.qrc.in 2021-07-03 14:14:03.000000000 +0200 @@ -46,7 +46,6 @@ <file alias="private/ActionsMenu.qml">@kirigami_QML_DIR@/src/controls/private/ActionsMenu.qml</file> <file alias="private/ActionMenuItem.qml">@kirigami_QML_DIR@/src/controls/private/ActionMenuItem.qml</file> <file alias="private/CardsGridViewPrivate.qml">@kirigami_QML_DIR@/src/controls/private/CardsGridViewPrivate.qml</file> - <file alias="private/CardsListViewPrivate.qml">@kirigami_QML_DIR@/src/controls/private/CardsListViewPrivate.qml</file> <file alias="Separator.qml">@kirigami_QML_DIR@/src/controls/Separator.qml</file> <file alias="OverlayDrawer.qml">@kirigami_QML_DIR@/src/controls/OverlayDrawer.qml</file> <file alias="OverlaySheet.qml">@kirigami_QML_DIR@/src/controls/OverlaySheet.qml</file> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.83.0/po/cs/libkirigami2plugin_qt.po new/kirigami2-5.84.0/po/cs/libkirigami2plugin_qt.po --- old/kirigami2-5.83.0/po/cs/libkirigami2plugin_qt.po 2021-06-05 11:20:11.000000000 +0200 +++ new/kirigami2-5.84.0/po/cs/libkirigami2plugin_qt.po 2021-07-03 14:14:03.000000000 +0200 @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"PO-Revision-Date: 2021-05-13 13:36+0200\n" +"PO-Revision-Date: 2021-06-14 15:44+0200\n" "Last-Translator: Vit Pelcak <vpel...@suse.cz>\n" "Language-Team: Czech <kde-i18n-...@kde.org>\n" "Language: cs\n" @@ -11,7 +11,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -"X-Generator: Lokalize 21.04.0\n" +"X-Generator: Lokalize 21.04.2\n" "X-Qt-Contexts: true\n" #: controls/AboutPage.qml:67 @@ -23,7 +23,7 @@ #, qt-format msgctxt "AboutPage|" msgid "Visit %1's KDE Store page" -msgstr "" +msgstr "Nav??t??vit str??nku KDE Store od %1" #: controls/AboutPage.qml:104 #, qt-format @@ -111,7 +111,7 @@ #: controls/SearchField.qml:57 msgctxt "SearchField|" msgid "Search???" -msgstr "" +msgstr "Hledat???" #: controls/SearchField.qml:59 msgctxt "SearchField|" @@ -123,34 +123,34 @@ #, qt-format msgctxt "PageTab|" msgid "Current page. Progress: %1 percent." -msgstr "" +msgstr "Sou??asn?? str??nka. Postup: %1 procent." #. Accessibility text for a page tab. Keep the text as concise as possible. #: controls/swipenavigator/templates/PageTab.qml:42 #, qt-format msgctxt "PageTab|" msgid "Navigate to %1. Progress: %2 percent." -msgstr "" +msgstr "P??ej??t na %1. Postup: %2 procent." #. Accessibility text for a page tab. Keep the text as concise as possible. #: controls/swipenavigator/templates/PageTab.qml:47 msgctxt "PageTab|" msgid "Current page." -msgstr "" +msgstr "Aktu??ln?? str??nka." #. Accessibility text for a page tab that's requesting the user's attention. Keep the text as concise as possible. #: controls/swipenavigator/templates/PageTab.qml:50 #, qt-format msgctxt "PageTab|" msgid "Navigate to %1. Demanding attention." -msgstr "" +msgstr "P??ej??t na %1. Vy??adovat pozornost." #. Accessibility text for a page tab that's requesting the user's attention. Keep the text as concise as possible. #: controls/swipenavigator/templates/PageTab.qml:53 #, qt-format msgctxt "PageTab|" msgid "Navigate to %1." -msgstr "" +msgstr "P??ej??t na %1." #: controls/templates/OverlayDrawer.qml:107 msgctxt "OverlayDrawer|" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.83.0/po/de/libkirigami2plugin_qt.po new/kirigami2-5.84.0/po/de/libkirigami2plugin_qt.po --- old/kirigami2-5.83.0/po/de/libkirigami2plugin_qt.po 2021-06-05 11:20:11.000000000 +0200 +++ new/kirigami2-5.84.0/po/de/libkirigami2plugin_qt.po 2021-07-03 14:14:03.000000000 +0200 @@ -10,9 +10,8 @@ "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 19.12.3\n" +"X-Qt-Contexts: true\n" #: controls/AboutPage.qml:67 msgctxt "AboutPage|" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.83.0/po/el/libkirigami2plugin_qt.po new/kirigami2-5.84.0/po/el/libkirigami2plugin_qt.po --- old/kirigami2-5.83.0/po/el/libkirigami2plugin_qt.po 2021-06-05 11:20:11.000000000 +0200 +++ new/kirigami2-5.84.0/po/el/libkirigami2plugin_qt.po 2021-07-03 14:14:03.000000000 +0200 @@ -1,8 +1,8 @@ -# Stelios <ssta...@gmail.com>, 2017, 2020. +# Stelios <ssta...@gmail.com>, 2017, 2020, 2021. msgid "" msgstr "" "Project-Id-Version: \n" -"PO-Revision-Date: 2020-09-19 16:21+0300\n" +"PO-Revision-Date: 2021-06-20 09:33+0300\n" "Last-Translator: Stelios <ssta...@gmail.com>\n" "Language-Team: Greek <kde-i18n...@kde.org>\n" "Language: el\n" @@ -22,7 +22,7 @@ #, qt-format msgctxt "AboutPage|" msgid "Visit %1's KDE Store page" -msgstr "" +msgstr "???????????????????????? ?????? ?????????????? ?????? KDE ?????? ???? %1" #: controls/AboutPage.qml:104 #, qt-format @@ -59,7 +59,7 @@ #: controls/AboutPage.qml:240 msgctxt "AboutPage|" msgid "Show author photos" -msgstr "" +msgstr "???????????????? ?????????????????????? ??????????????????" #: controls/AboutPage.qml:268 msgctxt "AboutPage|" @@ -74,7 +74,7 @@ #: controls/AbstractApplicationWindow.qml:343 msgctxt "AbstractApplicationWindow|" msgid "Quit" -msgstr "" +msgstr "????????????" #: controls/ActionToolBar.qml:144 msgctxt "ActionToolBar|" @@ -85,7 +85,7 @@ #, qt-format msgctxt "Avatar|" msgid "%1 ??? %2" -msgstr "" +msgstr "%1 ??? %2" #: controls/ContextDrawer.qml:66 msgctxt "ContextDrawer|" @@ -108,12 +108,9 @@ msgstr "?????????????? ??????????????????" #: controls/SearchField.qml:57 -#, fuzzy -#| msgctxt "SearchField|" -#| msgid "Search" msgctxt "SearchField|" msgid "Search???" -msgstr "??????????????????" +msgstr "?????????????????????" #: controls/SearchField.qml:59 msgctxt "SearchField|" @@ -125,46 +122,44 @@ #, qt-format msgctxt "PageTab|" msgid "Current page. Progress: %1 percent." -msgstr "" +msgstr "???????????????? ????????????. ??????????????: %1 ???????? ??????????." #. Accessibility text for a page tab. Keep the text as concise as possible. #: controls/swipenavigator/templates/PageTab.qml:42 #, qt-format msgctxt "PageTab|" msgid "Navigate to %1. Progress: %2 percent." -msgstr "" +msgstr "???????????????? ???????? ???? %1. ??????????????: %2 ???????? ??????????." #. Accessibility text for a page tab. Keep the text as concise as possible. #: controls/swipenavigator/templates/PageTab.qml:47 msgctxt "PageTab|" msgid "Current page." -msgstr "" +msgstr "???????????????? ????????????." #. Accessibility text for a page tab that's requesting the user's attention. Keep the text as concise as possible. #: controls/swipenavigator/templates/PageTab.qml:50 #, qt-format msgctxt "PageTab|" msgid "Navigate to %1. Demanding attention." -msgstr "" +msgstr "???????????????? ???????? ???? %1. ?????????? ??????????????." #. Accessibility text for a page tab that's requesting the user's attention. Keep the text as concise as possible. #: controls/swipenavigator/templates/PageTab.qml:53 -#, fuzzy, qt-format -#| msgctxt "ForwardButton|" -#| msgid "Navigate Forward" +#, qt-format msgctxt "PageTab|" msgid "Navigate to %1." -msgstr "???????????????? ???????? ???? ????????????" +msgstr "???????????????? ???????? ???? %1." #: controls/templates/OverlayDrawer.qml:107 msgctxt "OverlayDrawer|" msgid "Close" -msgstr "" +msgstr "????????????????" #: controls/templates/OverlayDrawer.qml:113 msgctxt "OverlayDrawer|" msgid "Open" -msgstr "" +msgstr "??????????????" #: controls/templates/private/BackButton.qml:36 msgctxt "BackButton|" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.83.0/po/en_GB/libkirigami2plugin_qt.po new/kirigami2-5.84.0/po/en_GB/libkirigami2plugin_qt.po --- old/kirigami2-5.83.0/po/en_GB/libkirigami2plugin_qt.po 2021-06-05 11:20:11.000000000 +0200 +++ new/kirigami2-5.84.0/po/en_GB/libkirigami2plugin_qt.po 2021-07-03 14:14:03.000000000 +0200 @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"PO-Revision-Date: 2021-04-03 15:18+0100\n" +"PO-Revision-Date: 2021-06-12 14:09+0100\n" "Last-Translator: Steve Allewell <steve.allew...@gmail.com>\n" "Language-Team: British English <kde-l10n-en...@kde.org>\n" "Language: en_GB\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 20.12.3\n" +"X-Generator: Lokalize 21.04.1\n" #: controls/AboutPage.qml:67 msgctxt "AboutPage|" @@ -22,7 +22,7 @@ #, qt-format msgctxt "AboutPage|" msgid "Visit %1's KDE Store page" -msgstr "" +msgstr "Visit %1's KDE Store page" #: controls/AboutPage.qml:104 #, qt-format @@ -59,7 +59,7 @@ #: controls/AboutPage.qml:240 msgctxt "AboutPage|" msgid "Show author photos" -msgstr "" +msgstr "Show author photos" #: controls/AboutPage.qml:268 msgctxt "AboutPage|" @@ -108,12 +108,9 @@ msgstr "Password" #: controls/SearchField.qml:57 -#, fuzzy -#| msgctxt "SearchField|" -#| msgid "Search" msgctxt "SearchField|" msgid "Search???" -msgstr "Search" +msgstr "Search???" #: controls/SearchField.qml:59 msgctxt "SearchField|" @@ -122,45 +119,34 @@ #. Accessibility text for a page tab. Keep the text as concise as possible and don't use a percent sign. #: controls/swipenavigator/templates/PageTab.qml:39 -#, fuzzy, qt-format -#| msgctxt "PrivateSwipeTab|" -#| msgid "Current page. Progress: %1 percent." +#, qt-format msgctxt "PageTab|" msgid "Current page. Progress: %1 percent." msgstr "Current page. Progress: %1 percent." #. Accessibility text for a page tab. Keep the text as concise as possible. #: controls/swipenavigator/templates/PageTab.qml:42 -#, fuzzy, qt-format -#| msgctxt "PrivateSwipeTab|" -#| msgid "Navigate to %1. Progress: %2 percent." +#, qt-format msgctxt "PageTab|" msgid "Navigate to %1. Progress: %2 percent." msgstr "Navigate to %1. Progress: %2 percent." #. Accessibility text for a page tab. Keep the text as concise as possible. #: controls/swipenavigator/templates/PageTab.qml:47 -#, fuzzy -#| msgctxt "PrivateSwipeTab|" -#| msgid "Current page." msgctxt "PageTab|" msgid "Current page." msgstr "Current page." #. Accessibility text for a page tab that's requesting the user's attention. Keep the text as concise as possible. #: controls/swipenavigator/templates/PageTab.qml:50 -#, fuzzy, qt-format -#| msgctxt "PrivateSwipeTab|" -#| msgid "Navigate to %1. Demanding attention." +#, qt-format msgctxt "PageTab|" msgid "Navigate to %1. Demanding attention." msgstr "Navigate to %1. Demanding attention." #. Accessibility text for a page tab that's requesting the user's attention. Keep the text as concise as possible. #: controls/swipenavigator/templates/PageTab.qml:53 -#, fuzzy, qt-format -#| msgctxt "PrivateSwipeTab|" -#| msgid "Navigate to %1." +#, qt-format msgctxt "PageTab|" msgid "Navigate to %1." msgstr "Navigate to %1." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.83.0/po/pl/libkirigami2plugin_qt.po new/kirigami2-5.84.0/po/pl/libkirigami2plugin_qt.po --- old/kirigami2-5.83.0/po/pl/libkirigami2plugin_qt.po 2021-06-05 11:20:11.000000000 +0200 +++ new/kirigami2-5.84.0/po/pl/libkirigami2plugin_qt.po 2021-07-03 14:14:03.000000000 +0200 @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"PO-Revision-Date: 2021-05-07 20:58+0200\n" +"PO-Revision-Date: 2021-06-27 08:56+0200\n" "Last-Translator: ??ukasz Wojni??owicz <lukasz.wojnilow...@gmail.com>\n" "Language-Team: Polish <kde-i18n-...@kde.org>\n" "Language: pl\n" @@ -109,12 +109,9 @@ msgstr "Has??o" #: controls/SearchField.qml:57 -#, fuzzy -#| msgctxt "SearchField|" -#| msgid "Search" msgctxt "SearchField|" msgid "Search???" -msgstr "Szukaj" +msgstr "Szukaj..." #: controls/SearchField.qml:59 msgctxt "SearchField|" @@ -123,45 +120,34 @@ #. Accessibility text for a page tab. Keep the text as concise as possible and don't use a percent sign. #: controls/swipenavigator/templates/PageTab.qml:39 -#, fuzzy, qt-format -#| msgctxt "PrivateSwipeTab|" -#| msgid "Current page. Progress: %1 percent." +#, qt-format msgctxt "PageTab|" msgid "Current page. Progress: %1 percent." msgstr "Bie????ca strona. Post??p: %1 procent." #. Accessibility text for a page tab. Keep the text as concise as possible. #: controls/swipenavigator/templates/PageTab.qml:42 -#, fuzzy, qt-format -#| msgctxt "PrivateSwipeTab|" -#| msgid "Navigate to %1. Progress: %2 percent." +#, qt-format msgctxt "PageTab|" msgid "Navigate to %1. Progress: %2 percent." msgstr "Przejd?? do %1. Post??p: %2 procent." #. Accessibility text for a page tab. Keep the text as concise as possible. #: controls/swipenavigator/templates/PageTab.qml:47 -#, fuzzy -#| msgctxt "PrivateSwipeTab|" -#| msgid "Current page." msgctxt "PageTab|" msgid "Current page." msgstr "Bie????ca strona." #. Accessibility text for a page tab that's requesting the user's attention. Keep the text as concise as possible. #: controls/swipenavigator/templates/PageTab.qml:50 -#, fuzzy, qt-format -#| msgctxt "PrivateSwipeTab|" -#| msgid "Navigate to %1. Demanding attention." +#, qt-format msgctxt "PageTab|" msgid "Navigate to %1. Demanding attention." msgstr "Przejd?? do %1. Wymaga uwagi." #. Accessibility text for a page tab that's requesting the user's attention. Keep the text as concise as possible. #: controls/swipenavigator/templates/PageTab.qml:53 -#, fuzzy, qt-format -#| msgctxt "PrivateSwipeTab|" -#| msgid "Navigate to %1." +#, qt-format msgctxt "PageTab|" msgid "Navigate to %1." msgstr "Przejd?? do %1." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.83.0/po/pt/libkirigami2plugin_qt.po new/kirigami2-5.84.0/po/pt/libkirigami2plugin_qt.po --- old/kirigami2-5.83.0/po/pt/libkirigami2plugin_qt.po 2021-06-05 11:20:11.000000000 +0200 +++ new/kirigami2-5.84.0/po/pt/libkirigami2plugin_qt.po 2021-07-03 14:14:03.000000000 +0200 @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: libkirigami2plugin_qt\n" -"PO-Revision-Date: 2021-05-06 16:42+0100\n" +"PO-Revision-Date: 2021-06-07 00:56+0100\n" "Last-Translator: Jos?? Nuno Coelho Pires <zepi...@gmail.com>\n" "Language-Team: Portuguese <kde-i18n...@kde.org>\n" "Language: pt\n" @@ -110,12 +110,9 @@ msgstr "Senha" #: controls/SearchField.qml:57 -#, fuzzy -#| msgctxt "SearchField|" -#| msgid "Search" msgctxt "SearchField|" msgid "Search???" -msgstr "Procurar" +msgstr "Procurar???" #: controls/SearchField.qml:59 msgctxt "SearchField|" @@ -124,45 +121,34 @@ #. Accessibility text for a page tab. Keep the text as concise as possible and don't use a percent sign. #: controls/swipenavigator/templates/PageTab.qml:39 -#, fuzzy, qt-format -#| msgctxt "PrivateSwipeTab|" -#| msgid "Current page. Progress: %1 percent." +#, qt-format msgctxt "PageTab|" msgid "Current page. Progress: %1 percent." msgstr "P??gina actual. Progresso: %1 por cento." #. Accessibility text for a page tab. Keep the text as concise as possible. #: controls/swipenavigator/templates/PageTab.qml:42 -#, fuzzy, qt-format -#| msgctxt "PrivateSwipeTab|" -#| msgid "Navigate to %1. Progress: %2 percent." +#, qt-format msgctxt "PageTab|" msgid "Navigate to %1. Progress: %2 percent." msgstr "Navegar para %1. Progresso: %2 por cento." #. Accessibility text for a page tab. Keep the text as concise as possible. #: controls/swipenavigator/templates/PageTab.qml:47 -#, fuzzy -#| msgctxt "PrivateSwipeTab|" -#| msgid "Current page." msgctxt "PageTab|" msgid "Current page." msgstr "P??gina actual." #. Accessibility text for a page tab that's requesting the user's attention. Keep the text as concise as possible. #: controls/swipenavigator/templates/PageTab.qml:50 -#, fuzzy, qt-format -#| msgctxt "PrivateSwipeTab|" -#| msgid "Navigate to %1. Demanding attention." +#, qt-format msgctxt "PageTab|" msgid "Navigate to %1. Demanding attention." msgstr "Navegar para %1. A chamar a aten????o." #. Accessibility text for a page tab that's requesting the user's attention. Keep the text as concise as possible. #: controls/swipenavigator/templates/PageTab.qml:53 -#, fuzzy, qt-format -#| msgctxt "PrivateSwipeTab|" -#| msgid "Navigate to %1." +#, qt-format msgctxt "PageTab|" msgid "Navigate to %1." msgstr "Navegar para %1." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.83.0/po/zh_CN/libkirigami2plugin_qt.po new/kirigami2-5.84.0/po/zh_CN/libkirigami2plugin_qt.po --- old/kirigami2-5.83.0/po/zh_CN/libkirigami2plugin_qt.po 2021-06-05 11:20:11.000000000 +0200 +++ new/kirigami2-5.84.0/po/zh_CN/libkirigami2plugin_qt.po 2021-07-03 14:14:03.000000000 +0200 @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: kdeorg\n" -"PO-Revision-Date: 2021-06-03 16:05\n" +"PO-Revision-Date: 2021-06-20 07:35\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" "MIME-Version: 1.0\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.83.0/src/CMakeLists.txt new/kirigami2-5.84.0/src/CMakeLists.txt --- old/kirigami2-5.83.0/src/CMakeLists.txt 2021-06-05 11:20:11.000000000 +0200 +++ new/kirigami2-5.84.0/src/CMakeLists.txt 2021-07-03 14:14:03.000000000 +0200 @@ -136,3 +136,10 @@ endif() install(TARGETS kirigamiplugin DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/kirigami.2) + +if (ANDROID) + install(FILES KF5Kirigami2-android-dependencies.xml + DESTINATION ${KDE_INSTALL_LIBDIR} + RENAME KF5Kirigami2_${CMAKE_ANDROID_ARCH_ABI}-android-dependencies.xml + ) +endif() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.83.0/src/KF5Kirigami2-android-dependencies.xml new/kirigami2-5.84.0/src/KF5Kirigami2-android-dependencies.xml --- old/kirigami2-5.83.0/src/KF5Kirigami2-android-dependencies.xml 1970-01-01 01:00:00.000000000 +0100 +++ new/kirigami2-5.84.0/src/KF5Kirigami2-android-dependencies.xml 2021-07-03 14:14:03.000000000 +0200 @@ -0,0 +1,9 @@ +<rules> + <dependencies> + <lib name="KF5Kirigami2"> + <depends> + <bundled file="plugins/kf5/kirigami" /> + </depends> + </lib> + </dependencies> +</rules> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.83.0/src/columnview.cpp new/kirigami2-5.84.0/src/columnview.cpp --- old/kirigami2-5.83.0/src/columnview.cpp 2021-06-05 11:20:11.000000000 +0200 +++ new/kirigami2-5.84.0/src/columnview.cpp 2021-07-03 14:14:03.000000000 +0200 @@ -304,7 +304,7 @@ m_slideAnim = new QPropertyAnimation(this); m_slideAnim->setTargetObject(this); m_slideAnim->setPropertyName("x"); - // NOTE: the duration will be taked from kirigami units upon classBegin + // NOTE: the duration will be taken from kirigami units upon classBegin m_slideAnim->setDuration(0); m_slideAnim->setEasingCurve(QEasingCurve(QEasingCurve::InOutQuad)); connect(m_slideAnim, &QPropertyAnimation::finished, this, [this]() { @@ -714,7 +714,7 @@ } m_items = childItems(); - // NOTE: polish() here sometimes gets indefinitely delayed and items chaging order isn't seen + // NOTE: polish() here sometimes gets indefinitely delayed and items changing order isn't seen layoutItems(); } @@ -1315,7 +1315,7 @@ setCurrentIndex(m_contentItem->m_items.indexOf(candidateItem)); } - // if !m_acceptsMouse we don't dra gwith mouse + // if !m_acceptsMouse we don't drag with mouse if (!m_acceptsMouse && me->source() == Qt::MouseEventNotSynthesized) { event->setAccepted(false); return false; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.83.0/src/columnview.h new/kirigami2-5.84.0/src/columnview.h --- old/kirigami2-5.83.0/src/columnview.h 2021-06-05 11:20:11.000000000 +0200 +++ new/kirigami2-5.84.0/src/columnview.h 2021-07-03 14:14:03.000000000 +0200 @@ -153,7 +153,7 @@ * the enum can have the following values: * * FixedColumns: every column is fixed at the same width of the columnWidth property * * DynamicColumns: columns take their width from their implicitWidth - * * SingleColumn: only one column at a time is shown, as wide as the viewport, eventual reservedSpace on the column's atttached property is ignored + * * SingleColumn: only one column at a time is shown, as wide as the viewport, eventual reservedSpace on the column's attached property is ignored */ Q_PROPERTY(ColumnResizeMode columnResizeMode READ columnResizeMode WRITE setColumnResizeMode NOTIFY columnResizeModeChanged) @@ -207,7 +207,7 @@ Q_PROPERTY(int scrollDuration READ scrollDuration WRITE setScrollDuration NOTIFY scrollDurationChanged) /** - * True if columns should be visually separed by a separator line + * True if columns should be visually separated by a separator line */ Q_PROPERTY(bool separatorVisible READ separatorVisible WRITE setSeparatorVisible NOTIFY separatorVisibleChanged) @@ -295,7 +295,7 @@ QQuickItem *currentItem(); - // NOTE: It's a QList<QObject *> as QML can't corectly build an Array out of QList<QQuickItem*> + // NOTE: It's a QList<QObject *> as QML can't correctly build an Array out of QList<QQuickItem*> QList<QObject *> visibleItems() const; QQuickItem *firstVisibleItem() const; QQuickItem *lastVisibleItem() const; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.83.0/src/controls/BasicListItem.qml new/kirigami2-5.84.0/src/controls/BasicListItem.qml --- old/kirigami2-5.83.0/src/controls/BasicListItem.qml 2021-06-05 11:20:11.000000000 +0200 +++ new/kirigami2-5.84.0/src/controls/BasicListItem.qml 2021-07-03 14:14:03.000000000 +0200 @@ -254,6 +254,24 @@ */ property bool fadeContent: false + /** + * The label item, for accessing the usual Text properties. + * + * @property QtQuick.Controls.Label labelItem + * @since 5.84 + * @since org.kde.kirigami 2.16 + */ + property alias labelItem: labelItem + + /** + * The subtitle item, for accessing the usual Text properties. + * + * @property QtQuick.Controls.Label subtitleItem + * @since 5.84 + * @since org.kde.kirigami 2.16 + */ + property alias subtitleItem: subtitleItem + default property alias _basicDefault: layout.data icon: action ? action.icon.name || action.icon.source : undefined diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.83.0/src/controls/CardsListView.qml new/kirigami2-5.84.0/src/controls/CardsListView.qml --- old/kirigami2-5.83.0/src/controls/CardsListView.qml 2021-06-05 11:20:11.000000000 +0200 +++ new/kirigami2-5.84.0/src/controls/CardsListView.qml 2021-07-03 14:14:03.000000000 +0200 @@ -4,7 +4,7 @@ * SPDX-License-Identifier: LGPL-2.0-or-later */ -import QtQuick 2.10 +import QtQuick 2.15 import QtQuick.Controls 2.0 as Controls import QtQuick.Layouts 1.2 import org.kde.kirigami 2.4 as Kirigami @@ -24,11 +24,13 @@ * @inherit QtQuick.ListView * @since 2.4 */ -CardsListViewPrivate { +ListView { id: root spacing: Kirigami.Units.largeSpacing * 2 topMargin: headerPositioning != ListView.InlineHeader ? spacing : 0 + rightMargin: Kirigami.Units.largeSpacing * 2 + leftMargin: Kirigami.Units.largeSpacing * 2 + reuseItems: true - property alias delegate: root._delegateComponent headerPositioning: ListView.OverlayHeader } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.83.0/src/controls/FormLayout.qml new/kirigami2-5.84.0/src/controls/FormLayout.qml --- old/kirigami2-5.83.0/src/controls/FormLayout.qml 2021-06-05 11:20:11.000000000 +0200 +++ new/kirigami2-5.84.0/src/controls/FormLayout.qml 2021-07-03 14:14:03.000000000 +0200 @@ -63,7 +63,7 @@ /** * twinFormLayouts: list<FormLayout> - * If for some implementation reason multiple FormLayouts has to appear + * If for some implementation reason multiple FormLayouts have to appear * on the same page, they can have each other in twinFormLayouts, * so they will vertically align each other perfectly * @since 5.53 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.83.0/src/controls/GlobalDrawer.qml new/kirigami2-5.84.0/src/controls/GlobalDrawer.qml --- old/kirigami2-5.83.0/src/controls/GlobalDrawer.qml 2021-06-05 11:20:11.000000000 +0200 +++ new/kirigami2-5.84.0/src/controls/GlobalDrawer.qml 2021-07-03 14:14:03.000000000 +0200 @@ -496,7 +496,7 @@ width: parent.width GlobalDrawerActionItem { id: drawerItem - visible: root.collapsed || !(modelData.hasOwnProperty("expandible") && modelData.expandible) && (modelData.hasOwnProperty("visible") && modelData.visible) + visible: (modelData.hasOwnProperty("visible") && modelData.visible) && (root.collapsed || !(modelData.hasOwnProperty("expandible") && modelData.expandible)) width: parent.width onCheckedChanged: { // move every checked item into view diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.83.0/src/controls/Page.qml new/kirigami2-5.84.0/src/controls/Page.qml --- old/kirigami2-5.83.0/src/controls/Page.qml 2021-06-05 11:20:11.000000000 +0200 +++ new/kirigami2-5.84.0/src/controls/Page.qml 2021-07-03 14:14:03.000000000 +0200 @@ -15,42 +15,40 @@ * Page is a container for all the app pages: everything pushed to the * ApplicationWindow's pageStack should be a Page. * - * For content that should be scrollable, such as ListViews, use ScrollablePage instead. - * * @see ScrollablePage + * For content that should be scrollable, such as ListViews, use ScrollablePage instead. * @inherit QtQuick.Controls.Page */ QQC2.Page { id: root /** - * padding: real - * * The default content padding is 1 gridUnit. + * // TODO this is not displayed in the generated api doc. */ padding: Kirigami.Units.gridUnit /** - * bottomPadding: real - * * The bottom content padding. Bound to verticalPadding or the height of floating action buttons (when present) by default. + * // TODO this is not displayed in the generated api doc. */ bottomPadding: actionButtons.item ? actionButtons.height : verticalPadding /** - * flickable: Flickable - * if the central element of the page is a Flickable + * @brief If the central element of the page is a Flickable * (ListView and Gridview as well) you can set it there. - * normally, you wouldn't need to do that, but just use the - * ScrollablePage element instead + * + * Normally, you wouldn't need to do that, but just use the + * ScrollablePage element instead. + * * @see ScrollablePage - * Use this if your flickable has some non standard properties, such as not covering the whole Page + * Use this if your flickable has some non standard properties, such as not covering the whole Page. */ property Flickable flickable /** - * actions.contextualActions: list<QtObject> - * Defines the contextual actions for the page: + * @property list<QtQml.QtObject> actions.contextualActions + * @brief Defines the contextual actions for the page: * an easy way to assign actions in the right sliding panel * * Example usage: @@ -95,8 +93,8 @@ property alias contextualActions: actionsGroup.contextualActions /** - * actions.main: Action - * An optional single action for the action button. + * @property Action mainAction + * @brief An optional single action for the action button. * it can be a Kirigami.Action or a QAction * * Example usage: @@ -117,8 +115,8 @@ property alias mainAction: actionsGroup.main /** - * actions.left: Action - * An optional extra action at the left of the main action button. + * @property Action leftAction + * @brief An optional extra action at the left of the main action button. * it can be a Kirigami.Action or a QAction * * Example usage: @@ -139,8 +137,8 @@ property alias leftAction: actionsGroup.left /** - * actions.right: Action - * An optional extra action at the right of the main action button. + * @property Action leftAction + * @brief An optional extra action at the right of the main action button. * it can be a Kirigami.Action or a QAction * * Example usage: @@ -181,7 +179,6 @@ readonly property alias actions: actionsGroup /** - * contextualActionsAboutToShow: signal * Emitted when a visualization for the actions is about to be shown, * such as the toolbar menu or the contextDrawer * @since 2.7 @@ -189,8 +186,6 @@ signal contextualActionsAboutToShow /** - * isCurrentPage: bool - * * Specifies if it's the currently selected page in the window's pages row, or if layers * are used whether this is the topmost item on the layers stack. If the page is * not attached to either a column view or a stack view, expect this to be true. @@ -204,7 +199,7 @@ : true) /** - * overlay: Item + * @property Item overlay * an item which stays on top of every other item in the page, * if you want to make sure some elements are completely in a * layer on top of the whole content, parent items to this one. @@ -214,21 +209,19 @@ readonly property alias overlay: overlayItem /** - * icon: variant + * @property variant icon * * The icon that represents this page. */ property ActionIconGroup icon: ActionIconGroup {} /** - * needsAttention: bool - * * Whether this page needs user attention. */ property bool needsAttention /** - * progress: real + * @property real progress * * Progress of a task this page is doing. Set to undefined to indicate * that there are no ongoing tasks. @@ -236,7 +229,6 @@ property var progress: undefined /** - * titleDelegate: Component * The delegate which will be used to draw the page title. It can be customized to put any kind of Item in there. * @since 2.7 */ @@ -255,7 +247,7 @@ } /** - * emitted When the application requests a Back action + * Emitted when the application requests a Back action * For instance a global "back" shortcut or the Android * Back button has been pressed. * The page can manage the back event by itself, @@ -279,7 +271,6 @@ } /** - * globalToolBarItem: Item * The item used as global toolbar for the page * present only if we are in a PageRow as a page or as a layer, * and the style is either Titles or ToolBar diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.83.0/src/controls/private/CardsListViewPrivate.qml new/kirigami2-5.84.0/src/controls/private/CardsListViewPrivate.qml --- old/kirigami2-5.83.0/src/controls/private/CardsListViewPrivate.qml 2021-06-05 11:20:11.000000000 +0200 +++ new/kirigami2-5.84.0/src/controls/private/CardsListViewPrivate.qml 1970-01-01 01:00:00.000000000 +0100 @@ -1,23 +0,0 @@ -/* - * SPDX-FileCopyrightText: 2018 Marco Martin <m...@kde.org> - * - * SPDX-License-Identifier: LGPL-2.0-or-later - */ - -import QtQuick 2.10 -import QtQuick.Controls 2.0 as Controls -import org.kde.kirigami 2.4 as Kirigami - - -ListView { - id: root - - rightMargin: Kirigami.Units.largeSpacing * 2 - leftMargin: Kirigami.Units.largeSpacing * 2 - - property Component _delegateComponent - delegate: Kirigami.DelegateRecycler { - width: root.width - root.leftMargin - root.rightMargin - sourceComponent: root._delegateComponent - } -} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.83.0/src/controls/templates/AbstractCard.qml new/kirigami2-5.84.0/src/controls/templates/AbstractCard.qml --- old/kirigami2-5.83.0/src/controls/templates/AbstractCard.qml 2021-06-05 11:20:11.000000000 +0200 +++ new/kirigami2-5.84.0/src/controls/templates/AbstractCard.qml 2021-07-03 14:14:03.000000000 +0200 @@ -68,6 +68,8 @@ bottomPadding: contentItemParent.children.length > 0 ? Kirigami.Units.largeSpacing : 0 rightPadding: Kirigami.Units.largeSpacing + width: ListView.view ? ListView.view.width - ListView.view.leftMargin - ListView.view.rightMargin : undefined + GridLayout { id: mainLayout rowSpacing: root.topPadding diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.83.0/src/controls/templates/OverlaySheet.qml new/kirigami2-5.84.0/src/controls/templates/OverlaySheet.qml --- old/kirigami2-5.83.0/src/controls/templates/OverlaySheet.qml 2021-06-05 11:20:11.000000000 +0200 +++ new/kirigami2-5.84.0/src/controls/templates/OverlaySheet.qml 2021-07-03 14:14:03.000000000 +0200 @@ -15,13 +15,16 @@ import "../private" /** - * An overlay sheet that covers the current Page content. + * @brief An overlay sheet that covers the current Page content. + * * Its contents can be scrolled up or down, scrolling all the way up or * all the way down, dismisses it. * Use this for big, modal dialogs or information display, that can't be * logically done as a new separate Page, even if potentially * are taller than the screen space. - * @inherits: QtQuick.QtObject + * + * @since 2.0 + * @inherit QtQml.QtObject */ QtObject { id: root @@ -30,7 +33,6 @@ Theme.inherit: false /** - * contentItem: Item * This property holds the visual content item. * * Note: The content item is automatically resized inside the @@ -42,100 +44,98 @@ default property Item contentItem /** - * sheetOpen: bool * If true the sheet is open showing the contents of the OverlaySheet * component. */ property bool sheetOpen /** - * leftPadding: int - * default contents padding at left + * This property holds the left padding. Unless explicitly set, + * the value is equal to Units::largeSpacing */ property int leftPadding: Units.largeSpacing /** - * topPadding: int - * default contents padding at top + * This property holds the top padding. Unless explicitly set, + * the value is equal to Units::largeSpacing */ property int topPadding: Units.largeSpacing /** - * rightPadding: int - * default contents padding at right + * This property holds the right padding. Unless explicitly set, + * the value is equal to Units::largeSpacing */ property int rightPadding: Units.largeSpacing /** - * bottomPadding: int - * default contents padding at bottom + * This property holds the bottom padding. Unless explicitly set, + * the value is equal to Units::largeSpacing */ property int bottomPadding: Units.largeSpacing /** - * leftInset: real - * padding that gets applied to both the content *and* the background + * This property holds the left inset for the background. The + * inset gets applied to both the content *and* the background. * @since 2.12 */ property real leftInset: 0 /** - * topInset: real - * padding that gets applied to both the content *and* the background + * This property holds the top inset for the background. The + * inset gets applied to both the content *and* the background. * @since 2.12 */ property real topInset: 0 /** - * rightInset: real - * padding that gets applied to both the content *and* the background + * This property holds the right inset for the background. The + * inset gets applied to both the content *and* the background. * @since 2.12 */ property real rightInset: 0 /** - * bottomInset: real - * padding that gets applied to both the content *and* the background + * This property holds the bottom inset for the background. The + * inset gets applied to both the content *and* the background. * @since 2.12 */ property real bottomInset: 0 /** - * header: Item - * an optional item which will be used as the sheet's header, - * always kept on screen + * An optional item which will be used as the sheet's header, + * always kept on screen. * @since 5.43 */ property Item header /** - * header: Item - * an optional item which will be used as the sheet's footer, - * always kept on screen + * An optional item which will be used as the sheet's footer, + * always kept on screen. * @since 5.43 */ property Item footer + /** - * background: Item * This property holds the background item. * - * Note: If the background item has no explicit size specified, - * it automatically follows the control's size. - * In most cases, there is no need to specify width or - * height for a background item. + * @note If the background item has no explicit size specified, + * it automatically follows the control's size. In most cases, + * there is no need to specify width or height for a background item. */ property Item background /** - * showCloseButton: bool - * whether to show the close button in the top-right corner + * Whether to show the close button in the top-right corner. + * By default only show on desktop. * @since 5.44 */ property bool showCloseButton: !Settings.isMobile property Item parent - + /** + * Open the overlay sheet. + */ function open() { openAnimation.running = true; root.sheetOpen = true; @@ -144,9 +144,12 @@ mainItem.forceActiveFocus(); } + /** + * Close the overlay sheet. + */ function close() { if (root.sheetOpen) { - root.sheetOpen = false + root.sheetOpen = false; } } @@ -234,7 +237,8 @@ readonly property int contentItemPreferredWidth: root.contentItem.Layout.preferredWidth > 0 ? root.contentItem.Layout.preferredWidth : root.contentItem.implicitWidth - readonly property int contentItemMaximumWidth: root.contentItem.Layout.maximumWidth > 0 ? Math.min(root.contentItem.Layout.maximumWidth, width) : width > Units.gridUnit * 30 ? width * 0.95 : width + readonly property int absoluteContentItemMaximumWidth: Math.round(width - Units.largeSpacing * 2) + readonly property int contentItemMaximumWidth: root.contentItem.Layout.maximumWidth > 0 ? Math.min(root.contentItem.Layout.maximumWidth, absoluteContentItemMaximumWidth) : width > Units.gridUnit * 30 ? width * 0.95 : absoluteContentItemMaximumWidth onHeightChanged: { var focusItem; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.83.0/src/controls/templates/private/IconPropertiesGroup.qml new/kirigami2-5.84.0/src/controls/templates/private/IconPropertiesGroup.qml --- old/kirigami2-5.83.0/src/controls/templates/private/IconPropertiesGroup.qml 2021-06-05 11:20:11.000000000 +0200 +++ new/kirigami2-5.84.0/src/controls/templates/private/IconPropertiesGroup.qml 2021-07-03 14:14:03.000000000 +0200 @@ -6,10 +6,31 @@ import QtQml 2.1 -//this is a subset of those used in QQC2, Kirigami.Action still needs the full one as needs 100% api compatibility +/** + * \brief Group of icon properties. + * + * This is a subset of those used in QQC2, Kirigami.Action still needs the full one as needs 100% api compatibility + */ QtObject { + /** + * This property holds the name of the icon to use. + * The icon will be loaded from the platform theme. If the icon is found + * in the theme, it will always be used; even if icon.source is also set. + * If the icon is not found, icon.source will be used instead. + */ property string name + + /** + * This property holds the name of the icon to use. + * The icon will be loaded as a regular image. + */ property var source + + /** + * This property holds the color of the icon. + * + * The icon is tinted with the specified color, unless the color is set to "transparent". + */ property color color: Qt.rgba(0, 0, 0, 0) } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.83.0/src/kirigamiplugin.cpp new/kirigami2-5.84.0/src/kirigamiplugin.cpp --- old/kirigami2-5.83.0/src/kirigamiplugin.cpp 2021-06-05 11:20:11.000000000 +0200 +++ new/kirigami2-5.84.0/src/kirigamiplugin.cpp 2021-07-03 14:14:03.000000000 +0200 @@ -39,9 +39,10 @@ static QString s_selectedStyle; -// Q_INIT_RESOURCE(kirigami); #ifdef KIRIGAMI_BUILD_TYPE_STATIC #include <qrc_kirigami.cpp> +#include "loggingcategory.h" +#include <QDebug> #endif class CopyHelperPrivate : public QObject @@ -283,4 +284,25 @@ connect(this, &KirigamiPlugin::languageChangeEvent, engine, &QQmlEngine::retranslate); } +#ifdef KIRIGAMI_BUILD_TYPE_STATIC +KirigamiPlugin& KirigamiPlugin::getInstance() +{ + static KirigamiPlugin instance; + return instance; +} + +void KirigamiPlugin::registerTypes(QQmlEngine* engine) +{ + Q_INIT_RESOURCE(shaders); + if (engine) { + engine->addImportPath(QLatin1String(":/")); + } + else { + qCWarning(KirigamiLog) + << "Registering Kirigami on a null QQmlEngine instance - you likely want to pass a valid engine, or you will want to manually add the " + "qrc root path :/ to your import paths list so the engine is able to load the plugin"; + } +} +#endif + #include "kirigamiplugin.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.83.0/src/kirigamiplugin.h new/kirigami2-5.84.0/src/kirigamiplugin.h --- old/kirigami2-5.83.0/src/kirigamiplugin.h 2021-06-05 11:20:11.000000000 +0200 +++ new/kirigami2-5.84.0/src/kirigamiplugin.h 2021-07-03 14:14:03.000000000 +0200 @@ -10,15 +10,9 @@ #define KIRIGAMIPLUGIN_H #include <QUrl> - #include <QQmlEngine> #include <QQmlExtensionPlugin> -#ifdef KIRIGAMI_BUILD_TYPE_STATIC -#include "loggingcategory.h" -#include <QDebug> -#endif - class KirigamiPlugin : public QQmlExtensionPlugin { Q_OBJECT @@ -30,23 +24,8 @@ void initializeEngine(QQmlEngine *engine, const char *uri) override; #ifdef KIRIGAMI_BUILD_TYPE_STATIC - static KirigamiPlugin &getInstance() - { - static KirigamiPlugin instance; - return instance; - } - - static void registerTypes(QQmlEngine *engine = nullptr) - { - Q_INIT_RESOURCE(shaders); - if (engine) { - engine->addImportPath(QLatin1String(":/")); - } else { - qCWarning(KirigamiLog) - << "Registering Kirigami on a null QQmlEngine instance - you likely want to pass a valid engine, or you will want to manually add the " - "qrc root path :/ to your import paths list so the engine is able to load the plugin"; - } - } + static KirigamiPlugin& getInstance(); + static void registerTypes(QQmlEngine* engine = nullptr); #endif Q_SIGNALS: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.83.0/src/libkirigami/CMakeLists.txt new/kirigami2-5.84.0/src/libkirigami/CMakeLists.txt --- old/kirigami2-5.83.0/src/libkirigami/CMakeLists.txt 2021-06-05 11:20:11.000000000 +0200 +++ new/kirigami2-5.84.0/src/libkirigami/CMakeLists.txt 2021-07-03 14:14:03.000000000 +0200 @@ -61,6 +61,14 @@ REQUIRED_HEADERS Kirigami2_HEADERS ) +if(NOT BUILD_SHARED_LIBS) + ecm_generate_headers(Kirigami2_HEADERS + HEADER_NAMES KirigamiPlugin + REQUIRED_HEADERS Kirigami2_HEADERS + RELATIVE .. + ) +endif() + install(TARGETS KF5Kirigami2 EXPORT KF5Kirigami2Targets ${KF5_INSTALL_TARGETS_DEFAULT_ARGS}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.83.0/src/libkirigami/basictheme.cpp new/kirigami2-5.84.0/src/libkirigami/basictheme.cpp --- old/kirigami2-5.83.0/src/libkirigami/basictheme.cpp 2021-06-05 11:20:11.000000000 +0200 +++ new/kirigami2-5.84.0/src/libkirigami/basictheme.cpp 2021-07-03 14:14:03.000000000 +0200 @@ -117,7 +117,7 @@ void BasicThemeDefinition::syncToQml(PlatformTheme *object) { auto item = qobject_cast<QQuickItem *>(object->parent()); - if (item) { + if (item && qmlAttachedPropertiesObject<PlatformTheme>(item, false) == object) { Q_EMIT sync(item); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.83.0/src/libkirigami/platformtheme.cpp new/kirigami2-5.84.0/src/libkirigami/platformtheme.cpp --- old/kirigami2-5.83.0/src/libkirigami/platformtheme.cpp 2021-06-05 11:20:11.000000000 +0200 +++ new/kirigami2-5.84.0/src/libkirigami/platformtheme.cpp 2021-07-03 14:14:03.000000000 +0200 @@ -857,21 +857,33 @@ #else const auto libraryPaths = QCoreApplication::libraryPaths(); for (const QString &path : libraryPaths) { +#ifdef Q_OS_ANDROID + QDir dir(path); +#else QDir dir(path + QStringLiteral("/kf5/kirigami")); +#endif const auto fileNames = dir.entryList(QDir::Files); + for (const QString &fileName : fileNames) { - // TODO: env variable? - if (!QQuickStyle::name().isEmpty() && fileName.startsWith(QQuickStyle::name())) { - QPluginLoader loader(dir.absoluteFilePath(fileName)); - QObject *plugin = loader.instance(); - // TODO: load actually a factory as plugin - KirigamiPluginFactory *factory = qobject_cast<KirigamiPluginFactory *>(plugin); - if (factory) { - PlatformThemePrivate::s_pluginFactory = factory; - return factory->createPlatformTheme(object); +#ifdef Q_OS_ANDROID + if (fileName.startsWith(QStringLiteral("libplugins_kf5_kirigami_")) && QLibrary::isLibrary(fileName)) { +#endif + // TODO: env variable? + if (!QQuickStyle::name().isEmpty() && fileName.contains(QQuickStyle::name())) { + QPluginLoader loader(dir.absoluteFilePath(fileName)); + QObject *plugin = loader.instance(); + // TODO: load actually a factory as plugin + + KirigamiPluginFactory *factory = qobject_cast<KirigamiPluginFactory *>(plugin); + if (factory) { + PlatformThemePrivate::s_pluginFactory = factory; + return factory->createPlatformTheme(object); + } } +#ifdef Q_OS_ANDROID } +#endif } } #endif
