moved most hotkeys to gtk accelerators

1 files changed, 81 insertions, 44 deletions

diff --git a/deadbeef.glade b/deadbeef.glade
index bcf1b87e..d6ff1249 100644
--- a/deadbeef.glade
+++ b/deadbeef.glade
@@ -50,12 +50,13 @@
 		  <child>
 		    <widget class="GtkImageMenuItem" id="open">
 		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">Open file(s)</property>
+		      <property name="label" translatable="yes">_Open file(s)</property>
 		      <property name="use_underline">True</property>
 		      <signal name="activate" handler="on_open_activate" last_modification_time="Sat, 04 Jul 2009 12:57:58 GMT"/>
+		      <accelerator key="O" modifiers="GDK_CONTROL_MASK" signal="activate"/>
 
 		      <child internal-child="image">
-			<widget class="GtkImage" id="image17">
+			<widget class="GtkImage" id="image35">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-open</property>
 			  <property name="icon_size">1</property>
@@ -82,7 +83,7 @@
 		      <signal name="activate" handler="on_add_files_activate" last_modification_time="Sat, 04 Jul 2009 13:04:01 GMT"/>
 
 		      <child internal-child="image">
-			<widget class="GtkImage" id="image18">
+			<widget class="GtkImage" id="image36">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-add</property>
 			  <property name="icon_size">1</property>
@@ -103,7 +104,7 @@
 		      <signal name="activate" handler="on_add_folders_activate" last_modification_time="Sun, 06 Sep 2009 17:51:40 GMT"/>
 
 		      <child internal-child="image">
-			<widget class="GtkImage" id="image19">
+			<widget class="GtkImage" id="image37">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-add</property>
 			  <property name="icon_size">1</property>
@@ -125,12 +126,13 @@
 		  <child>
 		    <widget class="GtkImageMenuItem" id="quit">
 		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">Quit</property>
+		      <property name="label" translatable="yes">_Quit</property>
 		      <property name="use_underline">True</property>
 		      <signal name="activate" handler="on_quit_activate" last_modification_time="Sat, 04 Jul 2009 12:57:58 GMT"/>
+		      <accelerator key="Q" modifiers="GDK_CONTROL_MASK" signal="activate"/>
 
 		      <child internal-child="image">
-			<widget class="GtkImage" id="image20">
+			<widget class="GtkImage" id="image38">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-quit</property>
 			  <property name="icon_size">1</property>
@@ -159,18 +161,31 @@
 		  <child>
 		    <widget class="GtkImageMenuItem" id="clear1">
 		      <property name="visible">True</property>
-		      <property name="label">gtk-clear</property>
-		      <property name="use_stock">True</property>
-		      <signal name="activate" handler="on_clear1_activate" last_modification_time="Sat, 04 Jul 2009 13:04:01 GMT"/>
+		      <property name="label" translatable="yes">_Clear</property>
+		      <property name="use_underline">True</property>
+		      <signal name="activate" handler="on_clear1_activate" last_modification_time="Sun, 06 Sep 2009 18:30:03 GMT"/>
+
+		      <child internal-child="image">
+			<widget class="GtkImage" id="image39">
+			  <property name="visible">True</property>
+			  <property name="stock">gtk-clear</property>
+			  <property name="icon_size">1</property>
+			  <property name="xalign">0.5</property>
+			  <property name="yalign">0.5</property>
+			  <property name="xpad">0</property>
+			  <property name="ypad">0</property>
+			</widget>
+		      </child>
 		    </widget>
 		  </child>
 
 		  <child>
-		    <widget class="GtkImageMenuItem" id="select_all1">
+		    <widget class="GtkMenuItem" id="select_all1">
 		      <property name="visible">True</property>
-		      <property name="label">gtk-select-all</property>
-		      <property name="use_stock">True</property>
-		      <signal name="activate" handler="on_select_all1_activate" last_modification_time="Sat, 04 Jul 2009 13:04:01 GMT"/>
+		      <property name="label" translatable="yes">Select all</property>
+		      <property name="use_underline">True</property>
+		      <signal name="activate" handler="on_select_all1_activate" last_modification_time="Sun, 06 Sep 2009 18:30:03 GMT"/>
+		      <accelerator key="A" modifiers="GDK_CONTROL_MASK" signal="activate"/>
 		    </widget>
 		  </child>
 
@@ -186,9 +201,22 @@
 			  <child>
 			    <widget class="GtkImageMenuItem" id="remove1">
 			      <property name="visible">True</property>
