Merge lp:~gerboland/unity-2d/launcher_shortcuts_fix into lp:unity-2d

[Gerry Boland]

[launcher] Fix keyboard shortcuts to start counting applications at index 1.

[lp:~gerboland/unity-2d/launcher_shortcuts_fix]

687. By Gerry Boland on 2011-08-31

[launcher] Small check to ensure no duplicate shortcuts.

[Florian Boucault (fboucault)]

Excellent!

review: Approve

=== modified file 'launcher/LauncherList.qml'
--- launcher/LauncherList.qml	2011-08-30 20:55:53 +0000
+++ launcher/LauncherList.qml	2011-08-31 14:23:47 +0000
@@ -107,12 +107,13 @@
         emblem: item.emblem ? "image://icons/" + item.emblem : ""
         emblemVisible: item.emblemVisible
 
+        /* Launcher of index 0 is the so-called BFB or Dash launcher */
         shortcutVisible: launcherView.superKeyHeld &&
-                         ((item.toString().indexOf("LauncherApplication") == 0 && index <= 9) ||
+                         ((item.toString().indexOf("LauncherApplication") == 0 && index > 0 && index <= 10) ||
                           item.shortcutKey != 0)
         shortcutText: {
             if (item.toString().indexOf("LauncherApplication") == 0) {
-                return (index + 1) % 10
+                return index % 10
             } else {
                 return String.fromCharCode(item.shortcutKey).toLowerCase()
             }

=== modified file 'launcher/app/launcherview.cpp'
--- launcher/app/launcherview.cpp	2011-08-11 15:21:01 +0000
+++ launcher/app/launcherview.cpp	2011-08-31 14:23:47 +0000
@@ -177,14 +177,18 @@
     Hotkey* hotkey = qobject_cast<Hotkey*>(sender());
     if (hotkey != NULL) {
         /* Shortcuts from 1 to 9 should activate the items with index
-           from 0 to 8. Shortcut for 0 should activate item with index 9.
+           from 1 to 9 (index 0 being the so-called "BFB" or Dash launcher).
+           Shortcut for 0 should activate item with index 10.
            In other words, the indexes are activated in the same order as
            the keys appear on a standard keyboard. */
         Qt::Key key = hotkey->key();
-        if (key >= Qt::Key_0 && key <= Qt::Key_9) {
-            int index = (key - Qt::Key_0 + 9) % 10;
+        if (key >= Qt::Key_1 && key <= Qt::Key_9) {
+            int index = key - Qt::Key_0;
             Q_EMIT keyboardShortcutPressed(index);
         }
+        else if (key == Qt::Key_0){
+            Q_EMIT keyboardShortcutPressed(10);
+        }
     }
 }