Merge lp:~marcus-lundgren/noise/fix-1182740 into lp:~elementary-apps/noise/trunk

[Marcus Lundgren]

Ctrl + n now changes the view mode, fixing bug bug #1182740.

Ctrl + n now changes the view mode.

[David Gomes (davidgomes)]

Newline after diff's line 30. All is good otherwise, I'll test it later.

review: Needs Fixing

[lp:~marcus-lundgren/noise/fix-1182740]

1502. By Marcus Lundgren on 2013-07-26

Added a missing newline.

[David Gomes (davidgomes)]

Approving, not merging yet because I need this to be test-compiled on 12.04 and tested by someone that will verify that this branch works as expected.

review: Approve

[Julián Unrrein (junrrein)]

I tested this on elementary Luna, but I couldn't get it to work. I tested this both running without installing, and then installing and trying again.

Console output doesn't seem to tell anything relevant.

[Julián Unrrein (junrrein)]

I misunderstood how the function was supposed to work because I didn't even look at the bug report. I'm sorry.

I kept pressing "<Ctrl>+n", where n is the actual letter. Of course it didn't work.

Now I can verify that this works as expected.

review: Approve

=== modified file 'src/LibraryWindow.vala'
--- src/LibraryWindow.vala	2013-06-27 07:04:46 +0000
+++ src/LibraryWindow.vala	2013-07-26 18:14:25 +0000
@@ -148,6 +148,12 @@
         }*/
     }
 
+    private void change_view (Widgets.ViewSelector.Mode mode) {
+        if (viewSelector.get_sensitive ()) {
+            viewSelector.selected = mode;
+        }
+    }
+
     public override bool key_press_event (Gdk.EventKey event) {
         var modifiers = Gtk.accelerator_get_default_mod_mask ();
         bool modifiers_active = (event.state & modifiers) != 0;
@@ -174,6 +180,18 @@
             }
         } else if ((event.state & Gdk.ModifierType.CONTROL_MASK) != 0) {
             switch (event.keyval) {
+                case Gdk.Key.@1:
+                    change_view (Widgets.ViewSelector.Mode.GRID);
+                    break;
+                case Gdk.Key.@2:
+                    change_view (Widgets.ViewSelector.Mode.LIST);
+                    break;
+                case Gdk.Key.@3:
+                    if (viewSelector.get_column_browser_toggle_visible ()) {
+                        change_view (Widgets.ViewSelector.Mode.COLUMN);
+                    }
+
+                    break;
                 case Gdk.Key.f:
                     return false;
                 case Gdk.Key.q:
 
=== modified file 'src/Widgets/ViewSelector.vala'
--- src/Widgets/ViewSelector.vala	2013-05-22 20:42:53 +0000
+++ src/Widgets/ViewSelector.vala	2013-07-26 18:14:25 +0000
@@ -106,6 +106,10 @@
         mode_button.set_active (sensitive ? (int)mode : 3);
     }
 
+    public new bool get_sensitive () {
+        return mode_button.get_sensitive ();
+    }
+
     // CRAPPY API
     // XXX ugly workaround to avoid dealing with API breaks, since there's no time
     // to come up with a fancy solution. Needs rewrite