replace change material with dual material change/settings buttons

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

1 files changed, 124 insertions, 13 deletions

diff --git a/src/eulogium.c b/src/eulogium.c
index 5594336..212a9ff 100644
--- a/src/eulogium.c
+++ b/src/eulogium.c
@@ -30,8 +30,8 @@ static void _on_print_abort_ret(void *data EINA_UNUSED, const Eldbus_Message *ms
 static void _cb_content_prev_set(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED);
 static void _print_abort_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED);
 static void _on_blink_ret(void *data EINA_UNUSED, const Eldbus_Message *msg, Eldbus_Pending *pending EINA_UNUSED);
-static void _but_mat_ch_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED);
-static void _but_mat_set_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED);
+static void _but_material_change_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED);
+static void _but_material_settings_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED);
 static void _but_settings_maintenance_cb(void *data, Evas_Object *object EINA_UNUSED, void *event_info EINA_UNUSED);
 static void _but_settings_settings_cb(void *data, Evas_Object *object EINA_UNUSED, void *event_info EINA_UNUSED);
 static void _but_main_settings_cb(void *data, Evas_Object *object EINA_UNUSED, void *event_info EINA_UNUSED);
@@ -39,6 +39,10 @@ static void _cb_button_main_print(void *data, Evas_Object *object EINA_UNUSED, v
 static void _but_print_local_cb(void *data, Evas_Object *object EINA_UNUSED, void *event_info EINA_UNUSED);
 static void _but_print_usb_cb(void *data, Evas_Object *object EINA_UNUSED, void *event_info EINA_UNUSED);
 static void _but_main_mathot_cb(void *data, Evas_Object *object EINA_UNUSED, void *event_info EINA_UNUSED);
+static void _but_settings_material_1_cb(void *data, Evas_Object *object EINA_UNUSED, void *event_info EINA_UNUSED);
+static void _but_settings_material_2_cb(void *data, Evas_Object *object EINA_UNUSED, void *event_info EINA_UNUSED);
+static void _but_change_material_1_cb(void *data, Evas_Object *object EINA_UNUSED, void *event_info EINA_UNUSED);
+static void _but_change_material_2_cb(void *data, Evas_Object *object EINA_UNUSED, void *event_info EINA_UNUSED);
 
 /* Buttons */
 static struct button_def but_return = {
@@ -150,19 +154,55 @@ static struct button_def but_settings_settings = {
 	.data = NULL,
 };
 
-static struct button_def but_mat_change = {
+static struct button_def but_material_change = {
 	.text = "CHANGE",
 	.cb = {
-		.func = &_but_mat_ch_cb,
+		.func = &_but_material_change_cb,
 		.data = NULL,
 	},
 	.data = NULL,
 };
 
-static struct button_def but_mat_settings = {
+static struct button_def but_material_settings = {
 	.text = "SETTINGS",
 	.cb = {
-		.func = &_but_mat_set_cb,
+		.func = &_but_material_settings_cb,
+		.data = NULL,
+	},
+	.data = NULL,
+};
+
+static struct button_def but_settings_material_1 = {
+	.text = "MATERIAL 1",
+	.cb = {
+		.func = &_but_settings_material_1_cb, /* XXX we should make 1/2 a var */
+		.data = NULL,
+	},
+	.data = NULL,
+};
+
+static struct button_def but_settings_material_2 = {
+	.text = "MATERIAL 2",
+	.cb = {
+		.func = &_but_settings_material_2_cb, /* XXX we should make 1/2 a var */
+		.data = NULL,
+	},
+	.data = NULL,
+};
+
+static struct button_def but_change_material_1 = {
+	.text = "MATERIAL 1",
+	.cb = {
+		.func = &_but_change_material_1_cb, /* XXX we should make 1/2 a var */
+		.data = NULL,
+	},
+	.data = NULL,
+};
+
+static struct button_def but_change_material_2 = {
+	.text = "MATERIAL 2",
+	.cb = {
+		.func = &_but_change_material_2_cb, /* XXX we should make 1/2 a var */
 		.data = NULL,
 	},
 	.data = NULL,
@@ -251,14 +291,28 @@ static void _but_settings_maintenance_cb(void *data, Evas_Object *obj EINA_UNUSE
 eldbus_proxy_call(eulogium->dbus.proxy[LED], "blink", _on_blink_ret, NULL, -1, "");
 }
 
-static void _but_mat_ch_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
+static void _but_material_change_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
 {
-	printf("But matterial change\n");
+	struct eulogium_data *eulogium = data;
+	Evas_Object *content;
+
+	printf("But material change\n");
+	content = eulogium_tripple_button_menu(eulogium->navi, &but_return, &but_return, &but_return);
+	if (!content)
+		return;
+	elm_naviframe_item_simple_push(eulogium->navi, content);
 }
 
-static void _but_mat_set_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
+static void _but_material_settings_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
 {
-	printf("But matterial settings\n");
+	struct eulogium_data *eulogium = data;
+	Evas_Object *content;
+
+	printf("But material settings\n");
+	content = eulogium_tripple_button_menu(eulogium->navi, &but_return, &but_return, &but_return);
+	if (!content)
+		return;
+	elm_naviframe_item_simple_push(eulogium->navi, content);
 }
 
 static void _but_main_settings_cb(void *data, Evas_Object *object EINA_UNUSED, void *event_info EINA_UNUSED)
@@ -356,12 +410,65 @@ static void _but_main_mathot_cb(void *data, Evas_Object *object EINA_UNUSED, voi
 
 	printf("Button matts pressed\n");
 
-	content = eulogium_tripple_button_menu(eulogium->navi, &but_mat_change, &but_mat_settings, &but_return);
+	content = eulogium_tripple_button_menu(eulogium->navi, &but_material_change, &but_material_settings, &but_return);
 	if (!content)
 		return;
 	elm_naviframe_item_simple_push(eulogium->navi, content);
 }
 
+static void _but_settings_material_1_cb(void *data, Evas_Object *object EINA_UNUSED, void *event_info EINA_UNUSED)
+{
+	struct eulogium_data *eulogium = data;
+	Evas_Object *content;
+
+	printf("Button matts settings 1 pressed\n");
+
+	content = eulogium_tripple_button_menu(eulogium->navi, &but_return, &but_return, &but_return);
+	if (!content)
+		return;
+	elm_naviframe_item_simple_push(eulogium->navi, content);
+}
+
+static void _but_settings_material_2_cb(void *data, Evas_Object *object EINA_UNUSED, void *event_info EINA_UNUSED)
+{
+	struct eulogium_data *eulogium = data;
+	Evas_Object *content;
+
+	printf("Button matts settings 2 pressed\n");
+
+	content = eulogium_tripple_button_menu(eulogium->navi, &but_return, &but_return, &but_return);
+	if (!content)
+		return;
+	elm_naviframe_item_simple_push(eulogium->navi, content);
+}
+
+static void _but_change_material_1_cb(void *data, Evas_Object *object EINA_UNUSED, void *event_info EINA_UNUSED)
+{
+	struct eulogium_data *eulogium = data;
+	Evas_Object *content;
+
+	printf("Button matts change 1 pressed\n");
+
+	content = eulogium_tripple_button_menu(eulogium->navi, &but_return, &but_return, &but_return);
+	if (!content)
+		return;
+	elm_naviframe_item_simple_push(eulogium->navi, content);
+}
+
+static void _but_change_material_2_cb(void *data, Evas_Object *object EINA_UNUSED, void *event_info EINA_UNUSED)
+{
+	struct eulogium_data *eulogium = data;
+	Evas_Object *content;
+
+	printf("Button matts change 2 pressed\n");
+
+	content = eulogium_tripple_button_menu(eulogium->navi, &but_return, &but_return, &but_return);
+	if (!content)
+		return;
+	elm_naviframe_item_simple_push(eulogium->navi, content);
+}
+
+
 Evas_Object *eulogium_button_list_add(Evas_Object *parent)
 {
 	Evas_Object *list, *box;
@@ -1245,8 +1352,12 @@ static void eulogium_setup(struct eulogium_data *eulogium)
 	eulogium_button_cb_data_set(&but_main_settings, eulogium);
 	eulogium_button_cb_data_set(&but_settings_maintenance, eulogium);
 	eulogium_button_cb_data_set(&but_settings_settings, eulogium);
-	eulogium_button_cb_data_set(&but_mat_change, eulogium);
-	eulogium_button_cb_data_set(&but_mat_settings, eulogium);
+	eulogium_button_cb_data_set(&but_material_change, eulogium);
+	eulogium_button_cb_data_set(&but_material_settings, eulogium);
+	eulogium_button_cb_data_set(&but_settings_material_1, eulogium);
+	eulogium_button_cb_data_set(&but_settings_material_2, eulogium);
+	eulogium_button_cb_data_set(&but_change_material_1, eulogium);
+	eulogium_button_cb_data_set(&but_change_material_2, eulogium);
 }
 
 /* TODO May need this later to change certain connections to objects */