diff options
author | Thierry Vignaud <tvignaud@mandriva.org> | 2003-07-17 17:57:10 +0000 |
---|---|---|
committer | Thierry Vignaud <tvignaud@mandriva.org> | 2003-07-17 17:57:10 +0000 |
commit | 96ca621d062fd1cc68e3faca20ad625d3088507c (patch) | |
tree | 46f8273366561ff8d635eec368c1d677c7418620 | |
parent | 86e78b4cfb7444b64289e1e68f6088ce23537efe (diff) | |
download | drakx-96ca621d062fd1cc68e3faca20ad625d3088507c.tar drakx-96ca621d062fd1cc68e3faca20ad625d3088507c.tar.gz drakx-96ca621d062fd1cc68e3faca20ad625d3088507c.tar.bz2 drakx-96ca621d062fd1cc68e3faca20ad625d3088507c.tar.xz drakx-96ca621d062fd1cc68e3faca20ad625d3088507c.zip |
- ihm team said: always use labels, textview are stupid nonsenses
- fcrozat then said: labels have no wrapping problems with cjk and the
like
-rw-r--r-- | perl-install/ugtk2.pm | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/perl-install/ugtk2.pm b/perl-install/ugtk2.pm index cafcf1ab0..13ae2a97a 100644 --- a/perl-install/ugtk2.pm +++ b/perl-install/ugtk2.pm @@ -304,22 +304,6 @@ sub create_box_with_title { return $box; } $o->{box_size} = n_line_size($nbline, 'text', $box); - #- hugly hack because GtkLabel doesn't wrap when using languages that don't contain spaces - if (@_ <= 2 && ($nbline > 4 || ($nbline > 1 && ref($::o) && member($::o->{locale}{lang}, qw(ja zh_CN zh_TW))))) { - $o->{icon} && !$::isWizard and - eval { gtkpack__($box, gtkset_border_width(gtkpack_(Gtk2::HBox->new(0,0), 1, gtkcreate_img($o->{icon})),5)) }; - my $wanted = $o->{box_size}; - $o->{box_size} = min(200, $o->{box_size}); - my $has_scroll = $o->{box_size} < $wanted; - - my $wtext = Gtk2::TextView->new; - $wtext->set_left_margin(3); - $wtext->can_focus($has_scroll); - chomp(my $text = join("\n", @_)); - my $scroll = create_scrolled_window(gtktext_insert($wtext, $text)); - $scroll->set_size_request(400, $o->{box_size}); - gtkpack($box, $scroll); - } else { my $a = !$::no_separator; undef $::no_separator; if ($o->{icon} && (!$::isWizard || $::isInstall)) { @@ -353,7 +337,6 @@ sub create_box_with_title { if_($a, Gtk2::HSeparator->new) ) } - } } sub _create_dialog { @@ -798,7 +781,7 @@ sub new { $o->_create_window($title); while (my $e = shift @tempory::objects) { $e->destroy } push @interactive::objects, $o if !$opts{no_interactive_objects}; - $o->{rwindow}->set_position('center-always') if $::isStandalone; +# $o->{rwindow}->set_position('center-always') if $::isStandalone; $o->{rwindow}->set_modal(1) if ($grab || $o->{grab} || $o->{modal}) && !$::isInstall; $o->{rwindow}->set_transient_for($o->{transient}) if $o->{transient}; |