[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [koko] qmlUiKirigami: don't break currentIndex
From:       Marco Martin <null () kde ! org>
Date:       2017-06-30 13:45:40
Message-ID: E1dQwEu-00026v-3L () code ! kde ! org
[Download RAW message or body]

Git commit 01ea8b61427c50e7866fd636af79c171b96c22fa by Marco Martin.
Committed on 30/06/2017 at 13:45.
Pushed by mart into branch 'master'.

don't break currentIndex

M  +1    -1    qmlUiKirigami/ImageViewer.qml
M  +4    -1    qmlUiKirigami/Sidebar.qml

https://commits.kde.org/koko/01ea8b61427c50e7866fd636af79c171b96c22fa

diff --git a/qmlUiKirigami/ImageViewer.qml b/qmlUiKirigami/ImageViewer.qml
index 2404a16..d373b8a 100644
--- a/qmlUiKirigami/ImageViewer.qml
+++ b/qmlUiKirigami/ImageViewer.qml
@@ -104,7 +104,7 @@ Rectangle {
         anchors.fill: parent
         orientation: Qt.Horizontal
         snapMode: ListView.SnapOneItem
-        onMovementEnded: currentIndex = indexAt(contentX+1, 1);
+        onMovementEnded: currentImage.index = indexAt(contentX+1, 1);
 
         delegate: Flickable {
             id: flick
diff --git a/qmlUiKirigami/Sidebar.qml b/qmlUiKirigami/Sidebar.qml
index e7a12b3..796a85f 100644
--- a/qmlUiKirigami/Sidebar.qml
+++ b/qmlUiKirigami/Sidebar.qml
@@ -34,6 +34,7 @@ Kirigami.GlobalDrawer {
     actions: [
         Kirigami.Action {
             text: qsTr("Locations")
+            iconName: "tag-places"
             enabled: false
         },
         Kirigami.Action {
@@ -66,6 +67,7 @@ Kirigami.GlobalDrawer {
         Kirigami.Action {
             text: qsTr("Time")
             enabled: false
+            iconName: "view-calendar"
         },
         Kirigami.Action {
             id: yearAction
@@ -106,6 +108,7 @@ Kirigami.GlobalDrawer {
         Kirigami.Action {
             text: qsTr("Path")
             enabled: false
+            iconName: "folder-symbolic"
         },
         Kirigami.Action {
             id: folderAction
@@ -118,7 +121,7 @@ Kirigami.GlobalDrawer {
         }
     ]      
     
-    Controls.Button {
+    Controls.ToolButton {
         id: settingsButton
         text: qsTr("Settings")
         checkable: true
[prev in list] [next in list] [prev in thread] [next in thread]