From 4c46169e0cead837bd66f50042bd1a7e2f7761a8 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Wed, 5 Sep 2012 08:51:11 +0000 Subject: [PATCH] allow efm directory first/last sorting to be disabled entirely, fix refresh when setting directory sorting SVN revision: 76180 --- src/bin/e_fm.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/bin/e_fm.c b/src/bin/e_fm.c index 3c0383020..c2c1e7e8c 100644 --- a/src/bin/e_fm.c +++ b/src/bin/e_fm.c @@ -8716,8 +8716,8 @@ _e_fm2_view_menu_sorting_change_dirs_first(void *data, E_Menu *m __UNUSED__, E_M E_Fm2_Smart_Data *sd = data; sd->config->list.sort.dirs.first = mi->toggle; - if (mi->toggle) - + if (mi->toggle && sd->config->list.sort.dirs.last) + sd->config->list.sort.dirs.last = 0; _e_fm2_refresh(sd, NULL, NULL); } @@ -8727,6 +8727,8 @@ _e_fm2_view_menu_sorting_change_dirs_last(void *data, E_Menu *m __UNUSED__, E_Me E_Fm2_Smart_Data *sd = data; sd->config->list.sort.dirs.last = mi->toggle; + if (mi->toggle && sd->config->list.sort.dirs.first) + sd->config->list.sort.dirs.first = 0; _e_fm2_refresh(sd, NULL, NULL); } @@ -8768,15 +8770,13 @@ _e_fm2_view_menu_sorting_pre(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi) mi = e_menu_item_new(subm); e_menu_item_label_set(mi, _("Directories First")); - e_menu_item_radio_group_set(mi, 1); - e_menu_item_radio_set(mi, 1); + e_menu_item_check_set(mi, 1); e_menu_item_toggle_set(mi, sd->config->list.sort.dirs.first); e_menu_item_callback_set(mi, _e_fm2_view_menu_sorting_change_dirs_first, sd); mi = e_menu_item_new(subm); e_menu_item_label_set(mi, _("Directories Last")); - e_menu_item_radio_group_set(mi, 1); - e_menu_item_radio_set(mi, 1); + e_menu_item_check_set(mi, 1); e_menu_item_toggle_set(mi, sd->config->list.sort.dirs.last); e_menu_item_callback_set(mi, _e_fm2_view_menu_sorting_change_dirs_last, sd); }