From 577303246c0d44d6fa2f58091f3a7d8b6bc5e47b Mon Sep 17 00:00:00 2001 From: Olliver Schinagl Date: Wed, 3 Jun 2015 14:49:10 +0200 Subject: [griffin.display] rename settings to system System was accidentally named settings, resulting in strange consturcts like settings_settings. This patch fixes this. Signed-off-by: Olliver Schinagl --- src/eulogium.c | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/src/eulogium.c b/src/eulogium.c index 524d834..9badd9f 100644 --- a/src/eulogium.c +++ b/src/eulogium.c @@ -32,9 +32,9 @@ static void _print_abort_cb(void *data, Evas_Object *obj EINA_UNUSED, void *even static void _on_blink_ret(void *data EINA_UNUSED, const Eldbus_Message *msg, Eldbus_Pending *pending 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); +static void _but_system_maintenance_cb(void *data, Evas_Object *object EINA_UNUSED, void *event_info EINA_UNUSED); +static void _but_system_settings_cb(void *data, Evas_Object *object EINA_UNUSED, void *event_info EINA_UNUSED); +static void _but_main_system_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); @@ -153,30 +153,30 @@ static struct button_def but_mathot_hotend = { .data = NULL, }; -static struct button_def but_main_settings = { - .text = "SETTINGS", +static struct button_def but_main_system = { + .text = "SYSTEM", .cb = { - .func = &_but_main_settings_cb, + .func = &_but_main_system_cb, .data = NULL, - .info = "settings button pressed", + .info = "system button pressed", }, .data = NULL, }; -static struct button_def but_settings_maintenance = { +static struct button_def but_system_maintenance = { .text = "MAINTE-
NANCE", .cb = { - .func = &_but_settings_maintenance_cb, + .func = &_but_system_maintenance_cb, .data = NULL, .info = "maintenance button pressed", }, .data = NULL, }; -static struct button_def but_settings_settings = { +static struct button_def but_system_settings = { .text = "SETTINGS", .cb = { - .func = &_but_settings_settings_cb, + .func = &_but_system_settings_cb, .data = NULL, }, .data = NULL, @@ -366,7 +366,7 @@ static void _on_blink_ret(void *data EINA_UNUSED, const Eldbus_Message *msg, Eld } } -static void _but_settings_maintenance_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) +static void _but_system_maintenance_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { struct eulogium_data *eulogium = data; printf("But build-plate\n"); @@ -421,13 +421,13 @@ static void _but_hotend_settings_cb(void *data EINA_UNUSED, Evas_Object *obj EIN 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) +static void _but_main_system_cb(void *data, Evas_Object *object EINA_UNUSED, void *event_info EINA_UNUSED) { struct eulogium_data *eulogium = data; Evas_Object *content; - printf("Button settings pressed\n"); - content = eulogium_tripple_button_menu(eulogium->navi, &but_settings_settings, &but_settings_maintenance, &but_return); + printf("Button system pressed\n"); + content = eulogium_tripple_button_menu(eulogium->navi, &but_system_settings, &but_system_maintenance, &but_return); if (!content) return; elm_naviframe_item_simple_push(eulogium->navi, content); @@ -485,7 +485,7 @@ 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_settings_settings_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) +static void _but_system_settings_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { struct eulogium_data *eulogium = data; Evas_Object *box, *object; @@ -1505,7 +1505,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_settings); + content = eulogium_tripple_button_menu(eulogium->navi, &but_main_print, &but_main_mathot, &but_main_system); if (!content) return NULL; elm_naviframe_item_simple_push(eulogium->navi, content); @@ -1532,9 +1532,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_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_main_system, eulogium); + eulogium_button_cb_data_set(&but_system_maintenance, eulogium); + eulogium_button_cb_data_set(&but_system_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); -- cgit v0.12