rename "layout" to "navi" as the layout used really is a naviframe

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

2 files changed, 35 insertions, 35 deletions

diff --git a/src/eulogium.c b/src/eulogium.c
index 72caff8..90fc1b2 100644
--- a/src/eulogium.c
+++ b/src/eulogium.c
@@ -102,7 +102,7 @@ Evas_Object *eulogium_split_screen(Evas_Object *parent, Evas_Object *top, Evas_O
 	elm_box_pack_end(box, top);
 
 #if 0 /* FIXME use themed seperator */
-	object = elm_separator_add(eulogium->layout);
+	object = elm_separator_add(eulogium->navi);
 	elm_separator_horizontal_set(object, EINA_TRUE);
 	evas_object_show(object);
 	elm_table_pack(table, object, 1, 5, 1, 1);
@@ -130,7 +130,7 @@ Evas_Object *eulogium_print_progress(struct eulogium_data *eulogium)
 	Evas_Object *object;
 	char buf[255];
 
-	table = elm_table_add(eulogium->layout);
+	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);
@@ -173,12 +173,12 @@ elm_progressbar_value_set(eulogium->print.progress, 0.5);
 	elm_table_pack(table, eulogium->print.progress, 0, 3, 3, 1);
 
 #if 0 /* FIXME use themed seperator */
-	object = elm_separator_add(eulogium->layout);
+	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);
 #else
-	object = evas_object_rectangle_add(evas_object_evas_get(eulogium->layout));
+	object = evas_object_rectangle_add(evas_object_evas_get(eulogium->navi));
 	evas_object_color_set(object, 0x33, 0x99, 0xff, 0xff);
 	evas_object_size_hint_min_set(object, 0, 1);
 	evas_object_size_hint_padding_set(object, 1, 1, 1, 1);
@@ -194,12 +194,12 @@ elm_progressbar_value_set(eulogium->print.progress, 0.5);
 	elm_table_pack(table, object, 0, 5, 1, 1);
 
 #if 0 /* FIXME use themed seperator */
-	object = elm_separator_add(eulogium->layout);
+	object = elm_separator_add(eulogium->navi);
 	elm_separator_horizontal_set(object, EINA_TRUE);
 	evas_object_show(object);
 	elm_table_pack(table, object, 1, 5, 1, 1);
 #else
-	object = evas_object_rectangle_add(evas_object_evas_get(eulogium->layout));
+	object = evas_object_rectangle_add(evas_object_evas_get(eulogium->navi));
 	evas_object_color_set(object, 0x33, 0x99, 0xff, 0xff);
 	evas_object_size_hint_min_set(object, 1, 0);
 	evas_object_size_hint_padding_set(object, 1, 1, 1, 1);
@@ -248,7 +248,7 @@ static void _cb_select_file(void *data, Evas_Object *obj EINA_UNUSED, void *even
 		eulogium->print.material = 100.23; /* TODO */
 		content = eulogium_start_print(eulogium, filepath);
 	}
-	elm_naviframe_item_simple_push(eulogium->layout, content);
+	elm_naviframe_item_simple_push(eulogium->navi, content);
 }
 
 static int _cb_dirfile_sort(const void *data1, const void *data2)
@@ -356,11 +356,11 @@ static void _cb_content_prev_set(void *data, Evas_Object *object EINA_UNUSED, vo
 	struct eulogium_data *eulogium = data;
 	uint_fast8_t list_size;
 
-	list_size = eina_list_count(elm_naviframe_items_get(eulogium->layout));
+	list_size = eina_list_count(elm_naviframe_items_get(eulogium->navi));
 	if (list_size < 2)
 		printf("Not popping last item cowboy\n"); /* TODO, use proper debug contruct */
 	else
-		elm_naviframe_item_pop(eulogium->layout);
+		elm_naviframe_item_pop(eulogium->navi);
 }
 
 static struct button_def but_return = {
@@ -379,7 +379,7 @@ Evas_Object *eulogium_print_menu(struct eulogium_data *eulogium, char *filepath)
 	Evas_Object *list;
 	Evas_Object *icon;
 
-	box = elm_box_add(eulogium->layout);
+	box = elm_box_add(eulogium->navi);
 #if 1
 	list = elm_label_add(box);
 	elm_object_text_set(list, "SD Card"); /* TODO This may be more then just the SD card */
@@ -432,13 +432,13 @@ static void _eulogium_multi_text_next_cb(void *data, Evas_Object *obj EINA_UNUSE
 	if (pagenum >= txtdata->count) {
 		Elm_Object_Item *item;
 
-		item = elm_naviframe_bottom_item_get(eulogium->layout);
+		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->layout, NULL, txtdata, pagenum, pageindex);
+		content = eulogium_multi_text_menu(eulogium, eulogium->navi, NULL, txtdata, pagenum, pageindex);
 		if (content)
-			elm_naviframe_item_simple_push(eulogium->layout, content); /* XXX what else? */
+			elm_naviframe_item_simple_push(eulogium->navi, content); /* XXX what else? */
 	}
 	free(data);
 }
