some updates to tlmgr gui

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

1 files changed, 23 insertions, 12 deletions

diff --git a/Master/texmf-dist/scripts/texlive/tlmgrgui.pl b/Master/texmf-dist/scripts/texlive/tlmgrgui.pl
index 535d2bfd3c8..3abf2288bda 100644
--- a/Master/texmf-dist/scripts/texlive/tlmgrgui.pl
+++ b/Master/texmf-dist/scripts/texlive/tlmgrgui.pl
@@ -1,7 +1,7 @@
 #!/usr/bin/env perl
 # $Id$
 #
-# Copyright 2009-2013 Norbert Preining
+# Copyright 2009-2014 Norbert Preining
 # This file is licensed under the GNU General Public License version 2
 # or any later version.
 #
@@ -110,6 +110,7 @@ my $darktext;
 my $match_entry;
 my $loaded_text;
 my $loaded_text_button;
+my $default_repo;
 my $update_all_button;
 
 my %settings_label;
@@ -284,17 +285,26 @@ sub do_rest_of_gui {
         -separator => "/",
         -selectmode => "none");
 
-  my $button_frame = $mw->Frame;
+  my $button_frame = $mw->Labelframe(-text => __("Repository"));
+  $loaded_text = $button_frame->Label(-text => __("Loaded:") . " " . __("none"));
+  $loaded_text->pack(@left, @p_ii);
+
   $loaded_text_button = $button_frame->Button(-text => __("Load default"),
     -command => sub { setup_location($tlpdb_location); });
-  $loaded_text_button->pack(
-      -anchor => 'e', -padx => 0, -pady => 0,
-      -ipadx => 0, -ipady => 0, -side => 'right');
-  $loaded_text = $button_frame->Label(
-    -text => __("Loaded repository:") . " " . __("none"));
-  $loaded_text->pack(-anchor => 'e', -padx => 0, -pady => 0, 
-    -ipadx => 0, -ipady => 0, -side => 'right');
-    
+  $loaded_text_button->pack( @left, @p_ii);
+
+  my %repos = repository_to_array($tlpdb_location);
+  my @tags = keys %repos;
+  my $foo;
+  if ($#tags > 0) {
+    $foo = __("multiple repositories");
+  } else {
+    $foo = $tlpdb_location;
+  }
+
+  $default_repo = $button_frame->Label(-text => __("Default:") . " " . $foo );
+  $default_repo->pack(@left, @p_ii);
+
   #$button_frame->pack(-expand => 1, -fill => 'x', @p_ii);
 
   #my $top_frame = $mw->Labelframe(-text => __("Display configuration"));
@@ -643,7 +653,7 @@ sub setup_menu_system {
 
 tlmgrgui revision $tlmgrguirevision
 $tlmgrrev
-Copyright 2009-2013 Norbert Preining
+Copyright 2009-2014 Norbert Preining
 
 Licensed under the GNU General Public License version 2 or higher
 In case of problems, please contact: texlive\@tug.org"
@@ -2629,9 +2639,10 @@ sub update_loaded_location_string {
   } else {
     $loaded_text_button->configure(-text => $arg);
   }
-  $loaded_text->configure(-text => __("Loaded repository:"));
+  $loaded_text->configure(-text => __("Loaded:"));
   $loaded_text_button->configure( -command => 
       sub { transient_show_multiple_repos($loaded_text_button, @vals); });
+  $default_repo->packForget;
 }
 
 sub transient_show_multiple_repos {