diff options
| author | Olliver Schinagl <o.schinagl@ultimaker.com> | 2015-04-07 19:32:10 (GMT) |
|---|---|---|
| committer | Olliver Schinagl <o.schinagl@ultimaker.com> | 2015-04-28 05:07:13 (GMT) |
| commit | 604d87c4aef8b486a12762e135a3acf22f4e1b27 (patch) | |
| tree | 35a0de0dcaf683d5c2b4cba4c159213e6a08cf37 /src | |
| parent | 5d47dce16ab007ebcd5953d0e43325ecb593111a (diff) | |
| download | eulogium-604d87c4aef8b486a12762e135a3acf22f4e1b27.zip eulogium-604d87c4aef8b486a12762e135a3acf22f4e1b27.tar.gz eulogium-604d87c4aef8b486a12762e135a3acf22f4e1b27.tar.bz2 | |
add multiscreen initial tries
Signed-off-by: Olliver Schinagl <o.schinagl@ultimaker.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/eulogium.c | 29 | ||||
| -rw-r--r-- | src/eulogium.h | 2 |
2 files changed, 28 insertions, 3 deletions
diff --git a/src/eulogium.c b/src/eulogium.c index 40239c1..d8c6dfd 100644 --- a/src/eulogium.c +++ b/src/eulogium.c @@ -482,17 +482,28 @@ Evas_Object *eulogium_multi_text_menu(struct eulogium_data *eulogium, Evas_Objec return eulogium_split_screen(parent, _top, _bottom); } -Evas_Object *eulogium_multi_screen_menu(struct eulogium_data *eulogium, Evas_Object *parent, Eina_List *multi_screen_data) +Evas_Object *eulogium_multi_screen_menu(struct eulogium_data *eulogium, Evas_Object *parent, struct multi_screen *screen) { Evas_Object *object; Evas_Object *_top, *_bottom; - struct multi_screen *screen; + + printf("%s\n", screen->text); + printf("%s\n", screen->text); + printf("%s\n", screen->text); switch (screen->type) { case TEXT: break; + case BUTTON: + break; + case MATERIAL: + break; + case PROGRESS: + break; } +// printf("%s\n", eulogium->print.name); + _bottom = elm_box_add(parent); evas_object_show(_bottom); if (screen->prev_button) { @@ -671,6 +682,15 @@ static struct multi_text txtdata = { }, }; +static Eina_List *wizzard; /* TODO find a good spot to put this. */ +static struct multi_screen screen = { + .type = TEXT, + .text = "Welcome to your new Ultimaker", + .data = NULL, + .next_button = "Continue", + .prev_button = NULL, +}; + Evas_Object *eulogium_main_menu(Evas_Object *window, struct eulogium_data *eulogium) { Evas_Object *content; @@ -682,7 +702,8 @@ Evas_Object *eulogium_main_menu(Evas_Object *window, struct eulogium_data *eulog // elm_naviframe_item_title_enabled_set(eulogium->layout, EINA_TRUE, EINA_TRUE); // elm_naviframe_item_title_visible_set(eulogium->layout, EINA_FALSE); - content = eulogium_tripple_button_menu(eulogium->layout, &but_main_print, &but_main_material, &but_main_maintanance); + //content = eulogium_tripple_button_menu(eulogium->layout, &but_main_print, &but_main_material, &but_main_maintanance); + content = eulogium_multi_screen_menu(eulogium, eulogium->layout, &screen); if (!content) return NULL; elm_naviframe_item_simple_push(eulogium->layout, content); @@ -832,6 +853,8 @@ EAPI_MAIN int elm_main(int argc, char **argv) elm_run(); + eina_list_free(wizzard); + elm_shutdown(); return EXIT_SUCCESS; diff --git a/src/eulogium.h b/src/eulogium.h index ee6294d..90df531 100644 --- a/src/eulogium.h +++ b/src/eulogium.h @@ -52,6 +52,7 @@ struct multi_screen { void *data; char *next_button; char *prev_button; + /* TODO concider adding a button_def for the buttons */ }; void eulogium_print_file_set(struct eulogium_data *eulogium, char *filepath); @@ -66,5 +67,6 @@ Evas_Object *eulogium_tripple_button_menu(Evas_Object *parent, const struct butt Evas_Object *eulogium_print_menu(struct eulogium_data *eulogium, char *filepath); Evas_Object *eulogium_print_progress(struct eulogium_data *eulogium); Evas_Object *eulogium_multi_text_menu(struct eulogium_data *eulogium, Evas_Object *parent, struct button_def *button, struct multi_text *data, const uint_fast8_t pagenum, Eina_Bool pageindex); +Evas_Object *eulogium_multi_screen_menu(struct eulogium_data *eulogium, Evas_Object *parent, struct multi_screen *screen); #endif /* _EULOGIUM_H */ |