1 files changed, 24 insertions, 23 deletions

diff --git a/src/ui_widgets.c b/src/ui_widgets.c
index 8e38227..468b082 100644
--- a/src/ui_widgets.c
+++ b/src/ui_widgets.c
@@ -16,7 +16,7 @@
 #include "ui_input.h"
 #include "ui_widgets.h"
 
-static struct multi_screen_data material_unload = {
+static struct wizard_screen_data material_unload = {
 	.count = 0,
 	.screens = {
 		{
@@ -37,7 +37,7 @@ static struct multi_screen_data material_unload = {
 	},
 };
 
-static struct multi_screen_data material_load = {
+static struct wizard_screen_data material_load = {
 	.count = 0,
 	.screens = {
 		{
@@ -193,7 +193,7 @@ static Eina_Bool _dial_change_delay(void *data)
 	return ECORE_CALLBACK_CANCEL;
 }
 
-static Eina_Bool _rotator_change(void *data, int type, void *event_info EINA_UNUSED)
+static Eina_Bool _spinner_change(void *data, int type, void *event_info EINA_UNUSED)
 {
 	struct settings_dial_data *dial_data = data;
 
@@ -296,7 +296,7 @@ static void _timer_del(void *data, Evas *e EINA_UNUSED, Evas_Object *eo EINA_UNU
 		ecore_timer_del(timer);
 }
 
-Evas_Object *ui_widget_rotator(Evas_Object *parent, struct eulogium_data *eulogium, struct settings_dial_data *dial_data)
+Evas_Object *ui_widget_spinner(Evas_Object *parent, struct eulogium_data *eulogium, struct settings_dial_data *dial_data)
 {
 	Evas_Object *_top, *_bottom;
 	Ecore_Event_Handler *handler;
@@ -305,9 +305,9 @@ Evas_Object *ui_widget_rotator(Evas_Object *parent, struct eulogium_data *eulogi
 	elm_object_text_set(_top, _(dial_data->label));
 	evas_object_size_hint_weight_set(_top, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
 	evas_object_size_hint_align_set(_top, EVAS_HINT_FILL, EVAS_HINT_FILL);
-	handler = ecore_event_handler_add(INPUT_MOUSE_WHEEL_UP, _rotator_change, dial_data);
+	handler = ecore_event_handler_add(INPUT_MOUSE_WHEEL_UP, _spinner_change, dial_data);
 	evas_object_data_set(parent, "event_inc", handler);
-	handler = ecore_event_handler_add(INPUT_MOUSE_WHEEL_DOWN, _rotator_change, dial_data);
+	handler = ecore_event_handler_add(INPUT_MOUSE_WHEEL_DOWN, _spinner_change, dial_data);
 	evas_object_data_set(parent, "event_dec", handler); /* XXX do this better (via dial_data?) */
 	evas_object_show(_top);
 
@@ -317,11 +317,12 @@ Evas_Object *ui_widget_rotator(Evas_Object *parent, struct eulogium_data *eulogi
 	evas_object_size_hint_align_set(_bottom, EVAS_HINT_FILL, EVAS_HINT_FILL);
 	evas_object_smart_callback_add(_bottom, "clicked", ui_stack_pop_cb, eulogium);
 	evas_object_show(_bottom);
+	/* remove handler on window destroy? */
 
 	return eulogium_split_screen(parent, _top, _bottom);
 }
 
-Evas_Object *ui_widget_dial(Evas_Object *parent, struct eulogium_data *eulogium, struct settings_dial_data *dial_data)
+Evas_Object *ui_widget_slider(Evas_Object *parent, struct eulogium_data *eulogium, struct settings_dial_data *dial_data)
 {
 	Evas_Object *_top, *_bottom, *obj;
 	Ecore_Timer *timer_value_end = NULL;
@@ -467,20 +468,20 @@ Evas_Object *ui_widget_progress(Evas_Object *parent, struct eulogium_data *eulog
 	return content;
 }
 
-struct _multi_screen_next_cb_data {
+struct _wizard_screen_next_cb_data {
 	struct eulogium_data *eulogium;
-	struct multi_screen_data *screen_data;
+	struct wizard_screen_data *screen_data;
 	uint_fast8_t pagenum;
 	Eina_Bool pageindex;
 };
 
-static void _eulogium_multi_screen_next_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
+static void _wizard_screen_next_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
 {
 	Evas_Object *content;
-	struct eulogium_data *eulogium = ((struct _multi_screen_next_cb_data *)data)->eulogium;
-	uint_fast8_t pagenum = ((struct _multi_screen_next_cb_data *)data)->pagenum;
-	Eina_Bool pageindex = ((struct _multi_screen_next_cb_data *)data)->pageindex;
-	struct multi_screen_data *screen_data = ((struct _multi_screen_next_cb_data *)data)->screen_data;
+	struct eulogium_data *eulogium = ((struct _wizard_screen_next_cb_data *)data)->eulogium;
+	uint_fast8_t pagenum = ((struct _wizard_screen_next_cb_data *)data)->pagenum;
+	Eina_Bool pageindex = ((struct _wizard_screen_next_cb_data *)data)->pageindex;
+	struct wizard_screen_data *screen_data = ((struct _wizard_screen_next_cb_data *)data)->screen_data;
 
 	if (pagenum >= screen_data->count) {
 		Elm_Object_Item *item;
@@ -490,18 +491,18 @@ static void _eulogium_multi_screen_next_cb(void *data, Evas_Object *obj EINA_UNU
 			elm_naviframe_item_pop_to(item);
 		/* XXX what else? */
 	} else {
-	//	content = eulogium_multi_screen_menu(eulogium, eulogium->navi, screen_data, pagenum, pageindex);
+	//	content = ui_window_wizard(eulogium->navi, eulogium, screen_data, pagenum, pageindex);
 		ui_stack_push(eulogium, content, PAGE_NORMAL);
 		/* XXX what else? */
 	}
 	free(data);
 }
 
-Evas_Object *eulogium_multi_screen_menu(struct eulogium_data *eulogium, Evas_Object *parent, struct multi_screen_data *screen_data, uint_fast8_t pagenum, Eina_Bool pageindex) /* TODO swap parent/eulogium */
+Evas_Object *ui_window_wizard(Evas_Object *parent, struct eulogium_data *eulogium, struct wizard_screen_data *screen_data, uint_fast8_t pagenum, Eina_Bool pageindex)
 {
 	Evas_Object *object;
 	Evas_Object *_top, *_bottom;
-	struct _multi_screen_next_cb_data *multi_screen_next_cb_data;
+	struct _wizard_screen_next_cb_data *wizard_screen_next_cb_data;
 	char buf[6];
 
 	_top = elm_box_add(parent);
@@ -584,11 +585,11 @@ Evas_Object *eulogium_multi_screen_menu(struct eulogium_data *eulogium, Evas_Obj
 	elm_box_horizontal_set(_bottom, EINA_TRUE);
 	evas_object_show(_bottom);
 
-	multi_screen_next_cb_data = malloc(sizeof(struct _multi_screen_next_cb_data));
-	multi_screen_next_cb_data->eulogium = eulogium;
-	multi_screen_next_cb_data->screen_data = screen_data;
-	multi_screen_next_cb_data->pagenum = pagenum + 1;
-	multi_screen_next_cb_data->pageindex = EINA_TRUE;
+	wizard_screen_next_cb_data = malloc(sizeof(struct _wizard_screen_next_cb_data));
+	wizard_screen_next_cb_data->eulogium = eulogium;
+	wizard_screen_next_cb_data->screen_data = screen_data;
+	wizard_screen_next_cb_data->pagenum = pagenum + 1;
+	wizard_screen_next_cb_data->pageindex = EINA_TRUE;
 
 	if (screen_data->screens[pagenum].prev_button) {
 		object = elm_button_add(parent);
@@ -604,7 +605,7 @@ Evas_Object *eulogium_multi_screen_menu(struct eulogium_data *eulogium, Evas_Obj
 		evas_object_size_hint_align_set(object, EVAS_HINT_FILL, EVAS_HINT_FILL);
 		evas_object_size_hint_weight_set(object, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
 		elm_object_text_set(object, _(screen_data->screens[pagenum].next_button));
-		evas_object_smart_callback_add(object, "clicked", _eulogium_multi_screen_next_cb, multi_screen_next_cb_data);
+		evas_object_smart_callback_add(object, "clicked", _wizard_screen_next_cb, wizard_screen_next_cb_data);
 		evas_object_show(object);
 		elm_box_pack_end(_bottom, object);
 	}