diff options
| -rwxr-xr-x | rpmdrake | 22 | ||||
| -rw-r--r-- | rpmdrake.spec | 6 |
2 files changed, 20 insertions, 8 deletions
@@ -698,7 +698,20 @@ or you already installed all of them.")); $compssUsers = parse_compssUsers_flat(); my @radios_names_ordered = qw(mandrake_choices flat by); $compssUsers or shift @radios_names_ordered; - @modes_buttons = gtkradio($radios_infos{by}{name}, map { $radios_infos{$_}{name} } @radios_names_ordered); + + my @advanced_modes = ([ 'by_group', N("All packages, by group"), 0 ], [ 'by_size', N("All packages, by size"), 1 ], + [ 'by_selection', N("All packages, by selection state"), 1 ]); + $MODE eq 'install' and push @advanced_modes, ([ 'by_source', N("All packages, by medium repository"), 0 ], [ 'by_presence', N("All packages, by update availability"), 0 ]); + $MODE eq 'remove' and push @advanced_modes, [ 'by_leaves', N("Leaves only, sorted by install date"), 1 ]; + + my $default_radio = $options->{tree_mode} = 'mandrake_choices'; + if (member($tree_mode->[0], keys %radios_infos, map { $_->[0] } @advanced_modes)) { + $default_radio = $options->{tree_mode} = $tree_mode->[0]; + $options->{state}{flat} = $tree_flat->[0]; + $default_radio =~ s/^by.*/by/; + } + + @modes_buttons = gtkradio($radios_infos{$default_radio}{name}, map { $radios_infos{$_}{name} } @radios_names_ordered); mapn { my $capture_mode = $_[0]; @@ -714,15 +727,10 @@ or you already installed all of them.")); } }); } \@radios_names_ordered, \@modes_buttons; - $options->{tree_mode} = $tree_mode->[0]; - $options->{state}{flat} = $tree_flat->[0]; my $advanced_menu = Gtk2::Menu->new; my $radio_by; - my @advanced_modes = ([ 'by_group', N("All packages, by group"), 0 ], [ 'by_size', N("All packages, by size"), 1 ], - [ 'by_selection', N("All packages, by selection state"), 1 ]); - $MODE eq 'install' and push @advanced_modes, ([ 'by_source', N("All packages, by medium repository"), 0 ], [ 'by_presence', N("All packages, by update availability"), 0 ]); - $MODE eq 'remove' and push @advanced_modes, [ 'by_leaves', N("Leaves only, sorted by install date"), 1 ]; + each_index { my ($capt_mode, $capt_flat) = ($_->[0], $_->[2]); my $item = Gtk2::MenuItem->new_with_label($_->[1]); diff --git a/rpmdrake.spec b/rpmdrake.spec index b2fd1af1..884bfac3 100644 --- a/rpmdrake.spec +++ b/rpmdrake.spec @@ -8,7 +8,7 @@ %define name rpmdrake %define version 2.1.1 -%define release 1mdk +%define release 2mdk Name: %{name} Version: %{version} @@ -101,6 +101,10 @@ rm -rf $RPM_BUILD_ROOT %{perl_vendorarch}/*.pm %changelog +* Wed Jan 14 2004 Guillaume Cottenceau <gc@mandrakesoft.com> 2.1.1-2mdk +- fix wrongly using unavailable sorting method in remove mode after + save in install mode + * Mon Jan 12 2004 Guillaume Cottenceau <gc@mandrakesoft.com> 2.1.1-1mdk - add ability to cancel packages downloads (#6317) - save sorting method at exit of rpmdrake for Lord Titi (#6051) |