Merge lp:~pqp/noise/fix-1082862 into lp:~elementary-apps/noise/trunk

[Patrick Pace]

I implemented keyboard shortcuts that will close Noise (Ctrl+W & Ctrl+Q), and reorganized key_press_event() a bit to allow for more shortcuts if necessary.

[David Gomes (davidgomes)]

this.destroy();
playClicked();

There should be a space before '('.

Also, on the 23rd line of the .diff, the curly brace ending the function doesn't seem to be matching the indentation of "var typed_unichar = event.str.get_char ();"

Implementation-wise, looks good.

review: Needs Fixing

[Patrick Pace (pqp)]

Yeah, I proposed a merge too soon. The branch should be fine now.

[lp:~pqp/noise/fix-1082862]

1193. By Patrick Pace on 2012-11-25

NEWLINE YAY.

[David Gomes (davidgomes)]

Good code.

review: Approve

=== modified file 'src/LibraryWindow.vala'
--- src/LibraryWindow.vala	2012-11-07 00:55:30 +0000
+++ src/LibraryWindow.vala	2012-11-25 18:34:19 +0000
@@ -153,10 +153,19 @@
     }
 
     public override bool key_press_event (Gdk.EventKey event) {
-        if(event.keyval == Gdk.Key.space && !searchField.has_focus) {
-            playClicked ();
-            return true;
-        }
+       if (!searchField.has_focus) {
+            switch (event.keyval) {
+                case Gdk.Key.space:
+                    playClicked ();
+                    return true;
+                case Gdk.Key.q:
+                case Gdk.Key.w:
+                    if ((event.state & Gdk.ModifierType.CONTROL_MASK) != 0)
+                        this.destroy ();
+                    break;
+            }
+       }
+
        var typed_unichar = event.str.get_char ();
        // Redirect valid key presses to the search entry
        if (typed_unichar.validate () && searchField.sensitive && !searchField.has_focus) {