Merge lp:~djaler1/pantheon-photos/fix-1405890 into lp:~pantheon-photos/pantheon-photos/trunk

[Kirill Romanov]

Make Ctrl + S work in the photo viewer

Fix bug #1405890

[Danielle Foré (danrabbit)]

I can confirm that this works as expected :)

review: Approve

[Corentin Noël (tintou)]

As a side note, instead of doing this (event.state & Gdk.ModifierType.CONTROL_MASK) != 0
The vala language allows you to do `if (Gdk.ModifierType.CONTROL_MASK in event.state)` with flags which is much more graceful and easier to recognize at first sight ;)

=== modified file 'src/direct/DirectPhotoPage.vala'
--- src/direct/DirectPhotoPage.vala	2017-01-03 11:02:51 +0000
+++ src/direct/DirectPhotoPage.vala	2017-01-03 11:58:43 +0000
@@ -520,24 +520,45 @@
         save_as_dialog.destroy ();
     }
 
+    /** Returns true if the code parameter matches the keycode of the keyval parameter for
+    * any keyboard group or level (in order to allow for non-QWERTY keyboards) **/
+    protected bool match_keycode (int keyval, uint code) {
+        Gdk.KeymapKey [] keys;
+        Gdk.Keymap keymap = Gdk.Keymap.get_default ();
+        if (keymap.get_entries_for_keyval (keyval, out keys)) {
+            foreach (var key in keys) {
+                if (code == key.keycode)
+                    return true;
+            }
+        }
+        return false;
+    }
+
     protected override bool on_app_key_pressed (Gdk.EventKey event) {
-        bool handled = true;
-
-        switch (Gdk.keyval_name (event.keyval)) {
-        case "bracketright":
+        uint keycode = event.hardware_keycode;
+
+        if (match_keycode (Gdk.Key.s, keycode)) {
+            if ((event.state & Gdk.ModifierType.CONTROL_MASK) != 0) {
+                if ((event.state & Gdk.ModifierType.SHIFT_MASK) != 0) {
+                    on_save_as ();
+                } else {
+                    on_save ();
+                }
+                return true;
+            }
+        }
+
+        if (match_keycode (Gdk.Key.bracketright, keycode)) {
             activate_action ("RotateClockwise");
-            break;
+            return true;
+        }
 
-        case "bracketleft":
+        if (match_keycode (Gdk.Key.bracketleft, keycode)) {
             activate_action ("RotateCounterclockwise");
-            break;
-
-        default:
-            handled = false;
-            break;
+            return true;
         }
 
-        return handled ? true : base.on_app_key_pressed (event);
+        return base.on_app_key_pressed (event);
     }
 
     private void on_print () {