diff options
author | Olliver Schinagl <o.schinagl@ultimaker.com> | 2015-04-25 20:17:51 (GMT) |
---|---|---|
committer | Olliver Schinagl <o.schinagl@ultimaker.com> | 2015-04-28 05:07:16 (GMT) |
commit | 6c02ee1fc136d0aed8f52553030b5081cb264bc4 (patch) | |
tree | 9ea08054f53696fc65a7ec3a7bff604617206513 /src | |
parent | 23e57482775fbbc4ef41e440145c9c9f8acf314f (diff) | |
download | eulogium-6c02ee1fc136d0aed8f52553030b5081cb264bc4.zip eulogium-6c02ee1fc136d0aed8f52553030b5081cb264bc4.tar.gz eulogium-6c02ee1fc136d0aed8f52553030b5081cb264bc4.tar.bz2 |
Remove old txtdata
Signed-off-by: Olliver Schinagl <o.schinagl@ultimaker.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/eulogium.c | 99 |
1 files changed, 13 insertions, 86 deletions
diff --git a/src/eulogium.c b/src/eulogium.c index 0458e5a..c042b8b 100644 --- a/src/eulogium.c +++ b/src/eulogium.c @@ -301,9 +301,22 @@ elm_progressbar_value_set(eulogium->print.progress, 0.5); return table; } +static void _on_start_print_ret(void *data EINA_UNUSED, const Eldbus_Message *msg, Eldbus_Pending *pending EINA_UNUSED) +{ + const char *errname, *errmsg; + + if (eldbus_message_error_get(msg, &errname, &errmsg)) { + EINA_LOG_ERR("%s %s", errname, errmsg); + return; + } +} + Evas_Object *eulogium_start_print(struct eulogium_data *eulogium, char *filepath) { eulogium_print_data_set(eulogium, filepath); + eldbus_proxy_call(eulogium->dbus.proxy[HARMA], "startPrint", _on_start_print_ret, eulogium, -1, "sss", + eulogium->print.name, eulogium->print.file, ""); + /* TODO check status of print and show that to the user before going to the progress screen */ return eulogium_print_progress(eulogium); } @@ -477,76 +490,6 @@ Evas_Object *eulogium_print_menu(struct eulogium_data *eulogium, char *filepath) return box; } -struct _multi_text_next_cb_data { - struct eulogium_data *eulogium; - struct multi_text *txtdata; - uint_fast8_t pagenum; - Eina_Bool pageindex; -}; - -static void _eulogium_multi_text_next_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) -{ - Evas_Object *content; - struct eulogium_data *eulogium = ((struct _multi_text_next_cb_data *)data)->eulogium; - uint_fast8_t pagenum = ((struct _multi_text_next_cb_data *)data)->pagenum; - Eina_Bool pageindex = ((struct _multi_text_next_cb_data *)data)->pageindex; - struct multi_text *txtdata = ((struct _multi_text_next_cb_data *)data)->txtdata; - - if (pagenum >= txtdata->count) { - Elm_Object_Item *item; - - item = elm_naviframe_bottom_item_get(eulogium->navi); - if (item) - elm_naviframe_item_pop_to(item); /* XXX what to do else? */ - } else { - content = eulogium_multi_text_menu(eulogium, eulogium->navi, NULL, txtdata, pagenum, pageindex); - if (content) - elm_naviframe_item_simple_push(eulogium->navi, content); /* XXX what else? */ - } - free(data); -} - -Evas_Object *eulogium_multi_text_menu(struct eulogium_data *eulogium, Evas_Object *parent, struct button_def *button, struct multi_text *txtdata, uint_fast8_t pagenum, Eina_Bool pageindex) -{ - Evas_Object *object; - Evas_Object *_top, *_bottom; - char buf[6]; - struct _multi_text_next_cb_data *multi_text_next_cb_data; - - if (pagenum >= txtdata->count) - pagenum = txtdata->count - 1; - - _top = elm_box_add(parent); - evas_object_show(_top); - - if (pageindex) { - object = elm_label_add(_top); - snprintf(buf, sizeof(buf), "%d/%d", pagenum + 1, txtdata->count); - elm_object_text_set(object, buf); - evas_object_show(object); - evas_object_size_hint_align_set(object, 1.0, 0); - elm_box_pack_end(_top, object); - } - - object = elm_label_add(_top); - elm_object_text_set(object, txtdata->text[pagenum]); - evas_object_show(object); - elm_box_pack_end(_top, object); - - multi_text_next_cb_data = malloc(sizeof(struct _multi_text_next_cb_data)); - multi_text_next_cb_data->eulogium = eulogium; - multi_text_next_cb_data->txtdata = txtdata; - multi_text_next_cb_data->pagenum = pagenum + 1; - multi_text_next_cb_data->pageindex = EINA_TRUE; - - _bottom = elm_button_add(parent); - elm_object_text_set(_bottom, button ? button->text : "NEXT"); /* change to txtdata->buttontext */ - evas_object_smart_callback_add(_bottom, "clicked", _eulogium_multi_text_next_cb, multi_text_next_cb_data); - evas_object_show(_bottom); - - return eulogium_split_screen(parent, _top, _bottom); -} - struct _multi_screen_next_cb_data { struct eulogium_data *eulogium; struct multi_screen_data *screen_data; @@ -869,16 +812,6 @@ static struct button_def but_main_maintanance = { .data = NULL, }; -static struct multi_text txtdata = { - .text = { - "Welcome<br>" - "to your new Ultimaker", - "Level the bed!", - "Lets Print!", - NULL, /* SENTINEL */ - }, -}; - static struct multi_screen screen[] = { { .type = NONE, @@ -945,7 +878,6 @@ Evas_Object *eulogium_main_menu(Evas_Object *window, struct eulogium_data *eulog #if 0 // if (firstrunwiz) { content = eulogium_multi_screen_menu(eulogium, eulogium->navi, &screen_data, 0, EINA_TRUE); - //content = eulogium_multi_text_menu(eulogium, eulogium->navi, NULL, &txtdata, 0, EINA_TRUE); if (!content) return NULL; elm_naviframe_item_simple_push(eulogium->navi, content); @@ -956,11 +888,6 @@ Evas_Object *eulogium_main_menu(Evas_Object *window, struct eulogium_data *eulog static void eulogium_setup(struct eulogium_data *eulogium) { - /* XXX this is very ugly */ - txtdata.count = 0; - while (txtdata.text[txtdata.count]) - txtdata.count++; - screen_data.count = 0; while (screen_data.screen[screen_data.count].type != END) screen_data.count++; |