From c96c80c905eee8a5e5c47aaf13230fb2054f65ad Mon Sep 17 00:00:00 2001 From: Olliver Schinagl Date: Wed, 29 Apr 2015 17:10:00 +0200 Subject: change print progress to a box from a table Signed-off-by: Olliver Schinagl --- src/eulogium.c | 51 +++++++++++++++++---------------------------------- 1 file changed, 17 insertions(+), 34 deletions(-) diff --git a/src/eulogium.c b/src/eulogium.c index a0a6613..dccb053 100644 --- a/src/eulogium.c +++ b/src/eulogium.c @@ -443,21 +443,21 @@ Evas_Object *eulogium_split_screen(Evas_Object *parent, Evas_Object *top, Evas_O Evas_Object *eulogium_print_progress(struct eulogium_data *eulogium) { - Evas_Object *table; + Evas_Object *box; Evas_Object *object; char buf[255]; - table = elm_table_add(eulogium->navi); - evas_object_size_hint_weight_set(table, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - evas_object_size_hint_align_set(table, EVAS_HINT_FILL, EVAS_HINT_FILL); - elm_table_homogeneous_set(table, EINA_FALSE); + 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); - eulogium->status = elm_label_add(table); + eulogium->status = elm_label_add(box); 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_table_pack(table, eulogium->status, 0, 0, 3, 1); + elm_box_pack_end(box, eulogium->status); #if 0 eulogium->status = elm_label_add(table); @@ -469,7 +469,7 @@ 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(table); + object = elm_label_add(box); elm_object_text_set(object, eulogium->print.name); elm_label_slide_mode_set(object, ELM_LABEL_SLIDE_MODE_AUTO); //elm_label_slide_speed_set(object, 2); @@ -477,10 +477,10 @@ Evas_Object *eulogium_print_progress(struct eulogium_data *eulogium) 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_table_pack(table, object, 0, 2, 3, 1); + elm_box_pack_end(box, object); if (!eulogium->progress) - eulogium->progress = elm_progressbar_add(table); /* TODO: depending on i18n sig, change inverted */ + eulogium->progress = elm_progressbar_add(box); /* 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,42 +488,25 @@ 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_table_pack(table, eulogium->progress, 0, 3, 3, 1); + 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_table_pack(table, object, 0, 4, 3, 1); - - object = elm_button_add(table); - elm_object_text_set(object, "TUNE"); /* TODO create tune button */ - 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); - evas_object_show(object); - elm_table_pack(table, object, 0, 5, 1, 1); + elm_box_pack_end(box, object); - object = elm_separator_add(eulogium->navi); - elm_separator_horizontal_set(object, EINA_FALSE); - evas_object_size_hint_weight_set(object, 0, 0); + object = eulogium_dual_button_add(box, &but_print_progress_tune, &but_print_abort); evas_object_show(object); - elm_table_pack(table, object, 1, 5, 1, 1); - - object = elm_button_add(table); - elm_object_text_set(object, "ABORT"); /* TODO create pause button */ - 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); - evas_object_smart_callback_add(object, "clicked", _print_abort_cb, eulogium); /* TODO use button! */ - evas_object_show(object); - elm_table_pack(table, object, 2, 5, 1, 1); + elm_box_pack_end(box, object); - object = elm_label_add(table); + 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_table_pack(table, object, 0, 6, 3, 1); + elm_box_pack_end(box, object); - return table; + return box; } Evas_Object *eulogium_generic_error(struct eulogium_data *eulogium, uint8_t eulogium_error) -- cgit v0.12