layout change, source location now in the top bar

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

3 files changed, 16 insertions, 48 deletions

diff --git a/Master/texmf/scripts/texlive/tlmgrgui/gui-install.pl b/Master/texmf/scripts/texlive/tlmgrgui/gui-install.pl
index 578ec6b55be..3fce0ad2881 100644
--- a/Master/texmf/scripts/texlive/tlmgrgui/gui-install.pl
+++ b/Master/texmf/scripts/texlive/tlmgrgui/gui-install.pl
@@ -32,7 +32,7 @@ $back_f1_f1_l1->pack(-side => "top");
 # listbox: packages
 #labelframe .back.f1.f21 -text "Select packages to install"
 our $back_f1_f21 = $back_f1->Labelframe(-text => "Select packages to install");
-$back_f1_f21->grid(-row => 2, -column => 1, -rowspan => 3,
+$back_f1_f21->grid(-row => 2, -column => 1, -rowspan => 2,
    -sticky => "nswe", -padx => "2m", -pady => "1m");
 
 
@@ -67,31 +67,10 @@ $back_f1_f21_scrx->pack(-side => "bottom", -fill => "x");
 $back_f1_f21_scry->pack(-side => "right", -fill => "y", -expand => 0);
 $back_f1_f21_lb->pack(-fill => "both", -expand => 1);
 
-########################    row 2 col 3
-## CD-ROM
-our $back_f1_f23 = $back_f1->Labelframe(-text => "Installation Source");
-$back_f1_f23->grid(-row => 2, -column => 2, -sticky => "we", 
-                   -padx => "2m", -pady => "1m");
-
-## CD-ROM
-# button .back.f1.f23.b  -text "CD/DVD" -command {}
-our $back_f1_f23_b = $back_f1_f23->Button(-text => "Change", 
-	-command => sub { menu_edit_location(); });
-# label  .back.f1.f23.l -width 30 -textvariable dircd -relief sunken -anchor w
-our $back_f1_f23_l = $back_f1_f23->Label(-width => 30, -textvariable => \$location, -relief => "sunken", -anchor => "w");
-# pack .back.f1.f23.b -side left -padx 2m -pady 2m
-$back_f1_f23_b->pack(-side => "left", -padx => "2m", -pady => "2m");
-# pack .back.f1.f23.l -side left -padx 2m -pady 2m -expand 1 -fill x
-$back_f1_f23_l->pack(-side => "left", -padx => "2m", -pady => "2m", 
-                     -expand => 1, -fill => "x");
-
-
 #######################     row 3 col 3
 ## text: info
-# labelframe .back.f1.f33 -text "Info on the selected item"
 our $back_f1_f33 = $back_f1->Labelframe(-text => "Info on the selected item");
-# grid .back.f1.f33 -row 3 -column 3 -sticky nswe -padx 2m -pady 1m
-$back_f1_f33->grid(-row => 3, -column => 2, -sticky => "nswe", 
+$back_f1_f33->grid(-row => 2, -column => 2, -sticky => "nswe", 
                    -padx => "2m", -pady => "1m");
 
 
@@ -109,7 +88,7 @@ $back_f1_f33_t->pack(-expand => 1, -fill => "both");
 
 ###############
 our $back_f1_buttons = $back_f1->Labelframe(); ### -text => "Buttons");
-$back_f1_buttons->grid(-row => 4, -column => 2, 
+$back_f1_buttons->grid(-row => 3, -column => 2, 
     -padx => "2m", -pady => "2m", -sticky => "we");
 
 ## Buttons
@@ -128,9 +107,8 @@ $back_f1_buttons_install->pack(-expand => 0, -fill => "both",
 
 
 $back_f1->gridRowconfigure(1,-weight => 0);
-$back_f1->gridRowconfigure(2,-weight => 0);
-$back_f1->gridRowconfigure(3,-weight => 1);
-$back_f1->gridRowconfigure(4,-weight => 0);
+$back_f1->gridRowconfigure(2,-weight => 1);
+$back_f1->gridRowconfigure(3,-weight => 0);
 $back_f1->gridColumnconfigure(1,-weight => 1);
 $back_f1->gridColumnconfigure(2,-weight => 1);
 
diff --git a/Master/texmf/scripts/texlive/tlmgrgui/gui-update.pl b/Master/texmf/scripts/texlive/tlmgrgui/gui-update.pl
index a9542bac53e..e24487e3816 100644
--- a/Master/texmf/scripts/texlive/tlmgrgui/gui-update.pl
+++ b/Master/texmf/scripts/texlive/tlmgrgui/gui-update.pl
@@ -24,7 +24,7 @@ $back_up_f1_l1->pack(-side => "top");
 #######################     row 2 col 1
 # listbox: packages
 our $back_up_f21 = $back_up->Labelframe(-text => "Select packages to update");
-$back_up_f21->grid(-row => 2, -column => 1, -rowspan => 3,
+$back_up_f21->grid(-row => 2, -column => 1, -rowspan => 2,
    -sticky => "nswe", -padx => "2m", -pady => "1m");
 
 
@@ -59,25 +59,10 @@ $back_up_f21_scrx->pack(-side => "bottom", -fill => "x");
 $back_up_f21_scry->pack(-side => "right", -fill => "y");
 $back_up_f21_lb->pack(-fill => "both", -expand => 1);
 
-########################    row 2 col 3
-## CD-ROM
-our $back_up_f23 = $back_up->Labelframe(-text => "Installation Source");
-$back_up_f23->grid(-row => 2, -column => 2, -sticky => "we", 
-                   -padx => "2m", -pady => "1m");
-
-## CD-ROM
-our $back_up_f23_b = $back_up_f23->Button(-text => "Change", 
-	-command => sub { menu_edit_location(); });
-our $back_up_f23_l = $back_up_f23->Label(-width => 30, -textvariable => \$location, -relief => "sunken", -anchor => "w");
-$back_up_f23_b->pack(-side => "left", -padx => "2m", -pady => "2m");
-$back_up_f23_l->pack(-side => "left", -padx => "2m", -pady => "2m", 
-                     -expand => 1, -fill => "x");
-
-
 #######################     row 3 col 3
 ## text: info
 our $back_up_f33 = $back_up->Labelframe(-text => "Info on the selected item");
-$back_up_f33->grid(-row => 3, -column => 2, -sticky => "nswe", 
+$back_up_f33->grid(-row => 2, -column => 2, -sticky => "nswe", 
                    -padx => "2m", -pady => "1m");
 
 
@@ -96,7 +81,7 @@ $back_up_f33_t->pack(-expand => 1, -fill => "both");
 
 ###############
 our $back_up_buttons = $back_up->Labelframe(); ### -text => "Buttons");
-$back_up_buttons->grid(-row => 4, -column => 2, 
+$back_up_buttons->grid(-row => 3, -column => 2, 
     -padx => "2m", -pady => "2m", -sticky => "nswe");
 
 ## Buttons
@@ -119,9 +104,8 @@ $back_up_buttons_updateall->pack(-expand => 1, -fill => "both",
 
 
 $back_up->gridRowconfigure(1,-weight => 0);
-$back_up->gridRowconfigure(2,-weight => 0);
-$back_up->gridRowconfigure(3,-weight => 1);
-$back_up->gridRowconfigure(4,-weight => 0);
+$back_up->gridRowconfigure(2,-weight => 1);
+$back_up->gridRowconfigure(3,-weight => 0);
 $back_up->gridColumnconfigure(1,-weight => 1);
 $back_up->gridColumnconfigure(2,-weight => 1);
 
diff --git a/Master/texmf/scripts/texlive/tlmgrgui/tlmgrgui.pl b/Master/texmf/scripts/texlive/tlmgrgui/tlmgrgui.pl
index 436e2ea28da..c3560e3b1b3 100755
--- a/Master/texmf/scripts/texlive/tlmgrgui/tlmgrgui.pl
+++ b/Master/texmf/scripts/texlive/tlmgrgui/tlmgrgui.pl
@@ -94,6 +94,12 @@ In case of problems, please contact: texlive\@tug.org",
 $about->pack(-side => 'right');
 $quit->pack(-side => 'right');
 
+$top->Label(-text => "Current installation source: ")->pack(-side => 'left');
+$top->Label(-textvariable => \$location,  -relief => "sunken")->pack(-side => 'left');
+$top->Button(-text => "Change", -command => sub { menu_edit_location(); })->pack(-side => 'left');
+
+
+
 # frame .back -borderwidth 2
 our $back = $mw->NoteBook(-borderwidth => 2, -dynamicgeometry => 1);