[Xfce4-commits] <parole:master> Allow returning to media control from playlist (bug 9936)

[Sean Davis]

Updating branch refs/heads/master
         to 88944888a18c87c16952397682f96e89c11beed8 (commit)
       from f5c42c8707e552ba3e27fd1ab2caba1338f2c9cd (commit)

commit 88944888a18c87c16952397682f96e89c11beed8
Author: Sean Davis <smd.seandavis at gmail.com>
Date:   Tue Apr 30 22:34:28 2013 -0400

    Allow returning to media control from playlist (bug 9936)

 data/interfaces/parole.ui |    8 ++++----
 src/parole-medialist.c    |   22 ++++++++++++++++++----
 2 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/data/interfaces/parole.ui b/data/interfaces/parole.ui
index bb33518..75f1bdc 100644
--- a/data/interfaces/parole.ui
+++ b/data/interfaces/parole.ui
@@ -477,9 +477,9 @@
                         <property name="use_underline">True</property>
                         <property name="image">image_volume_up</property>
                         <property name="use_stock">False</property>
-                        <accelerator key="plus" signal="activate"/>
-                        <accelerator key="equal" signal="activate"/>
                         <accelerator key="KP_Add" signal="activate"/>
+                        <accelerator key="equal" signal="activate"/>
+                        <accelerator key="plus" signal="activate"/>
                         <signal name="activate" handler="parole_player_volume_up" swapped="no"/>
                       </object>
                     </child>
@@ -492,8 +492,8 @@
                         <property name="use_underline">True</property>
                         <property name="image">image_volume_down</property>
                         <property name="use_stock">False</property>
-                        <accelerator key="KP_Subtract" signal="activate"/>
                         <accelerator key="minus" signal="activate"/>
+                        <accelerator key="KP_Subtract" signal="activate"/>
                         <signal name="activate" handler="parole_player_volume_down" swapped="no"/>
                       </object>
                     </child>
@@ -567,7 +567,7 @@
                     <child>
                       <object class="GtkVBox" id="vbox_player">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
+                        <property name="can_focus">True</property>
                         <child>
                           <object class="GtkHBox" id="hbox_infobar">
                             <property name="visible">True</property>
diff --git a/src/parole-medialist.c b/src/parole-medialist.c
index 50d0ffc..c9b4ba0 100644
--- a/src/parole-medialist.c
+++ b/src/parole-medialist.c
@@ -525,12 +525,26 @@ void	parole_media_list_drag_data_received_cb (GtkWidget *widget,
 
 gboolean parole_media_list_key_press (GtkWidget *widget, GdkEventKey *ev, ParoleMediaList *list)
 {
-    if ( ev->keyval == GDK_Delete )
+    GtkWidget *vbox_player;
+    switch ( ev->keyval )
     {
-	parole_media_list_remove_clicked_cb (NULL, list);
-	return TRUE;
+        case GDK_Delete:
+            parole_media_list_remove_clicked_cb (NULL, list);
+            return TRUE;
+            break;
+        case GDK_Right:
+        case GDK_Left:
+        case GDK_Page_Down:
+        case GDK_Page_Up:
+        case GDK_Escape:
+            vbox_player = GTK_WIDGET(gtk_container_get_children( GTK_CONTAINER(gtk_widget_get_parent(gtk_widget_get_parent(gtk_widget_get_parent(gtk_widget_get_parent(gtk_widget_get_parent(gtk_widget_get_parent(widget))))))) )[0].data);
+            gtk_widget_grab_focus(vbox_player);
+            return TRUE;
+            break;
+        default:
+            return FALSE;
+            break;
     }
-    return FALSE;
 }
 
 /* Callback for the add button */