Merge lp:~aacid/unity-2d/addshortcutstochangelens into lp:unity-2d

[Albert Astals Cid]

[Dash] Implement shortcuts to change lenses

UNBLOCK

[lp:~aacid/unity-2d/addshortcutstochangelens]

1049. By Albert Astals Cid on 2012-04-05

Merge lp:unity-2d

1050. By Albert Astals Cid on 2012-04-05

Not needed after last unity-2d merge

[Paweł Stołowski (stolowski)]

Would you mind extracting part of the changeLens code that sets activeLens into a new function - getActiveLensIndex or so?

Also, how about having two functions: nextLens(currentIndex) and previousLens(currentIndex) that would wrap changeLens? I don't have strong opinion on this, but I think this could make it more readable than changeLens(lenses.rowCount() - 1). Up to you.

BTW, I confirmed with John Lea that the current Ctrl+PageUp and Ctrl+PageDown mapping you have is correct - and he updated the description of bug report.

review: Needs Fixing

[lp:~aacid/unity-2d/addshortcutstochangelens]

1051. By Albert Astals Cid on 2012-04-10

code refinement

[Paweł Stołowski (stolowski)]

Works great!

review: Approve

=== modified file 'shell/dash/Dash.qml'
--- shell/dash/Dash.qml	2012-04-05 13:25:46 +0000
+++ shell/dash/Dash.qml	2012-04-10 09:09:19 +0000
@@ -258,6 +258,47 @@
            necessarily focusing the search bar first. */
         /* FIXME: deactivated because it makes the user lose the focus very often */
         //Keys.forwardTo: [search_entry]
+        Keys.onPressed: {
+            if ((event.key == Qt.Key_Tab || event.key == Qt.Key_PageDown) && event.modifiers == Qt.ControlModifier) {
+                changeLens(1);
+                event.accepted = true
+            } else if ((event.key == Qt.Key_Backtab && event.modifiers == (Qt.ControlModifier | Qt.ShiftModifier)) ||
+                       (event.key == Qt.Key_PageUp && event.modifiers == Qt.ControlModifier)) {
+                changeLens(-1);
+                event.accepted = true
+            }
+        }
+
+        function activeLensIndex() {
+            var count = lenses.rowCount()
+            for (var i = 0; i < count; i++) {
+                if (lenses.get(i).id == shellManager.dashActiveLens) {
+                    return i
+                }
+            }
+            return -1
+        }
+
+        function changeLens(step) {
+            var activeLens = activeLensIndex()
+            if (activeLens != -1) {
+                var lensesCount = lenses.rowCount()
+                if (step < 0) {
+                    // Can't do lenses.get(negativeNumber) so instead of adding a negative step
+                    // we add the positive number that results in the same value when doing the modulus
+                    step = lensesCount + step
+                }
+                var nextLensIndex = (activeLens + step) % lensesCount
+                var nextLens = lenses.get(nextLensIndex)
+                while (!nextLens.visible && nextLensIndex != activeLens) {
+                    nextLensIndex = (nextLensIndex + step) % lensesCount
+                    nextLens = lenses.get(nextLensIndex)
+                }
+                activateLens(nextLens.id)
+            } else {
+                console.log("Could not find the active dash lens")
+            }
+        }
 
         Image {
             id: panelBorder