X-Git-Url: http://git.maemo.org/git/?p=espeaktime;a=blobdiff_plain;f=src%2Fapplet.c;h=bf87eb33b357c8818300252689a6cff737aa0685;hp=6f744903b1367a5fbcb0776fec4ab5841f6cf587;hb=bf036d15e099e6070a316171a6652f28615c67a5;hpb=53861e36905b51603bfe872a31cb64f4f19a9945 diff --git a/src/applet.c b/src/applet.c index 6f74490..bf87eb3 100644 --- a/src/applet.c +++ b/src/applet.c @@ -1,6 +1,10 @@ +#include +#include #include #include #include +#include +#include "config.h" /* TODO: read these from disk */ @@ -67,6 +71,7 @@ static const struct effect { }; static const int num_effects = sizeof(effects) / sizeof(effects[0]); + static void add_scale(GtkVBox *vbox, GtkSizeGroup *size_group, const char *caption, GtkAdjustment *adjustment) { GtkWidget *scale = gtk_hscale_new(adjustment); @@ -78,8 +83,19 @@ 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, + }; + + GConfClient *client = gconf_client_get_default(); + cfg_read(client, &cfg); + GtkWidget *dialog; dialog = gtk_dialog_new_with_buttons( "eSpeakTime Settings", GTK_WINDOW(data), @@ -89,24 +105,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); @@ -114,28 +136,30 @@ 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); HildonEntry *text = HILDON_ENTRY(hildon_entry_new(HILDON_SIZE_AUTO)); + gtk_entry_set_text(GTK_ENTRY(text), "%H:%M"); gtk_box_pack_start(GTK_BOX(vbox), 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); @@ -145,18 +169,35 @@ osso_return_t execute(osso_context_t *osso, gpointer data, gboolean user_activat gtk_widget_show_all(dialog); while (1) { int result = gtk_dialog_run(GTK_DIALOG(dialog)); + + g_free(cfg.voice); + g_free(cfg.effect); + g_free(cfg.text); + cfg.voice = g_strdup(voices[hildon_picker_button_get_active(voice)].id); + cfg.effect = g_strdup(effects[hildon_picker_button_get_active(effect)].id); + cfg.text = g_strdup(gtk_entry_get_text(GTK_ENTRY(text))); + 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); + switch (result) { case 1: g_print("Test button\n"); + cfg_speak(&cfg, TRUE); continue; case GTK_RESPONSE_OK: g_print("Save\n"); + cfg_write(client, &cfg); break; } break; } gtk_widget_destroy(GTK_WIDGET(dialog)); + cfg_free(&cfg); + g_object_unref(G_OBJECT(client)); + return OSSO_OK; }