From 9bc2ce06784e3ed2c4ed97289ec73fee287d8b44 Mon Sep 17 00:00:00 2001 From: Gustavo Sverzut Barbieri Date: Tue, 3 Mar 2009 04:40:58 +0000 Subject: [PATCH] Invert view_flags logic, make it easier to use. Now flags do not negate, rather specify if things should be used. This will help us be compatible with original behavior and actually just e_fwin is using that. SVN revision: 39340 --- src/bin/e_fm.c | 10 +++++----- src/bin/e_fm.h | 13 +++++++------ src/bin/e_widget_flist.c | 1 - src/bin/e_widget_fsel.c | 2 -- src/modules/conf_desklock/e_int_config_desklock.c | 1 - src/modules/conf_imc/e_int_config_imc.c | 1 - src/modules/conf_startup/e_int_config_startup.c | 1 - src/modules/fileman/e_fwin.c | 2 +- src/modules/gadman/e_mod_config.c | 1 - 9 files changed, 13 insertions(+), 19 deletions(-) diff --git a/src/bin/e_fm.c b/src/bin/e_fm.c index 7602449c8..4efb62586 100644 --- a/src/bin/e_fm.c +++ b/src/bin/e_fm.c @@ -888,7 +888,7 @@ _e_fm2_dir_load_props(E_Fm2_Smart_Data *sd) { E_Fm2_Custom_File *cf; - if (sd->view_flags & E_FM2_VIEW_NO_LOAD_DIR_CUSTOM) return; + if (!(sd->view_flags & E_FM2_VIEW_LOAD_DIR_CUSTOM)) return; cf = e_fm2_custom_file_get(sd->realpath); if ((cf) && (cf->dir)) @@ -923,7 +923,7 @@ _e_fm2_dir_load_props(E_Fm2_Smart_Data *sd) sd->pos.y = 0; } - if (sd->view_flags & E_FM2_VIEW_NO_INHERIT_DIR_CUSTOM) + if (!(sd->view_flags & E_FM2_VIEW_INHERIT_DIR_CUSTOM)) { sd->view_mode = -1; sd->icon_size = -1; @@ -958,7 +958,7 @@ _e_fm2_dir_save_props(E_Fm2_Smart_Data *sd) E_Fm2_Custom_File *cf, cf0; E_Fm2_Custom_Dir dir0; - if (sd->view_flags & E_FM2_VIEW_NO_SAVE_DIR_CUSTOM) return; + if (!(sd->view_flags & E_FM2_VIEW_SAVE_DIR_CUSTOM)) return; cf = e_fm2_custom_file_get(sd->realpath); if (!cf) @@ -6951,7 +6951,7 @@ _e_fm2_menu(Evas_Object *obj, unsigned int timestamp) e_menu_item_separator_set(mi, 1); } if ((!(sd->icon_menu.flags & E_FM2_MENU_NO_INHERIT_PARENT)) && - (!(sd->view_flags & E_FM2_VIEW_NO_INHERIT_DIR_CUSTOM))) + (sd->view_flags & E_FM2_VIEW_INHERIT_DIR_CUSTOM)) { mi = e_menu_item_new(mn); e_menu_item_label_set(mi, _("Inherit parent settings")); @@ -7134,7 +7134,7 @@ _e_fm2_icon_menu(E_Fm2_Icon *ic, Evas_Object *obj, unsigned int timestamp) } if ((!(sd->icon_menu.flags & E_FM2_MENU_NO_INHERIT_PARENT)) && - (!(sd->view_flags & E_FM2_VIEW_NO_INHERIT_DIR_CUSTOM))) + (sd->view_flags & E_FM2_VIEW_INHERIT_DIR_CUSTOM)) { mi = e_menu_item_new(mn); e_menu_item_label_set(mi, _("Inherit parent settings")); diff --git a/src/bin/e_fm.h b/src/bin/e_fm.h index ceea7a729..1a17e20e2 100644 --- a/src/bin/e_fm.h +++ b/src/bin/e_fm.h @@ -37,12 +37,13 @@ typedef enum _E_Fm2_Menu_Flags typedef enum _E_Fm2_View_Flags { - E_FM2_VIEW_NO_LOAD_DIR_CUSTOM = (1 << 0), - E_FM2_VIEW_NO_SAVE_DIR_CUSTOM = (1 << 1), - E_FM2_VIEW_NO_INHERIT_DIR_CUSTOM = (1 << 2), - E_FM2_VIEW_NO_DIR_CUSTOM = (E_FM2_VIEW_NO_LOAD_DIR_CUSTOM | - E_FM2_VIEW_NO_SAVE_DIR_CUSTOM | - E_FM2_VIEW_NO_INHERIT_DIR_CUSTOM) + E_FM2_VIEW_NO_FLAGS = 0, + E_FM2_VIEW_LOAD_DIR_CUSTOM = (1 << 0), + E_FM2_VIEW_SAVE_DIR_CUSTOM = (1 << 1), + E_FM2_VIEW_INHERIT_DIR_CUSTOM = (1 << 2), + E_FM2_VIEW_DIR_CUSTOM = (E_FM2_VIEW_LOAD_DIR_CUSTOM | + E_FM2_VIEW_SAVE_DIR_CUSTOM | + E_FM2_VIEW_INHERIT_DIR_CUSTOM) } E_Fm2_View_Flags; typedef struct _E_Fm2_Config E_Fm2_Config; diff --git a/src/bin/e_widget_flist.c b/src/bin/e_widget_flist.c index b21ad4147..9db29f306 100644 --- a/src/bin/e_widget_flist.c +++ b/src/bin/e_widget_flist.c @@ -59,7 +59,6 @@ e_widget_flist_add(Evas *evas) wd->fmc.selection.windows_modifiers = 0; e_fm2_config_set(wd->o_fm, &wd->fmc); e_fm2_icon_menu_flags_set(wd->o_fm, E_FM2_MENU_NO_SHOW_HIDDEN); - e_fm2_view_flags_set(wd->o_fm, E_FM2_VIEW_NO_DIR_CUSTOM); evas_object_smart_callback_add(wd->o_fm, "dir_changed", _e_wid_cb_dir_changed, obj); diff --git a/src/bin/e_widget_fsel.c b/src/bin/e_widget_fsel.c index 863e061c5..d2c2ae441 100644 --- a/src/bin/e_widget_fsel.c +++ b/src/bin/e_widget_fsel.c @@ -408,7 +408,6 @@ e_widget_fsel_add(Evas *evas, const char *dev, const char *path, char *selected, fmc.selection.single = 1; fmc.selection.windows_modifiers = 0; e_fm2_config_set(o, &fmc); - e_fm2_view_flags_set(o, E_FM2_VIEW_NO_DIR_CUSTOM); evas_object_smart_callback_add(o, "changed", _e_wid_fsel_favorites_files_changed, wd); evas_object_smart_callback_add(o, "selected", @@ -449,7 +448,6 @@ e_widget_fsel_add(Evas *evas, const char *dev, const char *path, char *selected, fmc.selection.single = 1; fmc.selection.windows_modifiers = 0; e_fm2_config_set(o, &fmc); - e_fm2_view_flags_set(o, E_FM2_VIEW_NO_DIR_CUSTOM); evas_object_smart_callback_add(o, "dir_changed", _e_wid_fsel_files_changed, wd); evas_object_smart_callback_add(o, "selection_change", diff --git a/src/modules/conf_desklock/e_int_config_desklock.c b/src/modules/conf_desklock/e_int_config_desklock.c index 99551bc02..a736a1532 100644 --- a/src/modules/conf_desklock/e_int_config_desklock.c +++ b/src/modules/conf_desklock/e_int_config_desklock.c @@ -234,7 +234,6 @@ _adv_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) fmc.selection.windows_modifiers = 0; e_fm2_config_set(ow, &fmc); e_fm2_icon_menu_flags_set(ow, E_FM2_MENU_NO_SHOW_HIDDEN); - e_fm2_view_flags_set(ow, E_FM2_VIEW_NO_DIR_CUSTOM); e_fm2_path_set(ow, path, "/"); evas_object_smart_callback_add(ow, "dir_changed", diff --git a/src/modules/conf_imc/e_int_config_imc.c b/src/modules/conf_imc/e_int_config_imc.c index 723b71c19..edcb70955 100644 --- a/src/modules/conf_imc/e_int_config_imc.c +++ b/src/modules/conf_imc/e_int_config_imc.c @@ -861,7 +861,6 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data fmc.selection.windows_modifiers = 0; e_fm2_config_set(o, &fmc); e_fm2_icon_menu_flags_set(o, E_FM2_MENU_NO_SHOW_HIDDEN); - e_fm2_view_flags_set(o, E_FM2_VIEW_NO_DIR_CUSTOM); evas_object_smart_callback_add(o, "dir_changed", _cb_files_changed, cfdata); diff --git a/src/modules/conf_startup/e_int_config_startup.c b/src/modules/conf_startup/e_int_config_startup.c index 909e15527..d1b089ae9 100644 --- a/src/modules/conf_startup/e_int_config_startup.c +++ b/src/modules/conf_startup/e_int_config_startup.c @@ -309,7 +309,6 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf fmc.selection.windows_modifiers = 0; e_fm2_config_set(o, &fmc); e_fm2_icon_menu_flags_set(o, E_FM2_MENU_NO_SHOW_HIDDEN); - e_fm2_view_flags_set(o, E_FM2_VIEW_NO_DIR_CUSTOM); evas_object_smart_callback_add(o, "dir_changed", _cb_files_changed, cfdata); evas_object_smart_callback_add(o, "selection_change", diff --git a/src/modules/fileman/e_fwin.c b/src/modules/fileman/e_fwin.c index adcf81b64..08fabb6be 100644 --- a/src/modules/fileman/e_fwin.c +++ b/src/modules/fileman/e_fwin.c @@ -176,7 +176,6 @@ e_fwin_zone_new(E_Zone *zone, const char *dev, const char *path) _e_fwin_config_set(fwin); e_fm2_custom_theme_content_set(o, "desktop"); - e_fm2_view_flags_set(o, E_FM2_VIEW_NO_DIR_CUSTOM); evas_object_smart_callback_add(o, "dir_changed", _e_fwin_changed, fwin); @@ -343,6 +342,7 @@ _e_fwin_new(E_Container *con, const char *dev, const char *path) o = e_fm2_add(e_win_evas_get(fwin->win)); fwin->fm_obj = o; _e_fwin_config_set(fwin); + e_fm2_view_flags_set(o, E_FM2_VIEW_DIR_CUSTOM); evas_object_smart_callback_add(o, "dir_changed", _e_fwin_changed, fwin); diff --git a/src/modules/gadman/e_mod_config.c b/src/modules/gadman/e_mod_config.c index 675be27b4..6b92d00ad 100644 --- a/src/modules/gadman/e_mod_config.c +++ b/src/modules/gadman/e_mod_config.c @@ -222,7 +222,6 @@ _adv_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfda fmc.selection.windows_modifiers = 0; e_fm2_config_set(ow, &fmc); e_fm2_icon_menu_flags_set(ow, E_FM2_MENU_NO_SHOW_HIDDEN); - e_fm2_view_flags_set(ow, E_FM2_VIEW_NO_DIR_CUSTOM); e_fm2_path_set(ow, path, "/"); evas_object_smart_callback_add(ow, "selection_change",