From 70f0661426f23da3864867c7a98e71d5ffbca16f Mon Sep 17 00:00:00 2001 From: Olliver Schinagl Date: Wed, 3 Jun 2015 13:24:24 +0200 Subject: [griffin.display] rename old random buttons Signed-off-by: Olliver Schinagl --- src/eulogium.c | 47 ++++++++++++++++++++++++----------------------- 1 file changed, 24 insertions(+), 23 deletions(-) diff --git a/src/eulogium.c b/src/eulogium.c index 81bfc29..5594336 100644 --- a/src/eulogium.c +++ b/src/eulogium.c @@ -30,14 +30,14 @@ 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_maint_bp_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info 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 _eulogium_button_main_maintanance_cb(void *data, Evas_Object *object 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); static void _cb_button_main_print(void *data, Evas_Object *object EINA_UNUSED, void *event_info EINA_UNUSED); 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_maint_adv_cb(void *data, Evas_Object *obj 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); /* Buttons */ @@ -121,29 +121,30 @@ static struct button_def but_main_mathot = { .data = NULL, }; -static struct button_def but_main_maintanance = { - .text = "MAINTANANCE", +static struct button_def but_main_settings = { + .text = "SETTINGS", .cb = { - .func = &_eulogium_button_main_maintanance_cb, + .func = &_but_main_settings_cb, .data = NULL, - .info = "maintenance button pressed", + .info = "settings button pressed", }, .data = NULL, }; -static struct button_def but_maintanance_advanced = { - .text = "ADVANCED", +static struct button_def but_settings_maintenance = { + .text = "MAINTE-
NANCE", .cb = { - .func = &_but_maint_adv_cb, + .func = &_but_settings_maintenance_cb, .data = NULL, + .info = "maintenance button pressed", }, .data = NULL, }; -static struct button_def but_maintanance_buildplate = { - .text = "BUILD-PLATE", +static struct button_def but_settings_settings = { + .text = "SETTINGS", .cb = { - .func = &_but_maint_bp_cb, + .func = &_but_settings_settings_cb, .data = NULL, }, .data = NULL, @@ -243,7 +244,7 @@ static void _on_blink_ret(void *data EINA_UNUSED, const Eldbus_Message *msg, Eld } } -static void _but_maint_bp_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) +static void _but_settings_maintenance_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { struct eulogium_data *eulogium = data; printf("But build-plate\n"); @@ -260,13 +261,13 @@ static void _but_mat_set_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED printf("But matterial settings\n"); } -static void _eulogium_button_main_maintanance_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) { struct eulogium_data *eulogium = data; Evas_Object *content; - printf("Button maintanance pressed\n"); - content = eulogium_tripple_button_menu(eulogium->navi, &but_maintanance_buildplate, &but_maintanance_advanced, &but_return); + printf("Button settings pressed\n"); + content = eulogium_tripple_button_menu(eulogium->navi, &but_settings_settings, &but_settings_maintenance, &but_return); if (!content) return; elm_naviframe_item_simple_push(eulogium->navi, content); @@ -324,11 +325,11 @@ static void _cb_button_main_print(void *data, Evas_Object *object EINA_UNUSED, v elm_naviframe_item_simple_push(eulogium->navi, content); } -static void _but_maint_adv_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) +static void _but_settings_settings_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { struct eulogium_data *eulogium = data; Evas_Object *box, *object; - printf("But maint advanced\n"); + printf("But settings settings\n"); /* XXX Quick hack to make the adv feature a little more useful, this needs to be made much better! */ box = elm_box_add(eulogium->navi); @@ -1214,7 +1215,7 @@ Evas_Object *eulogium_main_menu(Evas_Object *window, struct eulogium_data *eulog return NULL; elm_naviframe_prev_btn_auto_pushed_set(eulogium->navi, EINA_FALSE); /* We removed this from the theme, enabling it causes errors */ - content = eulogium_tripple_button_menu(eulogium->navi, &but_main_print, &but_main_mathot, &but_main_maintanance); + content = eulogium_tripple_button_menu(eulogium->navi, &but_main_print, &but_main_mathot, &but_main_settings); if (!content) return NULL; elm_naviframe_item_simple_push(eulogium->navi, content); @@ -1241,9 +1242,9 @@ static void eulogium_setup(struct eulogium_data *eulogium) eulogium_button_cb_data_set(&but_print_local, eulogium); eulogium_button_cb_data_set(&but_print_usb, eulogium); eulogium_button_cb_data_set(&but_main_mathot, eulogium); - eulogium_button_cb_data_set(&but_main_maintanance, eulogium); - eulogium_button_cb_data_set(&but_maintanance_advanced, eulogium); - eulogium_button_cb_data_set(&but_maintanance_buildplate, 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); } -- cgit v0.12