Author: jsuchome Date: Mon Apr 18 09:18:26 2011 New Revision: 63806 URL: http://svn.opensuse.org/viewcvs/yast?rev=63806&view=rev Log: - removed YCP code for Tree recursive selection, widget can do it itself now (bnc#686639) - 2.21.4 Modified: trunk/snapper/VERSION trunk/snapper/package/yast2-snapper.changes trunk/snapper/src/dialogs.ycp Modified: trunk/snapper/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/snapper/VERSION?rev=63806&r1=63805&r2=63806&view=diff ============================================================================== --- trunk/snapper/VERSION (original) +++ trunk/snapper/VERSION Mon Apr 18 09:18:26 2011 @@ -1 +1 @@ -2.21.3 +2.21.4 Modified: trunk/snapper/package/yast2-snapper.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/snapper/package/yast2-snapper.changes?rev=63806&r1=63805&r2=63806&view=diff ============================================================================== --- trunk/snapper/package/yast2-snapper.changes (original) +++ trunk/snapper/package/yast2-snapper.changes Mon Apr 18 09:18:26 2011 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Apr 18 09:16:36 CEST 2011 - jsuchome@suse.cz + +- removed YCP code for Tree recursive selection, widget can do it + itself now (bnc#686639) +- 2.21.4 + +------------------------------------------------------------------- Fri Apr 15 11:35:28 CEST 2011 - jsuchome@suse.cz - return map structures from agent, to speed up building tree Modified: trunk/snapper/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/snapper/src/dialogs.ycp?rev=63806&r1=63805&r2=63806&view=diff ============================================================================== --- trunk/snapper/src/dialogs.ycp (original) +++ trunk/snapper/src/dialogs.ycp Mon Apr 18 09:18:26 2011 @@ -506,7 +506,7 @@ if (size (tree_items) > 0) { UI::ReplaceWidget (`id (`reptree), - `Tree (`id(`tree), `opt (`notify, `immediate, `multiSelection), tree_label, tree_items) + `Tree (`id(`tree), `opt (`notify, `immediate, `multiSelection, `recursiveSelection), tree_label, tree_items) ); // no item is selected UI::ChangeWidget (`tree, `CurrentItem, nil); @@ -529,58 +529,8 @@ current_file = (string) UI::QueryWidget (`id(`tree),`CurrentItem); if (current_file == nil) current_file = ""; - // tree checkbox clicked - if (ret == `tree && event["EventReason"]:"" == "ValueChanged") - { - // non-tracked file should be directory - if (current_file != "" && - (! haskey (files_index, current_file) || FileUtils::IsDirectory (current_file) == true)) - { - void select_items (map current_map, string prefix) { - selected_items[prefix] = ! selected_items[prefix]:false; - foreach (string key, map submap, current_map, { - string new_path = prefix + "/" + key; - if (submap != $[]) - { - select_items ((map) submap, new_path); - } - else - { - selected_items[new_path] = ! selected_items[new_path]:false; - } - }); - } - void update_selection (map current_map, list<string> path_list) - { - string first = path_list[0]:""; - if (size (path_list) == 0) - { - select_items (current_map, current_file); - } - else if (haskey (current_map, first)) - { - update_selection ((map)current_map[first]:$[], - (list<string>) remove (path_list, 0) - ); - } - } - list<string> path_l = splitstring (current_file, "/"); - if (path_l[0]:"" == "") - path_l = remove (path_l, 0); - - update_selection (tree_map, path_l); - - list<string> selection = []; - foreach (string key, boolean val, selected_items, { - if (val) - selection = add (selection, key); - }); - UI::ChangeWidget (`tree, `SelectedItems, selection); - } - - } // other tree events - else if (ret == `tree) + if (ret == `tree) { // seems like tree widget emits 2 SelectionChanged events if (current_file != previous_file) -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org