diff options
author | Norbert Preining <preining@logic.at> | 2008-05-07 07:01:20 +0000 |
---|---|---|
committer | Norbert Preining <preining@logic.at> | 2008-05-07 07:01:20 +0000 |
commit | 36860e6cd0bafed9ee933aff91d6cbf1d6a95cb2 (patch) | |
tree | 57999a36503805cc58416864cb6bf67d783a96aa /Master/texmf | |
parent | b6d182911f539982f91b1ad19bcd7c0dd3501878 (diff) |
better texts, uninstall fro windwos just gives a hint to Add/Remove Programs
git-svn-id: svn://tug.org/texlive/trunk@7908 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf')
-rw-r--r-- | Master/texmf/scripts/texlive/tlmgrgui/gui-install.pl | 6 | ||||
-rw-r--r-- | Master/texmf/scripts/texlive/tlmgrgui/gui-uninstall.pl | 12 | ||||
-rwxr-xr-x | Master/texmf/scripts/texlive/tlmgrgui/tlmgrgui.pl | 5 |
3 files changed, 4 insertions, 19 deletions
diff --git a/Master/texmf/scripts/texlive/tlmgrgui/gui-install.pl b/Master/texmf/scripts/texlive/tlmgrgui/gui-install.pl index b899f8a5623..0817727c6f3 100644 --- a/Master/texmf/scripts/texlive/tlmgrgui/gui-install.pl +++ b/Master/texmf/scripts/texlive/tlmgrgui/gui-install.pl @@ -120,14 +120,10 @@ $back_f1_f33->grid(-row => 3, -column => 2, -sticky => "nswe", -# text .back.f1.f33.t -width 65 -wrap word \ -# -yscrollcommand ".back.f1.f33.scry set" our $back_f1_f33_scry; our $back_f1_f33_t = $back_f1_f33->Text(-width => 45, -wrap => "word", -yscrollcommand => sub { $back_f1_f33_scry->set(@_); }); -# .back.f1.f33.t insert end "\nAttention. Please check if a CD drive with the TeX Live CD\n is properly selected.\n\nFirst fill in the list using the \"Search\" button, then select an item and click the \"Install\" or \"Info\" button." -# -$back_f1_f33_t->insert("end", "\nAttention. Please check if a CD drive with the TeX Live CD\n is properly selected.\n\nFirst fill in the list using the \"Search\" button, then select an item and click the \"Install\" or \"Info\" button."); +$back_f1_f33_t->insert("end", "\nAttention. Please check if a DVD drive with the TeX Live DVD\nor the correct network address is properly selected.\n\nFirst fill in the list using the \"Search\" button, then select one or more items and click \"Install\" button."); #scrollbar .back.f1.f33.scry -command ".back.f1.f33.t yview" -orient vertical $back_f1_f33_scry = $back_f1_f33->Scrollbar( diff --git a/Master/texmf/scripts/texlive/tlmgrgui/gui-uninstall.pl b/Master/texmf/scripts/texlive/tlmgrgui/gui-uninstall.pl index 21001baf640..2b8973f3cf2 100644 --- a/Master/texmf/scripts/texlive/tlmgrgui/gui-uninstall.pl +++ b/Master/texmf/scripts/texlive/tlmgrgui/gui-uninstall.pl @@ -8,20 +8,10 @@ if ($^O=~/^MSWin(32|64)$/i) { - # this should not happen!!!! my $lab = $back_f3->Label(-justify => 'left', - -text => "Start the TeX Live 2008 Uninstaller?"); + -text => "Please use the \"Add/Remove Programs\" from the Control Panel!"); $lab->pack(-padx => "10m", -pady => "5m"); - - my $f = $back_f3->Frame; - $f->pack(-padx => "10m", -pady => "5m"); - my $ok = $f->Button(-text => "Ok", - -command => sub { - exec("\"$Master/tlpkg/installer/uninst.bat\""); - die("Cannot execute the uninstall script"); - }); - $ok->pack(-side => 'left', -padx => "3m"); } else { my $lab = $back_f3->Label(-justify => 'left', -text => "Really remove the complete TeX Live 2008 installation?"); diff --git a/Master/texmf/scripts/texlive/tlmgrgui/tlmgrgui.pl b/Master/texmf/scripts/texlive/tlmgrgui/tlmgrgui.pl index 9e21d90b3bd..8f462802ca9 100755 --- a/Master/texmf/scripts/texlive/tlmgrgui/tlmgrgui.pl +++ b/Master/texmf/scripts/texlive/tlmgrgui/tlmgrgui.pl @@ -139,10 +139,9 @@ our $quit = $top->Button(-text => "Quit", # pack .top.b1 .top.b2 -side left $b1->pack(-side => 'left'); $b2->pack(-side => 'left'); -# uninstllation should not be done via tlmgr on win32 # arch support not be done via tlmgr on win32 +$b3->pack(-side => 'left'); if (!win32()) { - $b3->pack(-side => 'left'); $b4->pack(-side => 'left'); } $b5->pack(-side => 'left'); @@ -166,8 +165,8 @@ $back->pack(-side => 'top', -fill => 'both', -expand => 1); require("gui-install.pl"); require("gui-remove.pl"); +require("gui-uninstall.pl"); if (!win32()) { - require("gui-uninstall.pl"); require("gui-arch.pl"); } require("gui-config.pl"); |