Fixed keyboard shortcuts in embedded mode

This commit is contained in:
Pierre Pronchery 2011-08-11 21:37:08 +00:00
parent fca4b06951
commit 6b1d8f6307
2 changed files with 46 additions and 24 deletions

View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Mixer 0.0.1\n" "Project-Id-Version: Mixer 0.0.1\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-04-16 01:48+0200\n" "POT-Creation-Date: 2011-08-11 23:35+0200\n"
"PO-Revision-Date: 2010-04-23 04:08+0200\n" "PO-Revision-Date: 2010-04-23 04:08+0200\n"
"Last-Translator: Pierre Pronchery <khorben@defora.org>\n" "Last-Translator: Pierre Pronchery <khorben@defora.org>\n"
"Language-Team: French\n" "Language-Team: French\n"
@ -28,82 +28,82 @@ msgstr ""
" -V\tAffichage vertical des catégories\n" " -V\tAffichage vertical des catégories\n"
" -d\tChoix du périphérique sonore\n" " -d\tChoix du périphérique sonore\n"
#: ../src/mixer.c:115 #: ../src/mixer.c:134
msgid "_Properties" msgid "_Properties"
msgstr "_Propriétés" msgstr "_Propriétés"
#: ../src/mixer.c:117 #: ../src/mixer.c:136
msgid "_Close" msgid "_Close"
msgstr "_Fermer" msgstr "_Fermer"
#: ../src/mixer.c:124 #: ../src/mixer.c:143
msgid "_All" msgid "_All"
msgstr "_Tous" msgstr "_Tous"
#: ../src/mixer.c:126 #: ../src/mixer.c:146
msgid "_Outputs" msgid "_Outputs"
msgstr "_Sorties" msgstr "_Sorties"
#: ../src/mixer.c:128 #: ../src/mixer.c:148
msgid "_Inputs" msgid "_Inputs"
msgstr "_Entrées" msgstr "_Entrées"
#: ../src/mixer.c:130 #: ../src/mixer.c:150
msgid "_Record" msgid "_Record"
msgstr "En_registrement" msgstr "En_registrement"
#: ../src/mixer.c:132 #: ../src/mixer.c:152
msgid "Mo_nitor" msgid "Mo_nitor"
msgstr "Sui_vi" msgstr "Sui_vi"
#: ../src/mixer.c:134 #: ../src/mixer.c:154
msgid "_Equalization" msgid "_Equalization"
msgstr "É_galisation" msgstr "É_galisation"
#: ../src/mixer.c:136 #: ../src/mixer.c:156
msgid "Mi_x" msgid "Mi_x"
msgstr "Mi_x" msgstr "Mi_x"
#: ../src/mixer.c:138 #: ../src/mixer.c:158
msgid "_Modem" msgid "_Modem"
msgstr "_Modem" msgstr "_Modem"
#: ../src/mixer.c:146 #: ../src/mixer.c:166
msgid "_About" msgid "_About"
msgstr "À _propos" msgstr "À _propos"
#: ../src/mixer.c:152 #: ../src/mixer.c:172
msgid "_File" msgid "_File"
msgstr "_Fichier" msgstr "_Fichier"
#: ../src/mixer.c:153 #: ../src/mixer.c:173
msgid "_View" msgid "_View"
msgstr "_Vue" msgstr "_Vue"
#: ../src/mixer.c:154 #: ../src/mixer.c:174
msgid "_Help" msgid "_Help"
msgstr "_Aide" msgstr "_Aide"
#: ../src/mixer.c:426 #: ../src/mixer.c:448
msgid "Bind" msgid "Bind"
msgstr "Lier" msgstr "Lier"
#: ../src/mixer.c:581 #: ../src/mixer.c:603
msgid "Mixer properties" msgid "Mixer properties"
msgstr "Propriétés du mixer" msgstr "Propriétés du mixer"
#: ../src/mixer.c:597 #: ../src/mixer.c:619
msgid "Name: " msgid "Name: "
msgstr "Nom : " msgstr "Nom : "
#: ../src/mixer.c:607 #: ../src/mixer.c:629
msgid "Version: " msgid "Version: "
msgstr "Version : " msgstr "Version : "
#: ../src/mixer.c:617 #: ../src/mixer.c:639
msgid "Device: " msgid "Device: "
msgstr "Carte : " msgstr "Carte : "
#: ../src/mixer.c:706 ../src/mixer.c:711 #: ../src/mixer.c:728 ../src/mixer.c:733
msgid "Error" msgid "Error"
msgstr "Erreur" msgstr "Erreur"

