diff options
| -rwxr-xr-x | MandrivaUpdate | 10 | ||||
| -rw-r--r-- | Rpmdrake/gui.pm | 6 | ||||
| -rwxr-xr-x | rpmdrake | 12 |
3 files changed, 18 insertions, 10 deletions
diff --git a/MandrivaUpdate b/MandrivaUpdate index 1a392467..a264e055 100755 --- a/MandrivaUpdate +++ b/MandrivaUpdate @@ -48,7 +48,8 @@ use Gtk2::SimpleList; text => 1, short_name => 2, version => 3, - arch => 4 + release => 4, + arch => 5 ); $ugtk2::wm_icon = "title-$MODE"; @@ -78,8 +79,8 @@ sub refresh_packages_list { @{$list->{data}} = map { $data{$_} = $i++; my $summary = get_summary($_); - my ($name, $version, $arch) = split_fullname($_); - [ $pkgs->{$_}{selected}, $_, format_name_n_summary($name, $summary), $version, $arch ]; + my ($name, $version, $release, $arch) = split_fullname($_); + [ $pkgs->{$_}{selected}, $_, format_name_n_summary($name, $summary), $version, $release, $arch ]; } grep { $pkgs->{$_}{pkg} } @requested; gtktext_insert($info, formatAlaTeX(N("The list of updates is empty. This means that either there is @@ -130,6 +131,7 @@ sub run_treeview_dialog { '' => 'hidden', " " . N("Name") . " " => 'markup', #N("Name") " " . N("Version") . " " => 'text', + " " . N("Release") . " " => 'text', " " . N("Arch") . " " => 'text', ), ), @@ -184,7 +186,7 @@ sub run_treeview_dialog { $bool_col->set_sort_column_id($pkg_columns{selected}); # -1 because actual widget count differs from TreeModel one due to the hidden column: - foreach (@pkg_columns{qw(short_name version arch)}) { + foreach (@pkg_columns{qw(short_name version release arch)}) { my $col = $list->get_column($_-1); ($col->get_cell_renderers)[0]->set_property('xpad', '6'); $col->set_sizing('autosize'); diff --git a/Rpmdrake/gui.pm b/Rpmdrake/gui.pm index d4a0bfe6..66dfaa49 100644 --- a/Rpmdrake/gui.pm +++ b/Rpmdrake/gui.pm @@ -59,7 +59,8 @@ our %pkg_columns = ( selected => 3, short_name => 4, version => 5, - arch => 6, + release => 6, + arch => 7, ); @@ -235,10 +236,11 @@ sub add_node { if ($leaf) { my $iter; if (is_a_package($leaf)) { - my ($name, $version, $arch) = split_fullname($leaf); + my ($name, $version, $release, $arch) = split_fullname($leaf); $iter = $w->{detail_list_model}->append_set([ $pkg_columns{text} => $leaf, $pkg_columns{short_name} => format_name_n_summary($name, get_summary($leaf)), $pkg_columns{version} => $version, + $pkg_columns{release} => $release, $pkg_columns{arch} => $arch, ]); set_node_state($iter, $state, $w->{detail_list_model}); @@ -182,7 +182,7 @@ sub run_treeview_dialog { $tree->append_column(Gtk2::TreeViewColumn->new_with_attributes(undef, Gtk2::MDV::CellRendererPixWithLabel->new, 'pixbuf' => $grp_columns{icon}, label => $grp_columns{label})); $tree->set_headers_visible(0); - $detail_list_model = Gtk2::ListStore->new("Glib::String", "Gtk2::Gdk::Pixbuf", "Glib::String", "Glib::Boolean", "Glib::String", "Glib::String", "Glib::String"); + $detail_list_model = Gtk2::ListStore->new("Glib::String", "Gtk2::Gdk::Pixbuf", "Glib::String", "Glib::Boolean", "Glib::String", "Glib::String", "Glib::String", "Glib::String"); $detail_list = Gtk2::TreeView->new_with_model($detail_list_model); $detail_list->append_column(my $col1 = Gtk2::TreeViewColumn->new_with_attributes(undef, Gtk2::CellRendererToggle->new, active => $pkg_columns{selected})); $col1->set_fixed_width(34); # w/o this the toggle cells are not displayed @@ -203,12 +203,16 @@ sub run_treeview_dialog { title => N("Version"), text => $pkg_columns{version}, }, + 'release' => { + title => N("Release"), + text => $pkg_columns{release}, + }, 'arch' => { title => N("Arch"), text => $pkg_columns{arch}, }, ); - foreach my $col (@columns{qw(name version arch)}) { + foreach my $col (@columns{qw(name version release arch)}) { $detail_list->append_column( $col->{widget} = Gtk2::TreeViewColumn->new_with_attributes(' ' . $col->{title} . ' ', @@ -218,10 +222,10 @@ sub run_treeview_dialog { ); $col->{widget}->set_sort_column_id($col->{markup} ? $col->{markup} : $col->{text}); } - $columns{$_}{widget}->set_sizing('autosize') foreach qw(name version arch); + $columns{$_}{widget}->set_sizing('autosize') foreach qw(name version release arch); $columns{name}{widget}->set_property('expand', '1'); $columns{name}{renderer}->set_property('ellipsize', 'end'); - $columns{$_}{renderer}->set_property('xpad', '6') foreach qw(name version arch); + $columns{$_}{renderer}->set_property('xpad', '6') foreach qw(name version release arch); $columns{name}{widget}->set_resizable(1); $detail_list_model->set_sort_column_id(0, 'ascending'); $detail_list->set_rules_hint(1); |