Revamp progress display

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

1 files changed, 20 insertions, 30 deletions

diff --git a/src/eulogium.c b/src/eulogium.c
index 2d05131..318359b 100644
--- a/src/eulogium.c
+++ b/src/eulogium.c
@@ -538,7 +538,6 @@ static Eina_Bool _timer_progress_data_update_cb(void *data)
 Evas_Object *eulogium_print_progress(struct eulogium_data *eulogium)
 {
 	Evas_Object *_top, *_bottom;
-	Evas_Object *obj;
 
 	eulogium->progress_data_refresh = ecore_timer_add(1.0, _timer_progress_data_update_cb, eulogium);
 	if (!eulogium->progress_data_refresh) { /* TODO make define for the timeout */
@@ -551,51 +550,42 @@ Evas_Object *eulogium_print_progress(struct eulogium_data *eulogium)
 	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);
 	elm_box_homogeneous_set(_top, EINA_FALSE);
+	evas_object_show(_top);
 
 	eulogium->status = elm_label_add(_top);
-	elm_object_text_set(eulogium->status, "Print time: ...<br>Print status unknown.");
+	elm_object_text_set(eulogium->status, "Unknown print status");
 	elm_label_slide_mode_set(eulogium->status, ELM_LABEL_SLIDE_MODE_NONE);
 	evas_object_size_hint_align_set(eulogium->status, EVAS_HINT_FILL, EVAS_HINT_FILL);
 	evas_object_show(eulogium->status);
 	elm_box_pack_end(_top, eulogium->status);
-#if 0
 
-	eulogium->status = elm_label_add(table);
-	elm_object_text_set(eulogium->status, "Print status unknown.");
-	elm_label_slide_mode_set(eulogium->status, ELM_LABEL_SLIDE_MODE_AUTO);
-	elm_label_slide_duration_set(eulogium->status, 8);
-	elm_object_style_set(eulogium->status, "slide_bounce");
-	evas_object_size_hint_align_set(eulogium->status, EVAS_HINT_FILL, EVAS_HINT_FILL);
-	evas_object_show(eulogium->status);
-	elm_table_pack(table, eulogium->status, 0, 1, 3, 1);
-#endif
-	obj = elm_label_add(_top);
-	elm_object_text_set(obj, eulogium->print.name);
-	elm_label_slide_mode_set(obj, ELM_LABEL_SLIDE_MODE_AUTO);
+	eulogium->time = elm_label_add(_top);
+	elm_object_text_set(eulogium->time, "Calculating print time ...");
+	elm_label_slide_mode_set(eulogium->time, ELM_LABEL_SLIDE_MODE_NONE);
+	evas_object_size_hint_align_set(eulogium->time, EVAS_HINT_FILL, EVAS_HINT_FILL);
+	evas_object_show(eulogium->time);
+	elm_box_pack_end(_top, eulogium->time);
+
+	eulogium->name = elm_label_add(_top);
+	elm_object_text_set(eulogium->name, eulogium->print.name);
+	elm_label_slide_mode_set(eulogium->name, ELM_LABEL_SLIDE_MODE_AUTO);
 	//elm_label_slide_speed_set(object, 2);
-	elm_label_slide_go(obj);
-	elm_object_style_set(obj, "slide_bounce");
-	evas_object_size_hint_align_set(obj, EVAS_HINT_FILL, EVAS_HINT_FILL);
-	evas_object_show(obj);
-	elm_box_pack_end(_top, obj);
+	elm_label_slide_go(eulogium->name);
+	elm_object_style_set(eulogium->name, "slide_bounce");
+	evas_object_size_hint_align_set(eulogium->name, EVAS_HINT_FILL, EVAS_HINT_FILL);
+	evas_object_show(eulogium->name);
+	elm_box_pack_end(_top, eulogium->name);
 
-	if (!eulogium->progress)
-		eulogium->progress = elm_progressbar_add(_top); /* TODO: depending on i18n sig, change inverted */
+	eulogium->progress = elm_progressbar_add(_top); /* TODO: depending on i18n sig, change inverted */
 	elm_progressbar_horizontal_set(eulogium->progress, EINA_TRUE);
 	elm_progressbar_pulse_set(eulogium->progress, EINA_FALSE); /* TODO: pulse = time-unknown/pause */
 	elm_progressbar_pulse(eulogium->progress, EINA_FALSE);
-elm_progressbar_value_set(eulogium->progress, 0.5);
-	elm_progressbar_unit_format_set(eulogium->progress, "%1.0f%%");
+	elm_progressbar_value_set(eulogium->progress, eulogium->print.progress);
+	elm_progressbar_unit_format_set(eulogium->progress, "%1.1f %%");
 	evas_object_size_hint_align_set(eulogium->progress, EVAS_HINT_FILL, EVAS_HINT_FILL);
 	evas_object_show(eulogium->progress);
 	elm_box_pack_end(_top, eulogium->progress);
 
-	obj = elm_separator_add(eulogium->navi);
-	elm_separator_horizontal_set(obj, EINA_TRUE);
-	evas_object_show(obj);
-	elm_box_pack_end(_top, obj);
-	evas_object_show(_top);
-
 	_bottom = eulogium_dual_button_add(eulogium->navi, &but_print_progress_tune, &but_print_abort);
 	evas_object_show(_bottom);