View File

@ -109,6 +109,25 @@ static char const * _authors[] =
NULL NULL
}; };
#ifdef EMBEDDED
static DesktopAccel _mixer_accel[] =
{
{ G_CALLBACK(on_file_properties), GDK_MOD1_MASK, GDK_KEY_Return },
{ G_CALLBACK(on_file_close), GDK_CONTROL_MASK, GDK_KEY_W },
{ G_CALLBACK(on_view_all), GDK_CONTROL_MASK, GDK_KEY_A },
# ifdef AUDIO_MIXER_DEVINFO
{ G_CALLBACK(on_view_outputs), GDK_CONTROL_MASK, GDK_KEY_O },
{ G_CALLBACK(on_view_inputs), GDK_CONTROL_MASK, GDK_KEY_I },
{ G_CALLBACK(on_view_record), GDK_CONTROL_MASK, GDK_KEY_R },
{ G_CALLBACK(on_view_monitor), GDK_CONTROL_MASK, GDK_KEY_N },
{ G_CALLBACK(on_view_equalization), GDK_CONTROL_MASK, GDK_KEY_E },
{ G_CALLBACK(on_view_mix), GDK_CONTROL_MASK, GDK_KEY_X },
{ G_CALLBACK(on_view_modem), GDK_CONTROL_MASK, GDK_KEY_M },
# endif
{ NULL, 0, 0 }
};
#endif
#ifndef EMBEDDED #ifndef EMBEDDED
static DesktopMenu _mixer_menu_file[] = static DesktopMenu _mixer_menu_file[] =
{ {
@ -121,8 +140,9 @@ static DesktopMenu _mixer_menu_file[] =
static DesktopMenu _mixer_menu_view[] = static DesktopMenu _mixer_menu_view[] =
{ {
{ N_("_All"), G_CALLBACK(on_view_all), NULL, GDK_CONTROL_MASK, GDK_KEY_A }, { N_("_All"), G_CALLBACK(on_view_all), NULL, GDK_CONTROL_MASK,
#ifdef AUDIO_MIXER_DEVINFO GDK_KEY_A },
# ifdef AUDIO_MIXER_DEVINFO
{ N_("_Outputs"), G_CALLBACK(on_view_outputs), NULL, GDK_CONTROL_MASK, { N_("_Outputs"), G_CALLBACK(on_view_outputs), NULL, GDK_CONTROL_MASK,
GDK_KEY_O }, GDK_KEY_O },
{ N_("_Inputs"), G_CALLBACK(on_view_inputs), NULL, GDK_CONTROL_MASK, { N_("_Inputs"), G_CALLBACK(on_view_inputs), NULL, GDK_CONTROL_MASK,
@ -137,7 +157,7 @@ static DesktopMenu _mixer_menu_view[] =
GDK_KEY_X }, GDK_KEY_X },
{ N_("_Modem"), G_CALLBACK(on_view_modem), NULL, GDK_CONTROL_MASK, { N_("_Modem"), G_CALLBACK(on_view_modem), NULL, GDK_CONTROL_MASK,
GDK_KEY_M }, GDK_KEY_M },
#endif # endif
{ NULL, NULL, NULL, 0, 0 } { NULL, NULL, NULL, 0, 0 }
}; };
@ -234,6 +254,8 @@ Mixer * mixer_new(char const * device, MixerOrientation orientation)
/* menubar */ /* menubar */
widget = desktop_menubar_create(_mixer_menubar, mixer, group); widget = desktop_menubar_create(_mixer_menubar, mixer, group);
gtk_box_pack_start(GTK_BOX(vbox), widget, FALSE, TRUE, 0); gtk_box_pack_start(GTK_BOX(vbox), widget, FALSE, TRUE, 0);
#else
desktop_accel_create(_mixer_accel, mixer, group);
#endif #endif
/* classes */ /* classes */
if(orientation == MO_VERTICAL) if(orientation == MO_VERTICAL)