Merge lp:~nik90/unav/unav-convergence-part-2 into lp:unav

[costales]

- Adds keyboard shortcuts to the welcome wizard
- The sidebar can be closed by pressing "Escape"
- Search page can be opened by pressing "Ctrl+F"

As Nekhelesh said it is done and it's blocking another branches, I would like to propose it.

[costales (costales)]

As it's a big change, I would prefer to approve and refining in the end version.
What do you think? :)

review: Approve

[Nekhelesh Ramananthan (nik90)]

> As it's a big change, I would prefer to approve and refining in the end
> version.
> What do you think? :)

This is a small change. This MP adds very minor features and code which won't affect phone users and tablet users in any way unless they attach a keyboard. So current functionality won't be compromised or affected in any way.

I am not sure what you mean by end version. My plan was to slowly add keyboard shortcuts to improve convergence.

[costales (costales)]

Great :)

By end version, all together and ready for big QA from us :)

a hug!

--
Sent using Dekko from my Ubuntu device

=== modified file 'qml/Location.qml'
--- qml/Location.qml	2016-05-05 19:21:33 +0000
+++ qml/Location.qml	2016-05-31 20:05:36 +0000
@@ -298,7 +298,7 @@
                     height: units.gu(2.5)
                     width: height
                     visible: model.icon !== ""
-                    source: model.icon
+                    source: model.icon ? model.icon : ""
                     SlotsLayout.position: SlotsLayout.Last
                 }
             }

=== modified file 'qml/Main.qml'
--- qml/Main.qml	2016-05-20 17:26:15 +0000
+++ qml/Main.qml	2016-05-31 20:05:36 +0000
@@ -210,6 +210,7 @@
                             Action {
                                 id: searchAction
                                 iconName: "find"
+                                shortcut: "Ctrl+F"
                                 text: i18n.tr("Search")
                                 enabled: navigationPage.buttonsEnabled
                                 onTriggered: {

=== modified file 'qml/components/CloseHeaderAction.qml'
--- qml/components/CloseHeaderAction.qml	2016-04-28 16:07:19 +0000
+++ qml/components/CloseHeaderAction.qml	2016-05-31 20:05:36 +0000
@@ -20,6 +20,7 @@
     id: closeButton
     iconName: "close"
     visible: mainPageStack.columns !== 1
+    shortcut: "Escape"
     onTriggered: {
         mainPageStack.hideSideBar()
         mainPageStack.removePages(mainPageStack.primaryPage)

=== modified file 'qml/tuto/components/Walkthrough.qml'
--- qml/tuto/components/Walkthrough.qml	2016-04-14 15:32:41 +0000
+++ qml/tuto/components/Walkthrough.qml	2016-05-31 20:05:36 +0000
@@ -31,7 +31,7 @@
     property list<Component> model
 
     // Property to set the color of bottom cirle to indicate the user's progress
-    property color completeColor: "lightblue"
+    property color completeColor: "#398DFF"
 
     // Property to set the color of the bottom circle to indicate the slide still left to cover
     property color inCompleteColor: "lightgrey"
@@ -98,8 +98,11 @@
         }
 
         MouseArea {
+            hoverEnabled: true
             anchors.fill: parent
             onClicked: walkthrough.finished()
+            onEntered: skipLabel.color = completeColor
+            onExited: skipLabel.color = skipTextColor
         }
     }
 
@@ -131,10 +134,21 @@
                         duration: UbuntuAnimation.FastDuration
                     }
                 }
+
+                MouseArea {
+                    anchors.fill: parent
+                    onClicked: listView.currentIndex = index
+                }
             }
         }
     }
 
+    Keys.onRightPressed: {
+        if (listView.currentIndex !== listView.count-1) {
+            listView.currentIndex++
+        }
+    }
+
     ActionButton {
         id: rightchevron
 
@@ -152,6 +166,12 @@
         onClicked: listView.currentIndex++
     }
 
+    Keys.onLeftPressed: {
+        if (listView.currentIndex !== 0) {
+            listView.currentIndex--
+        }
+    }
+
     ActionButton {
         id: leftchevron