From 56ae853630c1c797f9228d0097728abf47163635 Mon Sep 17 00:00:00 2001 From: Angelo Naselli Date: Thu, 27 Nov 2014 14:02:04 +0100 Subject: removed tree_model --- modules/rpmdragora/rpmdragora | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/modules/rpmdragora/rpmdragora b/modules/rpmdragora/rpmdragora index b3a776c6..d66296eb 100755 --- a/modules/rpmdragora/rpmdragora +++ b/modules/rpmdragora/rpmdragora @@ -76,11 +76,14 @@ my %elems; my $old_value; sub viewbox_callback { - my %wanted_categories = (); +# my %wanted_categories = (); my ($selection, $options, $wanted_categories) = @_; my $val = $selection; $old_value="" if(!defined($old_value)); return if $val eq $old_value; # workarounding gtk+ sending us sometimes twice events + + yui::YUI::app()->busyCursor(); + $old_value = $val; $default_list_mode = $options->{rviews}{$val}; if (my @cat = $wanted_categories{$options->{rviews}{$val}} && @{$wanted_categories{$options->{rviews}{$val}}}) { @@ -94,6 +97,8 @@ sub viewbox_callback { switch_pkg_list_mode($options->{rviews}{$val}); $options->{rebuild_tree}->(); } + + yui::YUI::app()->normalCursor(); } sub filterbox_callback { @@ -101,6 +106,9 @@ sub filterbox_callback { state $oldval; my $val = $selection; return if $val eq $oldval; # workarounding gtk+ sending us sometimes twice events + + yui::YUI::app()->busyCursor(); + $oldval = $val; $val = $$rfilters{$val}; if ($filter->[0] ne $val) { @@ -109,6 +117,8 @@ sub filterbox_callback { slow_func($::main_window, sub { switch_pkg_list_mode($default_list_mode) }); $options->{rebuild_tree}->(); } + + yui::YUI::app()->normalCursor(); } my $current_group = -1; sub tree_callback { @@ -221,8 +231,8 @@ sub detaillist_callback { $info->setValue($info_text); } -sub do_search($$$$$$$) { - my ($find_entry, $tree, $tree_model, $options, $current_search_type, $urpm, $pkgs) = @_; +sub _do_search($$$$$$) { + my ($find_entry, $tree, $options, $current_search_type, $urpm, $pkgs) = @_; my $entry = $find_entry->value() or return; if (!$use_regexp->[0]) { $entry = quotemeta $entry; @@ -1170,6 +1180,7 @@ sub run_treeview_dialog { } elsif ($eventType == $yui::YEvent::WidgetEvent) { # widget selected + my $widget = $event->widget(); if($widget == $reset_search_button) { @@ -1177,7 +1188,7 @@ sub run_treeview_dialog { reset_search(); } elsif ($widget == $find_button) { - do_search($find_entry, $tree, $tree_model, $options, $current_search_type, $urpm, $pkgs); + _do_search($find_entry, $tree, $options, $current_search_type, $urpm, $pkgs); } elsif ($widget == $select_all_button) { toggle_all($options, 1); -- cgit v1.2.1