From 6e9742015d7b2ac4a8a4c9e42b5f8f35c4b87152 Mon Sep 17 00:00:00 2001
From: Norbert Preining <preining@logic.at>
Date: Fri, 9 Apr 2010 02:44:29 +0000
Subject: tlmgr: rework gui documentation a bit to reflect reality GUI: provide
 access to the manual (tlmgr help) in the Help menu

git-svn-id: svn://tug.org/texlive/trunk@17767 c570f23f-e606-0410-a88d-b1316a301751
---
 Master/texmf/scripts/texlive/NEWS        |  1 +
 Master/texmf/scripts/texlive/tlmgr.pl    | 16 ++++++++++------
 Master/texmf/scripts/texlive/tlmgrgui.pl | 17 ++++++++---------
 3 files changed, 19 insertions(+), 15 deletions(-)

(limited to 'Master/texmf')

diff --git a/Master/texmf/scripts/texlive/NEWS b/Master/texmf/scripts/texlive/NEWS
index 64b3132028a..ff81729927d 100644
--- a/Master/texmf/scripts/texlive/NEWS
+++ b/Master/texmf/scripts/texlive/NEWS
@@ -9,6 +9,7 @@ tlmgr rev next
   * GUI: add support for the three command line options: --no-auto-install,
     --no-auto-remove (under Menu->Options), and --reinstall-forcibly-removed
     (just below the "Update all installed" button)
+  * GUI: provide access to the manual (tlmgr help) in the Help menu
 
 tlmgr rev 17611 (2010-03-30)
 
diff --git a/Master/texmf/scripts/texlive/tlmgr.pl b/Master/texmf/scripts/texlive/tlmgr.pl
index 198fd8c0fc0..291a421646d 100755
--- a/Master/texmf/scripts/texlive/tlmgr.pl
+++ b/Master/texmf/scripts/texlive/tlmgr.pl
@@ -5357,7 +5357,7 @@ The following entries can be found in the menu bar:
 
 =over 4
 
-=item B<File>
+=item B<tlmgr>
 
 Provides access to load various repositories (the default as specified
 in the texlive database, the default network repository, if given
@@ -5369,20 +5369,22 @@ Furthermore is allows to quit C<tlmgr>.
 Provides access to three groups of options, I<General> (for almost all
 options), I<Paper> (configuration of default paper sizes),
 I<Architectures> (only on Unix, configuration of the supported/installed
-architectures), as well as a toggle to turn on and off debugging mode.
+architectures), as well as some toggles to turn on and off various
+options.
 
 =item B<Actions>
 
 Provides access to a variety of items, such as updating the filename
 database (aka ls-R, mktexlsr, texhash), rebuilding of all formats
 (C<fmtutil-sys --all>), updating the font map database (C<updmap-sys>),
-and handling of symbolic links in system directories (only Unix), as
-well as removal of the full TeX Live installation (only Unix).
+and handling of symbolic links in system directories (only Unix), 
+restoring backups of packages, as well as removal of the full TeX Live
+installation (only Unix).
 
 =item B<Help>
 
-Currently only gives basic information on the installed version, authors,
-license.
+Provides access to the manual and other basic information on the 
+installed version, authors, license.
 
 =back
 
@@ -5469,6 +5471,8 @@ Below the list of packages there are five buttons:
 this calls C<tlmgr update --all> internally, i.e., tries to update all
 available packages.
 
+Below this button there is a toggle that allows reinstallation of
+previously removed packages.
 
 The following four buttons only work on the I<selected> packages, i.e., those
 where the checkbutton at the beginning of the line is ticked.
diff --git a/Master/texmf/scripts/texlive/tlmgrgui.pl b/Master/texmf/scripts/texlive/tlmgrgui.pl
index e3a7d939e88..6db08bf444e 100644
--- a/Master/texmf/scripts/texlive/tlmgrgui.pl
+++ b/Master/texmf/scripts/texlive/tlmgrgui.pl
@@ -36,8 +36,8 @@ use Tk::ROText;
 use Tk::HList;
 use Tk::ItemStyle;
 
-# not ready yet
-# use Pod::Text;
+use Pod::Text;
+use IO::String;
 
 #use TeXLive::Splashscreen;
 #use Devel::Leak;
@@ -548,9 +548,7 @@ sub setup_menu_system {
 
   #
   # HELP MENU
-  # 
-  # not ready yet
-  # $menu_help->add('command', -label => __("Docs"), -command => \&pod_to_text);
+  $menu_help->add('command', -label => __("Manual"), -command => \&pod_to_text);
   $menu_help->add('command', -label => __("About"),
     -command => sub {
       my $sw = $mw->DialogBox(-title => __("About"),
@@ -1974,12 +1972,13 @@ sub give_warning_window {
 
 sub pod_to_text {
   my $txt;
-  my $parser = Pod::Simple->new (sentence => 0, width => 78);
-  $parser->output_string( \$txt );
-  $parser->parse_file("$Master/texmf/scripts/texlive/tlmgr.pl");
+  my $io = IO::String->new($txt);
+  my $parser = Pod::Text->new (sentence => 0, width => 78);
+  $parser->parse_from_file("$Master/texmf/scripts/texlive/tlmgr.pl", $io);
   my $sw = $mw->Toplevel(-title => __("Help"));
   $sw->transient($mw);
-  my $t = $sw->ROText(-height => 40, -width => 80);
+  my $t = $sw->Scrolled("ROText", -scrollbars => "e",
+                                  -height => 40, -width => 80);
   $t->Contents($txt);
   $t->pack;
 }
-- 
cgit v1.2.3