Merge lp:~gero-bare/midori/midori-bug-1300451 into lp:midori

[Gero.Bare]

This is a initial support for media keys in midori.

Things to notice: First you'll see that I grouped the events of the media keys together, instead of grouping them by the action they perform (with the other keys related).

This is because I though it would be nice to be able to enable/disable with an option in midori, but because I don't know how to do that it ended this way.

[Cris Dywan (kalikiana)]

Note: I can't really test these. Ideally if we at one point in the future have UI test coverage this should be included.

In general this seems fine. Ideally it wouldn't be manually hacked into the key handling, alas we still don't have a way to assign several keys to the same UI action. So, I won't object to doing it this way.

review: Approve

[Gero.Bare (gero-bare)]

You are right.
But we have a way. I think I should merge this into our shortcut plugin.
A simple "use media key" check button to turn on, off. Generally the people don't play with media keys so we should be fine.

review: Needs Fixing

Unmerged revisions

6844. By Gero.Bare on 2014-11-24

Deleted a duplicated condition.

6843. By Gero.Bare on 2014-11-24

Add Media Keys support.

=== modified file 'midori/midori-browser.c'
--- midori/midori-browser.c	2014-11-22 17:20:43 +0000
+++ midori/midori-browser.c	2014-11-24 04:16:36 +0000
@@ -2141,6 +2141,33 @@
         return TRUE;
     }
 
+    /*Implementing Media keys*/
+    if (event->keyval == GDK_KEY_HomePage)
+    {
+        midori_browser_activate_action (browser, "Homepage");
+        return TRUE;
+    }
+    else if (event->keyval == GDK_KEY_Search){
+        midori_browser_activate_action (browser, "Search");
+        return TRUE;
+    }
+    else if (event->keyval == GDK_KEY_Stop){
+        midori_browser_activate_action (browser, "Stop");
+        return TRUE;
+    }
+    else if (event->keyval == GDK_KEY_Refresh){
+        midori_browser_activate_action (browser, "Reload");
+        return TRUE;
+    }
+    else if (event->keyval == GDK_KEY_Back){
+        midori_browser_activate_action (browser, "Back");
+        return TRUE;
+    }
+    else if (event->keyval == GDK_KEY_Forward){
+        midori_browser_activate_action (browser, "Forward");
+        return TRUE;
+    }
+    
     widget_class = g_type_class_peek_static (g_type_parent (GTK_TYPE_WINDOW));
     return widget_class->key_press_event (widget, event);
 }