Hello community, here is the log from the commit of package kirigami for openSUSE:Factory checked in at 2016-09-27 13:45:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kirigami (Old) and /work/SRC/openSUSE:Factory/.kirigami.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kirigami" Changes: -------- --- /work/SRC/openSUSE:Factory/kirigami/kirigami.changes 2016-09-24 15:28:56.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kirigami.new/kirigami.changes 2016-09-27 13:45:26.000000000 +0200 @@ -1,0 +2,21 @@ +Mon Sep 26 13:29:50 UTC 2016 - lbeltr...@kde.org + +- New upstream release 1.1.0 +* Menu + knowing which is the parent of the currently displayed submenu. + allow the submenu view to be reset when the application needs it to. + control the behavior we want upon a leaf action press + Have submenus also trigger their action, in case it needs to do something +* OverlaySheet + possible to embed ListView and GridView instances in it as well +* Drawer + The drawer width now is standardized so all applications look coherent from one another + Elide title if it doesn't fit + Introduced GlobalDrawer.bannerClicked signal to let applications react to banner interaction +* SwipeListItem has been polished to make sure its contents can fit to the space they have +* The application window now has a default shortcut to close the application, depending on the system preferences. Commonly Ctrl+Q. +* Introduced the Separator component + +- A bunch of fixing and polishing- Use the source URL + +------------------------------------------------------------------- Old: ---- kirigami-1.0.2.tar.xz New: ---- kirigami-1.1.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kirigami.spec ++++++ --- /var/tmp/diff_new_pack.xXMrXX/_old 2016-09-27 13:45:28.000000000 +0200 +++ /var/tmp/diff_new_pack.xXMrXX/_new 2016-09-27 13:45:28.000000000 +0200 @@ -18,13 +18,13 @@ %bcond_without lang Name: kirigami -Version: 1.0.2 +Version: 1.1.0 Release: 0 Summary: Set of QtQuick components License: LGPL-2.1+ Group: Development/Libraries/KDE Url: http://www.kde.org/ -Source: %{name}-%{version}.tar.xz +Source: http://download.kde.org/stable/kirigami/%{name}-%{version}.tar.xz BuildRequires: extra-cmake-modules >= 0.0.8 BuildRequires: kf5-filesystem BuildRequires: cmake(KF5Declarative) ++++++ kirigami-1.0.2.tar.xz -> kirigami-1.1.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami-1.0.2/CMakeLists.txt new/kirigami-1.1.0/CMakeLists.txt --- old/kirigami-1.0.2/CMakeLists.txt 2016-08-22 19:31:47.000000000 +0200 +++ new/kirigami-1.1.0/CMakeLists.txt 2016-09-26 13:45:57.000000000 +0200 @@ -118,4 +118,3 @@ endif() feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES) - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami-1.0.2/examples/CMakeLists.txt new/kirigami-1.1.0/examples/CMakeLists.txt --- old/kirigami-1.0.2/examples/CMakeLists.txt 2016-08-22 16:42:44.000000000 +0200 +++ new/kirigami-1.1.0/examples/CMakeLists.txt 2016-09-26 11:25:19.000000000 +0200 @@ -1,5 +1,5 @@ add_subdirectory(android) -install(DIRECTORY gallery/ DESTINATION ${CMAKE_INSTALL_PREFIX}/${DATA_INSTALL_DIR}/kpackage/genericqml/org.kde.kirigami.gallery) +install(DIRECTORY gallery/ DESTINATION ${KDE_INSTALL_DATAROOTDIR}/kpackage/genericqml/org.kde.kirigami.gallery) install(FILES gallery/metadata.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} RENAME org.kde.kirigami.gallery.desktop) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami-1.0.2/examples/gallery/contents/ui/gallery/CheckBoxGallery.qml new/kirigami-1.1.0/examples/gallery/contents/ui/gallery/CheckBoxGallery.qml --- old/kirigami-1.0.2/examples/gallery/contents/ui/gallery/CheckBoxGallery.qml 2016-08-22 16:42:44.000000000 +0200 +++ new/kirigami-1.1.0/examples/gallery/contents/ui/gallery/CheckBoxGallery.qml 2016-09-26 11:25:19.000000000 +0200 @@ -62,7 +62,7 @@ Item { Layout.fillWidth: true - Layout.minimumHeight: units.gridUnit * 10 + Layout.minimumHeight: Units.gridUnit * 10 GridLayout { anchors.centerIn: parent columns: 3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami-1.0.2/examples/gallery/contents/ui/gallery/ListViewGallery.qml new/kirigami-1.1.0/examples/gallery/contents/ui/gallery/ListViewGallery.qml --- old/kirigami-1.0.2/examples/gallery/contents/ui/gallery/ListViewGallery.qml 2016-08-22 16:42:44.000000000 +0200 +++ new/kirigami-1.1.0/examples/gallery/contents/ui/gallery/ListViewGallery.qml 2016-09-26 11:25:19.000000000 +0200 @@ -27,6 +27,16 @@ Layout.fillWidth: true title: "Long List view" + actions { + main: Action { + iconName: sheet.opened ? "dialog-cancel" : "document-edit" + text: "Main Action Text" + checked: sheet.opened + checkable: true + onCheckedChanged: sheet.opened = checked; + } + } + supportsRefreshing: true onRefreshingChanged: { if (refreshing) { @@ -39,6 +49,16 @@ background: Rectangle { color: Theme.viewBackgroundColor } + OverlaySheet { + id: sheet + ListView { + model: 100 + implicitWidth: Units.gridUnit * 30 + delegate: BasicListItem { + label: "Item in sheet" + modelData + } + } + } ListView { Timer { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami-1.0.2/examples/gallery/contents/ui/gallery/ProgressBarGallery.qml new/kirigami-1.1.0/examples/gallery/contents/ui/gallery/ProgressBarGallery.qml --- old/kirigami-1.0.2/examples/gallery/contents/ui/gallery/ProgressBarGallery.qml 2016-08-22 16:42:44.000000000 +0200 +++ new/kirigami-1.1.0/examples/gallery/contents/ui/gallery/ProgressBarGallery.qml 2016-09-26 11:25:19.000000000 +0200 @@ -62,7 +62,7 @@ anchors.centerIn: parent rowSpacing: Units.largeSpacing columns: 2 - width: parent.width - units.gridUnit*2 + width: parent.width - Units.gridUnit*2 Label { text: "Determinate:" @@ -72,7 +72,7 @@ minimumValue: 0 maximumValue: 100 value: timer.value - Layout.maximumWidth: units.gridUnit * 10 + Layout.maximumWidth: Units.gridUnit * 10 } Label { text: "Indeterminate:" @@ -82,7 +82,7 @@ minimumValue: 0 maximumValue: 100 indeterminate: true - Layout.maximumWidth: units.gridUnit * 10 + Layout.maximumWidth: Units.gridUnit * 10 } Label { text: "Busy indicator:" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami-1.0.2/examples/gallery/contents/ui/gallery/RadioButtonGallery.qml new/kirigami-1.1.0/examples/gallery/contents/ui/gallery/RadioButtonGallery.qml --- old/kirigami-1.0.2/examples/gallery/contents/ui/gallery/RadioButtonGallery.qml 2016-08-22 16:42:44.000000000 +0200 +++ new/kirigami-1.1.0/examples/gallery/contents/ui/gallery/RadioButtonGallery.qml 2016-09-26 11:25:19.000000000 +0200 @@ -56,7 +56,7 @@ Item { Layout.fillWidth: true - Layout.minimumHeight: units.gridUnit * 10 + Layout.minimumHeight: Units.gridUnit * 10 GridLayout { anchors.centerIn: parent columns: 3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami-1.0.2/examples/gallery/contents/ui/gallery/SwitchGallery.qml new/kirigami-1.1.0/examples/gallery/contents/ui/gallery/SwitchGallery.qml --- old/kirigami-1.0.2/examples/gallery/contents/ui/gallery/SwitchGallery.qml 2016-08-22 16:42:44.000000000 +0200 +++ new/kirigami-1.1.0/examples/gallery/contents/ui/gallery/SwitchGallery.qml 2016-09-26 11:25:19.000000000 +0200 @@ -32,7 +32,7 @@ Item { Layout.fillWidth: true - Layout.minimumHeight: units.gridUnit * 10 + Layout.minimumHeight: Units.gridUnit * 10 GridLayout { anchors.centerIn: parent columns: 3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami-1.0.2/examples/gallery/metadata.desktop new/kirigami-1.1.0/examples/gallery/metadata.desktop --- old/kirigami-1.0.2/examples/gallery/metadata.desktop 2016-08-22 16:42:44.000000000 +0200 +++ new/kirigami-1.1.0/examples/gallery/metadata.desktop 2016-09-26 11:25:19.000000000 +0200 @@ -2,12 +2,16 @@ Name=Kirigami Gallery Name[ca]=Galeria del Kirigami Name[ca@valencia]=Galeria del Kirigami +Name[cs]=Galerie Kirigami +Name[de]=Kirigami-Galerie Name[en_GB]=Kirigami Gallery Name[es]=Galería Kirigami Name[nl]=Kirigami galerij Name[pl]=Galeria Kirigami Name[pt]=Galeria do Kirigami +Name[pt_BR]=Galeria do Kirigami Name[sk]=Galéria Kirigami +Name[sl]=Galerija Kirigami Name[sv]=Kirigami-galleri Name[uk]=Галерея Kirigami Name[x-test]=xxKirigami Galleryxx diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami-1.0.2/kirigami.qrc new/kirigami-1.1.0/kirigami.qrc --- old/kirigami-1.0.2/kirigami.qrc 2016-08-22 16:42:44.000000000 +0200 +++ new/kirigami-1.1.0/kirigami.qrc 2016-09-26 11:25:19.000000000 +0200 @@ -14,6 +14,7 @@ <file alias="private/ActionButton.qml">src/controls/private/ActionButton.qml</file> <file alias="private/DefaultListItemBackground.qml">src/controls/private/DefaultListItemBackground.qml</file> <file alias="private/EdgeShadow.qml">src/controls/private/EdgeShadow.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> <file alias="GlobalDrawer.qml">src/controls/GlobalDrawer.qml</file> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami-1.0.2/po/ca/libkirigamiplugin_qt.po new/kirigami-1.1.0/po/ca/libkirigamiplugin_qt.po --- old/kirigami-1.0.2/po/ca/libkirigamiplugin_qt.po 2016-08-22 19:13:03.000000000 +0200 +++ new/kirigami-1.1.0/po/ca/libkirigamiplugin_qt.po 2016-09-26 13:43:45.000000000 +0200 @@ -16,6 +16,7 @@ "Content-Transfer-Encoding: 8bit\n" "X-Qt-Contexts: true\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Accelerator-Marker: &\n" "X-Generator: Lokalize 2.0\n" #: controls/ContextDrawer.qml:76 @@ -23,7 +24,7 @@ msgid "Actions" msgstr "Accions" -#: controls/GlobalDrawer.qml:364 +#: controls/GlobalDrawer.qml:361 msgctxt "GlobalDrawer|" msgid "Back" msgstr "Enrere" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami-1.0.2/po/ca@valencia/libkirigamiplugin_qt.po new/kirigami-1.1.0/po/ca@valencia/libkirigamiplugin_qt.po --- old/kirigami-1.0.2/po/ca@valencia/libkirigamiplugin_qt.po 2016-08-22 19:13:05.000000000 +0200 +++ new/kirigami-1.1.0/po/ca@valencia/libkirigamiplugin_qt.po 2016-09-26 13:43:47.000000000 +0200 @@ -16,6 +16,7 @@ "Content-Transfer-Encoding: 8bit\n" "X-Qt-Contexts: true\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Accelerator-Marker: &\n" "X-Generator: Lokalize 2.0\n" #: controls/ContextDrawer.qml:76 @@ -23,7 +24,7 @@ msgid "Actions" msgstr "Accions" -#: controls/GlobalDrawer.qml:364 +#: controls/GlobalDrawer.qml:361 msgctxt "GlobalDrawer|" msgid "Back" msgstr "Arrere" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami-1.0.2/po/cs/libkirigamiplugin_qt.po new/kirigami-1.1.0/po/cs/libkirigamiplugin_qt.po --- old/kirigami-1.0.2/po/cs/libkirigamiplugin_qt.po 2016-08-22 19:13:07.000000000 +0200 +++ new/kirigami-1.1.0/po/cs/libkirigamiplugin_qt.po 2016-09-26 13:43:49.000000000 +0200 @@ -18,7 +18,7 @@ msgid "Actions" msgstr "Činnosti" -#: controls/GlobalDrawer.qml:364 +#: controls/GlobalDrawer.qml:361 msgctxt "GlobalDrawer|" msgid "Back" msgstr "Zpět" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami-1.0.2/po/de/libkirigamiplugin_qt.po new/kirigami-1.1.0/po/de/libkirigamiplugin_qt.po --- old/kirigami-1.0.2/po/de/libkirigamiplugin_qt.po 2016-08-22 19:13:12.000000000 +0200 +++ new/kirigami-1.1.0/po/de/libkirigamiplugin_qt.po 2016-09-26 13:43:53.000000000 +0200 @@ -18,7 +18,7 @@ msgid "Actions" msgstr "Aktionen" -#: controls/GlobalDrawer.qml:364 +#: controls/GlobalDrawer.qml:361 msgctxt "GlobalDrawer|" msgid "Back" msgstr "Zurück" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami-1.0.2/po/en_GB/libkirigamiplugin_qt.po new/kirigami-1.1.0/po/en_GB/libkirigamiplugin_qt.po --- old/kirigami-1.0.2/po/en_GB/libkirigamiplugin_qt.po 2016-08-22 19:13:14.000000000 +0200 +++ new/kirigami-1.1.0/po/en_GB/libkirigamiplugin_qt.po 2016-09-26 13:43:56.000000000 +0200 @@ -18,7 +18,7 @@ msgid "Actions" msgstr "Actions" -#: controls/GlobalDrawer.qml:364 +#: controls/GlobalDrawer.qml:361 msgctxt "GlobalDrawer|" msgid "Back" msgstr "Back" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami-1.0.2/po/es/libkirigamiplugin_qt.po new/kirigami-1.1.0/po/es/libkirigamiplugin_qt.po --- old/kirigami-1.0.2/po/es/libkirigamiplugin_qt.po 2016-08-22 19:13:17.000000000 +0200 +++ new/kirigami-1.1.0/po/es/libkirigamiplugin_qt.po 2016-09-26 13:43:58.000000000 +0200 @@ -18,7 +18,7 @@ msgid "Actions" msgstr "Acciones" -#: controls/GlobalDrawer.qml:364 +#: controls/GlobalDrawer.qml:361 msgctxt "GlobalDrawer|" msgid "Back" msgstr "Atrás" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami-1.0.2/po/nl/libkirigamiplugin_qt.po new/kirigami-1.1.0/po/nl/libkirigamiplugin_qt.po --- old/kirigami-1.0.2/po/nl/libkirigamiplugin_qt.po 2016-08-22 19:14:06.000000000 +0200 +++ new/kirigami-1.1.0/po/nl/libkirigamiplugin_qt.po 2016-09-26 13:44:45.000000000 +0200 @@ -18,7 +18,7 @@ msgid "Actions" msgstr "Acties" -#: controls/GlobalDrawer.qml:364 +#: controls/GlobalDrawer.qml:361 msgctxt "GlobalDrawer|" msgid "Back" msgstr "Terug" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami-1.0.2/po/pl/libkirigamiplugin_qt.po new/kirigami-1.1.0/po/pl/libkirigamiplugin_qt.po --- old/kirigami-1.0.2/po/pl/libkirigamiplugin_qt.po 2016-08-22 19:14:13.000000000 +0200 +++ new/kirigami-1.1.0/po/pl/libkirigamiplugin_qt.po 2016-09-26 13:44:51.000000000 +0200 @@ -19,7 +19,7 @@ msgid "Actions" msgstr "Działania" -#: controls/GlobalDrawer.qml:364 +#: controls/GlobalDrawer.qml:361 msgctxt "GlobalDrawer|" msgid "Back" msgstr "Wstecz" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami-1.0.2/po/pt/libkirigamiplugin_qt.po new/kirigami-1.1.0/po/pt/libkirigamiplugin_qt.po --- old/kirigami-1.0.2/po/pt/libkirigamiplugin_qt.po 2016-08-22 19:14:16.000000000 +0200 +++ new/kirigami-1.1.0/po/pt/libkirigamiplugin_qt.po 2016-09-26 13:44:54.000000000 +0200 @@ -16,7 +16,7 @@ msgid "Actions" msgstr "Acções" -#: controls/GlobalDrawer.qml:364 +#: controls/GlobalDrawer.qml:361 msgctxt "GlobalDrawer|" msgid "Back" msgstr "Recuar" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami-1.0.2/po/pt_BR/libkirigamiplugin_qt.po new/kirigami-1.1.0/po/pt_BR/libkirigamiplugin_qt.po --- old/kirigami-1.0.2/po/pt_BR/libkirigamiplugin_qt.po 1970-01-01 01:00:00.000000000 +0100 +++ new/kirigami-1.1.0/po/pt_BR/libkirigamiplugin_qt.po 2016-09-26 13:44:55.000000000 +0200 @@ -0,0 +1,24 @@ +# Luiz Fernando Ranghetti <elchev...@opensuse.org>, 2016. +msgid "" +msgstr "" +"Project-Id-Version: \n" +"PO-Revision-Date: 2016-08-31 19:28-0300\n" +"Last-Translator: Luiz Fernando Ranghetti <elchev...@opensuse.org>\n" +"Language-Team: Portuguese <kde-i18n-pt...@kde.org>\n" +"Language: pt_BR\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Qt-Contexts: true\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" +"X-Generator: Lokalize 2.0\n" + +#: controls/ContextDrawer.qml:76 +msgctxt "ContextDrawer|" +msgid "Actions" +msgstr "Ações" + +#: controls/GlobalDrawer.qml:361 +msgctxt "GlobalDrawer|" +msgid "Back" +msgstr "Voltar" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami-1.0.2/po/sk/libkirigamiplugin_qt.po new/kirigami-1.1.0/po/sk/libkirigamiplugin_qt.po --- old/kirigami-1.0.2/po/sk/libkirigamiplugin_qt.po 2016-08-22 19:14:26.000000000 +0200 +++ new/kirigami-1.1.0/po/sk/libkirigamiplugin_qt.po 2016-09-26 13:45:01.000000000 +0200 @@ -21,7 +21,7 @@ msgid "Actions" msgstr "Akcie" -#: controls/GlobalDrawer.qml:364 +#: controls/GlobalDrawer.qml:361 msgctxt "GlobalDrawer|" msgid "Back" msgstr "Späť" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami-1.0.2/po/sl/libkirigamiplugin_qt.po new/kirigami-1.1.0/po/sl/libkirigamiplugin_qt.po --- old/kirigami-1.0.2/po/sl/libkirigamiplugin_qt.po 2016-08-22 19:14:27.000000000 +0200 +++ new/kirigami-1.1.0/po/sl/libkirigamiplugin_qt.po 2016-09-26 13:45:03.000000000 +0200 @@ -19,7 +19,7 @@ msgid "Actions" msgstr "Dejanja" -#: controls/GlobalDrawer.qml:364 +#: controls/GlobalDrawer.qml:361 msgctxt "GlobalDrawer|" msgid "Back" msgstr "Nazaj" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami-1.0.2/po/sv/libkirigamiplugin_qt.po new/kirigami-1.1.0/po/sv/libkirigamiplugin_qt.po --- old/kirigami-1.0.2/po/sv/libkirigamiplugin_qt.po 2016-08-22 19:14:34.000000000 +0200 +++ new/kirigami-1.1.0/po/sv/libkirigamiplugin_qt.po 2016-09-26 13:45:09.000000000 +0200 @@ -18,7 +18,7 @@ msgid "Actions" msgstr "Åtgärder" -#: controls/GlobalDrawer.qml:364 +#: controls/GlobalDrawer.qml:361 msgctxt "GlobalDrawer|" msgid "Back" msgstr "Tillbaka" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami-1.0.2/po/uk/libkirigamiplugin_qt.po new/kirigami-1.1.0/po/uk/libkirigamiplugin_qt.po --- old/kirigami-1.0.2/po/uk/libkirigamiplugin_qt.po 2016-08-22 19:14:44.000000000 +0200 +++ new/kirigami-1.1.0/po/uk/libkirigamiplugin_qt.po 2016-09-26 13:45:18.000000000 +0200 @@ -24,7 +24,7 @@ msgid "Actions" msgstr "Дії" -#: controls/GlobalDrawer.qml:364 +#: controls/GlobalDrawer.qml:361 msgctxt "GlobalDrawer|" msgid "Back" msgstr "Назад" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami-1.0.2/po/zh_TW/libkirigamiplugin_qt.po new/kirigami-1.1.0/po/zh_TW/libkirigamiplugin_qt.po --- old/kirigami-1.0.2/po/zh_TW/libkirigamiplugin_qt.po 1970-01-01 01:00:00.000000000 +0100 +++ new/kirigami-1.1.0/po/zh_TW/libkirigamiplugin_qt.po 2016-09-26 13:45:27.000000000 +0200 @@ -0,0 +1,25 @@ +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-09-22 20:30+0800\n" +"Last-Translator: Jeff Huang <s8321...@gmail.com>\n" +"Language-Team: Traditional Chinese <zh-l...@linux.org.tw>\n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: Translate Toolkit 1.10.0\n" +"X-Qt-Contexts: true\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: controls/ContextDrawer.qml:76 +msgctxt "ContextDrawer|" +msgid "Actions" +msgstr "" + +#: controls/GlobalDrawer.qml:361 +msgctxt "GlobalDrawer|" +msgid "Back" +msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami-1.0.2/src/controls/AbstractApplicationWindow.qml new/kirigami-1.1.0/src/controls/AbstractApplicationWindow.qml --- old/kirigami-1.0.2/src/controls/AbstractApplicationWindow.qml 2016-08-22 16:42:44.000000000 +0200 +++ new/kirigami-1.1.0/src/controls/AbstractApplicationWindow.qml 2016-09-26 11:25:19.000000000 +0200 @@ -288,4 +288,9 @@ id: internal property Item __passiveNotification } + + Shortcut { + sequence: StandardKey.Quit + onActivated: root.close() + } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami-1.0.2/src/controls/GlobalDrawer.qml new/kirigami-1.1.0/src/controls/GlobalDrawer.qml --- old/kirigami-1.0.2/src/controls/GlobalDrawer.qml 2016-08-22 16:42:44.000000000 +0200 +++ new/kirigami-1.1.0/src/controls/GlobalDrawer.qml 2016-09-26 11:25:19.000000000 +0200 @@ -175,10 +175,40 @@ */ property alias topContent: topContent.data + /** + * resetMenuOnTriggered: bool + * + * On the actions menu, whenever a leaf action is triggered, the menu + * will reset to its parent. + */ + property bool resetMenuOnTriggered: true + + /** + * currentSubMenu: Action + * + * Points to the action acting as a submenu + */ + readonly property Action currentSubMenu: stackView.currentItem ? stackView.currentItem.current: null + + /** + * Notifies that the banner has been clicked + */ + signal bannerClicked() + + /** + * Reverts the menu back to its initial state + */ + function resetMenu() { + stackView.pop(stackView.initialItem); + if (root.modal) { + root.opened = false; + } + } + contentItem: Controls.ScrollView { id: scrollView anchors.fill: parent - implicitWidth: Math.min (Math.max(Units.gridUnit * 12, title.width), root.parent.width * 0.8) + implicitWidth: Math.min (Units.gridUnit * 20, root.parent.width * 0.8) horizontalScrollBarPolicy: Qt.ScrollBarAlwaysOff Flickable { id: mainFlickable @@ -192,12 +222,18 @@ Image { id: bannerImage + Layout.fillWidth: true Layout.preferredWidth: title.implicitWidth Layout.preferredHeight: bannerImageSource != "" ? Math.max(title.implicitHeight, Math.floor(width / (sourceSize.width/sourceSize.height))) : title.implicitHeight Layout.minimumHeight: Math.max(headingIcon.height, heading.height) + Units.smallSpacing * 2 + MouseArea { + anchors.fill: parent + onClicked: root.bannerClicked() + } + fillMode: Image.PreserveAspectCrop asynchronous: true @@ -252,12 +288,11 @@ } Heading { id: heading + Layout.fillWidth: true + Layout.rightMargin: heading.height level: 1 color: bannerImageSource != "" ? "white" : Theme.textColor - } - Item { - height: 1 - Layout.minimumWidth: heading.height + elide: Text.ElideRight } } } @@ -311,14 +346,23 @@ Component { id: menuComponent ColumnLayout { - id: optionMenu spacing: 0 property alias model: actionsRepeater.model + property Action current property int level: 0 Layout.maximumHeight: Layout.minimumHeight + BasicListItem { + visible: level > 0 + supportsMouseEvents: true + icon: "go-previous" + label: qsTr("Back") + separatorVisible: false + onClicked: stackView.pop() + } + Repeater { id: actionsRepeater model: actions @@ -345,26 +389,16 @@ } onClicked: { + modelData.trigger(); + if (modelData.children!==undefined && modelData.children.length > 0) { - stackView.push(menuComponent, {"model": modelData.children, "level": level + 1}); - } else { - modelData.trigger(); - stackView.pop(stackView.initialItem); - if (root.modal) { - root.opened = false; - } + stackView.push(menuComponent, {model: modelData.children, level: level + 1, current: modelData }); + } else if (root.resetMenuOnTriggered) { + root.resetMenu(); } } } } - BasicListItem { - visible: level > 0 - supportsMouseEvents: true - icon: "go-previous" - label: qsTr("Back") - separatorVisible: false - onClicked: stackView.pop() - } } } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami-1.0.2/src/controls/Separator.qml new/kirigami-1.1.0/src/controls/Separator.qml --- old/kirigami-1.0.2/src/controls/Separator.qml 1970-01-01 01:00:00.000000000 +0100 +++ new/kirigami-1.1.0/src/controls/Separator.qml 2016-09-26 11:25:19.000000000 +0200 @@ -0,0 +1,37 @@ +/* + * Copyright 2012 Marco Martin <m...@kde.org> + * Copyright 2016 Aleix Pol Gonzalez <aleix...@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 QtQuick 2.1 +import org.kde.kirigami 1.0 + +/** + * A visual separator + * + * Useful for splitting one set of items from another. + * + * @inherit QtQuick.Rectangle + */ + +Rectangle { + opacity: 0.2 + height: Units.devicePixelRatio + width: Units.devicePixelRatio + color: Theme.textColor +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami-1.0.2/src/controls/private/DefaultListItemBackground.qml new/kirigami-1.1.0/src/controls/private/DefaultListItemBackground.qml --- old/kirigami-1.0.2/src/controls/private/DefaultListItemBackground.qml 2016-08-22 16:42:44.000000000 +0200 +++ new/kirigami-1.1.0/src/controls/private/DefaultListItemBackground.qml 2016-09-26 11:25:19.000000000 +0200 @@ -37,17 +37,14 @@ ColorAnimation { duration: Units.longDuration } } - Rectangle { - id: separator - color: listItem.textColor - opacity: 0.2 - visible: listItem.separatorVisible + Separator { anchors { left: parent.left right: parent.right bottom: parent.bottom } - height: Math.ceil(Units.smallSpacing / 5); + visible: listItem.separatorVisible + color: listItem.textColor } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami-1.0.2/src/controls/templates/AbstractListItem.qml new/kirigami-1.1.0/src/controls/templates/AbstractListItem.qml --- old/kirigami-1.0.2/src/controls/templates/AbstractListItem.qml 2016-08-22 16:42:44.000000000 +0200 +++ new/kirigami-1.1.0/src/controls/templates/AbstractListItem.qml 2016-09-26 11:25:19.000000000 +0200 @@ -30,7 +30,7 @@ * * @inherit QtQuick.Item */ -Rectangle { +Item { id: listItem /** @@ -166,10 +166,7 @@ } Component.onCompleted: { - if (background) { - background.parent = itemMouse; - background.anchors.fill = itemMouse; - } + itemMouse.integrateBackground() } MouseArea { @@ -189,10 +186,17 @@ margins: Units.smallSpacing } } + + function integrateBackground() { + if (background) { + background.parent = itemMouse; + background.anchors.fill = itemMouse; + } + } } onBackgroundChanged: { - background.parent = itemMouse + itemMouse.integrateBackground() } Accessible.role: Accessible.ListItem diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami-1.0.2/src/controls/templates/OverlaySheet.qml new/kirigami-1.1.0/src/controls/templates/OverlaySheet.qml --- old/kirigami-1.0.2/src/controls/templates/OverlaySheet.qml 2016-08-22 16:42:44.000000000 +0200 +++ new/kirigami-1.1.0/src/controls/templates/OverlaySheet.qml 2016-09-26 11:25:19.000000000 +0200 @@ -100,10 +100,10 @@ } function close() { - if (mainFlickable.contentY < 0) { + if (scrollView.flickableItem.contentY < 0) { closeAnimation.to = -height; } else { - closeAnimation.to = flickableContents.height; + closeAnimation.to = scrollView.flickableItem.contentHeight; } closeAnimation.running = true; } @@ -112,22 +112,30 @@ anchors.fill: parent color: Theme.textColor opacity: 0.6 * Math.min( - (Math.min(mainFlickable.contentY + mainFlickable.height, mainFlickable.height) / mainFlickable.height), - (2 + (mainFlickable.contentHeight - mainFlickable.contentY - mainFlickable.topMargin - mainFlickable.bottomMargin)/mainFlickable.height)) + (Math.min(scrollView.flickableItem.contentY + scrollView.flickableItem.height, scrollView.flickableItem.height) / scrollView.flickableItem.height), + (2 + (scrollView.flickableItem.contentHeight - scrollView.flickableItem.contentY - scrollView.flickableItem.topMargin - scrollView.flickableItem.bottomMargin)/scrollView.flickableItem.height)) } Component.onCompleted: { - mainFlickable.interactive = true; + scrollView.flickableItem.interactive = true; } onBackgroundChanged: { background.parent = flickableContents; background.z = -1; } onContentItemChanged: { - contentItem.parent = contentItemParent; - contentItem.anchors.left = contentItemParent.left; - contentItem.anchors.right = contentItemParent.right; + if (contentItem.hasOwnProperty("contentY") && // Check if flickable + contentItem.hasOwnProperty("contentHeight")) { + contentItem.parent = scrollView; + scrollView.contentItem = contentItem; + } else { + contentItem.parent = contentItemParent; + scrollView.contentItem = flickableContents; + contentItem.anchors.left = contentItemParent.left; + contentItem.anchors.right = contentItemParent.right; + } + scrollView.flickableItem.flickableDirection = Flickable.VerticalFlick; } onOpenedChanged: { if (opened) { @@ -137,6 +145,14 @@ Qt.inputMethod.hide(); } } + onWidthChanged: { + if (!contentItem.contentItem) + return + + var width = Math.max(root.width/2, Math.min(root.width, root.contentItem.implicitWidth)); + contentItem.contentItem.x = (root.width - width)/2 + contentItem.contentItem.width = width; + } onHeightChanged: { var focusItem; @@ -174,37 +190,47 @@ var pos = focusItem.mapToItem(flickableContents, 0, cursorY - Units.gridUnit*3); //focused item alreqady visible? add some margin for the space of the action buttons - if (pos.y >= mainFlickable.contentY && pos.y <= mainFlickable.contentY + mainFlickable.height - Units.gridUnit * 8) { + if (pos.y >= scrollView.flickableItem.contentY && pos.y <= scrollView.flickableItem.contentY + scrollView.flickableItem.height - Units.gridUnit * 8) { return; } - mainFlickable.contentY = pos.y; + scrollView.flickableItem.contentY = pos.y; } NumberAnimation { id: openAnimation - property int topOpenPosition: Math.min(-root.height*0.15, flickableContents.height - root.height + Units.gridUnit * 5) - property int bottomOpenPosition: (flickableContents.height - root.height) + (Units.gridUnit * 5) - target: mainFlickable + property int topOpenPosition: Math.min(-root.height*0.15, scrollView.flickableItem.contentHeight - root.height + Units.gridUnit * 5) + property int bottomOpenPosition: (scrollView.flickableItem.contentHeight - root.height) + (Units.gridUnit * 5) + target: scrollView.flickableItem properties: "contentY" from: -root.height to: topOpenPosition duration: Units.longDuration easing.type: Easing.OutQuad + onRunningChanged: { + if (!running) { + var width = Math.max(root.width/2, Math.min(root.width, root.contentItem.implicitWidth)); + contentItem.contentItem.x = (root.width - width)/2 + contentItem.contentItem.width = width; + } + } } SequentialAnimation { id: closeAnimation property int to: -root.height NumberAnimation { - target: mainFlickable + target: scrollView.flickableItem properties: "contentY" to: closeAnimation.to duration: Units.longDuration easing.type: Easing.InQuad } ScriptAction { - script: root.visible = root.opened = false; + script: { + scrollView.flickableItem.contentY = -root.height; + root.visible = root.opened = false; + } } } @@ -212,6 +238,7 @@ anchors.fill: parent z: 2 drag.filterChildren: true + hoverEnabled: true onClicked: { var pos = mapToItem(flickableContents, mouse.x, mouse.y); @@ -220,59 +247,73 @@ } } - Controls.ScrollView { - id: scrollView - anchors.fill: parent - Flickable { - id: mainFlickable - topMargin: height - contentWidth: width - contentHeight: flickableContents.height; - flickableDirection: Flickable.VerticalFlick - Item { - width: mainFlickable.width - height: flickableContents.height - Item { - id: flickableContents - anchors.horizontalCenter: parent.horizontalCenter - width: root.contentItem.implicitWidth <= 0 ? root.width : Math.max(root.width/2, Math.min(root.width, root.contentItem.implicitWidth)) - height: contentItem.height + topPadding + bottomPadding + Units.iconSizes.medium + Units.gridUnit - Item { - id: contentItemParent - anchors { - fill: parent - leftMargin: leftPadding - topMargin: topPadding - rightMargin: rightPadding - bottomMargin: bottomPadding - } - } - } + Item { + id: flickableContents + //anchors.horizontalCenter: parent.horizontalCenter + x: (root.width - width) / 2 + y: scrollView.flickableItem && root.contentItem.hasOwnProperty("contentY") ? -scrollView.flickableItem.contentY : 0 + width: root.contentItem.implicitWidth <= 0 ? root.width : Math.max(root.width/2, Math.min(root.width, root.contentItem.implicitWidth)) + height: scrollView.flickableItem && root.contentItem.hasOwnProperty("contentY") ? scrollView.flickableItem.contentHeight : (root.contentItem.height + topPadding + bottomPadding + Units.iconSizes.medium + Units.gridUnit) + Item { + id: contentItemParent + anchors { + fill: parent + leftMargin: leftPadding + topMargin: topPadding + rightMargin: rightPadding + bottomMargin: bottomPadding } - bottomMargin: height - onMovementEnded: { - //close - if ((root.height + mainFlickable.contentY) < root.height/2) { - closeAnimation.to = -root.height; - closeAnimation.running = true; - } else if ((root.height*0.6 + mainFlickable.contentY) > flickableContents.height) { - closeAnimation.to = flickableContents.height - closeAnimation.running = true; - - //reset to the default opened position - } else if (mainFlickable.contentY < openAnimation.topOpenPosition) { - openAnimation.from = mainFlickable.contentY; - openAnimation.to = openAnimation.topOpenPosition; - openAnimation.running = true; - //reset to the default "bottom" opened position - } else if (mainFlickable.contentY > openAnimation.bottomOpenPosition) { - openAnimation.from = mainFlickable.contentY; - openAnimation.to = openAnimation.bottomOpenPosition; - openAnimation.running = true; - } + } + } + Binding { + when: scrollView.flickableItem != null + target: scrollView.flickableItem + property: "topMargin" + value: scrollView.height + } + Binding { + when: scrollView.flickableItem != null + target: scrollView.flickableItem + property: "bottomMargin" + value: scrollView.height + } + + Connections { + target: scrollView.flickableItem + function movementEnded() { + //close + if ((root.height + scrollView.flickableItem.contentY) < root.height/2) { + closeAnimation.to = -root.height; + closeAnimation.running = true; + } else if ((root.height*0.6 + scrollView.flickableItem.contentY) > scrollView.flickableItem.contentHeight) { + closeAnimation.to = scrollView.flickableItem.contentHeight + closeAnimation.running = true; + + //reset to the default opened position + } else if (scrollView.flickableItem.contentY < openAnimation.topOpenPosition) { + openAnimation.from = scrollView.flickableItem.contentY; + openAnimation.to = openAnimation.topOpenPosition; + openAnimation.running = true; + //reset to the default "bottom" opened position + } else if (scrollView.flickableItem.contentY > openAnimation.bottomOpenPosition) { + openAnimation.from = scrollView.flickableItem.contentY; + openAnimation.to = openAnimation.bottomOpenPosition; + openAnimation.running = true; + } + } + onMovementEnded: movementEnded(); + onFlickEnded: movementEnded(); + onContentHeightChanged: { + if (openAnimation.running) { + openAnimation.running = false; + open(); } - onFlickEnded: movementEnded(); } } + Controls.ScrollView { + id: scrollView + anchors.fill: parent + horizontalScrollBarPolicy: Qt.ScrollBarAlwaysOff + } } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami-1.0.2/src/controls/templates/SwipeListItem.qml new/kirigami-1.1.0/src/controls/templates/SwipeListItem.qml --- old/kirigami-1.0.2/src/controls/templates/SwipeListItem.qml 2016-08-22 16:42:44.000000000 +0200 +++ new/kirigami-1.1.0/src/controls/templates/SwipeListItem.qml 2016-09-26 11:25:19.000000000 +0200 @@ -225,25 +225,21 @@ //BEGIN signal handlers onBackgroundChanged: { - background.parent = itemMouse; - background.anchors.fill = itemMouse; - background.z = 0; + if (background) { + background.parent = itemMouse; + background.anchors.fill = itemMouse; + background.z = -1; + } } onContentItemChanged: { contentItem.parent = paddingItem - contentItem.z = 0; + contentItem.z = 1; } Component.onCompleted: { - - if (background) { - background.parent = itemMouse; - background.z = 0; - } - - contentItem.parent = itemMouse - contentItem.z = 1; + backgroundChanged(); + contentItemChanged(); } onPositionChanged: { @@ -344,7 +340,7 @@ Item { id: mainItem - width: (mainFlickable.width * 2) - height + width: (mainFlickable.width * 2) - handleMouse.width height: mainFlickable.height MouseArea { id: itemMouse @@ -363,6 +359,7 @@ anchors { fill: parent margins: Units.smallSpacing + rightMargin: handleIcon.width + Units.smallSpacing } } } @@ -371,12 +368,12 @@ id: handleMouse anchors { left: itemMouse.right + right: itemMouse.right top: parent.top bottom: parent.bottom leftMargin: -height } preventStealing: true - width: mainFlickable.width - actionsLayout.width - actionsLayout.anchors.rightMargin property var downTimestamp; property int startX property int startMouseX @@ -407,11 +404,10 @@ } Icon { id: handleIcon - anchors.verticalCenter: parent.verticalCenter + anchors.centerIn: parent selected: listItem.checked || (listItem.pressed && !listItem.checked && !listItem.sectionDelegate) width: Units.iconSizes.smallMedium height: width - x: y source: (mainFlickable.contentX > mainFlickable.width / 2) ? "handle-right" : "handle-left" } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami-1.0.2/src/controls/templates/private/PageRow.qml new/kirigami-1.1.0/src/controls/templates/private/PageRow.qml --- old/kirigami-1.0.2/src/controls/templates/private/PageRow.qml 2016-08-22 16:42:44.000000000 +0200 +++ new/kirigami-1.1.0/src/controls/templates/private/PageRow.qml 2016-09-26 11:25:19.000000000 +0200 @@ -205,7 +205,7 @@ readonly property int count: mainLayout.children.length property var componentCache - property int roundedDefaultColumnWidth: Math.floor(root.width/root.defaultColumnWidth) > 0 ? root.width/Math.floor(root.width/root.defaultColumnWidth) : root.width + property int roundedDefaultColumnWidth: root.width < root.defaultColumnWidth*2 ? root.width : root.defaultColumnWidth //NOTE:seems to only work if the array is defined in a declarative way, //the Object in an imperative way, espacially on Android diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami-1.0.2/src/kirigamiplugin.cpp new/kirigami-1.1.0/src/kirigamiplugin.cpp --- old/kirigami-1.0.2/src/kirigamiplugin.cpp 2016-08-22 16:42:44.000000000 +0200 +++ new/kirigami-1.1.0/src/kirigamiplugin.cpp 2016-09-26 11:25:19.000000000 +0200 @@ -29,11 +29,8 @@ QString KirigamiPlugin::componentPath(const QString &fileName) const { - QString candidate; - QString candidatePath; - foreach (const QString &style, m_stylesFallbackChain) { - candidate = QStringLiteral("styles/") + style + QLatin1Char('/') + fileName; + const QString candidate = QStringLiteral("styles/") + style + QLatin1Char('/') + fileName; if (QFile::exists(resolveFilePath(candidate))) { return resolveFileUrl(candidate); } @@ -79,10 +76,11 @@ qmlRegisterType(componentPath(QStringLiteral("ContextDrawer.qml")), uri, 1, 0, "ContextDrawer"); qmlRegisterType(componentPath(QStringLiteral("GlobalDrawer.qml")), uri, 1, 0, "GlobalDrawer"); qmlRegisterType(componentPath(QStringLiteral("Heading.qml")), uri, 1, 0, "Heading"); + qmlRegisterType(componentPath(QStringLiteral("Separator.qml")), uri, 1, 0, "Separator"); //The icon is "special: we have to use a wrapper class to QIcon on desktops #if !defined(Q_OS_ANDROID) && !defined(Q_OS_IOS) - if (m_stylesFallbackChain.first() == QStringLiteral("Desktop")) { + if (!m_stylesFallbackChain.isEmpty() && m_stylesFallbackChain.first() == QStringLiteral("Desktop")) { qmlRegisterType<DesktopIcon>(uri, 1, 0, "Icon"); } else { qmlRegisterType(componentPath(QStringLiteral("Icon.qml")), uri, 1, 0, "Icon"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami-1.0.2/src/kirigamiplugin.h new/kirigami-1.1.0/src/kirigamiplugin.h --- old/kirigami-1.0.2/src/kirigamiplugin.h 2016-08-22 16:42:44.000000000 +0200 +++ new/kirigami-1.1.0/src/kirigamiplugin.h 2016-09-26 11:25:19.000000000 +0200 @@ -82,16 +82,11 @@ QString componentPath(const QString &fileName) const; QString resolveFilePath(const QString &path) const { - #ifdef Q_OS_WIN - // On Windows, the leading slash does not make sense, so let's snip that off - return baseUrl().path().mid(1) + QLatin1Char('/') + path; - #else - return baseUrl().path() + QLatin1Char('/') + path; - #endif + return baseUrl().toLocalFile() + QLatin1Char('/') + path; } QString resolveFileUrl(const QString &filePath) const { - return QStringLiteral("file://") + baseUrl().path() + QLatin1Char('/') + filePath; + return baseUrl().toString() + QLatin1Char('/') + filePath; } QStringList m_stylesFallbackChain; }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kirigami-1.0.2/src/styles/Desktop/SwipeListItem.qml new/kirigami-1.1.0/src/styles/Desktop/SwipeListItem.qml --- old/kirigami-1.0.2/src/styles/Desktop/SwipeListItem.qml 2016-08-22 16:42:44.000000000 +0200 +++ new/kirigami-1.1.0/src/styles/Desktop/SwipeListItem.qml 2016-09-26 11:25:19.000000000 +0200 @@ -23,7 +23,7 @@ import "../../templates" as T T.SwipeListItem { - id: root + id: listItem background: DefaultListItemBackground {} implicitHeight: contentItem.height + Units.smallSpacing*4
