From 0bd99e37b5a62bd23ae4a590a5fcbd8c34405a1a Mon Sep 17 00:00:00 2001 From: David Walter Seikel Date: Thu, 16 Nov 2006 17:44:20 +0000 Subject: [PATCH] All instances of the apps config dialog are now specialized to their task, so that the plethora of meaningless directories is no longer presented to the user. The bits of text all change to suit the task. Sort was changed to all to help reduce the confusion. SVN revision: 27140 --- src/bin/e_configure.c | 6 +++++- src/bin/e_int_config_apps.c | 30 +++++++++++++++++++++--------- src/bin/e_int_menus.c | 6 +++++- 3 files changed, 31 insertions(+), 11 deletions(-) diff --git a/src/bin/e_configure.c b/src/bin/e_configure.c index 77275653b..c1d03c63c 100644 --- a/src/bin/e_configure.c +++ b/src/bin/e_configure.c @@ -112,7 +112,11 @@ e_configure_show(E_Container *con) e_configure_standard_item_add(eco, "enlightenment/menus", _("Menus"), e_int_config_menus); e_configure_header_item_add(eco, "enlightenment/misc", _("Miscellaneous")); - e_configure_standard_item_add(eco, "enlightenment/applications", _("Applications"), e_int_config_apps); +#ifdef ENABLE_FAVORITES + e_configure_standard_item_add(eco, "enlightenment/applications", _("Application Menus"), e_int_config_apps); +#else + e_configure_standard_item_add(eco, "enlightenment/applications", _("Applications Menu"), e_int_config_apps); +#endif e_configure_standard_item_add(eco, "enlightenment/performance", _("Performance"), e_int_config_performance); e_configure_standard_item_add(eco, "enlightenment/configuration", _("Configuration Dialogs"), e_int_config_cfgdialogs); e_configure_standard_item_add(eco, "enlightenment/intl", _("Language Settings"), e_int_config_intl); diff --git a/src/bin/e_int_config_apps.c b/src/bin/e_int_config_apps.c index b763968cb..4bbeb0d16 100644 --- a/src/bin/e_int_config_apps.c +++ b/src/bin/e_int_config_apps.c @@ -25,7 +25,7 @@ struct _E_Config_Dialog_Data E_Config_Dialog *cfd; E_Fm2_Icon_Info *info; char *selected; - char path_all[4096], path_everything[4096], path[4096], *homedir; + char path_all[PATH_MAX], path_menu[PATH_MAX], path_everything[PATH_MAX], path[PATH_MAX], *homedir; int sorted; struct { Evas_Object *o_fm_all; @@ -103,6 +103,11 @@ _fill_data(E_Config_Dialog_Data *cfdata) snprintf(cfdata->path_everything, sizeof(cfdata->path_everything), "%s/.e/e/applications/all", cfdata->homedir); snprintf(cfdata->path, sizeof(cfdata->path), "%s/.e/e/applications", cfdata->homedir); snprintf(cfdata->path_all, sizeof(cfdata->path_all), "%s/.e/e/applications/menu/all", cfdata->homedir); +#ifdef ENABLE_FAVORITES + snprintf(cfdata->path_menu, sizeof(cfdata->path_all), "%s/.e/e/applications/menu", cfdata->homedir); +#else + snprintf(cfdata->path_menu, sizeof(cfdata->path_all), "%s/.e/e/applications/menu/all", cfdata->homedir); +#endif return; } @@ -651,7 +656,7 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf 150, 220, /* min */ 99999, 99999 /* max */ ); - mt = e_widget_check_add(evas, _("Sort applications"), &(cfdata->sorted)); + mt = e_widget_check_add(evas, _("All applications"), &(cfdata->sorted)); evas_object_smart_callback_add(mt, "changed", _cb_files_sorted_changed, cfdata); e_widget_framelist_object_append(of, mt); @@ -673,7 +678,7 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf e_widget_disabled_set(mt, 1); } - mt = e_widget_button_add(evas, _("Create a new application"), "enlightenment/e", + mt = e_widget_button_add(evas, _("Create a new Application"), "enlightenment/e", _cb_button_create, cfdata, NULL); cfdata->gui.o_create_button = mt; e_widget_framelist_object_append(of, mt); @@ -685,7 +690,11 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf if ((once) && (once->title)) of = e_widget_framelist_add(evas, once->title, 0); else - of = e_widget_framelist_add(evas, _("Bars, Menus, etc."), 0); +#ifdef ENABLE_FAVORITES + of = e_widget_framelist_add(evas, _("Menus"), 0); +#else + of = e_widget_framelist_add(evas, _("Menu"), 0); +#endif mt = e_widget_button_add(evas, _("Go up a Directory"), "widget/up_dir", _cb_button_up, cfdata, NULL); @@ -727,7 +736,7 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf if ((once) && (once->path)) e_fm2_path_set(cfdata->gui.o_fm, once->path, "/"); else - e_fm2_path_set(cfdata->gui.o_fm, cfdata->path, "/"); + e_fm2_path_set(cfdata->gui.o_fm, cfdata->path_menu, "/"); e_fm2_window_object_set(cfdata->gui.o_fm, E_OBJECT(cfd->dia->win)); ob = e_widget_scrollframe_pan_add(evas, mt, @@ -758,10 +767,13 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf e_widget_framelist_object_append(of, mt); e_widget_disabled_set(cfdata->gui.o_move_down_button, 1); */ - mt = e_widget_button_add(evas, _("Regenerate/update \"Applications\" Menu"), "enlightenment/regenerate_menus", - _cb_button_regen, cfdata, NULL); - cfdata->gui.o_regen_button = mt; - e_widget_framelist_object_append(of, mt); + if (!once) + { + mt = e_widget_button_add(evas, _("Regenerate/update \"Applications\" Menu"), "enlightenment/regenerate_menus", + _cb_button_regen, cfdata, NULL); + cfdata->gui.o_regen_button = mt; + e_widget_framelist_object_append(of, mt); + } e_widget_table_object_append(ot, of, 2, 0, 2, 4, 1, 1, 1, 1); } diff --git a/src/bin/e_int_menus.c b/src/bin/e_int_menus.c index 54acdcb77..81bdefcfc 100644 --- a/src/bin/e_int_menus.c +++ b/src/bin/e_int_menus.c @@ -774,7 +774,11 @@ _e_int_menus_config_pre_cb(void *data, E_Menu *m) e_menu_item_callback_set(mi, _e_int_menus_shelf_item_cb, NULL); mi = e_menu_item_new(m); - e_menu_item_label_set(mi, _("Applications")); +#ifdef ENABLE_FAVORITES + e_menu_item_label_set(mi, _("Application Menus")); +#else + e_menu_item_label_set(mi, _("Applications Menu")); +#endif e_util_menu_item_edje_icon_set(mi, "enlightenment/applications"); e_menu_item_callback_set(mi, _e_int_menus_applications_item_cb, NULL);