DeforaOS/Mixer
DeforaOS/Mixer
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Implemented page selection in tabbed mode

Browse Source
This commit is contained in:
Pierre Pronchery 2012-03-21 15:38:25 +00:00
parent 4cfa5d4948
commit a0ce0c4ad6
2 changed files with 42 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
po/fr.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Mixer 0.0.1\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2012-03-21 16:11+0100\n"
"POT-Creation-Date: 2012-03-21 16:37+0100\n"
"PO-Revision-Date: 2010-04-23 04:08+0200\n"
"Last-Translator: Pierre Pronchery <khorben@defora.org>\n"
"Language-Team: French\n"
@ -32,94 +32,94 @@ msgstr ""
" -d\tChoix du périphérique sonore\n"
" -x\tActiver le mode embarqué\n"
#: ../src/mixer.c:140
#: ../src/mixer.c:141
msgid "_Properties"
msgstr "_Propriétés"
#: ../src/mixer.c:142
#: ../src/mixer.c:143
msgid "_Close"
msgstr "_Fermer"
#: ../src/mixer.c:149
#: ../src/mixer.c:150
msgid "_All"
msgstr "_Tous"
#: ../src/mixer.c:152
#: ../src/mixer.c:153
msgid "_Outputs"
msgstr "_Sorties"
#: ../src/mixer.c:154
#: ../src/mixer.c:155
msgid "_Inputs"
msgstr "_Entrées"
#: ../src/mixer.c:156
#: ../src/mixer.c:157
msgid "_Record"
msgstr "En_registrement"
#: ../src/mixer.c:158
#: ../src/mixer.c:159
msgid "Mo_nitor"
msgstr "Sui_vi"
#: ../src/mixer.c:160
#: ../src/mixer.c:161
msgid "_Equalization"
msgstr "É_galisation"
#: ../src/mixer.c:162
#: ../src/mixer.c:163
msgid "Mi_x"
msgstr "Mi_x"
#: ../src/mixer.c:164
#: ../src/mixer.c:165
msgid "_Modem"
msgstr "_Modem"
#: ../src/mixer.c:172
#: ../src/mixer.c:173
msgid "_About"
msgstr "À _propos"
#: ../src/mixer.c:178
#: ../src/mixer.c:179
msgid "_File"
msgstr "_Fichier"
#: ../src/mixer.c:179
#: ../src/mixer.c:180
msgid "_View"
msgstr "_Vue"
#: ../src/mixer.c:180
#: ../src/mixer.c:181
msgid "_Help"
msgstr "_Aide"
#: ../src/mixer.c:334
#: ../src/mixer.c:336
msgid "All"
msgstr "Tous"
#: ../src/mixer.c:606
#: ../src/mixer.c:608
msgid "Mute"
msgstr "Muet"
#: ../src/mixer.c:677
#: ../src/mixer.c:679
msgid "Bind"
msgstr "Lier"
#: ../src/mixer.c:839
#: ../src/mixer.c:841
msgid "translator-credits"
msgstr "Pierre Pronchery <khorben@defora.org>"
#: ../src/mixer.c:872
#: ../src/mixer.c:874
msgid "Mixer properties"
msgstr "Propriétés du mixer"
#: ../src/mixer.c:888
#: ../src/mixer.c:890
msgid "Name: "
msgstr "Nom : "
#: ../src/mixer.c:898
#: ../src/mixer.c:900
msgid "Version: "
msgstr "Version : "
#: ../src/mixer.c:908
#: ../src/mixer.c:910
msgid "Device: "
msgstr "Carte : "
#: ../src/mixer.c:980 ../src/mixer.c:985
#: ../src/mixer.c:993 ../src/mixer.c:998
msgid "Error"
msgstr "Erreur"

23
src/mixer.c
View File

@ -56,6 +56,7 @@ typedef struct _MixerClass
int mixer_class;
audio_mixer_name_t label;
GtkWidget * hbox;
int page;
} MixerClass;
#endif
@ -327,6 +328,7 @@ Mixer * mixer_new(char const * device, MixerLayout layout, gboolean embedded)
p->mixer_class = md.mixer_class;
memcpy(&p->label, &md.label, sizeof(md.label));
p->hbox = NULL;
p->page = -1;
#else
hbox = gtk_hbox_new(FALSE, 4);
if(mixer->notebook != NULL)
@ -412,8 +414,8 @@ Mixer * mixer_new(char const * device, MixerLayout layout, gboolean embedded)
gtk_scrolled_window_add_with_viewport(
GTK_SCROLLED_WINDOW(scrolled),
hbox);
gtk_notebook_append_page(GTK_NOTEBOOK(
mixer->notebook),
mixer->mc[u].page = gtk_notebook_append_page(
GTK_NOTEBOOK(mixer->notebook),
scrolled, label);
}
else if(hvbox != NULL)
@ -945,9 +947,20 @@ void mixer_show_class(Mixer * mixer, char const * name)
#ifdef AUDIO_MIXER_DEVINFO
size_t u;
if(mixer->notebook != NULL)
/* FIXME really implement */
name = NULL;
if(mixer->notebook != NULL && name != NULL)
{
for(u = 0; u < mixer->mc_cnt; u++)
{
if(mixer->mc[u].hbox == NULL)
continue;
if(strcmp(mixer->mc[u].label.name, name) != 0)
continue;
gtk_notebook_set_current_page(GTK_NOTEBOOK(
mixer->notebook),
mixer->mc[u].page);
}
return;
}
for(u = 0; u < mixer->mc_cnt; u++)
if(mixer->mc[u].hbox == NULL)
continue;