X-Git-Url: http://git.maemo.org/git/?p=espeaktime;a=blobdiff_plain;f=src%2Fapplet.c;h=d98db8289e7c5d64e671b70493787986b43ae9fc;hp=86762a465a9f0f4c970c163a167776e82e4dea3e;hb=669f1a2dd13d094f28392a90cf81500e6314816b;hpb=dbcf11f6024be3b18369d7e92888e1f899b080a1 diff --git a/src/applet.c b/src/applet.c index 86762a4..d98db82 100644 --- a/src/applet.c +++ b/src/applet.c @@ -77,6 +77,7 @@ struct espeaktime_settings { gint amplitude; gint pitch; gint speed; + gboolean ignore_silent; }; static void do_test(struct espeaktime_settings *cfg) @@ -89,13 +90,6 @@ static void do_test(struct espeaktime_settings *cfg) int res; pid_t pid; - pid = fork(); - if (pid < 0) { - perror("fork"); - return; - } - if (pid) - return; time(&t); tm = localtime(&t); @@ -105,7 +99,15 @@ static void do_test(struct espeaktime_settings *cfg) g_snprintf(vstr, sizeof(vstr), "%s%s%s", cfg->voice, (*cfg->effect) ? "+" : "", cfg->effect); strftime(text, sizeof(text), cfg->text, tm); - g_print("execlp: -a '%s' -p '%s' -v '%s' '%s'\n", + + pid = fork(); + if (pid < 0) { + perror("fork"); + return; + } + if (pid) + return; + g_print("execlp: -a '%s' -p '%s' -s '%s' -v '%s' '%s'\n", astr, pstr, sstr, vstr, text); res = execlp(ESPEAK_BIN, ESPEAK_BIN, "-a", astr, "-p", pstr, "-s", sstr, "-v", vstr, @@ -125,8 +127,16 @@ static void add_scale(GtkVBox *vbox, GtkSizeGroup *size_group, const char *capti osso_return_t execute(osso_context_t *osso, gpointer data, gboolean user_activated) { - GtkWidget *dialog; + struct espeaktime_settings cfg = { + .voice = "en-us", + .effect = "", + .amplitude = 100, + .pitch = 50, + .speed = 170, + .ignore_silent = TRUE, + }; + GtkWidget *dialog; dialog = gtk_dialog_new_with_buttons( "eSpeakTime Settings", GTK_WINDOW(data), @@ -136,24 +146,30 @@ osso_return_t execute(osso_context_t *osso, gpointer data, gboolean user_activat GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, NULL); - int k; + int k, voice_sel = 0, effect_sel = 0; GtkVBox *vbox = GTK_VBOX(gtk_vbox_new(FALSE, 0)); GtkSizeGroup *title_group = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); GtkSizeGroup *value_group = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); /* selectors */ HildonTouchSelector *voice_selector = HILDON_TOUCH_SELECTOR(hildon_touch_selector_new_text()); - for (k = 0; k < num_voices; k++) + for (k = 0; k < num_voices; k++) { hildon_touch_selector_append_text(voice_selector, voices[k].name); + if (!strcmp(voices[k].id, cfg.voice)) + voice_sel = k; + } HildonTouchSelector *effect_selector = HILDON_TOUCH_SELECTOR(hildon_touch_selector_new_text()); - for (k = 0; k < num_effects; k++) + for (k = 0; k < num_effects; k++) { hildon_touch_selector_append_text(effect_selector, effects[k].name); + if (!strcmp(effects[k].id, cfg.effect)) + effect_sel = k; + } HildonPickerButton *voice = HILDON_PICKER_BUTTON(hildon_picker_button_new(HILDON_SIZE_FINGER_HEIGHT, HILDON_BUTTON_ARRANGEMENT_HORIZONTAL)); hildon_button_set_title(HILDON_BUTTON(voice), "Voice"); hildon_picker_button_set_selector(voice, voice_selector); - hildon_picker_button_set_active(voice, 0); + hildon_picker_button_set_active(voice, voice_sel); hildon_button_add_size_groups(HILDON_BUTTON(voice), title_group, value_group, NULL); gtk_button_set_alignment(GTK_BUTTON(voice), 0.0, 0.5); gtk_box_pack_start(GTK_BOX(vbox), GTK_WIDGET(voice), FALSE, FALSE, 0); @@ -161,7 +177,7 @@ osso_return_t execute(osso_context_t *osso, gpointer data, gboolean user_activat HildonPickerButton *effect = HILDON_PICKER_BUTTON(hildon_picker_button_new(HILDON_SIZE_FINGER_HEIGHT, HILDON_BUTTON_ARRANGEMENT_HORIZONTAL)); hildon_button_set_title(HILDON_BUTTON(effect), "Effect"); hildon_picker_button_set_selector(effect, effect_selector); - hildon_picker_button_set_active(effect, 0); + hildon_picker_button_set_active(effect, effect_sel); hildon_button_add_size_groups(HILDON_BUTTON(effect), title_group, value_group, NULL); gtk_button_set_alignment(GTK_BUTTON(effect), 0.0, 0.5); gtk_box_pack_start(GTK_BOX(vbox), GTK_WIDGET(effect), FALSE, FALSE, 0); @@ -172,18 +188,19 @@ osso_return_t execute(osso_context_t *osso, gpointer data, gboolean user_activat hildon_caption_new(title_group, "Speech string", GTK_WIDGET(text), NULL, HILDON_CAPTION_MANDATORY), FALSE, FALSE, 0); - GtkAdjustment *amplitude_adj = GTK_ADJUSTMENT(gtk_adjustment_new(100, 0, 200, 1, 10, 0)); + GtkAdjustment *amplitude_adj = GTK_ADJUSTMENT(gtk_adjustment_new(cfg.amplitude, 0, 200, 1, 10, 0)); add_scale(vbox, title_group, "Amplitude", amplitude_adj); - GtkAdjustment *pitch_adj = GTK_ADJUSTMENT(gtk_adjustment_new(50, 00, 99, 1, 10, 0)); + GtkAdjustment *pitch_adj = GTK_ADJUSTMENT(gtk_adjustment_new(cfg.pitch, 00, 99, 1, 10, 0)); add_scale(vbox, title_group, "Pitch", pitch_adj); - GtkAdjustment *speed_adj = GTK_ADJUSTMENT(gtk_adjustment_new(170, 80, 390, 1, 10, 0)); + GtkAdjustment *speed_adj = GTK_ADJUSTMENT(gtk_adjustment_new(cfg.speed, 80, 390, 1, 10, 0)); add_scale(vbox, title_group, "Words per minute", speed_adj); - GtkWidget *ignore_silent = hildon_check_button_new(HILDON_SIZE_FINGER_HEIGHT); + HildonCheckButton *ignore_silent = HILDON_CHECK_BUTTON(hildon_check_button_new(HILDON_SIZE_FINGER_HEIGHT)); + hildon_check_button_set_active(ignore_silent, cfg.ignore_silent); gtk_button_set_label(GTK_BUTTON(ignore_silent), "Ignore silent profile"); - gtk_box_pack_start(GTK_BOX(vbox), ignore_silent, FALSE, FALSE, 0); + gtk_box_pack_start(GTK_BOX(vbox), GTK_WIDGET(ignore_silent), FALSE, FALSE, 0); GtkWidget *panarea = hildon_pannable_area_new(); gtk_widget_set_size_request(panarea, -1, 800); @@ -192,7 +209,6 @@ osso_return_t execute(osso_context_t *osso, gpointer data, gboolean user_activat gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), panarea); gtk_widget_show_all(dialog); while (1) { - struct espeaktime_settings cfg; int result = gtk_dialog_run(GTK_DIALOG(dialog)); switch (result) { @@ -204,6 +220,7 @@ osso_return_t execute(osso_context_t *osso, gpointer data, gboolean user_activat cfg.amplitude = gtk_adjustment_get_value(amplitude_adj); cfg.pitch = gtk_adjustment_get_value(pitch_adj); cfg.speed = gtk_adjustment_get_value(speed_adj); + cfg.ignore_silent = hildon_check_button_get_active(ignore_silent); do_test(&cfg); continue; case GTK_RESPONSE_OK: