From bcafdebb71f84643dfd29a0a0238a543dbcd0aa6 Mon Sep 17 00:00:00 2001 From: Olliver Schinagl Date: Thu, 30 Apr 2015 11:38:59 +0200 Subject: Use new dual and split screen frames Signed-off-by: Olliver Schinagl --- src/eulogium.c | 60 +++++++++++++++++++++++++--------------------------------- 1 file changed, 26 insertions(+), 34 deletions(-) diff --git a/src/eulogium.c b/src/eulogium.c index 5342e66..b115bcd 100644 --- a/src/eulogium.c +++ b/src/eulogium.c @@ -443,21 +443,20 @@ Evas_Object *eulogium_split_screen(Evas_Object *parent, Evas_Object *top, Evas_O Evas_Object *eulogium_print_progress(struct eulogium_data *eulogium) { - Evas_Object *box; - Evas_Object *object; - char buf[255]; + Evas_Object *_top, *_bottom; + Evas_Object *obj; - box = elm_box_add(eulogium->navi); - evas_object_size_hint_weight_set(box, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - evas_object_size_hint_align_set(box, EVAS_HINT_FILL, EVAS_HINT_FILL); - elm_box_homogeneous_set(box, EINA_FALSE); + _top = elm_box_add(eulogium->navi); + 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); - eulogium->status = elm_label_add(box); + eulogium->status = elm_label_add(_top); elm_object_text_set(eulogium->status, "Print time: ...
Print status unknown."); 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(box, eulogium->status); + elm_box_pack_end(_top, eulogium->status); #if 0 eulogium->status = elm_label_add(table); @@ -469,18 +468,18 @@ Evas_Object *eulogium_print_progress(struct eulogium_data *eulogium) evas_object_show(eulogium->status); elm_table_pack(table, eulogium->status, 0, 1, 3, 1); #endif - object = elm_label_add(box); - elm_object_text_set(object, eulogium->print.name); - elm_label_slide_mode_set(object, ELM_LABEL_SLIDE_MODE_AUTO); + obj = elm_label_add(_top); + elm_object_text_set(obj, eulogium->print.name); + elm_label_slide_mode_set(obj, ELM_LABEL_SLIDE_MODE_AUTO); //elm_label_slide_speed_set(object, 2); - elm_label_slide_go(object); - elm_object_style_set(object, "slide_bounce"); - evas_object_size_hint_align_set(object, EVAS_HINT_FILL, EVAS_HINT_FILL); - evas_object_show(object); - elm_box_pack_end(box, object); + 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); if (!eulogium->progress) - eulogium->progress = elm_progressbar_add(box); /* 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); @@ -488,25 +487,18 @@ elm_progressbar_value_set(eulogium->progress, 0.5); elm_progressbar_unit_format_set(eulogium->progress, "%1.0f%%"); evas_object_size_hint_align_set(eulogium->progress, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_show(eulogium->progress); - elm_box_pack_end(box, eulogium->progress); - - object = elm_separator_add(eulogium->navi); - elm_separator_horizontal_set(object, EINA_TRUE); - evas_object_show(object); - elm_box_pack_end(box, object); + elm_box_pack_end(_top, eulogium->progress); - object = eulogium_dual_button_add(box, &but_print_progress_tune, &but_print_abort); - evas_object_show(object); - elm_box_pack_end(box, object); + 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); - object = elm_label_add(box); - snprintf(buf, sizeof(buf), "Material: %g m", eulogium->print.material); - elm_object_text_set(object, buf); - evas_object_size_hint_align_set(object, EVAS_HINT_FILL, EVAS_HINT_FILL); - evas_object_show(object); - elm_box_pack_end(box, object); + _bottom = eulogium_dual_button_add(eulogium->navi, &but_print_progress_tune, &but_print_abort); + evas_object_show(_bottom); - return box; + return eulogium_split_screen(eulogium->navi, _top, _bottom); } Evas_Object *eulogium_generic_error(struct eulogium_data *eulogium, uint8_t eulogium_error) -- cgit v0.12