X-Git-Url: http://git.maemo.org/git/?p=espeaktime;a=blobdiff_plain;f=src%2Fapplet.c;h=f9426df99f27ef743495b712dbce75accf22f841;hp=83d17862793f84b066d771a552fab3ceba3b2422;hb=985bbc6de528f1fd1a6d38d2a29b867bfcc61a56;hpb=eeb5538fefb4b879149fe260083494deb37f3f2a

diff --git a/src/applet.c b/src/applet.c
index 83d1786..f9426df 100644
--- a/src/applet.c
+++ b/src/applet.c
@@ -67,40 +67,69 @@ 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);
+	gtk_scale_set_digits(GTK_SCALE(scale), 0);
+	gtk_box_pack_start(GTK_BOX(vbox),
+		hildon_caption_new(size_group, caption, scale, NULL, HILDON_CAPTION_MANDATORY),
+		FALSE, FALSE, 0);
+}
+
 static GtkWidget *build_ui(void)
 {
 	int k;
-	GtkVBox *vbox = GTK_VBOX(gtk_vbox_new(0, FALSE));
+	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);
 
-	HildonPickerButton *voice, *effect;
-	HildonTouchSelector *voice_selector, *effect_selector;
-	voice = HILDON_PICKER_BUTTON(hildon_picker_button_new(HILDON_SIZE_FINGER_HEIGHT, HILDON_BUTTON_ARRANGEMENT_VERTICAL));
-	hildon_button_set_title(HILDON_BUTTON(voice), "Voice");
-	voice_selector = HILDON_TOUCH_SELECTOR(hildon_touch_selector_new_text());
+	/* selectors */
+	HildonTouchSelector *voice_selector = HILDON_TOUCH_SELECTOR(hildon_touch_selector_new_text());
 	for (k = 0; k < num_voices; k++)
 		hildon_touch_selector_append_text(voice_selector, voices[k].name);
+
+	HildonTouchSelector *effect_selector = HILDON_TOUCH_SELECTOR(hildon_touch_selector_new_text());
+	for (k = 0; k < num_effects; k++)
+		hildon_touch_selector_append_text(effect_selector, effects[k].name);
+
+	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_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);
 
-	effect = HILDON_PICKER_BUTTON(hildon_picker_button_new(HILDON_SIZE_FINGER_HEIGHT, HILDON_BUTTON_ARRANGEMENT_VERTICAL));
+	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");
-	effect_selector = HILDON_TOUCH_SELECTOR(hildon_touch_selector_new_text());
-	for (k = 0; k < num_effects; k++)
-		hildon_touch_selector_append_text(effect_selector, effects[k].name);
 	hildon_picker_button_set_selector(effect, effect_selector);
 	hildon_picker_button_set_active(effect, 0);
-
-	GtkHBox *buttons = GTK_HBOX(gtk_hbox_new(0, TRUE));
-	gtk_container_add(GTK_CONTAINER(buttons), GTK_WIDGET(voice));
-	gtk_container_add(GTK_CONTAINER(buttons), GTK_WIDGET(effect));
-	gtk_box_pack_start(GTK_BOX(vbox), GTK_WIDGET(buttons), FALSE, FALSE, 0);
+	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_box_pack_start(GTK_BOX(vbox), GTK_WIDGET(text), FALSE, FALSE, 0);
+	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));
+	add_scale(vbox, title_group, "Amplitude", amplitude_adj);
+
+	GtkAdjustment *pitch_adj = GTK_ADJUSTMENT(gtk_adjustment_new(50, 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));
+	add_scale(vbox, title_group, "Words per minute", speed_adj);
 
-	gtk_box_pack_start(GTK_BOX(vbox), hildon_hvolumebar_new(), FALSE, FALSE, 0);
+	GtkWidget *ignore_silent = hildon_check_button_new(HILDON_SIZE_FINGER_HEIGHT);
+	gtk_button_set_label(GTK_BUTTON(ignore_silent), "Ignore silent profile");
+	gtk_box_pack_start(GTK_BOX(vbox), ignore_silent, FALSE, FALSE, 0);
 
-	return GTK_WIDGET(vbox);
+	GtkWidget *panarea = hildon_pannable_area_new();
+	gtk_widget_set_size_request(panarea, -1, 800);
+	hildon_pannable_area_add_with_viewport(HILDON_PANNABLE_AREA(panarea), GTK_WIDGET(vbox));
+	return panarea;
 }
 
 osso_return_t execute(osso_context_t *osso, gpointer data, gboolean user_activated)
@@ -111,15 +140,25 @@ osso_return_t execute(osso_context_t *osso, gpointer data, gboolean user_activat
 		"eSpeakTime Settings",
 		GTK_WINDOW(data),
 		GTK_DIALOG_MODAL | GTK_DIALOG_NO_SEPARATOR,
-		GTK_STOCK_SAVE,
-		GTK_RESPONSE_OK,
-		GTK_STOCK_CANCEL,
-		GTK_RESPONSE_CANCEL,
+		"Test", 1,
+		GTK_STOCK_SAVE, GTK_RESPONSE_OK,
+		GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
 		NULL);
 
 	gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), build_ui());
 	gtk_widget_show_all(dialog);
-	gtk_dialog_run(GTK_DIALOG(dialog));
+	while (1) {
+		int result = gtk_dialog_run(GTK_DIALOG(dialog));
+		switch (result) {
+		case 1:
+			g_print("Test button\n");
+			continue;
+		case GTK_RESPONSE_OK:
+			g_print("Save\n");
+			break;
+		}
+		break;
+	}
 	gtk_widget_destroy(GTK_WIDGET(dialog));
 
 	return OSSO_OK;
@@ -127,6 +166,7 @@ osso_return_t execute(osso_context_t *osso, gpointer data, gboolean user_activat
 
 osso_return_t save_state(osso_context_t *osso, gpointer data)
 {
+	g_print("save_state called\n");
 	return OSSO_OK;
 }