[Goodies-commits] r3839 - xfmpc/trunk/src

[Mike Massonnet]

Author: mmassonnet
Date: 2008-01-21 18:29:31 +0000 (Mon, 21 Jan 2008)
New Revision: 3839

Modified:
   xfmpc/trunk/src/interface-ui.h
   xfmpc/trunk/src/interface-ui.xml
   xfmpc/trunk/src/interface.c
Log:
* src/interface-ui.h, src/interface-ui.xml,
  src/interface.c:
  - Add keybinding Ctrl+V for volume


Modified: xfmpc/trunk/src/interface-ui.h
===================================================================
--- xfmpc/trunk/src/interface-ui.h	2008-01-21 15:51:09 UTC (rev 3838)
+++ xfmpc/trunk/src/interface-ui.h	2008-01-21 18:29:31 UTC (rev 3839)
@@ -8,10 +8,10 @@
 static const char xfmpc_interface_ui[] =
 #endif
 {
-  "<ui>\n\n  <accelerator action=\"previous\" />\n  <accelerator action=\""
-  "pp\" />\n  <accelerator action=\"stop\" />\n  <accelerator action=\"nex"
-  "t\" />\n  <accelerator action=\"quit\" />\n\n</ui>\n\n"
+  "<ui><accelerator action=\"previous\" /><accelerator action=\"pp\" /><ac"
+  "celerator action=\"stop\" /><accelerator action=\"next\" /><accelerator"
+  " action=\"volume\" /><accelerator action=\"quit\" /></ui>"
 };
 
-static const unsigned xfmpc_interface_ui_length = 176u;
+static const unsigned xfmpc_interface_ui_length = 187u;
 

Modified: xfmpc/trunk/src/interface-ui.xml
===================================================================
--- xfmpc/trunk/src/interface-ui.xml	2008-01-21 15:51:09 UTC (rev 3838)
+++ xfmpc/trunk/src/interface-ui.xml	2008-01-21 18:29:31 UTC (rev 3839)
@@ -4,6 +4,7 @@
   <accelerator action="pp" />
   <accelerator action="stop" />
   <accelerator action="next" />
+  <accelerator action="volume" />
   <accelerator action="quit" />
 
 </ui>

Modified: xfmpc/trunk/src/interface.c
===================================================================
--- xfmpc/trunk/src/interface.c	2008-01-21 15:51:09 UTC (rev 3838)
+++ xfmpc/trunk/src/interface.c	2008-01-21 18:29:31 UTC (rev 3839)
@@ -48,6 +48,8 @@
                                                                  XfmpcInterface *interface);
 static void             xfmpc_interface_action_next             (GtkAction *action,
                                                                  XfmpcInterface *interface);
+static void             xfmpc_interface_action_volume           (GtkAction *action,
+                                                                 XfmpcInterface *interface);
 
 
 
@@ -80,11 +82,12 @@
 
 static const GtkActionEntry action_entries[] =
 {
-  { "previous", NULL, N_("Previous"), "<control>b", NULL, G_CALLBACK (xfmpc_interface_action_previous), },
-  { "pp", NULL, N_("Play/Pause"), "<control>p", NULL, G_CALLBACK (xfmpc_interface_action_pp), },
-  { "stop", NULL, N_("Stop"), "<control>s", NULL, G_CALLBACK (xfmpc_interface_action_stop), },
-  { "next", NULL, N_("Next"), "<control>f", NULL, G_CALLBACK (xfmpc_interface_action_next), },
-  { "quit", NULL, N_("Quit"), "<control>q", NULL, G_CALLBACK (gtk_main_quit), },
+  { "previous", NULL, "", "<control>b", NULL, G_CALLBACK (xfmpc_interface_action_previous), },
+  { "pp", NULL, "", "<control>p", NULL, G_CALLBACK (xfmpc_interface_action_pp), },
+  { "stop", NULL, "", "<control>s", NULL, G_CALLBACK (xfmpc_interface_action_stop), },
+  { "next", NULL, "", "<control>f", NULL, G_CALLBACK (xfmpc_interface_action_next), },
+  { "volume", NULL, "", "<control>v", NULL, G_CALLBACK (xfmpc_interface_action_volume), },
+  { "quit", NULL, "", "<control>q", NULL, G_CALLBACK (gtk_main_quit), },
 };
 
 
@@ -220,7 +223,6 @@
 
   /* === Accelerators === */
   GtkActionGroup *action_group = gtk_action_group_new ("XfmpcInterface");
-  gtk_action_group_set_translation_domain (action_group, GETTEXT_PACKAGE);
   gtk_action_group_add_actions (action_group, action_entries, G_N_ELEMENTS (action_entries), GTK_WINDOW (interface));
 
   GtkUIManager *ui_manager = gtk_ui_manager_new ();
@@ -471,3 +473,10 @@
   xfmpc_mpdclient_next (interface->priv->mpdclient);
 }
 
+static void
+xfmpc_interface_action_volume (GtkAction *action,
+                               XfmpcInterface *interface)
+{
+  g_signal_emit_by_name (interface->priv->button_volume, "popup", G_TYPE_NONE);
+}
+