diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2002-02-14 19:54:38 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2002-02-14 19:54:38 +0000 |
| commit | b91894f2f3a57c6455626e60f21966da943b3ddc (patch) | |
| tree | d157bf060d993cf6f092ebf28043597c4851a07c | |
| parent | 3a565013bcc06f1b87ac863c7f5728de53d5c29e (diff) | |
| download | drakx-b91894f2f3a57c6455626e60f21966da943b3ddc.tar drakx-b91894f2f3a57c6455626e60f21966da943b3ddc.tar.gz drakx-b91894f2f3a57c6455626e60f21966da943b3ddc.tar.bz2 drakx-b91894f2f3a57c6455626e60f21966da943b3ddc.tar.xz drakx-b91894f2f3a57c6455626e60f21966da943b3ddc.zip | |
use the new warp_text feature
| -rw-r--r-- | perl-install/diskdrake/interactive.pm | 2 | ||||
| -rw-r--r-- | perl-install/interactive_gtk.pm | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/perl-install/diskdrake/interactive.pm b/perl-install/diskdrake/interactive.pm index ff3e85051..0436991e5 100644 --- a/perl-install/diskdrake/interactive.pm +++ b/perl-install/diskdrake/interactive.pm @@ -791,7 +791,7 @@ sub Options { '', [ (map {; - { label => $_, text => warp_text(formatAlaTeX($help{$_})), val => \$options->{$_}, + { label => $_, text => join("\n", warp_text(formatAlaTeX($help{$_}))), val => \$options->{$_}, advanced => !$part->{rootDevice} && !member($_, @simple_options), if_(!/=$/, type => 'bool'), } } keys %$options), { label => _("Various"), val => \$unknown, advanced => 1 }, diff --git a/perl-install/interactive_gtk.pm b/perl-install/interactive_gtk.pm index 9d3df0d79..d7f539b08 100644 --- a/perl-install/interactive_gtk.pm +++ b/perl-install/interactive_gtk.pm @@ -792,7 +792,7 @@ sub wait_messageW($$$) { my $w = my_gtk->new($title, %$o, grab => 1); gtkadd($w->{window}, my $hbox = new Gtk::HBox(0,0)); $hbox->pack_start(my $box = new Gtk::VBox(0,0), 1, 1, 10); - $box->pack_start($_, 1, 1, 4) foreach my @l = map { new Gtk::Label(join("\n", warp_text($_))) } @$messages; + $box->pack_start($_, 1, 1, 4) foreach my @l = map { new Gtk::Label(warp_text($_)) } @$messages; ($w->{wait_messageW} = $l[$#l])->signal_connect(expose_event => sub { $w->{displayed} = 1 }); $w->{rwindow}->set_position('center') if ($::isStandalone && (!$::isEmbedded && !$::isWizard || $my_gtk::pop_it)); @@ -802,7 +802,7 @@ sub wait_messageW($$$) { } sub wait_message_nextW { my ($o, $messages, $w) = @_; - my $msg = join("\n", warp_text(join "\n", @$messages)); + my $msg = warp_text(join "\n", @$messages); return if $msg eq $w->{wait_messageW}->get; #- needed otherwise no expose_event :( $w->{displayed} = 0; $w->{wait_messageW}->set($msg); |