[Xfce4-commits] <parole:master> Cleaned up accelerators and added accelerators to menu items.

[Sean Davis]

Updating branch refs/heads/master
         to 4ba106370c9031e79562aa4ba43658a6ebcdca1e (commit)
       from e93282510b786826babdc331a10463219a124dc4 (commit)

commit 4ba106370c9031e79562aa4ba43658a6ebcdca1e
Author: Sean Davis <smd.seandavis at gmail.com>
Date:   Thu Jul 19 16:13:53 2012 -0400

    Cleaned up accelerators and added accelerators to menu items.

 data/interfaces/parole.ui |    3 +++
 src/parole-player.c       |   16 ----------------
 2 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/data/interfaces/parole.ui b/data/interfaces/parole.ui
index 0139fb5..5c9747f 100644
--- a/data/interfaces/parole.ui
+++ b/data/interfaces/parole.ui
@@ -161,6 +161,7 @@
                         <property name="use_action_appearance">False</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
+                        <accelerator key="o" signal="activate" modifiers="GDK_CONTROL_MASK"/>
                         <signal name="activate" handler="parole_player_menu_add_cb" swapped="no"/>
                       </object>
                     </child>
@@ -173,6 +174,7 @@
                         <property name="use_underline">True</property>
                         <property name="image">image5</property>
                         <property name="use_stock">False</property>
+                        <accelerator key="l" signal="activate" modifiers="GDK_CONTROL_MASK"/>
                         <signal name="activate" handler="parole_player_menu_open_location_cb" swapped="no"/>
                       </object>
                     </child>
@@ -263,6 +265,7 @@
                         <property name="use_action_appearance">False</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
+                        <accelerator key="q" signal="activate" modifiers="GDK_CONTROL_MASK"/>
                         <signal name="activate" handler="parole_player_menu_exit_cb" swapped="no"/>
                       </object>
                     </child>
diff --git a/src/parole-player.c b/src/parole-player.c
index 77282ef..7daccf6 100644
--- a/src/parole-player.c
+++ b/src/parole-player.c
@@ -1807,26 +1807,17 @@ parole_player_handle_key_press (GdkEventKey *ev, ParolePlayer *player)
     
     switch (ev->keyval)
     {
-	case GDK_F11:
 	case GDK_f:
 	case GDK_F:
 	    parole_player_full_screen_menu_item_activate (player);
 	    ret_val = TRUE;
 	    break;
-	case GDK_plus:
-	    parole_player_volume_up (NULL, player);
-	    ret_val = TRUE;
-	    break;
 	case GDK_space:
 	case GDK_p:
 	case GDK_P:
 	    parole_player_play_pause_clicked (NULL, player);
 	    ret_val = TRUE;
 	    break;
-	case GDK_minus:
-	    parole_player_volume_down (NULL, player);
-	    ret_val = TRUE;
-	    break;
 	case GDK_Right:
 	    /* Media seekable ?*/
 	    if ( GTK_WIDGET_SENSITIVE (player->priv->range) )
@@ -1852,13 +1843,6 @@ parole_player_handle_key_press (GdkEventKey *ev, ParolePlayer *player)
 	    parole_media_list_open_location (player->priv->list);
 	    break;
 #endif
-	case GDK_O:
-	case GDK_o:
-	    if ( ev->state & GDK_CONTROL_MASK )
-	    {
-		parole_player_full_screen (player, FALSE);
-		parole_media_list_open (player->priv->list);
-	    }
 	break;
 	/* 
 	 * Pass these to the media list and tell it to