From a3caf67546692bbe1c07f49defc0efe49c5d5c2d Mon Sep 17 00:00:00 2001 From: Hannes Janetzek Date: Mon, 11 Apr 2011 19:56:41 +0000 Subject: [PATCH] e17/conf_menus: no need for adv/basic dialog: everything from basic in on main-page SVN revision: 58565 --- src/modules/conf_menus/e_int_config_menus.c | 90 ++++----------------- 1 file changed, 15 insertions(+), 75 deletions(-) diff --git a/src/modules/conf_menus/e_int_config_menus.c b/src/modules/conf_menus/e_int_config_menus.c index 4abb6abfc..deebf6620 100644 --- a/src/modules/conf_menus/e_int_config_menus.c +++ b/src/modules/conf_menus/e_int_config_menus.c @@ -19,9 +19,6 @@ static void _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); static Evas_Object *_basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata); static int _basic_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); static int _basic_check_changed(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); -static Evas_Object *_adv_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata); -static int _adv_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); -static int _adv_check_changed(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); E_Config_Dialog * e_int_config_menus(E_Container *con, const char *params __UNUSED__) @@ -37,9 +34,6 @@ e_int_config_menus(E_Container *con, const char *params __UNUSED__) v->basic.create_widgets = _basic_create; v->basic.apply_cfdata = _basic_apply; v->basic.check_changed = _basic_check_changed; - v->advanced.create_widgets = _adv_create; - v->advanced.apply_cfdata = _adv_apply; - v->advanced.check_changed = _adv_check_changed; cfd = e_config_dialog_new(con, _("Menu Settings"), "E", "menus/menu_settings", "preferences-menus", 0, v, NULL); @@ -87,61 +81,6 @@ _free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) E_FREE(cfdata); } -static Evas_Object * -_basic_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data *cfdata) -{ - Evas_Object *o, *of, *ow; - - o = e_widget_list_add(evas, 0, 0); - - of = e_widget_framelist_add(evas, _("Main Menu"), 0); - ow = e_widget_check_add(evas, _("Favorites"), &(cfdata->show_favs)); - e_widget_framelist_object_append(of, ow); - ow = e_widget_check_add(evas, _("Applications"), &(cfdata->show_apps)); - e_widget_framelist_object_append(of, ow); - e_widget_list_object_append(o, of, 1, 0, 0.5); - - of = e_widget_framelist_add(evas, _("Display"), 0); - ow = e_widget_check_add(evas, _("Name"), &(cfdata->show_name)); - e_widget_framelist_object_append(of, ow); - ow = e_widget_check_add(evas, _("Generic"), &(cfdata->show_generic)); - e_widget_framelist_object_append(of, ow); - ow = e_widget_check_add(evas, _("Comments"), &(cfdata->show_comment)); - e_widget_framelist_object_append(of, ow); - e_widget_list_object_append(o, of, 1, 0, 0.5); - - of = e_widget_framelist_add(evas, _("Gadgets"), 0); - ow = e_widget_check_add(evas, _("Show gadget settings in top-level"), &(cfdata->menu_gadcon_client_toplevel)); - e_widget_framelist_object_append(of, ow); - e_widget_list_object_append(o, of, 1, 0, 0.5); - - return o; -} - -static int -_basic_apply(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) -{ - e_config->menu_favorites_show = cfdata->show_favs; - e_config->menu_apps_show = cfdata->show_apps; - e_config->menu_eap_name_show = cfdata->show_name; - e_config->menu_eap_generic_show = cfdata->show_generic; - e_config->menu_eap_comment_show = cfdata->show_comment; - e_config->menu_gadcon_client_toplevel = cfdata->menu_gadcon_client_toplevel; - e_config_save_queue(); - return 1; -} - -static int -_basic_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) -{ - return ((e_config->menu_favorites_show != cfdata->show_favs) || - (e_config->menu_apps_show != cfdata->show_apps) || - (e_config->menu_eap_name_show != cfdata->show_name) || - (e_config->menu_eap_generic_show != cfdata->show_generic) || - (e_config->menu_eap_comment_show != cfdata->show_comment) || - (e_config->menu_gadcon_client_toplevel != cfdata->menu_gadcon_client_toplevel)); -} - static void check_menu_dir(const char *dir, Eina_List **menus) { @@ -285,7 +224,7 @@ _create_menus_list(Evas *evas, E_Config_Dialog_Data *cfdata) } static Evas_Object * -_adv_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data *cfdata) +_basic_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data *cfdata) { Evas_Object *otb, *ol, *of, *ow; @@ -299,17 +238,7 @@ _adv_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data *c e_widget_framelist_object_append(of, ow); e_widget_list_object_append(ol, of, 1, 0, 0.5); - of = e_widget_framelist_add(evas, _("Gadgets"), 0); - ow = e_widget_check_add(evas, _("Show gadget settings in top-level"), &(cfdata->menu_gadcon_client_toplevel)); - e_widget_framelist_object_append(of, ow); - e_widget_list_object_append(ol, of, 1, 0, 0.5); - e_widget_toolbook_page_append(otb, NULL, _("Menus"), ol, 1, 0, 1, 0, - 0.5, 0.0); - - ol = e_widget_list_add(evas, 0, 0); - ow = _create_menus_list(evas, cfdata); - e_widget_list_object_append(ol, ow, 1, 0, 0.5); - of = e_widget_framelist_add(evas, _("Display"), 0); + of = e_widget_framelist_add(evas, _("Applications Display"), 0); ow = e_widget_check_add(evas, _("Name"), &(cfdata->show_name)); e_widget_framelist_object_append(of, ow); ow = e_widget_check_add(evas, _("Generic"), &(cfdata->show_generic)); @@ -318,6 +247,16 @@ _adv_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data *c e_widget_framelist_object_append(of, ow); e_widget_list_object_append(ol, of, 1, 0, 0.5); + of = e_widget_framelist_add(evas, _("Gadgets"), 0); + ow = e_widget_check_add(evas, _("Show gadget settings in top-level"), &(cfdata->menu_gadcon_client_toplevel)); + e_widget_framelist_object_append(of, ow); + e_widget_list_object_append(ol, of, 1, 1, 0.5); + e_widget_toolbook_page_append(otb, NULL, _("Menus"), ol, 1, 0, 1, 0, + 0.5, 0.0); + + ol = e_widget_list_add(evas, 0, 0); + ow = _create_menus_list(evas, cfdata); + e_widget_list_object_append(ol, ow, 1, 0, 0.5); e_widget_toolbook_page_append(otb, NULL, _("Applications"), ol, 1, 0, 1, 0, 0.5, 0.0); @@ -359,7 +298,7 @@ _adv_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data *c } static int -_adv_apply(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_basic_apply(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) { e_config->menu_favorites_show = cfdata->show_favs; e_config->menu_apps_show = cfdata->show_apps; @@ -398,7 +337,7 @@ _adv_apply(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) } static int -_adv_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_basic_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) { double scroll_speed, move_threshold; @@ -422,6 +361,7 @@ _adv_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata (e_config->menu_autoscroll_cursor_margin != cfdata->autoscroll_cursor_margin) || (e_config->menus_scroll_speed != scroll_speed) || (e_config->menus_fast_mouse_move_threshhold != move_threshold) || + (e_config->menu_gadcon_client_toplevel != cfdata->menu_gadcon_client_toplevel) || (!((cfdata->default_system_menu) && (e_config->default_system_menu) && (!strcmp(cfdata->default_system_menu,