Cleanups and comment fixin

Signed-off-by: Olliver Schinagl <o.schinagl@ultimaker.com>

1 files changed, 23 insertions, 91 deletions

diff --git a/src/eulogium.c b/src/eulogium.c
index 8412831..56715f8 100644
--- a/src/eulogium.c
+++ b/src/eulogium.c
@@ -42,24 +42,6 @@ void eulogium_print_file_set(struct eulogium_data *eulogium, char *filepath)
 	eulogium->print.name = ecore_file_strip_ext(ecore_file_file_get(filepath));
 }
 
-/* test function to map try to mouse button to emit a click event */
-static void _cb_eulogium_input_button(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info)
-{
-	Evas_Event_Mouse_Down *ev = event_info;
-//	struct eulogium_data *eulogium = data;
-
-	printf("Button: %d\n", ev->button);
-	if (ev->button == 2) {
-//		/* Broken */
-//		focused = elm_object_focused_object_get((Evas_Object *)data);
-//		elm_object_signal_emit(focused, "mouse,down,1", "event"); /* TODO does not work */
-//		printf("Object: 0x%p\n", focused);
-	} else {
-//		/* TODO: remove if we know the button event from the rotary encoder */
-//		printf("Button: %d\n", ev->button);
-	}
-}
-
 /* Function to make the Z-axis of any wheel focus the next/previous focusable widget */
 static void _cb_eulogium_input_wheel(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info)
 {
@@ -77,53 +59,37 @@ static void _cb_eulogium_button(void *data EINA_UNUSED, Evas_Object *obj EINA_UN
 	printf("Button clicked\n");
 }
 
-static void _cb_eulogium_resize(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
-{
-	/* TODO: (adapt button sizes to window size? or keep fixed size? scale?) */
-}
-
 static void _cb_eulogium_exit(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
 {
 	elm_exit();
 }
 
-static void _box_vert_resize_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *box, void *event_info EINA_UNUSED)
+Evas_Object *eulogium_split_screen(Evas_Object *parent, Evas_Object *top, Evas_Object *bottom)
 {
-	Evas_Coord h, hs, ht, hb;
-	Eina_List *list, *l;
-	Evas_Object *obj;
+	Evas_Object *table;
+	Evas_Object *sep;
 
-	evas_object_geometry_get(box, NULL, NULL, NULL, &h);
+	table = elm_table_add(parent);
+	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);
 
-	list = elm_box_children_get(box);
-	EINA_LIST_FOREACH(list, l, obj) {
-		char *type = (char *)evas_object_data_get(obj, "type");
+//	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_table_pack(table, top, 0, 0, 1, 4);
 
-		if (type[0] == 's') /* Only check for the last separator in the list */
-			evas_object_geometry_get(obj, NULL, NULL, NULL, &hs);
-	}
-	hb = h * 0.22; /* Approx 14 pixels on a 64 pixel high screen */
-	ht = h - hs - hb;
-	EINA_LIST_FOREACH(list, l, obj) {
-		char *type = (char *)evas_object_data_get(obj, "type");
-		Evas_Coord wb;
-
-		evas_object_geometry_get(obj, NULL, NULL, &wb, NULL);
-		if (type[0] == 't')
-			evas_object_size_hint_min_set(obj, wb, ht);
-		if (type[0] == 'b')
-			evas_object_size_hint_min_set(obj, wb, hb);
-	}
+	sep = elm_separator_add(table);
+	elm_separator_horizontal_set(sep, EINA_TRUE);
+	evas_object_show(sep);
+	elm_table_pack(table, sep, 0, 3, 1, 1);
 
-}
-
-Evas_Object *eulogium_split_screen(Evas_Object *parent, Evas_Object *top, Evas_Object *bottom)
-{
-	Evas_Object *box;
-	Evas_Object *obj;
+	elm_table_pack(table, bottom, 0, 4, 1, 1);
+//	evas_object_size_hint_weight_set(bottom, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+//	evas_object_size_hint_align_set(bottom, EVAS_HINT_FILL, EVAS_HINT_FILL);
+	evas_object_show(table);
 
+	return table;
+#if 0
 	box = elm_box_add(parent);
-	evas_object_event_callback_add(box, EVAS_CALLBACK_RESIZE, _box_vert_resize_cb, NULL);
 	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);
 	evas_object_show(box);
@@ -143,6 +109,7 @@ Evas_Object *eulogium_split_screen(Evas_Object *parent, Evas_Object *top, Evas_O
 	elm_box_pack_end(box, bottom);
 
 	return box;
+#endif
 }
 
 Evas_Object *eulogium_print_progress(struct eulogium_data *eulogium)
@@ -199,7 +166,7 @@ elm_progressbar_value_set(eulogium->print.progress, 0.5);
 	elm_table_pack(table, object, 0, 4, 3, 1);
 
 	object = elm_button_add(table);
-	elm_object_text_set(object, "TUNE"); /* create tune button */
+	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_show(object);
 	elm_table_pack(table, object, 0, 5, 1, 1);
@@ -210,7 +177,7 @@ elm_progressbar_value_set(eulogium->print.progress, 0.5);
 	elm_table_pack(table, object, 1, 5, 1, 1);
 
 	object = elm_button_add(table);
-	elm_object_text_set(object, "PAUSE"); /* create pause button */
+	elm_object_text_set(object, "PAUSE"); /* TODO create pause button */
 	evas_object_size_hint_align_set(object, EVAS_HINT_FILL, EVAS_HINT_FILL);
 	evas_object_show(object);
 	elm_table_pack(table, object, 2, 5, 1, 1);
@@ -352,7 +319,7 @@ static void _cb_filelist_top(void *data, Evas_Object *object EINA_UNUSED, void *
 }
 #endif
 
-static void _cb_content_prev_set(void *data, Evas_Object *object EINA_UNUSED, void *event_info EINA_UNUSED)
+static void _cb_content_prev_set(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
 {
 	struct eulogium_data *eulogium = data;
 	uint_fast8_t list_size;
@@ -636,37 +603,6 @@ Evas_Object *eulogium_multi_screen_menu(struct eulogium_data *eulogium, Evas_Obj
 	return eulogium_split_screen(parent, _top, _bottom);;
 }
 
-static void _box_hor_resize_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *box, void *event_info EINA_UNUSED)
-{
-	Evas_Coord w, ws, wb;
-	Eina_List *list, *l;
-	Evas_Object *obj;
-	int lc;
-
-	evas_object_geometry_get(box, NULL, NULL, &w, NULL);
-
-	list = elm_box_children_get(box);
-	EINA_LIST_FOREACH(list, l, obj) {
-		char *type = (char *)evas_object_data_get(obj, "type");
-
-		if (type[0] == 's') /* Only check for the last separator in the list */
-			evas_object_geometry_get(obj, NULL, NULL, &ws, NULL);
-	}
-	lc = eina_list_count(list);
-	wb = (w - ws) / (lc - 1);
-	EINA_LIST_FOREACH(list, l, obj) {
-		char *type = (char *)evas_object_data_get(obj, "type");
-
-		if (type[0] == 'b') {
-			Evas_Coord hb;
-
-			evas_object_geometry_get(obj, NULL, NULL, NULL, &hb);
-			evas_object_size_hint_min_set(obj, wb, hb);
-		}
-	}
-
-}
-
 Evas_Object *eulogium_tripple_button_menu(Evas_Object *parent, const struct button_def *left, const struct button_def *right, const struct button_def *bottom)
 {
 	Evas_Object *object;
@@ -674,7 +610,6 @@ Evas_Object *eulogium_tripple_button_menu(Evas_Object *parent, const struct butt
 
 	_top = elm_box_add(parent);
 	elm_box_horizontal_set(_top, EINA_TRUE);
-	evas_object_event_callback_add(_top, EVAS_CALLBACK_RESIZE, _box_hor_resize_cb, NULL);
 	evas_object_show(_top);
 
 	object = elm_button_add(_top);
@@ -824,7 +759,6 @@ static struct multi_text txtdata = {
 	},
 };
 
-static Eina_List *wizzard; /* TODO find a good spot to put this. */
 static struct multi_screen screen[] = {
 	{
 		.type = NONE,
@@ -1039,8 +973,6 @@ EAPI_MAIN int elm_main(int argc, char **argv)
 
 	elm_run();
 
-	eina_list_free(wizzard);
-
 	elm_shutdown();
 
 	return EXIT_SUCCESS;