diff options
| -rw-r--r-- | lib/AdminPanel/Rpmdragora/gui.pm | 16 | ||||
| -rwxr-xr-x | modules/rpmdragora/rpmdragora | 5 |
2 files changed, 13 insertions, 8 deletions
diff --git a/lib/AdminPanel/Rpmdragora/gui.pm b/lib/AdminPanel/Rpmdragora/gui.pm index 87e6d2dd..2fe8563d 100644 --- a/lib/AdminPanel/Rpmdragora/gui.pm +++ b/lib/AdminPanel/Rpmdragora/gui.pm @@ -489,17 +489,17 @@ sub set_node_state { $detail_list->checkItem($tblItem, 0); # $tblItem->setSelected(0); } - if(!to_bool($state ne 'base')){ - #$iter->cell(0)->setLabel('-'); - $tblItem->cell(0)->setLabel('-'); - } +# if(!to_bool($state ne 'base')){ +# #$iter->cell(0)->setLabel('-'); +# $tblItem->cell(0)->setLabel('-'); +# } $detail_list->parent()->parent()->doneMultipleChanges(); } else { # no item list means we use just the item to add state information $tblItem->addCell($state,"/usr/share/rpmdrake/icons/state_$state.png") if(ref $tblItem eq "yui::YCBTableItem"); $tblItem->check(to_bool(member($state, qw(base installed to_install)))); - $tblItem->cell(0)->setLabel('-') if !to_bool($state ne 'base'); +# $tblItem->cell(0)->setLabel('-') if !to_bool($state ne 'base'); } } @@ -685,7 +685,8 @@ sub add_package_item { # TODO FIXME summary is not visible in necurses (adding a new column as in dragoraUpdate) my $newTableItem = new yui::YCBTableItem( - $name."\n".get_summary($pkg_name), + $name, + get_summary($pkg_name), $version, $release, $arch @@ -750,7 +751,8 @@ carp "TODO: add_node is_a_package(\$leaf)" . $leaf . "\n"; $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::YCBTableItem($name."\n".get_summary($leaf), + my $newTableItem = new yui::YCBTableItem($name, + get_summary($leaf), $version, $release, $arch); diff --git a/modules/rpmdragora/rpmdragora b/modules/rpmdragora/rpmdragora index 80d0aa92..b37650bf 100755 --- a/modules/rpmdragora/rpmdragora +++ b/modules/rpmdragora/rpmdragora @@ -509,13 +509,16 @@ sub run_treeview_dialog { #$col_sel->set_sort_column_id($pkg_columns{selected}); my $display_arch_col = to_bool(arch() =~ /64/); - my @columns = (qw(name version release), if_($display_arch_col, 'arch')); + my @columns = (qw(name summary version release), if_($display_arch_col, 'arch')); my %columns = ( 'name' => { title => $loc->N("Package"), markup => $pkg_columns{short_name}, }, + 'summary' => { + title => $loc->N("Summary"), + }, 'version' => { title => $loc->N("Version"), text => $pkg_columns{version}, |