From 4afb88d77a862360c460cf090cf674001d146629 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Tue, 6 May 2008 21:34:05 +0000 Subject: arch not for win32 ... git-svn-id: svn://tug.org/texlive/trunk@7904 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf/scripts/texlive/tlmgrgui/gui-arch.pl | 3 --- Master/texmf/scripts/texlive/tlmgrgui/gui-config.pl | 3 --- .../texmf/scripts/texlive/tlmgrgui/gui-install.pl | 3 --- Master/texmf/scripts/texlive/tlmgrgui/gui-remove.pl | 4 ---- .../texmf/scripts/texlive/tlmgrgui/gui-uninstall.pl | 3 --- Master/texmf/scripts/texlive/tlmgrgui/tlmgrgui.pl | 21 ++++++++++++++++----- 6 files changed, 16 insertions(+), 21 deletions(-) (limited to 'Master/texmf') diff --git a/Master/texmf/scripts/texlive/tlmgrgui/gui-arch.pl b/Master/texmf/scripts/texlive/tlmgrgui/gui-arch.pl index 59550118929..7cfe4c8d357 100644 --- a/Master/texmf/scripts/texlive/tlmgrgui/gui-arch.pl +++ b/Master/texmf/scripts/texlive/tlmgrgui/gui-arch.pl @@ -7,9 +7,6 @@ # -# frame .back.f1 -$back_arch = $back->Frame; - # this will be loaded only on unix systems! # diff --git a/Master/texmf/scripts/texlive/tlmgrgui/gui-config.pl b/Master/texmf/scripts/texlive/tlmgrgui/gui-config.pl index a72a5e88521..b060d572a2c 100644 --- a/Master/texmf/scripts/texlive/tlmgrgui/gui-config.pl +++ b/Master/texmf/scripts/texlive/tlmgrgui/gui-config.pl @@ -12,9 +12,6 @@ my $default_formats = ($localtlpdb->option_formats ? "Yes" : "No"); my $default_docfiles = ($localtlpdb->option_docfiles ? "Yes" : "No"); my $default_srcfiles = ($localtlpdb->option_srcfiles ? "Yes" : "No"); -# frame .back.f1 -$back_config = $back->Frame; - # this will be loaded only on unix systems! # diff --git a/Master/texmf/scripts/texlive/tlmgrgui/gui-install.pl b/Master/texmf/scripts/texlive/tlmgrgui/gui-install.pl index a1e23abda73..b899f8a5623 100644 --- a/Master/texmf/scripts/texlive/tlmgrgui/gui-install.pl +++ b/Master/texmf/scripts/texlive/tlmgrgui/gui-install.pl @@ -7,9 +7,6 @@ # -# frame .back.f1 -$back_f1 = $back->Frame; - ####################### row 1 # frame .back.f1.f1 -relief ridge -borderwidth 2 diff --git a/Master/texmf/scripts/texlive/tlmgrgui/gui-remove.pl b/Master/texmf/scripts/texlive/tlmgrgui/gui-remove.pl index d3117090d89..f2f94f47be3 100644 --- a/Master/texmf/scripts/texlive/tlmgrgui/gui-remove.pl +++ b/Master/texmf/scripts/texlive/tlmgrgui/gui-remove.pl @@ -6,10 +6,6 @@ # GUI for tlmgr # -####################################### GUI remove packages -# frame .back.f2 -$back_f2 = $back->Frame(); - ####################### row 1 # frame .back.f2.f1 -relief ridge -borderwidth 2 diff --git a/Master/texmf/scripts/texlive/tlmgrgui/gui-uninstall.pl b/Master/texmf/scripts/texlive/tlmgrgui/gui-uninstall.pl index 699c988a89b..21001baf640 100644 --- a/Master/texmf/scripts/texlive/tlmgrgui/gui-uninstall.pl +++ b/Master/texmf/scripts/texlive/tlmgrgui/gui-uninstall.pl @@ -7,9 +7,6 @@ # -# frame .back.f1 -$back_f3 = $back->Frame; - if ($^O=~/^MSWin(32|64)$/i) { # this should not happen!!!! my $lab = $back_f3->Label(-justify => 'left', diff --git a/Master/texmf/scripts/texlive/tlmgrgui/tlmgrgui.pl b/Master/texmf/scripts/texlive/tlmgrgui/tlmgrgui.pl index f3ce915216e..9e21d90b3bd 100755 --- a/Master/texmf/scripts/texlive/tlmgrgui/tlmgrgui.pl +++ b/Master/texmf/scripts/texlive/tlmgrgui/tlmgrgui.pl @@ -89,7 +89,7 @@ our $b1 = $top->Button(-text => "Adding packages", $back_f2->packForget; $back_f3->packForget; $back_arch->packForget; - $back_config->packForget; + $back_config->packForget; $back_f1->pack; }); @@ -102,7 +102,7 @@ our $b2 = $top->Button(-text => "Removing packages", $back_f1->packForget; $back_f3->packForget; $back_arch->packForget; - $back_config->packForget; + $back_config->packForget; $back_f2->pack; }); @@ -140,10 +140,11 @@ our $quit = $top->Button(-text => "Quit", $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 if (!win32()) { $b3->pack(-side => 'left'); + $b4->pack(-side => 'left'); } -$b4->pack(-side => 'left'); $b5->pack(-side => 'left'); $quit->pack(-side => 'right'); @@ -151,14 +152,24 @@ $quit->pack(-side => 'right'); # frame .back -borderwidth 2 our $back = $mw->Frame(-borderwidth => 2); +$back_f1 = $back->Frame; +$back_f2 = $back->Frame; +$back_f3 = $back->Frame; +$back_arch = $back->Frame; +$back_config = $back->Frame; + + + # pack .top .back -side top -fill both -expand 1 $top->pack(-side => 'top', -fill => 'both', -expand => 1); $back->pack(-side => 'top', -fill => 'both', -expand => 1); require("gui-install.pl"); require("gui-remove.pl"); -require("gui-uninstall.pl"); -require("gui-arch.pl"); +if (!win32()) { + require("gui-uninstall.pl"); + require("gui-arch.pl"); +} require("gui-config.pl"); # pack .back.f1 -- cgit v1.2.3