@@ -502,14 +502,14 @@ static void _eulogium_multi_screen_next_cb(void *data, Evas_Object *obj EINA_UNU
 	if (pagenum >= screen_data->count) {
 		Elm_Object_Item *item;
 
-		item = elm_naviframe_bottom_item_get(eulogium->layout);
+		item = elm_naviframe_bottom_item_get(eulogium->navi);
 		if (item)
 			elm_naviframe_item_pop_to(item);
 		/* XXX what else? */
 	} else {
-		content = eulogium_multi_screen_menu(eulogium, eulogium->layout, screen_data, pagenum, pageindex);
+		content = eulogium_multi_screen_menu(eulogium, eulogium->navi, screen_data, pagenum, pageindex);
 		if (content)
-			elm_naviframe_item_simple_push(eulogium->layout, content); 
+			elm_naviframe_item_simple_push(eulogium->navi, content); 
 		/* XXX what else? */
 	}
 	free(data);
@@ -723,10 +723,10 @@ static void _eulogium_button_main_mat_cb(void *data, Evas_Object *object EINA_UN
 	struct eulogium_data *eulogium = data;
 	Evas_Object *content;
 
-	content = eulogium_tripple_button_menu(eulogium->layout, &but_mat_change, &but_mat_settings, &but_return);
+	content = eulogium_tripple_button_menu(eulogium->navi, &but_mat_change, &but_mat_settings, &but_return);
 	if (!content)
 		return;
-	elm_naviframe_item_simple_push(eulogium->layout, content);
+	elm_naviframe_item_simple_push(eulogium->navi, content);
 }
 
 static void _eulogium_button_main_maintanance_cb(void *data, Evas_Object *object EINA_UNUSED, void *event_info EINA_UNUSED)
@@ -734,10 +734,10 @@ static void _eulogium_button_main_maintanance_cb(void *data, Evas_Object *object
 	struct eulogium_data *eulogium = data;
 	Evas_Object *content;
 
-	content = eulogium_tripple_button_menu(eulogium->layout, &but_maintanance_buildplate, &but_maintanance_advanced, &but_return);
+	content = eulogium_tripple_button_menu(eulogium->navi, &but_maintanance_buildplate, &but_maintanance_advanced, &but_return);
 	if (!content)
 		return;
-	elm_naviframe_item_simple_push(eulogium->layout, content);
+	elm_naviframe_item_simple_push(eulogium->navi, content);
 }
 
 static void _cb_button_main_print(void *data, Evas_Object *object EINA_UNUSED, void *event_info EINA_UNUSED)
@@ -749,7 +749,7 @@ static void _cb_button_main_print(void *data, Evas_Object *object EINA_UNUSED, v
 	content = eulogium_print_menu(eulogium, "/home/oliver"); /* TODO: replace later */
 	if (!content)
 		return;
-	elm_naviframe_item_simple_push(eulogium->layout, content);
+	elm_naviframe_item_simple_push(eulogium->navi, content);
 }
 
 /* Buttons */
@@ -841,25 +841,25 @@ Evas_Object *eulogium_main_menu(Evas_Object *window, struct eulogium_data *eulog
 {
 	Evas_Object *content;
 
-	eulogium->layout = elm_naviframe_add(window);
-	if (!eulogium->layout)
+	eulogium->navi = elm_naviframe_add(window);
+	if (!eulogium->navi)
 		return NULL;
-	elm_naviframe_prev_btn_auto_pushed_set(eulogium->layout, EINA_FALSE);
-//	elm_naviframe_item_title_enabled_set(eulogium->layout, EINA_TRUE, EINA_TRUE);
-//	elm_naviframe_item_title_visible_set(eulogium->layout, EINA_FALSE);
+	elm_naviframe_prev_btn_auto_pushed_set(eulogium->navi, EINA_FALSE);
+//	elm_naviframe_item_title_enabled_set(eulogium->navi, EINA_TRUE, EINA_TRUE);
+//	elm_naviframe_item_title_visible_set(eulogium->navi, EINA_FALSE);
 
-	content = eulogium_tripple_button_menu(eulogium->layout, &but_main_print, &but_main_material, &but_main_maintanance);
+	content = eulogium_tripple_button_menu(eulogium->navi, &but_main_print, &but_main_material, &but_main_maintanance);
 	if (!content)
 		return NULL;
-	elm_naviframe_item_simple_push(eulogium->layout, content);
+	elm_naviframe_item_simple_push(eulogium->navi, content);
 //	if (firstrunwiz) {
-		content = eulogium_multi_screen_menu(eulogium, eulogium->layout, &screen_data, 0, EINA_TRUE);
-		//content = eulogium_multi_text_menu(eulogium, eulogium->layout, NULL, &txtdata, 0, EINA_TRUE);
+		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->layout, content);
+		elm_naviframe_item_simple_push(eulogium->navi, content);
 
-	return eulogium->layout;
+	return eulogium->navi;
 }
 
 static void eulogium_setup(struct eulogium_data *eulogium)
diff --git a/src/eulogium.h b/src/eulogium.h
index 66f27d5..72b09bc 100644
--- a/src/eulogium.h
+++ b/src/eulogium.h
@@ -8,10 +8,10 @@
 
 enum screen_type {
 	NONE,
+	FUNC,
 	MATERIAL,
 	PROGRESS,
-	FUNC,
-	END,
+	END, /* sentinel */
 };
 
 struct print_data {
@@ -24,7 +24,7 @@ struct print_data {
 };
 
 struct eulogium_data {
-	Evas_Object *layout;
+	Evas_Object *navi;
 	struct print_data print;
 	void *data;
 };