summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorOlliver Schinagl <o.schinagl@ultimaker.com>2015-02-13 10:34:02 (GMT)
committerOlliver Schinagl <o.schinagl@ultimaker.com>2015-04-28 05:07:12 (GMT)
commit9a8bd679820fe5d0d18580dc4d3d6a4e1c1ce1a1 (patch)
treececa5e0495e9961a8f13ea183ea01b3fbcc6ce43 /src
parent68624705cd11cbc28bfdf73e2b011cea1e1ca0d2 (diff)
downloadeulogium-9a8bd679820fe5d0d18580dc4d3d6a4e1c1ce1a1.zip
eulogium-9a8bd679820fe5d0d18580dc4d3d6a4e1c1ce1a1.tar.gz
eulogium-9a8bd679820fe5d0d18580dc4d3d6a4e1c1ce1a1.tar.bz2
tripple_menu done
Diffstat (limited to 'src')
-rw-r--r--src/eulogium.c103
1 files changed, 58 insertions, 45 deletions
diff --git a/src/eulogium.c b/src/eulogium.c
index 2e621f8..ae0bfda 100644
--- a/src/eulogium.c
+++ b/src/eulogium.c
@@ -28,55 +28,61 @@ static void _cb_eulogium_exit(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUS
static Evas_Object *eulogium_mainmenu_create(Evas_Object *window)
{
- Evas_Object *screen;
- Evas_Object *bg;
- Evas_Object *vert_box, *hor_box;
- Evas_Object *but_print, *hspacer, *but_material, *vspacer, *but_maintanance;
+ Evas_Object *screen, *table, *item;
+ Evas_Object *object;
screen = elm_box_add(window);
- bg = elm_bg_add(window);
- elm_bg_color_set(bg, 255, 0, 255);
- evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- evas_object_size_hint_align_set(bg, EVAS_HINT_FILL, EVAS_HINT_FILL);
- elm_box_pack_end(screen, bg);
- evas_object_show(bg);
-
-// vert_box = elm_box_add(window);
-// hor_box = elm_box_add(vert_box);
-
-// elm_box_horizontal_set(hor_box, EINA_TRUE);
-// elm_box_horizontal_set(vert_box, EINA_FALSE);
-
-// elm_object_add(window, vert_box);
-
-// evas_object_show(hor_box);
-// evas_object_show(vert_box);
-
-// but_print = elm_button_add(window);
-// elm_object_text_set(but_print, "PRINT");
-// elm_box_pack_end(hor_box, but_print);
-// evas_object_show(but_print);
-
-// vspacer = elm_separator_add(window);
-// elm_separator_horizontal_set(vspacer, EINA_FALSE);
-// elm_box_pack_end(hor_box, vspacer);
-// evas_object_show(vspacer);
-
-// but_material = elm_button_add(window);
-// elm_object_text_set(but_print, "MATERIAL");
-// elm_box_pack_end(hor_box, but_material);
-// evas_object_show(but_material);
+ table = elm_table_add(window);
+ elm_table_homogeneous_set(table, EINA_FALSE);
+ elm_box_pack_end(screen, table);
+ evas_object_show(table);
+
+ object = elm_button_add(window);
+ elm_object_text_set(object, "PRINT");
+ evas_object_show(object);
+ elm_table_pack(table, object, 0, 0, 1, 1);
+
+#if 0 /* FIXME use themed seperator */
+ object = elm_separator_add(window);
+ elm_separator_horizontal_set(object, EINA_TRUE);
+ evas_object_show(object);
+ elm_table_pack(table, object, 1, 0, 1, 1);
+#else
+ object = evas_object_rectangle_add(evas_object_evas_get(window));
+ evas_object_color_set(object, 0x33, 0x99, 0xff, 0xff);
+ evas_object_size_hint_min_set(object, 1, 0);
+ evas_object_size_hint_weight_set(object, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+ evas_object_size_hint_align_set(object, EVAS_HINT_FILL, EVAS_HINT_FILL);
+ evas_object_show(object);
+ elm_table_pack(table, object, 1, 0, 1, 1);
+#endif
-// hspacer = elm_separator_add(window);
-// elm_separator_horizontal_set(hspacer, EINA_TRUE);
-// elm_box_pack_end(vert_box, hspacer);
-// evas_object_show(hspacer);
+ object = elm_button_add(window);
+ elm_object_text_set(object, "MATERIAL");
+ evas_object_show(object);
+ elm_table_pack(table, object, 2, 0, 1, 1);
+
+#if 0 /* FIXME use themed seperator */
+ object = elm_separator_add(window);
+ elm_separator_horizontal_set(object, EINA_TRUE);
+ evas_object_show(object);
+ elm_table_pack(table, object, 0, 1, 3, 1);
+#else
+ object = evas_object_rectangle_add(evas_object_evas_get(window));
+ evas_object_color_set(object, 0x33, 0x99, 0xff, 0xff);
+ evas_object_size_hint_min_set(object, 0, 1);
+ evas_object_size_hint_weight_set(object, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+ evas_object_size_hint_align_set(object, EVAS_HINT_FILL, EVAS_HINT_FILL);
+ evas_object_show(object);
+ elm_table_pack(table, object, 0, 1, 3, 1);
+#endif
-// but_maintanance = elm_button_add(window);
-// elm_object_text_set(but_maintanance, "MAINTANANCE");
-// elm_box_pack_end(vert_box, but_maintanance);
-// evas_object_show(but_maintanance);
+ object = elm_button_add(window);
+ elm_object_text_set(object, "MAINTANANCE");
+ evas_object_show(object);
+ elm_table_pack(table, object, 0, 2, 3, 1);
+
evas_object_show(screen);
return screen;
@@ -147,8 +153,8 @@ EAPI_MAIN int elm_main(int argc, char **argv)
evas_object_image_file_set(o, buf, NULL);
elm_win_icon_object_set(win, o);
#endif
+ elm_config_focus_highlight_enabled_set(EINA_TRUE);
-// splash_window = elm_win_add(NULL, PACKAGE_NAME, ELM_WIN_SPLASH);
window = elm_win_add(NULL, PACKAGE_NAME, ELM_WIN_BASIC);
if (!window)
return EXIT_FAILURE;
@@ -159,6 +165,13 @@ EAPI_MAIN int elm_main(int argc, char **argv)
evas_object_resize(window, 500, 400);
+ content = elm_bg_add(window);
+ elm_bg_color_set(content, 0, 0, 0);
+ evas_object_size_hint_weight_set(content, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+ evas_object_size_hint_align_set(content, EVAS_HINT_FILL, EVAS_HINT_FILL);
+ elm_win_resize_object_add(window, content);
+ evas_object_show(content);
+
content = eulogium_menu(window);
evas_object_size_hint_weight_set(content, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(content, EVAS_HINT_FILL, EVAS_HINT_FILL);