make scheme selection dialog one window

and wrap descriptions


git-svn-id: svn://tug.org/texlive/trunk@26430 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 4 insertions, 15 deletions

diff --git a/Master/tlpkg/installer/install-menu-perltk.pl b/Master/tlpkg/installer/install-menu-perltk.pl
index ec23c49bc7d..3045c7091ec 100644
--- a/Master/tlpkg/installer/install-menu-perltk.pl
+++ b/Master/tlpkg/installer/install-menu-perltk.pl
@@ -1,7 +1,7 @@
 #!/usr/bin/env perl
 # $Id$
 #
-# Copyright 2008, 2009, 2010 Norbert Preining
+# Copyright 2008, 2009, 2010, 2011, 2012 Norbert Preining
 # Copyright 2008 Reinhard Kotucha
 # This file is licensed under the GNU General Public License version 2
 # or any later version.
@@ -742,10 +742,6 @@ sub menu_select_scheme {
   my $selected = $vars{'selected_scheme'};
   $sw->Label(-text => __("Selected scheme"))->pack(-padx => "2m", -pady => "2m");
   my $f2 = $sw->Frame;
-  my $f2l = $f2->Frame;
-  my $f2r = $f2->Frame;
-  my $nrfh = $#schemes / 2;
-  my $i = 0;
   foreach my $scheme (@schemes) {
     my $desc;
     if ($scheme ne "scheme-custom") {
@@ -755,20 +751,13 @@ sub menu_select_scheme {
       $desc = __("custom selection of collections");
     }
     my $b;
-    if ($i < $nrfh) {
-      $b = $f2l->Radiobutton(-variable => \$selected, -value => $scheme,
-        -text => __($desc))->pack(-anchor => 'w');
-    } else {
-      $b = $f2r->Radiobutton(-variable => \$selected, -value => $scheme,
-        -text => __($desc))->pack(-anchor => 'w');
-    }
+    $b = $f2->Radiobutton(-variable => \$selected, -value => $scheme,
+      -text => __($desc), 
+      -justify => 'left', -wraplength => 500)->pack(-anchor => 'w', -pady => "2m");
     if ($selected eq $scheme) {
       $b->focus();
     }
-    $i++;
   }
-  $f2l->pack(-side => 'left', -padx => "2m", -pady => "2m");
-  $f2r->pack(-side => 'right', -padx => "2m", -pady => "2m");
   $f2->pack;
   my $f3 = $sw->Frame;
   my $okbutton = $f3->Button(-text => __("Ok"),