Hello community, here is the log from the commit of package kirigami2 for openSUSE:Factory checked in at 2018-01-09 14:47:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kirigami2 (Old) and /work/SRC/openSUSE:Factory/.kirigami2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kirigami2" Tue Jan 9 14:47:12 2018 rev:8 rq:561339 version:5.41.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kirigami2/kirigami2.changes 2017-11-16 14:38:48.399474304 +0100 +++ /work/SRC/openSUSE:Factory/.kirigami2.new/kirigami2.changes 2018-01-09 14:47:13.632585062 +0100 @@ -1,0 +2,11 @@ +Wed Jan 3 12:42:30 UTC 2018 - fab...@ritter-vogt.de + +- Remove baselibs.conf: + * Not needed + +------------------------------------------------------------------- +Sun Dec 17 09:43:48 CET 2017 - lbeltr...@kde.org + + * Update to 5.41.0 + +------------------------------------------------------------------- Old: ---- baselibs.conf kirigami2-5.40.0.tar.xz New: ---- kirigami2-5.41.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kirigami2.spec ++++++ --- /var/tmp/diff_new_pack.eG1p90/_old 2018-01-09 14:47:14.340551866 +0100 +++ /var/tmp/diff_new_pack.eG1p90/_new 2018-01-09 14:47:14.352551303 +0100 @@ -1,7 +1,7 @@ # # spec file for package kirigami2 # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,16 +18,15 @@ %define lname libKF5Kirigami2-5 %bcond_without lang -%define _tar_path 5.40 +%define _tar_path 5.41 Name: kirigami2 -Version: 5.40.0 +Version: 5.41.0 Release: 0 Summary: Set of QtQuick components License: LGPL-2.1+ Group: Development/Libraries/KDE Url: http://www.kde.org/ Source: https://download.kde.org/stable/frameworks/%{_tar_path}/%{name}-%{version}.tar.xz -Source1: baselibs.conf BuildRequires: extra-cmake-modules >= %{_tar_path} BuildRequires: kf5-filesystem BuildRequires: cmake(KF5Declarative) >= %{_tar_path} ++++++ kirigami2-5.40.0.tar.xz -> kirigami2-5.41.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.40.0/CMakeLists.txt new/kirigami2-5.41.0/CMakeLists.txt --- old/kirigami2-5.40.0/CMakeLists.txt 2017-11-05 09:33:30.000000000 +0100 +++ new/kirigami2-5.41.0/CMakeLists.txt 2017-12-02 21:06:06.000000000 +0100 @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 3.0) -set(KF5_VERSION "5.40.0") # handled by release scripts -set(KF5_DEP_VERSION "5.40.0") # handled by release scripts +set(KF5_VERSION "5.41.0") # handled by release scripts +set(KF5_DEP_VERSION "5.41.0") # handled by release scripts project(kirigami2 VERSION ${KF5_VERSION}) @@ -34,7 +34,7 @@ ################# set KDE specific information ################# -find_package(ECM 5.40.0 NO_MODULE) +find_package(ECM 5.41.0 NO_MODULE) set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://projects.kde.org/projects/kdesupport/extra-cmake-modules";) # where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is checked diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.40.0/examples/galleryapp/AndroidManifest.xml new/kirigami2-5.41.0/examples/galleryapp/AndroidManifest.xml --- old/kirigami2-5.40.0/examples/galleryapp/AndroidManifest.xml 2017-11-05 09:33:30.000000000 +0100 +++ new/kirigami2-5.41.0/examples/galleryapp/AndroidManifest.xml 2017-12-02 21:06:06.000000000 +0100 @@ -12,7 +12,7 @@ <action android:name="android.intent.action.MAIN"/> <category android:name="android.intent.category.LAUNCHER"/> </intent-filter> - <meta-data android:name="android.app.lib_name" android:value="-- %%INSERT_APP_LIB_NAME%% --"/> + <meta-data android:name="android.app.lib_name" android:value="kirigami2gallery"/> <meta-data android:name="android.app.qt_sources_resource_id" android:resource="@array/qt_sources"/> <meta-data android:name="android.app.repository" android:value="default"/> <meta-data android:name="android.app.qt_libs_resource_id" android:resource="@array/qt_libs"/> @@ -53,10 +53,6 @@ <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="16"/> <supports-screens android:largeScreens="true" android:normalScreens="true" android:anyDensity="true" android:smallScreens="true"/> - <!-- The following comment will be replaced upon deployment with default permissions based on the dependencies of the application. - Remove the comment if you do not require these default permissions. --> - <!-- %%INSERT_PERMISSIONS --> - <!-- The following comment will be replaced upon deployment with default features based on the dependencies of the application. Remove the comment if you do not require these default features. --> <!-- %%INSERT_FEATURES --> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.40.0/examples/galleryapp/CMakeLists.txt new/kirigami2-5.41.0/examples/galleryapp/CMakeLists.txt --- old/kirigami2-5.40.0/examples/galleryapp/CMakeLists.txt 2017-11-05 09:33:30.000000000 +0100 +++ new/kirigami2-5.41.0/examples/galleryapp/CMakeLists.txt 2017-12-02 21:06:06.000000000 +0100 @@ -37,30 +37,6 @@ message(WARNING "KPackage components should be specified in reverse domain notation. Appstream information won't be generated for ${component}.") endif() -find_program(kpackagetool_cmd kpackagetool5) -if (kpackagetool_cmd) - set(component org.kde.kirigami2.gallery) - set(APPDATAFILE "${CMAKE_CURRENT_BINARY_DIR}/${component}.appdata.xml") - - message(STATUS "${kpackagetool_cmd} --appstream-metainfo ${CMAKE_CURRENT_SOURCE_DIR}/../gallerydata --appstream-metainfo-output ${APPDATAFILE}") - execute_process( - COMMAND ${kpackagetool_cmd} --appstream-metainfo ${CMAKE_CURRENT_SOURCE_DIR}/../gallerydata --appstream-metainfo-output ${APPDATAFILE} - ERROR_VARIABLE appstreamerror - RESULT_VARIABLE result) - if (NOT result EQUAL 0) - message(WARNING "couldn't generate metainfo for ${component}: ${appstreamerror}") - else() - if(appstreamerror) - message(WARNING "warnings during generation of metainfo for ${component}: ${appstreamerror}") - endif() - - # OPTIONAL because desktop files can be NoDisplay so they render no XML. - install(FILES ${APPDATAFILE} DESTINATION ${KDE_INSTALL_METAINFODIR} OPTIONAL) - endif() -else() - message(WARNING "KPackage components should be specified in reverse domain notation. Appstream information won't be generated for ${component}.") -endif() - add_executable(kirigami2gallery ${kirigami2gallery_SRCS} ${RESOURCES}) target_link_libraries(kirigami2gallery Qt5::Core Qt5::Qml Qt5::Quick Qt5::Svg ${kirigami2gallery_EXTRA_LIBS}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.40.0/examples/gallerydata/contents/ui/DesktopExampleApp.qml new/kirigami2-5.41.0/examples/gallerydata/contents/ui/DesktopExampleApp.qml --- old/kirigami2-5.40.0/examples/gallerydata/contents/ui/DesktopExampleApp.qml 2017-11-05 09:33:30.000000000 +0100 +++ new/kirigami2-5.41.0/examples/gallerydata/contents/ui/DesktopExampleApp.qml 2017-12-02 21:06:06.000000000 +0100 @@ -86,7 +86,10 @@ }, Kirigami.Action { text: "Open A Layer" - iconName: "configure" + icon { + name: "configure" + color: Kirigami.Theme.activeTextColor + } onTriggered: { pageStack.layers.push(Qt.resolvedUrl("gallery/LayersGallery.qml")); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.40.0/examples/gallerydata/contents/ui/gallery/MiscGallery.qml new/kirigami2-5.41.0/examples/gallerydata/contents/ui/gallery/MiscGallery.qml --- old/kirigami2-5.40.0/examples/gallerydata/contents/ui/gallery/MiscGallery.qml 2017-11-05 09:33:30.000000000 +0100 +++ new/kirigami2-5.41.0/examples/gallerydata/contents/ui/gallery/MiscGallery.qml 2017-12-02 21:06:06.000000000 +0100 @@ -28,18 +28,27 @@ actions { main: Action { - iconName: "document-edit" + icon { + name: "document-edit" + color: Theme.negativeTextColor + } text: "Main Action Text" } left: Action { - iconName: "go-previous" + icon { + name: "go-previous" + color: Theme.positiveTextColor + } text: "Left Action Text" onTriggered: { showPassiveNotification("Left action triggered") } } right: Action { - iconName: "go-next" + icon { + name: "go-next" + color: Theme.neutralTextColor + } text: "Right Action Text" onTriggered: { showPassiveNotification("Right action triggered") @@ -48,12 +57,15 @@ contextualActions: [ Action { text:"Action for buttons" - iconName: "bookmarks" + icon { + name: "bookmarks" + color: Theme.activeTextColor + } onTriggered: showPassiveNotification("Action 1 clicked") }, Action { text:"Disabled Action" - iconName: "folder" + icon.name: "folder" enabled: false }, Action { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.40.0/examples/gallerydata/contents/ui/gallery/NonScrollableGallery.qml new/kirigami2-5.41.0/examples/gallerydata/contents/ui/gallery/NonScrollableGallery.qml --- old/kirigami2-5.40.0/examples/gallerydata/contents/ui/gallery/NonScrollableGallery.qml 2017-11-05 09:33:30.000000000 +0100 +++ new/kirigami2-5.41.0/examples/gallerydata/contents/ui/gallery/NonScrollableGallery.qml 2017-12-02 21:06:06.000000000 +0100 @@ -29,7 +29,9 @@ actions { main: Action { - iconName: sheet.sheetOpen ? "dialog-cancel" : "document-edit" + icon { + name: sheet.sheetOpen ? "dialog-cancel" : "document-edit" + } text: "Main Action Text" checkable: true onCheckedChanged: sheet.sheetOpen = checked; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.40.0/examples/gallerydata/contents/ui/gallery/SliderGallery.qml new/kirigami2-5.41.0/examples/gallerydata/contents/ui/gallery/SliderGallery.qml --- old/kirigami2-5.40.0/examples/gallerydata/contents/ui/gallery/SliderGallery.qml 2017-11-05 09:33:30.000000000 +0100 +++ new/kirigami2-5.41.0/examples/gallerydata/contents/ui/gallery/SliderGallery.qml 2017-12-02 21:06:06.000000000 +0100 @@ -55,7 +55,7 @@ anchors.centerIn: parent spacing: Units.smallSpacing - Label { + Controls.Label { text: "Normal:" } Controls.Slider { @@ -69,7 +69,7 @@ text: slider.position.toFixed(1) } } - Label { + Controls.Label { text: "Disabled:" } Controls.Slider { @@ -78,7 +78,7 @@ value: 2 to: 5.0 } - Label { + Controls.Label { text: "Thickmarks:" } Controls.Slider { @@ -94,7 +94,7 @@ } } Controls.RangeSlider {} - Label { + Controls.Label { text: "Vertical:" } RowLayout { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.40.0/examples/gallerydata/metadata.desktop new/kirigami2-5.41.0/examples/gallerydata/metadata.desktop --- old/kirigami2-5.40.0/examples/gallerydata/metadata.desktop 2017-11-05 09:33:30.000000000 +0100 +++ new/kirigami2-5.41.0/examples/gallerydata/metadata.desktop 2017-12-02 21:06:06.000000000 +0100 @@ -41,8 +41,11 @@ Comment[ca]=Mostra exemples de components del Kirigami i permet jugar-hi Comment[ca@valencia]=Mostra exemples de components del Kirigami i permet jugar-hi Comment[da]=Viser eksempler på Kirigami-komponenter og lader dig lege med dem +Comment[de]=Zeigt Beispiele von Kirigami-Komponenten und ermöglicht es, sie auszuprobieren +Comment[en_GB]=Shows examples of Kirigami components and allows you to play with them Comment[es]=Muestra ejemplos de componentes de Kirigami y le permite jugar con ellos Comment[eu]=Kirigami osagaien adibideak erakusten ditu eta haiekin jolasten uzten dizu +Comment[fr]=Affiche des exemples des composants Kirigami et permet de jouer avec eux Comment[it]=Mostra esempi di componenti Kirigami e ti permette di giocare con essi Comment[nl]=Toont voorbeelden van Kirigami componenten en laat u met ze spelen Comment[pl]=Pokazuje przykłady składników Kirigami i umożliwia zabawę nimi @@ -56,7 +59,8 @@ Comment[tr]=Kirigami bileşenlerinin örneklerini gösterir ve onlarla oynamanıza izin verir Comment[uk]=Показує приклади компонентів Kirigami і надає вам змогу попрацювати з ними Comment[x-test]=xxShows examples of Kirigami components and allows you to play with themxx -Comment[zh_CN]=显示 Kirigami 组件并允许您试玩它们 +Comment[zh_CN]=显示 Kirigami 组件实例并允许您试用它们 +Comment[zh_TW]=顯示 Kirigami 組件的範例，讓您可以玩玩看 Encoding=UTF-8 Type=Application diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.40.0/examples/simpleexamples/MultipleColumnsGallery.qml new/kirigami2-5.41.0/examples/simpleexamples/MultipleColumnsGallery.qml --- old/kirigami2-5.40.0/examples/simpleexamples/MultipleColumnsGallery.qml 2017-11-05 09:33:30.000000000 +0100 +++ new/kirigami2-5.41.0/examples/simpleexamples/MultipleColumnsGallery.qml 2017-12-02 21:06:06.000000000 +0100 @@ -48,7 +48,7 @@ width: page.width spacing: Units.smallSpacing - Label { + Controls.Label { Layout.fillWidth: true wrapMode: Text.WordWrap text: "This page is used to test multiple columns: you can push and pop an arbitrary number of pages, each new page will have a random implicit width between 8 and 35 grid units.\nIf you enlarge the window enough, you can test how the application behaves with multiple columns." @@ -57,7 +57,7 @@ Layout.minimumWidth: Units.gridUnit *2 Layout.minimumHeight: Layout.minimumWidth } - Label { + Controls.Label { anchors.horizontalCenter: parent.horizontalCenter text: "Page implicitWidth: " + page.implicitWidth } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.40.0/po/cs/libkirigami2plugin_qt.po new/kirigami2-5.41.0/po/cs/libkirigami2plugin_qt.po --- old/kirigami2-5.40.0/po/cs/libkirigami2plugin_qt.po 2017-11-05 09:33:30.000000000 +0100 +++ new/kirigami2-5.41.0/po/cs/libkirigami2plugin_qt.po 2017-12-02 21:06:06.000000000 +0100 @@ -1,9 +1,9 @@ -# Vít Pelčák <v...@pelcak.org>, 2016. +# Vít Pelčák <v...@pelcak.org>, 2016, 2017. msgid "" msgstr "" "Project-Id-Version: \n" -"PO-Revision-Date: 2016-08-16 09:26+0100\n" -"Last-Translator: Vít Pelčák <v...@pelcak.org>\n" +"PO-Revision-Date: 2017-11-14 14:15+0100\n" +"Last-Translator: Vit Pelcak <v...@pelcak.org>\n" "Language-Team: Czech <kde-i18n-...@kde.org>\n" "Language: cs\n" "MIME-Version: 1.0\n" @@ -26,9 +26,9 @@ #: controls/templates/private/BackButton.qml:54 msgctxt "BackButton|" msgid "Navigate Back" -msgstr "" +msgstr "Přejít zpět" #: controls/templates/private/ForwardButton.qml:50 msgctxt "ForwardButton|" msgid "Navigate Forward" -msgstr "" +msgstr "Přejít vpřed" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.40.0/po/de/libkirigami2plugin_qt.po new/kirigami2-5.41.0/po/de/libkirigami2plugin_qt.po --- old/kirigami2-5.40.0/po/de/libkirigami2plugin_qt.po 2017-11-05 09:33:30.000000000 +0100 +++ new/kirigami2-5.41.0/po/de/libkirigami2plugin_qt.po 2017-12-02 21:06:06.000000000 +0100 @@ -1,9 +1,10 @@ # Frederik Schwarzer <schwar...@kde.org>, 2016. +# Burkhard Lück <lu...@hube-lueck.de>, 2017. msgid "" msgstr "" "Project-Id-Version: \n" -"PO-Revision-Date: 2016-08-12 15:42+0100\n" -"Last-Translator: Frederik Schwarzer <schwar...@kde.org>\n" +"PO-Revision-Date: 2017-11-27 09:50+0100\n" +"Last-Translator: Burkhard Lück <lu...@hube-lueck.de>\n" "Language-Team: German <kde-i18n...@kde.org>\n" "Language: de\n" "MIME-Version: 1.0\n" @@ -26,9 +27,9 @@ #: controls/templates/private/BackButton.qml:54 msgctxt "BackButton|" msgid "Navigate Back" -msgstr "" +msgstr "Zurück gehen" #: controls/templates/private/ForwardButton.qml:50 msgctxt "ForwardButton|" msgid "Navigate Forward" -msgstr "" +msgstr "Vorwärts gehen" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.40.0/po/en_GB/libkirigami2plugin_qt.po new/kirigami2-5.41.0/po/en_GB/libkirigami2plugin_qt.po --- old/kirigami2-5.40.0/po/en_GB/libkirigami2plugin_qt.po 2017-11-05 09:33:30.000000000 +0100 +++ new/kirigami2-5.41.0/po/en_GB/libkirigami2plugin_qt.po 2017-12-02 21:06:06.000000000 +0100 @@ -1,10 +1,10 @@ -# Steve Allewell <steve.allew...@gmail.com>, 2016. +# Steve Allewell <steve.allew...@gmail.com>, 2016, 2017. msgid "" msgstr "" "Project-Id-Version: \n" -"PO-Revision-Date: 2016-08-05 09:59+0000\n" +"PO-Revision-Date: 2017-11-26 15:56+0000\n" "Last-Translator: Steve Allewell <steve.allew...@gmail.com>\n" -"Language-Team: English <kde-l10n-en...@kde.org>\n" +"Language-Team: British English <kde-i18n-...@kde.org>\n" "Language: en_GB\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -26,9 +26,9 @@ #: controls/templates/private/BackButton.qml:54 msgctxt "BackButton|" msgid "Navigate Back" -msgstr "" +msgstr "Navigate Back" #: controls/templates/private/ForwardButton.qml:50 msgctxt "ForwardButton|" msgid "Navigate Forward" -msgstr "" +msgstr "Navigate Forward" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.40.0/po/fr/libkirigami2plugin_qt.po new/kirigami2-5.41.0/po/fr/libkirigami2plugin_qt.po --- old/kirigami2-5.40.0/po/fr/libkirigami2plugin_qt.po 2017-11-05 09:33:30.000000000 +0100 +++ new/kirigami2-5.41.0/po/fr/libkirigami2plugin_qt.po 2017-12-02 21:06:06.000000000 +0100 @@ -1,10 +1,10 @@ -# Vincent Pinon <vpi...@kde.org>, 2016. +# Vincent Pinon <vpi...@kde.org>, 2016, 2017. msgid "" msgstr "" "Project-Id-Version: \n" -"PO-Revision-Date: 2016-11-21 15:54+0100\n" +"PO-Revision-Date: 2017-10-09 08:46+0100\n" "Last-Translator: Vincent Pinon <vpi...@kde.org>\n" -"Language-Team: French <kde-i18n-...@kde.org>\n" +"Language-Team: French <kde-francoph...@kde.org>\n" "Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -29,9 +29,9 @@ #: controls/templates/private/BackButton.qml:54 msgctxt "BackButton|" msgid "Navigate Back" -msgstr "" +msgstr "Navigation arrière" #: controls/templates/private/ForwardButton.qml:50 msgctxt "ForwardButton|" msgid "Navigate Forward" -msgstr "" +msgstr "Navigation avant" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.40.0/po/ru/libkirigami2plugin_qt.po new/kirigami2-5.41.0/po/ru/libkirigami2plugin_qt.po --- old/kirigami2-5.40.0/po/ru/libkirigami2plugin_qt.po 2017-11-05 09:33:30.000000000 +0100 +++ new/kirigami2-5.41.0/po/ru/libkirigami2plugin_qt.po 2017-12-02 21:06:06.000000000 +0100 @@ -1,8 +1,8 @@ -# Alexander Potashev <aspotas...@gmail.com>, 2016. +# Alexander Potashev <aspotas...@gmail.com>, 2016, 2017. msgid "" msgstr "" "Project-Id-Version: \n" -"PO-Revision-Date: 2016-10-10 01:01+0300\n" +"PO-Revision-Date: 2017-11-28 13:27+0300\n" "Last-Translator: Alexander Potashev <aspotas...@gmail.com>\n" "Language-Team: Russian <kde-russ...@lists.kde.ru>\n" "Language: ru\n" @@ -27,9 +27,9 @@ #: controls/templates/private/BackButton.qml:54 msgctxt "BackButton|" msgid "Navigate Back" -msgstr "" +msgstr "Перейти назад" #: controls/templates/private/ForwardButton.qml:50 msgctxt "ForwardButton|" msgid "Navigate Forward" -msgstr "" +msgstr "Перейти вперёд" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.40.0/po/tr/libkirigami2plugin_qt.po new/kirigami2-5.41.0/po/tr/libkirigami2plugin_qt.po --- old/kirigami2-5.40.0/po/tr/libkirigami2plugin_qt.po 2017-11-05 09:33:30.000000000 +0100 +++ new/kirigami2-5.41.0/po/tr/libkirigami2plugin_qt.po 2017-12-02 21:06:06.000000000 +0100 @@ -1,7 +1,7 @@ msgid "" msgstr "" -"PO-Revision-Date: 2017-06-15 12:23+0000\n" -"Last-Translator: Mete <metebilgi...@gmail.com>\n" +"PO-Revision-Date: 2017-10-23 09:50+0000\n" +"Last-Translator: Kaan <kaanozdin...@gmail.com>\n" "Language: tr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -24,9 +24,9 @@ #: controls/templates/private/BackButton.qml:54 msgctxt "BackButton|" msgid "Navigate Back" -msgstr "" +msgstr "Geriye Git" #: controls/templates/private/ForwardButton.qml:50 msgctxt "ForwardButton|" msgid "Navigate Forward" -msgstr "" +msgstr "İleri Git" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.40.0/po/zh_TW/libkirigami2plugin_qt.po new/kirigami2-5.41.0/po/zh_TW/libkirigami2plugin_qt.po --- old/kirigami2-5.40.0/po/zh_TW/libkirigami2plugin_qt.po 2017-11-05 09:33:30.000000000 +0100 +++ new/kirigami2-5.41.0/po/zh_TW/libkirigami2plugin_qt.po 2017-12-02 21:06:06.000000000 +0100 @@ -1,12 +1,13 @@ # Jeff Huang <s8321...@gmail.com>, 2016. +# Franklin Weng <frank...@goodhorse.idv.tw>, 2017. msgid "" msgstr "" "Project-Id-Version: libkirigamiplugin_qt\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-09-22 20:41+0800\n" -"PO-Revision-Date: 2016-11-16 09:13+0800\n" -"Last-Translator: Jeff Huang <s8321...@gmail.com>\n" -"Language-Team: Chinese <kde-i18n-...@kde.org>\n" +"PO-Revision-Date: 2017-11-11 20:26+0800\n" +"Last-Translator: Franklin Weng <frank...@goodhorse.idv.tw>\n" +"Language-Team: Chinese <zh-l...@linux.org.tw>\n" "Language: zh_TW\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -28,9 +29,9 @@ #: controls/templates/private/BackButton.qml:54 msgctxt "BackButton|" msgid "Navigate Back" -msgstr "" +msgstr "返回" #: controls/templates/private/ForwardButton.qml:50 msgctxt "ForwardButton|" msgid "Navigate Forward" -msgstr "" +msgstr "往前" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.40.0/src/controls/Action.qml new/kirigami2-5.41.0/src/controls/Action.qml --- old/kirigami2-5.40.0/src/controls/Action.qml 2017-11-05 09:33:30.000000000 +0100 +++ new/kirigami2-5.41.0/src/controls/Action.qml 2017-12-02 21:06:06.000000000 +0100 @@ -18,6 +18,7 @@ */ import QtQuick 2.7 +import "private" /** * An item that represents an abstract Action @@ -71,13 +72,41 @@ * iconName: string * Sets the icon name for the action. This will pick the icon with the given name from the current theme. */ - property string iconName + property alias iconName: iconGroup.name /** * iconSource: string * Sets the icon file or resource url for the action. Defaults to the empty URL. Use this if you want a specific file rather than an icon from the theme */ - property string iconSource + property alias iconSource: iconGroup.source + + /** + * metadata for the icon, such as width/height.name and source + * * name 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. + * For more information on theme icons, see QIcon::fromTheme(). + * + * * source This property holds the name of the icon to use. + * The icon will be loaded as a regular image. + * If icon.name is set and refers to a valid theme icon, + * it will always be used instead of this property. + * + * * width This property holds the width of the icon. + * The icon's width will never exceed this value, + * though it will shrink when necessary. + * height This property holds the height of the icon. + * The icon's height will never exceed this value, + * though it will shrink when necessary. + * + * *color This property holds the color of the icon. + * The icon is tinted with the specified color, unless the color is set to "transparent". + */ + property ActionIconGroup icon: ActionIconGroup { + id: iconGroup + } /** * shortcut : keysequence diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.40.0/src/controls/BasicListItem.qml new/kirigami2-5.41.0/src/controls/BasicListItem.qml --- old/kirigami2-5.40.0/src/controls/BasicListItem.qml 2017-11-05 09:33:30.000000000 +0100 +++ new/kirigami2-5.41.0/src/controls/BasicListItem.qml 2017-12-02 21:06:06.000000000 +0100 @@ -40,11 +40,12 @@ /** * icon: var - * A single icon that will be displayed in the list item. The icon can - * be either a QIcon, a string name of a fdo compatible name, + * A single icon that will be displayed in the list item. + * The icon can be a grouped property with name,size,color etc, as QtQuickControls2 icons are defined. + * The icon can also be either a QIcon, a string name of a fdo compatible name, * or any url accepted by the Image element. */ - property alias icon: iconItem.source + property var icon /** * reserveSpaceForIcon: bool @@ -62,10 +63,12 @@ property bool indicateActiveFocus: listItem.pressed || Settings.isMobile || listItem.activeFocus || (listItem.ListView.view ? listItem.ListView.view.activeFocus : false) Icon { id: iconItem + source: listItem.icon && listItem.icon.hasOwnProperty && listItem.icon.hasOwnProperty("name") ? listItem.icon.name : listItem.icon Layout.minimumHeight: Units.iconSizes.smallMedium Layout.maximumHeight: Layout.minimumHeight Layout.minimumWidth: height selected: layout.indicateActiveFocus && (listItem.checked || listItem.pressed) + color: listItem.icon && listItem.icon.color && listItem.icon.color.a > 0 ? listItem.icon.color : Qt.rgba(0, 0, 0, 0) } QQC2.Label { id: labelItem diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.40.0/src/controls/ContextDrawer.qml new/kirigami2-5.41.0/src/controls/ContextDrawer.qml --- old/kirigami2-5.40.0/src/controls/ContextDrawer.qml 2017-11-05 09:33:30.000000000 +0100 +++ new/kirigami2-5.41.0/src/controls/ContextDrawer.qml 2017-12-02 21:06:06.000000000 +0100 @@ -133,7 +133,7 @@ } delegate: BasicListItem { checked: modelData.checked - icon: modelData.iconName + icon: modelData.icon supportsMouseEvents: true separatorVisible: false label: model ? (model.tooltip ? model.tooltip : model.text) : (modelData.tooltip ? modelData.tooltip : modelData.text) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.40.0/src/controls/GlobalDrawer.qml new/kirigami2-5.41.0/src/controls/GlobalDrawer.qml --- old/kirigami2-5.40.0/src/controls/GlobalDrawer.qml 2017-11-05 09:33:30.000000000 +0100 +++ new/kirigami2-5.41.0/src/controls/GlobalDrawer.qml 2017-12-02 21:06:06.000000000 +0100 @@ -405,7 +405,7 @@ id: listItem supportsMouseEvents: true checked: modelData.checked - icon: modelData.iconName + icon: modelData.icon label: modelData.text separatorVisible: false visible: model ? model.visible || model.visible===undefined : modelData.visible diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.40.0/src/controls/Page.qml new/kirigami2-5.41.0/src/controls/Page.qml --- old/kirigami2-5.40.0/src/controls/Page.qml 2017-11-05 09:33:30.000000000 +0100 +++ new/kirigami2-5.41.0/src/controls/Page.qml 2017-12-02 21:06:06.000000000 +0100 @@ -55,7 +55,7 @@ * bottomPadding: int * default contents padding at bottom */ - bottomPadding: Kirigami.Units.gridUnit + bottomPadding: actionButtons.item ? actionButtons.height : Kirigami.Units.gridUnit /** * flickable: Flickable @@ -249,6 +249,7 @@ //on material the shadow would bleed over clip: header !== undefined Loader { + id: actionButtons z: 9999 parent: root anchors { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.40.0/src/controls/ScrollablePage.qml new/kirigami2-5.41.0/src/controls/ScrollablePage.qml --- old/kirigami2-5.40.0/src/controls/ScrollablePage.qml 2017-11-05 09:33:30.000000000 +0100 +++ new/kirigami2-5.41.0/src/controls/ScrollablePage.qml 2017-12-02 21:06:06.000000000 +0100 @@ -108,10 +108,11 @@ z: 0 //child of root as it shouldn't have margins parent: root - topPadding: (applicationWindow() && applicationWindow().header ? applicationWindow().header.preferredHeight : 0) + (contentItem == flickable ? 0 : root.topPadding) + page: root + topPadding: (applicationWindow() && applicationWindow().header ? applicationWindow().header.preferredHeight : 0) + (contentItem == flickableItem ? 0 : root.topPadding) leftPadding: root.leftPadding rightPadding: root.rightPadding - bottomPadding: contentItem == flickable ? 0 : root.bottomPadding + bottomPadding: contentItem == flickableItem ? 0 : root.bottomPadding anchors { fill: parent topMargin: root.header ? root.header.height : 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.40.0/src/controls/ToolBarApplicationHeader.qml new/kirigami2-5.41.0/src/controls/ToolBarApplicationHeader.qml --- old/kirigami2-5.40.0/src/controls/ToolBarApplicationHeader.qml 2017-11-05 09:33:30.000000000 +0100 +++ new/kirigami2-5.41.0/src/controls/ToolBarApplicationHeader.qml 2017-12-02 21:06:06.000000000 +0100 @@ -153,7 +153,7 @@ model: page && page.actions.contextualActions ? page.actions.contextualActions : null delegate: BasicListItem { text: modelData ? modelData.text : "" - icon: modelData.iconName + icon: modelData.icon checkable: modelData.checkable checked: modelData.checked onClicked: { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.40.0/src/controls/private/ActionButton.qml new/kirigami2-5.41.0/src/controls/private/ActionButton.qml --- old/kirigami2-5.40.0/src/controls/private/ActionButton.qml 2017-11-05 09:33:30.000000000 +0100 +++ new/kirigami2-5.41.0/src/controls/private/ActionButton.qml 2017-12-02 21:06:06.000000000 +0100 @@ -231,7 +231,8 @@ width: height visible: root.action readonly property bool pressed: root.action && ((mouseArea.buttonPressedUnderMouse && mouseArea.pressed) || root.action.checked) - color: pressed ? Qt.darker(Theme.highlightColor, 1.3) : Theme.highlightColor + property color baseColor: root.action && root.action.icon && root.action.icon.color && root.action.icon.color != undefined && root.action.icon.color.a > 0 ? root.action.icon.color : Theme.highlightColor + color: pressed ? Qt.darker(baseColor, 1.3) : baseColor Icon { id: icon @@ -270,7 +271,8 @@ visible: root.leftAction readonly property bool pressed: root.leftAction && ((mouseArea.leftButtonPressedUnderMouse && mouseArea.pressed) || root.leftAction.checked) - color: pressed ? Theme.highlightColor : Theme.backgroundColor + property color baseColor: root.leftAction && root.leftAction.icon && root.leftAction.icon.color && root.leftAction.icon.color != undefined && root.leftAction.icon.color.a > 0 ? root.leftAction.icon.color : Theme.highlightColor + color: pressed ? baseColor : Theme.backgroundColor Behavior on color { ColorAnimation { duration: Units.longDuration @@ -304,7 +306,8 @@ width: height + (root.action ? Units.gridUnit*2 : 0) visible: root.rightAction readonly property bool pressed: root.rightAction && ((mouseArea.rightButtonPressedUnderMouse && mouseArea.pressed) || root.rightAction.checked) - color: pressed ? Theme.highlightColor : Theme.backgroundColor + property color baseColor: root.rightAction && root.rightAction.icon && root.rightAction.icon.color && root.rightAction.icon.color != undefined && root.rightAction.icon.color.a > 0 ? root.rightAction.icon.color : Theme.highlightColor + color: pressed ? baseColor : Theme.backgroundColor Behavior on color { ColorAnimation { duration: Units.longDuration diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.40.0/src/controls/private/ActionIconGroup.qml new/kirigami2-5.41.0/src/controls/private/ActionIconGroup.qml --- old/kirigami2-5.40.0/src/controls/private/ActionIconGroup.qml 1970-01-01 01:00:00.000000000 +0100 +++ new/kirigami2-5.41.0/src/controls/private/ActionIconGroup.qml 2017-12-02 21:06:06.000000000 +0100 @@ -0,0 +1,29 @@ +/* + * Copyright 2017 Marco Martin <m...@kde.org> + * + * 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 02110-1301, USA. + */ + +import QtQml 2.1 + +QtObject { + property string name + property string source + property int width + property int height + property color color: Qt.rgba(0, 0, 0, 0) +} + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.40.0/src/controls/private/PrivateActionToolButton.qml new/kirigami2-5.41.0/src/controls/private/PrivateActionToolButton.qml --- old/kirigami2-5.40.0/src/controls/private/PrivateActionToolButton.qml 2017-11-05 09:33:30.000000000 +0100 +++ new/kirigami2-5.41.0/src/controls/private/PrivateActionToolButton.qml 2017-12-02 21:06:06.000000000 +0100 @@ -57,10 +57,11 @@ Icon { Layout.minimumWidth: 22 Layout.minimumHeight: 22 - source: control.action ? control.action.iconName : "" + source: control.action ? (control.action.icon ? control.action.icon.name : control.action.iconName) : "" visible: control.action && control.action.iconName != "" + color: control.action && control.action.icon && control.action.icon.color.a > 0 ? control.action.icon.color : Qt.rgba(0, 0, 0, 0) } - Label { + Controls.Label { text: action ? action.text : "" visible: control.showText } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.40.0/src/controls/private/RefreshableScrollView.qml new/kirigami2-5.41.0/src/controls/private/RefreshableScrollView.qml --- old/kirigami2-5.40.0/src/controls/private/RefreshableScrollView.qml 2017-11-05 09:33:30.000000000 +0100 +++ new/kirigami2-5.41.0/src/controls/private/RefreshableScrollView.qml 2017-12-02 21:06:06.000000000 +0100 @@ -18,6 +18,7 @@ */ import QtQuick 2.5 +import QtQuick.Window 2.2 import QtQuick.Controls 2.0 as QQC2 import QtGraphicalEffects 1.0 import QtQuick.Layouts 1.2 @@ -102,6 +103,10 @@ */ property int bottomPadding: Units.gridUnit + /** + * Set when this scrollview manages a whole page + */ + property Page page property Item _swipeFilter @@ -157,7 +162,7 @@ if (y - busyIndicatorFrame.headerItemHeight > root.topPadding + Units.gridUnit && !applicationWindow().reachableMode) { overshootResetTimer.running = true; //not reachable and not overshooting enough, stop reachability countdown - } else if (!applicationWindow().reachableMode) { + } else if (typeof(applicationWindow) == "undefined" || !applicationWindow().reachableMode) { //it's important it doesn't restart overshootResetTimer.running = false; } @@ -217,7 +222,7 @@ Binding { target: root.flickableItem property: "bottomMargin" - value: Units.gridUnit * 5 + value: root.page.bottomPadding } Binding { @@ -229,14 +234,19 @@ ] onHeightChanged: { - if (!applicationWindow() || !applicationWindow().activeFocusItem) { + if (!Window.window) { + return; + } + var focusItem = Window.window.activeFocusItem; + + if (!focusItem) { return; } //NOTE: there is no function to know if an item is descended from another, //so we have to walk the parent hyerarchy by hand var isDescendent = false; - var candidate = applicationWindow().activeFocusItem.parent; + var candidate = focusItem.parent; while (candidate) { if (candidate == root) { isDescendent = true; @@ -249,11 +259,11 @@ } var cursorY = 0; - if (applicationWindow().activeFocusItem.cursorPosition !== undefined) { - cursorY = applicationWindow().activeFocusItem.positionToRectangle(applicationWindow().activeFocusItem.cursorPosition).y; + if (focusItem.cursorPosition !== undefined) { + cursorY = focusItem.positionToRectangle(focusItem.cursorPosition).y; } - var pos = applicationWindow().activeFocusItem.mapToItem(root.contentItem, 0, cursorY); + var pos = focusItem.mapToItem(root.contentItem, 0, cursorY); //focused item alreqady visible? add some margin for the space of the action buttons if (pos.y >= root.flickableItem.contentY && pos.y <= root.flickableItem.contentY + root.flickableItem.height - Units.gridUnit * 8) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.40.0/src/controls/templates/private/ScrollView.qml new/kirigami2-5.41.0/src/controls/templates/private/ScrollView.qml --- old/kirigami2-5.40.0/src/controls/templates/private/ScrollView.qml 2017-11-05 09:33:30.000000000 +0100 +++ new/kirigami2-5.41.0/src/controls/templates/private/ScrollView.qml 2017-12-02 21:06:06.000000000 +0100 @@ -89,13 +89,8 @@ flickableItem.interactive = Settings.isMobile || root.alwaysInteractive; flickableItem.anchors.fill = flickableParent; flickableItem.ScrollBar.vertical = scrollComponent.createObject(root); - flickableItem.ScrollBar.vertical.anchors.right = root.right - flickableItem.ScrollBar.vertical.anchors.top = root.top - //flickableItem.ScrollBar.vertical.anchors.bottom = root.bottom } - //NOTE: use this instead of anchors as crashes on some Qt 5.8 checkouts - onHeightChanged: flickableItem.ScrollBar.vertical.height = root.height MultiPointTouchArea { id: flickableParent anchors { @@ -127,6 +122,14 @@ ScrollBar { z: flickableParent.z + 1 visible: root.contentItem.visible && size < 1 + + //NOTE: use this instead of anchors as crashes on some Qt 5.8 checkouts + height: parent.height - anchors.topMargin + anchors { + topMargin: parent.flickableItem.headerItem ? parent.flickableItem.headerItem.height : 0 + right: parent.right + top: parent.top + } } } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.40.0/src/libkirigami/platformtheme.cpp new/kirigami2-5.41.0/src/libkirigami/platformtheme.cpp --- old/kirigami2-5.40.0/src/libkirigami/platformtheme.cpp 2017-11-05 09:33:30.000000000 +0100 +++ new/kirigami2-5.41.0/src/libkirigami/platformtheme.cpp 2017-12-02 21:06:06.000000000 +0100 @@ -67,6 +67,7 @@ QFont font; QPalette palette; bool m_inherit = true; + bool m_init = true; }; PlatformThemePrivate::PlatformThemePrivate(PlatformTheme *q) @@ -129,6 +130,7 @@ d->findParentStyle(); }); } + d->m_init = false; //TODO: needs https://codereview.qt-project.org/#/c/206889/ for font changes } @@ -153,8 +155,10 @@ } } - emit colorSetChanged(colorSet); - d->setColorCompressTimer->start(); + if (!d->m_init) { + emit colorSetChanged(colorSet); + d->setColorCompressTimer->start(); + } } PlatformTheme::ColorSet PlatformTheme::colorSet() const diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami2-5.40.0/src/libkirigami/platformtheme.h new/kirigami2-5.41.0/src/libkirigami/platformtheme.h --- old/kirigami2-5.40.0/src/libkirigami/platformtheme.h 2017-11-05 09:33:30.000000000 +0100 +++ new/kirigami2-5.41.0/src/libkirigami/platformtheme.h 2017-12-02 21:06:06.000000000 +0100 @@ -148,6 +148,7 @@ Tooltip, /** Color set used by tooltips */ Complementary /** Color set meant to be complementary to Window: usually is a dark theme for light themes */ }; + Q_ENUM(ColorSet) explicit PlatformTheme(QObject *parent = 0); ~PlatformTheme();
