more archive

Signed-off-by: Olliver Schinagl <o.schinagl@ultimaker.com>

8 files changed, 88 insertions, 72 deletions

diff --git a/data/themes/default/Makefile.am b/data/themes/default/Makefile.am
index c67f0a1..369a986 100644
--- a/data/themes/default/Makefile.am
+++ b/data/themes/default/Makefile.am
@@ -99,7 +99,8 @@ edc/elm/scroller.edc \
 edc/elm/segment_control.edc \
 edc/elm/separator.edc \
 edc/elm/slider.edc \
-edc/elm/slideshow.edc \
+edc/elm/slider.edc \
+edc/elm/spinner.edc \
 edc/elm/spinner.edc \
 edc/elm/thumb.edc \
 edc/elm/toolbar.edc \
diff --git a/data/themes/default/default.edc b/data/themes/default/default.edc
index 725867a..6195350 100644
--- a/data/themes/default/default.edc
+++ b/data/themes/default/default.edc
@@ -63,7 +63,7 @@ collections {
 //#include "edc/elm/popup.edc"
 //#include "edc/elm/border.edc"
 // XXX: min size calc problems - too wide! ... err ok on my 32bit box... eh?
-//#include "edc/elm/spinner.edc"
+#include "edc/elm/spinner.edc"
 //#include "edc/elm/menu.edc"
 //#include "edc/elm/clock.edc"
 //#include "edc/elm/gengrid.edc"
diff --git a/data/themes/default/deps.txt b/data/themes/default/deps.txt
index 3d5155b..eec7534 100644
--- a/data/themes/default/deps.txt
+++ b/data/themes/default/deps.txt
@@ -11,6 +11,7 @@
   ../../../data/themes/default/edc/elm/icon.edc \
   ../../../data/themes/default/edc/elm/progress.edc \
   ../../../data/themes/default/edc/elm/naviframe.edc \
+  ../../../data/themes/default/edc/elm/spinner.edc \
   ../../../data/themes/default/img/button_normal.png \
   ../../../data/themes/default/img/button_outline.png \
   ../../../data/themes/default/img/bevel_in.png \
@@ -33,4 +34,17 @@
   ../../../data/themes/default/img/inset_bar_vert_glow_inv_base.png \
   ../../../data/themes/default/img/inset_bar_vert_glow_mid_base.png \
   ../../../data/themes/default/img/knob_round_busy.png \
-  ../../../data/themes/default/img/glow_round_corners.png
\ No newline at end of file
+  ../../../data/themes/default/img/glow_round_corners.png \
+  ../../../data/themes/default/img/vert_bar_inset.png \
+  ../../../data/themes/default/img/sym_left_light_normal.png \
+  ../../../data/themes/default/img/sym_left_glow_normal.png \
+  ../../../data/themes/default/img/sym_left_dark_normal.png \
+  ../../../data/themes/default/img/sym_right_light_normal.png \
+  ../../../data/themes/default/img/sym_right_glow_normal.png \
+  ../../../data/themes/default/img/sym_right_dark_normal.png \
+  ../../../data/themes/default/img/sym_up_light_normal.png \
+  ../../../data/themes/default/img/sym_up_glow_normal.png \
+  ../../../data/themes/default/img/sym_up_dark_normal.png \
+  ../../../data/themes/default/img/sym_down_light_normal.png \
+  ../../../data/themes/default/img/sym_down_glow_normal.png \
+  ../../../data/themes/default/img/sym_down_dark_normal.png
\ No newline at end of file
diff --git a/data/themes/default/edc/elm/slider.edc b/data/themes/default/edc/elm/slider.edc
index 1b1c324..f1b3e18 100644
--- a/data/themes/default/edc/elm/slider.edc
+++ b/data/themes/default/edc/elm/slider.edc
@@ -53,15 +53,15 @@ group { name: "elm/slider/horizontal/default";
          new i = m & INVERT;
          if (i) {
             if (!d) {
-               set_state(PART:"base", "default", 0.0);
+               set_state(PART:"basebar", "default", 0.0);
             } else {
-               set_state(PART:"base", "disabled", 0.0);
+               set_state(PART:"basebar", "disabled", 0.0);
             }
          } else {
             if (!d) {
-               set_state(PART:"base", "default", 0.0);
+               set_state(PART:"basebar", "default", 0.0);
             } else {
-               set_state(PART:"base", "disabled", 0.0);
+               set_state(PART:"basebar", "disabled", 0.0);
             }
          }
          if (l) {
@@ -110,10 +110,10 @@ group { name: "elm/slider/horizontal/default";
    }
    parts {
       part { name: "elm.swallow.bar"; type: SWALLOW;
-         scale: 1;
+         scale: 0;
          description { state: "default" 0.0;
-            min: 42 14;
-            max: 99999 14;
+            min: 42 10;
+            max: 99999 10;
             align: 1.0 0.5;
             rel1.to_x: "elm.swallow.icon";
             rel1.relative: 1.0 0.0;
@@ -124,6 +124,10 @@ group { name: "elm/slider/horizontal/default";
          }
       }
       part { name: "base"; mouse_events: 0;
+	      description { state: "default" 0.0;
+	      }
+      }
+      part { name: "basebar"; mouse_events: 0;
          description { state: "default" 0.0;
             rel1.to: "elm.swallow.bar";
             rel2.to: "elm.swallow.bar";
@@ -141,8 +145,8 @@ group { name: "elm/slider/horizontal/default";
       }
       part { name: "bevel"; mouse_events: 0;
          description { state: "default" 0.0;
-            rel1.to: "base";
-            rel2.to: "base";
+            rel1.to: "basebar";
+            rel2.to: "basebar";
             image.normal: "slider_run_bevel_horiz.png";
             image.border: 5 5 0 0;
             fill.smooth: 0;
@@ -253,11 +257,13 @@ group { name: "elm/slider/horizontal/default";
             rel2.offset: -3 -3;
          }
       }
-      part { name: "sizer.content.values"; type: TEXT; mouse_events: 0;
+      part { name: "elm.content.values"; type: TEXT; mouse_events: 0;
          scale: 1;
 	 description { state: "default" 0.0;
             visible: 0;
 	    fixed: 1 1;
+	    rel1.offset: 1 1;
+	    rel2.offset: -1 -1;
 	    rel1.relative: 0.0 (2/3);
 	    rel2.relative: 1.0 (3/3);
 	    text {
@@ -272,15 +278,13 @@ group { name: "elm/slider/horizontal/default";
          description { state: "default" 0.0;
             visible: 0;
             fixed: 1 1;
-            //rel1.to_x: "limits";
-            //rel2.to_x: "limits";
-	    rel1.relative: 0.0 (2/3);
-	    rel2.relative: 0.0 (3/3);
+	    rel1.to: "elm.content.values";
+	    rel2.to: "elm.content.values";
             color: FN_COL_DEFAULT;
             color_class: "slider_text";
             text { font: FN;
                text_class: "slider";
-               align: 1.0 0.5;
+               align: 0.25 0.5;
                min: 1 1;
                ellipsis: -1;
             }
@@ -300,17 +304,14 @@ group { name: "elm/slider/horizontal/default";
          description { state: "default" 0.0;
             visible: 0;
             align: 1.0 0.5;
-	    // TODO move this to hug the 'units' element
-            rel1.relative: 1.0 (2/3);
-            rel2.relative: 1.0 (3/3);
+	    rel1.to: "elm.content.values";
+	    rel2.to: "elm.content.values";
+            rel1.relative: 0.75 0.5; /* TODO 'align to 0.5' */
+            rel2.relative: 0.75 0.5;
          }
          description { state: "visible" 0.0;
             inherit: "default" 0.0;
             visible: 1;
-            aspect: 1.0 1.0;
-            aspect_preference: VERTICAL;
-            rel1.offset: -3 2;
-            rel2.offset: -3 -3;
          }
       }
       part { name: "sizer.content.end"; type: TEXT; mouse_events:  0;
diff --git a/data/themes/default/edc/elm/spinner.edc b/data/themes/default/edc/elm/spinner.edc
index a631eae..b5e5694 100644
--- a/data/themes/default/edc/elm/spinner.edc
+++ b/data/themes/default/edc/elm/spinner.edc
@@ -8,7 +8,6 @@ group { name: "elm/spinner/base/default";
    images.image: "sym_right_dark_normal.png" COMP;
    parts {
       part { name: "elm.text"; type: TEXT;
-         effect: SHADOW BOTTOM;
          scale: 1;
          description { state: "default" 0.0;
             color: FN_COL_DEFAULT;
diff --git a/src/eulogium.c b/src/eulogium.c
index 973965e..663f1ff 100644
--- a/src/eulogium.c
+++ b/src/eulogium.c
@@ -2248,7 +2248,7 @@ static void _but_led_hue_cb(void *data, Evas_Object *object EINA_UNUSED, void *e
 	Evas_Object *content;
 
 	printf("Button led_hue pressed\n");
-	content = ui_widget_dial(eulogium->navi, eulogium, &dial_led_hue);
+	content = ui_widget_slider(eulogium->navi, eulogium, &dial_led_hue);
 	ui_stack_push(eulogium, content, PAGE_NORMAL);
 }
 
@@ -2258,7 +2258,7 @@ static void _but_led_saturation_cb(void *data, Evas_Object *object EINA_UNUSED,
 	Evas_Object *content;
 
 	printf("Button led_saturation pressed\n");
-	content = ui_widget_dial(eulogium->navi, eulogium, &dial_led_saturation);
+	content = ui_widget_slider(eulogium->navi, eulogium, &dial_led_saturation);
 	ui_stack_push(eulogium, content, PAGE_NORMAL);
 }
 
@@ -2268,7 +2268,7 @@ static void _but_led_brightness_cb(void *data, Evas_Object *object EINA_UNUSED,
 	Evas_Object *content;
 
 	printf("Button led_brightness pressed\n");
-	content = ui_widget_dial(eulogium->navi, eulogium, &dial_led_brightness);
+	content = ui_widget_slider(eulogium->navi, eulogium, &dial_led_brightness);
 	ui_stack_push(eulogium, content, PAGE_PRINTING);
 }
 
@@ -2278,7 +2278,7 @@ static void _but_bed_heatup_cb(void *data, Evas_Object *object EINA_UNUSED, void
 	Evas_Object *content;
 
 	printf("Button bed temperature pressed\n");
-	content = ui_widget_dial(eulogium->navi, eulogium, &dials[PROC_BED_HEATUP]);
+	content = ui_widget_slider(eulogium->navi, eulogium, &dials[PROC_BED_HEATUP]);
 	ui_stack_push(eulogium, content, PAGE_NORMAL);
 }
 
@@ -2288,7 +2288,7 @@ static void _but_hotend_heatup_0_cb(void *data, Evas_Object *object EINA_UNUSED,
 	Evas_Object *content;
 
 	printf("Button hotend 1 temperature pressed\n");
-	content = ui_widget_dial(eulogium->navi, eulogium, &dials[PROC_HOTEND_HEATUP_0]);
+	content = ui_widget_slider(eulogium->navi, eulogium, &dials[PROC_HOTEND_HEATUP_0]);
 	ui_stack_push(eulogium, content, PAGE_NORMAL);
 }
 
@@ -2298,7 +2298,7 @@ static void _but_hotend_heatup_1_cb(void *data, Evas_Object *object EINA_UNUSED,
 	Evas_Object *content;
 
 	printf("Button hotend 2 temperature pressed\n");
-	content = ui_widget_dial(eulogium->navi, eulogium, &dials[PROC_HOTEND_HEATUP_1]);
+	content = ui_widget_slider(eulogium->navi, eulogium, &dials[PROC_HOTEND_HEATUP_1]);
 	ui_stack_push(eulogium, content, PAGE_NORMAL);
 }
 
@@ -2314,7 +2314,7 @@ static void _but_print_speed_cb(void *data, Evas_Object *object EINA_UNUSED, voi
 	Evas_Object *content;
 
 	printf("Button print speed pressed\n");
-	content = ui_widget_dial(eulogium->navi, eulogium, &dials[PROC_PRINT_SPEED]);
+	content = ui_widget_slider(eulogium->navi, eulogium, &dials[PROC_PRINT_SPEED]);
 	ui_stack_push(eulogium, content, PAGE_PRINTING);
 }
 
@@ -2324,7 +2324,7 @@ static void _but_fan_speed_cb(void *data, Evas_Object *object EINA_UNUSED, void
 	Evas_Object *content;
 
 	printf("Button fan speed pressed\n");
-	content = ui_widget_dial(eulogium->navi, eulogium, &dials[PROC_FAN_SPEED]);
+	content = ui_widget_slider(eulogium->navi, eulogium, &dials[PROC_FAN_SPEED]);
 	ui_stack_push(eulogium, content, PAGE_NORMAL);
 }
 
@@ -2334,7 +2334,7 @@ static void _but_flow_rate_cb(void *data, Evas_Object *object EINA_UNUSED, void
 	Evas_Object *content;
 
 	printf("Button material flow pressed\n");
-	content = ui_widget_dial(eulogium->navi, eulogium, &dials[PROC_FLOW_RATE]);
+	content = ui_widget_slider(eulogium->navi, eulogium, &dials[PROC_FLOW_RATE]);
 	ui_stack_push(eulogium, content, PAGE_NORMAL);
 }
 
@@ -2354,7 +2354,7 @@ static void _but_retraction_length_cb(void *data, Evas_Object *obj EINA_UNUSED,
 	Evas_Object *content = NULL;
 
 	printf("But retraction length\n");
-	content = ui_widget_dial(eulogium->navi, eulogium, &dials[PROC_RETRACTION_LENGTH]);
+	content = ui_widget_slider(eulogium->navi, eulogium, &dials[PROC_RETRACTION_LENGTH]);
 	ui_stack_push(eulogium, content, PAGE_NORMAL);
 }
 
@@ -2364,7 +2364,7 @@ static void _but_retraction_speed_cb(void *data, Evas_Object *obj EINA_UNUSED, v
 	Evas_Object *content = NULL;
 
 	printf("But retraction speed\n");
-	content = ui_widget_dial(eulogium->navi, eulogium, &dials[PROC_RETRACTION_SPEED]);
+	content = ui_widget_slider(eulogium->navi, eulogium, &dials[PROC_RETRACTION_SPEED]);
 	ui_stack_push(eulogium, content, PAGE_NORMAL);
 }
 
@@ -2374,7 +2374,7 @@ static void _but_retraction_zhop_cb(void *data, Evas_Object *obj EINA_UNUSED, vo
 	Evas_Object *content = NULL;
 
 	printf("But retraction zhop\n");
-	content = ui_widget_dial(eulogium->navi, eulogium, &dials[PROC_RETRACTION_ZHOP]);
+	content = ui_widget_slider(eulogium->navi, eulogium, &dials[PROC_RETRACTION_ZHOP]);
 	ui_stack_push(eulogium, content, PAGE_NORMAL);
 }
 
@@ -2408,7 +2408,7 @@ static void _but_bed_move_cb(void *data, Evas_Object *obj EINA_UNUSED, void *eve
 	Evas_Object *content = NULL;
 
 	printf("But bed move\n");
-	content = ui_widget_rotator(eulogium->navi, eulogium, &dials[PROC_BED_MOVE]);
+	content = ui_widget_spinner(eulogium->navi, eulogium, &dials[PROC_BED_MOVE]);
 	ui_stack_push(eulogium, content, PAGE_NORMAL);
 }
 
@@ -2418,7 +2418,7 @@ static void _but_material_move_0_cb(void *data, Evas_Object *obj EINA_UNUSED, vo
 	Evas_Object *content = NULL;
 
 	printf("But move material 0\n");
-	content = ui_widget_rotator(eulogium->navi, eulogium, &dials[PROC_MATERIAL_MOVE_0]);
+	content = ui_widget_spinner(eulogium->navi, eulogium, &dials[PROC_MATERIAL_MOVE_0]);
 	ui_stack_push(eulogium, content, PAGE_NORMAL);
 }
 
@@ -2428,7 +2428,7 @@ static void _but_material_move_1_cb(void *data, Evas_Object *obj EINA_UNUSED, vo
 	Evas_Object *content = NULL;
 
 	printf("But move material 1\n");
-	content = ui_widget_rotator(eulogium->navi, eulogium, &dials[PROC_MATERIAL_MOVE_1]);
+	content = ui_widget_spinner(eulogium->navi, eulogium, &dials[PROC_MATERIAL_MOVE_1]);
 	ui_stack_push(eulogium, content, PAGE_NORMAL);
 }
 
@@ -2448,7 +2448,7 @@ static void _but_jerk_xy_cb(void *data, Evas_Object *obj EINA_UNUSED, void *even
 	Evas_Object *content = NULL;
 
 	printf("But jerk xy\n");
-	content = ui_widget_dial(eulogium->navi, eulogium, &dials[PROC_JERK_XY]);
+	content = ui_widget_slider(eulogium->navi, eulogium, &dials[PROC_JERK_XY]);
 	ui_stack_push(eulogium, content, PAGE_NORMAL);
 }
 
@@ -2458,7 +2458,7 @@ static void _but_jerk_z_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event
 	Evas_Object *content = NULL;
 
 	printf("But jerk z\n");
-	content = ui_widget_dial(eulogium->navi, eulogium, &dials[PROC_JERK_Z]);
+	content = ui_widget_slider(eulogium->navi, eulogium, &dials[PROC_JERK_Z]);
 	ui_stack_push(eulogium, content, PAGE_NORMAL);
 }
 
@@ -2468,7 +2468,7 @@ static void _but_current_xy_cb(void *data, Evas_Object *obj EINA_UNUSED, void *e
 	Evas_Object *content = NULL;
 
 	printf("But current xy\n");
-	content = ui_widget_dial(eulogium->navi, eulogium, &dials[PROC_CURRENT_XY]);
+	content = ui_widget_slider(eulogium->navi, eulogium, &dials[PROC_CURRENT_XY]);
 	ui_stack_push(eulogium, content, PAGE_NORMAL);
 }
 
@@ -2478,7 +2478,7 @@ static void _but_current_z_cb(void *data, Evas_Object *obj EINA_UNUSED, void *ev
 	Evas_Object *content = NULL;
 
 	printf("But current z\n");
-	content = ui_widget_dial(eulogium->navi, eulogium, &dials[PROC_CURRENT_Z]);
+	content = ui_widget_slider(eulogium->navi, eulogium, &dials[PROC_CURRENT_Z]);
 	ui_stack_push(eulogium, content, PAGE_NORMAL);
 }
 
@@ -2488,7 +2488,7 @@ static void _but_current_e_cb(void *data, Evas_Object *obj EINA_UNUSED, void *ev
 	Evas_Object *content = NULL;
 
 	printf("But current e\n");
-	content = ui_widget_dial(eulogium->navi, eulogium, &dials[PROC_CURRENT_E]);
+	content = ui_widget_slider(eulogium->navi, eulogium, &dials[PROC_CURRENT_E]);
 	ui_stack_push(eulogium, content, PAGE_NORMAL);
 }
 
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);
 	}
diff --git a/src/ui_widgets.h b/src/ui_widgets.h
index e6a5f56..d4b1524 100644
--- a/src/ui_widgets.h
+++ b/src/ui_widgets.h
@@ -93,7 +93,7 @@ enum screen_type {
 	END, /* sentinel */
 };
 
-struct multi_screen_data {
+struct wizard_screen_data {
 	uint_fast8_t count;
 	struct {
 		enum screen_type type;
@@ -117,8 +117,8 @@ Elm_Object_Item *ui_stack_push(const struct eulogium_data *eulogium, Evas_Object
 Eina_Bool ui_stack_pop(const struct eulogium_data *eulogium);
 void ui_stack_page_invalidate(Evas_Object *navi, const enum navi_page_state page_state);
 void ui_stack_pop_cb(void *data, Evas_Object *eo EINA_UNUSED, void *event_info EINA_UNUSED);
-Evas_Object *ui_widget_dial(Evas_Object *parent, struct eulogium_data *eulogium, struct settings_dial_data *dial_data);
-Evas_Object *ui_widget_rotator(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 *ui_widget_spinner(Evas_Object *parent, struct eulogium_data *eulogium, struct settings_dial_data *dial_data);
 Evas_Object *ui_widget_progress(Evas_Object *parent, struct eulogium_data *eulogium, const struct procedure_data *procedure);
 
 void ui_init(void);