summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--NEWS3
-rw-r--r--src/bin/e_config.h3
-rw-r--r--src/bin/e_configure_option.c1
-rw-r--r--src/bin/e_menu.c2
-rw-r--r--src/modules/conf_menus/e_int_config_menus.c7
6 files changed, 17 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 60c0908..efda884 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
12013-01-07 Mike Blumenkrantz
2
3 * Added option for disabling icons in menus
4
12013-01-07 Thomas Petazzoni 52013-01-07 Thomas Petazzoni
2 6
3 * Fix build with uClibc. 7 * Fix build with uClibc.
diff --git a/NEWS b/NEWS
index cb9db09..5a1932a 100644
--- a/NEWS
+++ b/NEWS
@@ -15,6 +15,9 @@ Additions:
15 * Added e_configure_option API 15 * Added e_configure_option API
16 * Added D-Bus notification to systray module 16 * Added D-Bus notification to systray module
17 * Added D-Bus menu support 17 * Added D-Bus menu support
18 Config:
19 * Added option for disabling icons in menus
20
18 21
19Deprecations: 22Deprecations:
20 * 23 *
diff --git a/src/bin/e_config.h b/src/bin/e_config.h
index 9956ce7..0d585e7 100644
--- a/src/bin/e_config.h
+++ b/src/bin/e_config.h
@@ -38,7 +38,7 @@ typedef struct _E_Event_Config_Icon_Theme E_Event_Config_Icon_Theme;
38/* increment this whenever a new set of config values are added but the users 38/* increment this whenever a new set of config values are added but the users
39 * config doesn't need to be wiped - simply new values need to be put in 39 * config doesn't need to be wiped - simply new values need to be put in
40 */ 40 */
41#define E_CONFIG_FILE_GENERATION 1 41#define E_CONFIG_FILE_GENERATION 2
42#define E_CONFIG_FILE_VERSION ((E_CONFIG_FILE_EPOCH * 1000000) + E_CONFIG_FILE_GENERATION) 42#define E_CONFIG_FILE_VERSION ((E_CONFIG_FILE_EPOCH * 1000000) + E_CONFIG_FILE_GENERATION)
43 43
44struct _E_Config 44struct _E_Config
@@ -173,6 +173,7 @@ struct _E_Config
173 int menu_eap_comment_show; // GUI 173 int menu_eap_comment_show; // GUI
174 int menu_favorites_show; // GUI 174 int menu_favorites_show; // GUI
175 int menu_apps_show; // GUI 175 int menu_apps_show; // GUI
176 Eina_Bool menu_icons_hide; // GUI
176 int menu_gadcon_client_toplevel; // GUI 177 int menu_gadcon_client_toplevel; // GUI
177 int fullscreen_policy; // GUI 178 int fullscreen_policy; // GUI
178 const char *exebuf_term_cmd; // GUI 179 const char *exebuf_term_cmd; // GUI
diff --git a/src/bin/e_configure_option.c b/src/bin/e_configure_option.c
index ce330f4..db92adc 100644
--- a/src/bin/e_configure_option.c
+++ b/src/bin/e_configure_option.c
@@ -1702,6 +1702,7 @@ e_configure_option_init(void)
1702 OPT_ADD(BOOL, transient.desktop, _("Transient windows follow desk change of their child"), _("border"), _("transient"), _("placement"), _("vdesk")); 1702 OPT_ADD(BOOL, transient.desktop, _("Transient windows follow desk change of their child"), _("border"), _("transient"), _("placement"), _("vdesk"));
1703 OPT_ADD(BOOL, transient.iconify, _("Transient windows follow iconification of their child"), _("border"), _("transient"), _("iconif")); 1703 OPT_ADD(BOOL, transient.iconify, _("Transient windows follow iconification of their child"), _("border"), _("transient"), _("iconif"));
1704 1704
1705 OPT_ADD(BOOL, menu_icons_hide, _("Disable icons in menus"), _("menu"), _("image"));
1705 OPT_ADD(BOOL, menu_eap_name_show, _("Application menus shows Name field"), _("menu")); 1706 OPT_ADD(BOOL, menu_eap_name_show, _("Application menus shows Name field"), _("menu"));
1706 OPT_HELP("This information is taken from the related .desktop file"); 1707 OPT_HELP("This information is taken from the related .desktop file");
1707 OPT_ADD(BOOL, menu_eap_generic_show, _("Application menus shows Generic field"), _("menu")); 1708 OPT_ADD(BOOL, menu_eap_generic_show, _("Application menus shows Generic field"), _("menu"));
diff --git a/src/bin/e_menu.c b/src/bin/e_menu.c
index 276e8da..0630af0 100644
--- a/src/bin/e_menu.c
+++ b/src/bin/e_menu.c
@@ -1516,7 +1516,7 @@ no_submenu_item:
1516 evas_object_pass_events_set(o, 1); 1516 evas_object_pass_events_set(o, 1);
1517 e_box_pack_end(mi->container_object, o); 1517 e_box_pack_end(mi->container_object, o);
1518 } 1518 }
1519 if ((mi->icon) || (mi->realize_cb.func)) 1519 if ((!e_config->menu_icons_hide) && ((mi->icon) || (mi->realize_cb.func)))
1520 { 1520 {
1521 int icon_w = 0, icon_h = 0; 1521 int icon_w = 0, icon_h = 0;
1522 1522
diff --git a/src/modules/conf_menus/e_int_config_menus.c b/src/modules/conf_menus/e_int_config_menus.c
index 7c01089..8d504cd 100644
--- a/src/modules/conf_menus/e_int_config_menus.c
+++ b/src/modules/conf_menus/e_int_config_menus.c
@@ -3,7 +3,7 @@
3/* local structures */ 3/* local structures */
4struct _E_Config_Dialog_Data 4struct _E_Config_Dialog_Data
5{ 5{
6 int show_favs, show_apps; 6 int show_favs, show_apps, hide_icons;
7 int show_name, show_generic, show_comment; 7 int show_name, show_generic, show_comment;
8 int menu_gadcon_client_toplevel; 8 int menu_gadcon_client_toplevel;
9 double scroll_speed, fast_mouse_move_threshhold; 9 double scroll_speed, fast_mouse_move_threshhold;
@@ -61,6 +61,7 @@ _fill_data(E_Config_Dialog_Data *cfdata __UNUSED__)
61 cfdata->default_system_menu = NULL; 61 cfdata->default_system_menu = NULL;
62 cfdata->show_favs = e_config->menu_favorites_show; 62 cfdata->show_favs = e_config->menu_favorites_show;
63 cfdata->show_apps = e_config->menu_apps_show; 63 cfdata->show_apps = e_config->menu_apps_show;
64 cfdata->hide_icons = e_config->menu_icons_hide;
64 cfdata->show_name = e_config->menu_eap_name_show; 65 cfdata->show_name = e_config->menu_eap_name_show;
65 cfdata->show_generic = e_config->menu_eap_generic_show; 66 cfdata->show_generic = e_config->menu_eap_generic_show;
66 cfdata->show_comment = e_config->menu_eap_comment_show; 67 cfdata->show_comment = e_config->menu_eap_comment_show;
@@ -298,6 +299,8 @@ _basic_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data
298 0.5, 0.0); 299 0.5, 0.0);
299 300
300 ol = e_widget_list_add(evas, 0, 0); 301 ol = e_widget_list_add(evas, 0, 0);
302 ow = e_widget_check_add(evas, _("Disable icons in menus"), &(cfdata->hide_icons));
303 e_widget_list_object_append(ol, ow, 1, 0, 0.5);
301 ow = e_widget_label_add(evas, _("Menu Scroll Speed")); 304 ow = e_widget_label_add(evas, _("Menu Scroll Speed"));
302 e_widget_list_object_append(ol, ow, 1, 0, 0.5); 305 e_widget_list_object_append(ol, ow, 1, 0, 0.5);
303 ow = e_widget_slider_add(evas, 1, 0, _("%5.0f pixels/s"), 0, 20000, 100, 306 ow = e_widget_slider_add(evas, 1, 0, _("%5.0f pixels/s"), 0, 20000, 100,
@@ -325,6 +328,7 @@ _basic_apply(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
325{ 328{
326 e_config->menu_favorites_show = cfdata->show_favs; 329 e_config->menu_favorites_show = cfdata->show_favs;
327 e_config->menu_apps_show = cfdata->show_apps; 330 e_config->menu_apps_show = cfdata->show_apps;
331 e_config->menu_icons_hide = cfdata->hide_icons;
328 e_config->menu_eap_name_show = cfdata->show_name; 332 e_config->menu_eap_name_show = cfdata->show_name;
329 e_config->menu_eap_generic_show = cfdata->show_generic; 333 e_config->menu_eap_generic_show = cfdata->show_generic;
330 e_config->menu_eap_comment_show = cfdata->show_comment; 334 e_config->menu_eap_comment_show = cfdata->show_comment;
@@ -377,6 +381,7 @@ _basic_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfda
377 381
378 return ((e_config->menu_favorites_show != cfdata->show_favs) || 382 return ((e_config->menu_favorites_show != cfdata->show_favs) ||
379 (e_config->menu_apps_show != cfdata->show_apps) || 383 (e_config->menu_apps_show != cfdata->show_apps) ||
384 (e_config->menu_icons_hide != !!cfdata->hide_icons) ||
380 (e_config->menu_eap_name_show != cfdata->show_name) || 385 (e_config->menu_eap_name_show != cfdata->show_name) ||
381 (e_config->menu_eap_generic_show != cfdata->show_generic) || 386 (e_config->menu_eap_generic_show != cfdata->show_generic) ||
382 (e_config->menu_eap_comment_show != cfdata->show_comment) || 387 (e_config->menu_eap_comment_show != cfdata->show_comment) ||