Merge lp:~tiagosh/unity-2d/bugfix-891565 into lp:unity-2d

[Tiago Salem Herrmann]

Implement lenses switching in dash by pressing CTRL+TAB, CTRL+SHIFT+TAB, CTRL+PGUP and CTRL+PGDOWN

[Michał Sawicz (saviq)]

Typos on lines 31 and 54 of the diff.

Also, please link to a bug from design, or assign one to ayatana-design, to get feedback on whether the navigation should wrap or not. In other instances, they explicitly said to disable wrapping, not sure it should be different here.

[Gerry Boland (gerboland)]

Until we get automated testing going, I need to ask you to write unit tests to test this fix, and place them in https://wiki.ubuntu.com/Unity2DRegressionTests

Please note that some may already be in https://wiki.ubuntu.com/UnityTests so you don't need to repeat them.

[Lohith D Shivamurthy (dyams)]

Hey, Bug description says that TAB key should be supported. Would you add TAB key suport too? Please.

review: Needs Fixing

[Gerry Boland (gerboland)]

Hey Tiago,
I was keeping this MR aside as I found the code pretty huge for such a featurette. Now with the Home lens soon being an actual lens, it may simplify this a lit. So let's sit on this a little longer?
Thanks
-Gerry

[Tiago Salem Herrmann (tiagosh)]

Yes, I believe it is better to wait for the home lens to be integrated. It will make things easier.
Besides that, this MR doesn't implement everything that was requested in that bug report.

[Albert Astals Cid (aacid)]

Doesn't apply cleanly to lp:unity-2d anymore

review: Needs Fixing

[jenkins (martin-mrazik+qa)]

FAILED: Continuous integration, rev:792
http://s-jenkins:8080/job/unity-2d-ci/10/

review: Disapprove (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:792
http://s-jenkins:8080/job/unity-2d-ci/25/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/unity-2d-ci/./distribution=precise,flavor=amd64/25/console
    FAILURE: http://s-jenkins:8080/job/unity-2d-ci/./distribution=precise,flavor=i386/25/console

review: Needs Fixing (continuous-integration)

[Albert Astals Cid (aacid)]

Cleaning up my review request queue[1], i guess noone cares if i reject this, right?

[1] https://code.launchpad.net/~aacid/+activereviews

review: Disapprove

Unmerged revisions

792. By Tiago Salem Herrmann on 2011-11-23

[places] cleanup legacy code

791. By Tiago Salem Herrmann on 2011-11-23

[places] move tab key handling code to dash.qml in order to make it work globally

790. By Tiago Salem Herrmann on 2011-11-23

[places] fix typo on comments

789. By Tiago Salem Herrmann on 2011-11-22

[places] add backtab handling for lenses switching

788. By Tiago Salem Herrmann on 2011-11-22

[places] make tab key switch between lenses

=== modified file 'places/LensBar.qml'
--- places/LensBar.qml	2011-11-14 10:45:33 +0000
+++ places/LensBar.qml	2011-11-23 13:00:17 +0000
@@ -34,6 +34,14 @@
         filterRegExp: RegExp("^true$")
     }
 
+    function activateNext(currentLensId) {
+        lensContainer.activateNext(currentLensId)
+    }
+
+    function activatePrevious(currentLensId) {
+        lensContainer.activatePrevious(currentLensId)
+    }
+
     Rectangle {
         id: background
 
@@ -93,6 +101,57 @@
             return undefined
         }
 
+        function activateNext(currentLensId) {
+            /* as Repeater is also a child, we have to decrease 2 */
+            var numberOfChildren = children.length-2
+            for(var i=0; i<children.length; i++) {
+                if (children[i] != repeater) {
+                    var child = children[i]
+                    /* currentLensId for home is empty */
+                    if (child.lensId == currentLensId || currentLensId == "") {
+                        /* make sure this isn't the last icon, and if so go back to home */
+                        if (i < numberOfChildren) {
+                            var childNext = children[i+1]
+                            dash.activateLens(childNext.lensId)
+                            return
+                        } else {
+                            dash.activateHome()
+                            return
+                        }
+                    }
+                }
+            }
+        }
+
+        function activatePrevious(currentLensId) {
+            /* as Repeater is also a child, we have to decrease 2 */
+            var numberOfChildren = children.length-2
+            var visibleChildrenLength = 0;
+            for(var i=0; i<children.length; i++) {
+                if (children[i] != repeater) {
+                    var child = children[i]
+                    /* currentLensId for home is empty */
+                    if (child.lensId == currentLensId || currentLensId == "") {
+                        /* make sure this isn't the first icon, and if so activate the last one */
+                        if (visibleChildrenLength == 0) {
+                            var childLast = children[numberOfChildren]
+                            dash.activateLens(childLast.lensId)
+                            return
+                        } else {
+                            if (i == 1) {
+                                dash.activateHome();
+                                return
+                            }
+                            var childPrevious = children[i-1]
+                            dash.activateLens(childPrevious.lensId)
+                            return
+                        }
+                    }
+                    visibleChildrenLength++
+                }
+            }
+        }
+
         /* Need to manually include the Home lens */
         LensButton {
             id: homeLens
@@ -115,6 +174,8 @@
 
             model: visibleLenses
             delegate: LensButton {
+                property string lensId: item.id
+
                 Accessible.name: u2d.tr(item.name)
 
                 /* Heuristic: if iconHint does not contain a '/' then it is an icon name */

=== modified file 'places/dash.qml'
--- places/dash.qml	2011-11-18 11:33:28 +0000
+++ places/dash.qml	2011-11-23 13:00:17 +0000
@@ -145,6 +145,19 @@
 
     property variant lenses: Lenses {}
 
+    Keys.onPressed: {
+        if ((event.key == Qt.Key_Backtab && event.modifiers & Qt.ControlModifier) ||
+                (event.key == Qt.Key_PageDown && event.modifiers & Qt.ControlModifier)) {
+            lensBar.activatePrevious(dashView.activeLens)
+            event.accepted = true;
+        }
+        if ((event.key == Qt.Key_Tab && event.modifiers & Qt.ControlModifier) ||
+                (event.key == Qt.Key_PageUp && event.modifiers & Qt.ControlModifier)) {
+            lensBar.activateNext(dashView.activeLens)
+            event.accepted = true;
+        }
+    }
+
     Item {
         id: background