-			      <property name="label">gtk-remove</property>
-			      <property name="use_stock">True</property>
-			      <signal name="activate" handler="on_remove1_activate" last_modification_time="Sat, 04 Jul 2009 13:04:01 GMT"/>
+			      <property name="label" translatable="yes">Remove</property>
+			      <property name="use_underline">True</property>
+			      <signal name="activate" handler="on_remove1_activate" last_modification_time="Sun, 06 Sep 2009 18:30:03 GMT"/>
+			      <accelerator key="Delete" modifiers="0" signal="activate"/>
+
+			      <child internal-child="image">
+				<widget class="GtkImage" id="image40">
+				  <property name="visible">True</property>
+				  <property name="stock">gtk-remove</property>
+				  <property name="icon_size">1</property>
+				  <property name="xalign">0.5</property>
+				  <property name="yalign">0.5</property>
+				  <property name="xpad">0</property>
+				  <property name="ypad">0</property>
+				</widget>
+			      </child>
 			    </widget>
 			  </child>
 
@@ -206,11 +234,12 @@
 		  </child>
 
 		  <child>
-		    <widget class="GtkImageMenuItem" id="find">
+		    <widget class="GtkMenuItem" id="find1">
 		      <property name="visible">True</property>
-		      <property name="label">gtk-find</property>
-		      <property name="use_stock">True</property>
-		      <signal name="activate" handler="on_find_activate" last_modification_time="Sun, 06 Sep 2009 16:00:58 GMT"/>
+		      <property name="label" translatable="yes">_Find</property>
+		      <property name="use_underline">True</property>
+		      <signal name="activate" handler="on_find_activate" last_modification_time="Sun, 06 Sep 2009 18:30:03 GMT"/>
+		      <accelerator key="F" modifiers="GDK_CONTROL_MASK" signal="activate"/>
 		    </widget>
 		  </child>
 		</widget>
@@ -405,6 +434,7 @@
 		  <property name="relief">GTK_RELIEF_NONE</property>
 		  <property name="focus_on_click">True</property>
 		  <signal name="clicked" handler="on_stopbtn_clicked" last_modification_time="Sun, 05 Jul 2009 10:48:41 GMT"/>
+		  <accelerator key="v" modifiers="0" signal="activate"/>
 
 		  <child>
 		    <widget class="GtkImage" id="image7">
@@ -430,6 +460,8 @@
 		  <property name="relief">GTK_RELIEF_NONE</property>
 		  <property name="focus_on_click">True</property>
 		  <signal name="clicked" handler="on_playbtn_clicked" last_modification_time="Sun, 05 Jul 2009 10:48:53 GMT"/>
+		  <accelerator key="x" modifiers="0" signal="activate"/>
+		  <accelerator key="Return" modifiers="0" signal="activate"/>
 
 		  <child>
 		    <widget class="GtkImage" id="image2">
@@ -455,6 +487,8 @@
 		  <property name="relief">GTK_RELIEF_NONE</property>
 		  <property name="focus_on_click">True</property>
 		  <signal name="clicked" handler="on_pausebtn_clicked" last_modification_time="Sun, 05 Jul 2009 10:49:01 GMT"/>
+		  <accelerator key="c" modifiers="0" signal="activate"/>
+		  <accelerator key="p" modifiers="GDK_CONTROL_MASK" signal="activate"/>
 
 		  <child>
 		    <widget class="GtkImage" id="image3">
@@ -480,6 +514,7 @@
 		  <property name="relief">GTK_RELIEF_NONE</property>
 		  <property name="focus_on_click">True</property>
 		  <signal name="clicked" handler="on_prevbtn_clicked" last_modification_time="Sun, 05 Jul 2009 10:49:08 GMT"/>
+		  <accelerator key="z" modifiers="0" signal="activate"/>
 
 		  <child>
 		    <widget class="GtkImage" id="image4">
@@ -505,6 +540,7 @@
 		  <property name="relief">GTK_RELIEF_NONE</property>
 		  <property name="focus_on_click">True</property>
 		  <signal name="clicked" handler="on_nextbtn_clicked" last_modification_time="Sun, 05 Jul 2009 10:49:12 GMT"/>
+		  <accelerator key="b" modifiers="0" signal="activate"/>
 
 		  <child>
 		    <widget class="GtkImage" id="image5">
@@ -530,6 +566,7 @@
 		  <property name="relief">GTK_RELIEF_NONE</property>
 		  <property name="focus_on_click">True</property>
 		  <signal name="clicked" handler="on_playrand_clicked" last_modification_time="Sun, 05 Jul 2009 10:49:16 GMT"/>
