From a3a01f4ee06aa9df8dcdaaf30cf9e27f3049e55d Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Mon, 17 Sep 2007 15:52:57 +0000 Subject: (extract_header,format_pkg_simplifiedinfo) indent expanders' contents --- Rpmdrake/gui.pm | 4 ++-- Rpmdrake/pkg.pm | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'Rpmdrake') diff --git a/Rpmdrake/gui.pm b/Rpmdrake/gui.pm index f115497f..d71d5068 100644 --- a/Rpmdrake/gui.pm +++ b/Rpmdrake/gui.pm @@ -111,7 +111,7 @@ sub format_pkg_simplifiedinfo { push @$s, [ "\n" ]; push @$s, [ gtkadd(gtkshow(my $exp0 = Gtk2::Expander->new(format_field(N("Details:")))), gtknew('TextView', text => ugtk2::markup_to_TextView_format( - join("\n", + $spacing . join("\n$spacing", format_field(N("Version: ")) . $version, ($pkgs->{$key}{pkg}->flag_installed ? @@ -129,7 +129,7 @@ sub format_pkg_simplifiedinfo { push @$s, [ gtkadd(gtkshow(my $exp = Gtk2::Expander->new(format_field(N("Files:")))), gtknew('TextView', text => exists $pkgs->{$key}{files} ? - ugtk2::markup_to_TextView_format('' . join("\n", map { "\x{200e}$_" } @{$pkgs->{$key}{files}}) . '') #- to highlight information + ugtk2::markup_to_TextView_format('' . $spacing . join("\n$spacing", map { "\x{200e}$_" } @{$pkgs->{$key}{files}}) . '') #- to highlight information : N("(Not available)"), )) ]; $exp->set_use_markup(1); diff --git a/Rpmdrake/pkg.pm b/Rpmdrake/pkg.pm index 2e3819da..83e77900 100644 --- a/Rpmdrake/pkg.pm +++ b/Rpmdrake/pkg.pm @@ -48,7 +48,7 @@ use urpm::args qw(); use Exporter; our @ISA = qw(Exporter); -our @EXPORT = qw(extract_header find_installed_version formatlistpkg get_pkgs parse_compssUsers_flat perform_installation perform_removal run_rpm); +our @EXPORT = qw(extract_header find_installed_version formatlistpkg get_pkgs parse_compssUsers_flat perform_installation perform_removal run_rpm $spacing); use mygtk2 qw(gtknew); use ugtk2 qw(:all); @@ -90,11 +90,12 @@ sub run_rpm { } +our $spacing = " "; sub extract_header { my ($pkg, $urpm) = @_; my $chg_prepro = sub { #- preprocess changelog for faster TextView insert reaction - [ map { [ "$_\n", if_(/^\*/, { 'weight' => Gtk2::Pango->PANGO_WEIGHT_BOLD }) ] } split("\n", $_[0]) ]; + [ map { [ "$spacing$_\n", if_(/^\*/, { 'weight' => Gtk2::Pango->PANGO_WEIGHT_BOLD }) ] } split("\n", $_[0]) ]; }; my $name = urpm_name($pkg->{pkg}); if ($pkg->{pkg}->flag_installed && !$pkg->{pkg}->flag_upgrade) { -- cgit v1.2.1