Merge lp:~marcus-lundgren/slingshot/fix-1182740 into lp:~elementary-pantheon/slingshot/trunk

[Marcus Lundgren]

Change view modes with Ctrl + n, fixing bug #1182740.

Change view modes with Ctrl + n.

[David Gomes (davidgomes)]

I'm not sure we need more keyboard shortcuts, but I approve the code. Adding ~elementary-design to review too.

review: Approve

[David Gomes (davidgomes)]

I also need somebody who tests this on Pantheon please (13.04 here).

[Julián Unrrein (junrrein)]

Tested under elementary Luna. Works as expected.

review: Approve

=== modified file 'src/SlingshotView.vala'
--- src/SlingshotView.vala	2013-06-12 21:40:45 +0000
+++ src/SlingshotView.vala	2013-08-11 12:04:24 +0000
@@ -295,6 +295,17 @@
             move_to_rect (app_launcher_pos, show);
         }
 
+        private void change_view_mode (string key) {
+            switch (key) {
+                case "1": // Normal view
+                    view_selector.selected = 0;
+                    break;
+                default: // Category view
+                    view_selector.selected = 1;
+                    break;
+            }
+        }
+
         public override bool key_press_event (Gdk.EventKey event) {
 
             var key = Gdk.keyval_name (event.keyval).replace ("KP_", "");
@@ -303,6 +314,12 @@
                             Gdk.ModifierType.MOD1_MASK |
                             Gdk.ModifierType.CONTROL_MASK);
 
+            if ((event.state & Gdk.ModifierType.CONTROL_MASK) != 0 &&
+                (key == "1" || key == "2")) {
+                change_view_mode (key);
+                return true;
+            }
+
             switch (key) {
 
                 case "Escape":