+		  <accelerator key="n" modifiers="0" signal="activate"/>
 
 		  <child>
 		    <widget class="GtkImage" id="image6">
@@ -897,47 +934,47 @@ Stas &quot;uncle lag&quot; Akimushkin &lt;uncle.lag@gmail.com&gt;</property>
 <widget class="GtkMenu" id="traymenu">
 
   <child>
-    <widget class="GtkImageMenuItem" id="stop1">
+    <widget class="GtkMenuItem" id="stop2">
       <property name="visible">True</property>
-      <property name="label">gtk-media-stop</property>
-      <property name="use_stock">True</property>
-      <signal name="activate" handler="on_stopbtn_clicked" last_modification_time="Sun, 16 Aug 2009 14:48:58 GMT"/>
+      <property name="label" translatable="yes">Stop</property>
+      <property name="use_underline">True</property>
+      <signal name="activate" handler="on_stopbtn_clicked" last_modification_time="Sun, 06 Sep 2009 18:34:01 GMT"/>
     </widget>
   </child>
 
   <child>
-    <widget class="GtkImageMenuItem" id="play1">
+    <widget class="GtkMenuItem" id="play2">
       <property name="visible">True</property>
-      <property name="label">gtk-media-play</property>
-      <property name="use_stock">True</property>
-      <signal name="activate" handler="on_playbtn_clicked" last_modification_time="Sun, 16 Aug 2009 14:48:58 GMT"/>
+      <property name="label" translatable="yes">Play</property>
+      <property name="use_underline">True</property>
+      <signal name="activate" handler="on_playbtn_clicked" last_modification_time="Sun, 06 Sep 2009 18:34:01 GMT"/>
     </widget>
   </child>
 
   <child>
-    <widget class="GtkImageMenuItem" id="pause1">
+    <widget class="GtkMenuItem" id="pause2">
       <property name="visible">True</property>
-      <property name="label">gtk-media-pause</property>
-      <property name="use_stock">True</property>
-      <signal name="activate" handler="on_pausebtn_clicked" last_modification_time="Sun, 16 Aug 2009 14:48:58 GMT"/>
+      <property name="label" translatable="yes">Pause</property>
+      <property name="use_underline">True</property>
+      <signal name="activate" handler="on_pausebtn_clicked" last_modification_time="Sun, 06 Sep 2009 18:34:01 GMT"/>
     </widget>
   </child>
 
   <child>
-    <widget class="GtkImageMenuItem" id="previous1">
+    <widget class="GtkMenuItem" id="previous2">
       <property name="visible">True</property>
-      <property name="label">gtk-media-previous</property>
-      <property name="use_stock">True</property>
-      <signal name="activate" handler="on_prevbtn_clicked" last_modification_time="Sun, 16 Aug 2009 14:48:58 GMT"/>
+      <property name="label" translatable="yes">Previous</property>
+      <property name="use_underline">True</property>
+      <signal name="activate" handler="on_prevbtn_clicked" last_modification_time="Sun, 06 Sep 2009 18:34:01 GMT"/>
     </widget>
   </child>
 
   <child>
-    <widget class="GtkImageMenuItem" id="next1">
+    <widget class="GtkMenuItem" id="next2">
       <property name="visible">True</property>
-      <property name="label">gtk-media-next</property>
-      <property name="use_stock">True</property>
-      <signal name="activate" handler="on_nextbtn_clicked" last_modification_time="Sun, 16 Aug 2009 14:48:58 GMT"/>
+      <property name="label" translatable="yes">Next</property>
+      <property name="use_underline">True</property>
+      <signal name="activate" handler="on_nextbtn_clicked" last_modification_time="Sun, 06 Sep 2009 18:34:01 GMT"/>
     </widget>
   </child>
 
@@ -957,11 +994,11 @@ Stas &quot;uncle lag&quot; Akimushkin &lt;uncle.lag@gmail.com&gt;</property>
   </child>
 
   <child>
-    <widget class="GtkImageMenuItem" id="about2">
+    <widget class="GtkMenuItem" id="about3">
       <property name="visible">True</property>
-      <property name="label">gtk-about</property>
-      <property name="use_stock">True</property>
-      <signal name="activate" handler="on_about1_activate" last_modification_time="Sun, 16 Aug 2009 14:44:07 GMT"/>
+      <property name="label" translatable="yes">About</property>
+      <property name="use_underline">True</property>
+      <signal name="activate" handler="on_about1_activate" last_modification_time="Sun, 06 Sep 2009 18:34:01 GMT"/>
     </widget>
   </child>