From 08adb26fd0bf8cec4845cf4e46b4f13dda369444 Mon Sep 17 00:00:00 2001 From: Matteo Pasotti Date: Fri, 18 Jan 2013 12:20:28 +0000 Subject: added missing pkg status column to detail_list --- AdminPanel/Rpmdragora/gui.pm | 13 ++++++++++--- modules/rpmdragora/rpmdragora | 2 ++ 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/AdminPanel/Rpmdragora/gui.pm b/AdminPanel/Rpmdragora/gui.pm index 2e940c88..dd252354 100644 --- a/AdminPanel/Rpmdragora/gui.pm +++ b/AdminPanel/Rpmdragora/gui.pm @@ -408,8 +408,14 @@ sub set_node_state { #$model->set($iter, $pkg_columns{selected} => to_bool(member($state, qw(base installed to_install)))); #$pkg->{selected})); #$model->set($iter, $pkg_columns{selectable} => to_bool($state ne 'base')); $iter->addCell($state,"/usr/share/rpmdrake/icons/state_$state.png"); - $iter->addCell("".to_bool(member($state, qw(base installed to_install))),''); - $iter->addCell("".to_bool($state ne 'base'),''); + if(to_bool(member($state, qw(base installed to_install)))){ + $iter->cell(0)->setLabel('x'); + }else{ + $iter->cell(0)->setLabel(''); + } + if(!to_bool($state ne 'base')){ + $iter->cell(0)->setLabel('-'); + } } sub set_leaf_state { @@ -473,7 +479,8 @@ sub add_node { $release = "" if(!defined($release)); $arch = "" if(!defined($arch)); #my $newTableItem = new yui::YTableItem(format_name_n_summary($name, get_summary($leaf)), - my $newTableItem = new yui::YTableItem($name."\n".get_summary($leaf), + my $newTableItem = new yui::YTableItem($state, + $name."\n".get_summary($leaf), $version, $release, $arch); diff --git a/modules/rpmdragora/rpmdragora b/modules/rpmdragora/rpmdragora index 3fdeccbb..f0a8edeb 100755 --- a/modules/rpmdragora/rpmdragora +++ b/modules/rpmdragora/rpmdragora @@ -411,6 +411,8 @@ sub run_treeview_dialog { #$col_sel->set_sizing('fixed'); #$col_sel->set_sort_column_id($pkg_columns{selected}); + $detail_list_header->addColumn(''); + my $display_arch_col = to_bool(arch() =~ /64/); my @columns = (qw(name version release), if_($display_arch_col, 'arch')); -- cgit v1.2.1