summaryrefslogtreecommitdiff
path: root/Master/tlpkg/installer
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2009-06-18 06:43:26 +0000
committerNorbert Preining <preining@logic.at>2009-06-18 06:43:26 +0000
commit7af7021e141e0d8f197e16bb6d51f73612557749 (patch)
tree3d437ee52ab3adbbbc99d83cdcb1f221dd450bc6 /Master/tlpkg/installer
parenteed6246121c1fd59b6c3afb98300d09064b30ceb (diff)
offer TeX Works installation only on Windows
git-svn-id: svn://tug.org/texlive/trunk@13805 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/tlpkg/installer')
-rw-r--r--Master/tlpkg/installer/install-menu-perltk.pl11
-rwxr-xr-xMaster/tlpkg/installer/install-menu-text.pl4
-rw-r--r--Master/tlpkg/installer/install-menu-wizard.pl5
3 files changed, 11 insertions, 9 deletions
diff --git a/Master/tlpkg/installer/install-menu-perltk.pl b/Master/tlpkg/installer/install-menu-perltk.pl
index 70643eb3594..a23d4e7bc5a 100644
--- a/Master/tlpkg/installer/install-menu-perltk.pl
+++ b/Master/tlpkg/installer/install-menu-perltk.pl
@@ -269,11 +269,12 @@ sub run_menu_perltk {
$fr->Button(-text => $text{'toggle'}, -command => sub { toggle_and_set_opt_variable(\$vars{'option_desktop_integration'}, \$deskintyesno); })->grid(-row => $row, -column => 3, -sticky => "ew", -padx => "2m");
}
- $row++;
- $fr->Label(-text => $labels{'addon_editor'}, -anchor => 'w')->grid(-row => $row, -column => 1, -sticky => 'w');
- $fr->Label(-anchor => 'w', -textvariable => \$editoryesno)->grid(-row => $row, -column => 2, -padx => "2m");
- $fr->Button(-text => $text{'toggle'}, -command => sub { toggle_and_set_opt_variable(\$vars{'addon_editor'}, \$editoryesno); })->grid(-row => $row, -column => 3, -sticky => "ew", -padx => "2m");
-
+ if (win32()) {
+ $row++;
+ $fr->Label(-text => $labels{'addon_editor'}, -anchor => 'w')->grid(-row => $row, -column => 1, -sticky => 'w');
+ $fr->Label(-anchor => 'w', -textvariable => \$editoryesno)->grid(-row => $row, -column => 2, -padx => "2m");
+ $fr->Button(-text => $text{'toggle'}, -command => sub { toggle_and_set_opt_variable(\$vars{'addon_editor'}, \$editoryesno); })->grid(-row => $row, -column => 3, -sticky => "ew", -padx => "2m");
+ }
# install/cancel buttons
my $f3 = $fr->Frame;
diff --git a/Master/tlpkg/installer/install-menu-text.pl b/Master/tlpkg/installer/install-menu-text.pl
index bec29497c9d..20d98b0cd93 100755
--- a/Master/tlpkg/installer/install-menu-text.pl
+++ b/Master/tlpkg/installer/install-menu-text.pl
@@ -748,8 +748,8 @@ EOF
# if we are admin we allow normal user installation, too
print " <U> make installation available to all users: $b_admin\n";
}
+ print " <E> install TeX Works editor: $b_addoneditor\n";
}
- print " <E> install TeX Works editor: $b_addoneditor\n";
}
other_options qw(R Q diskspace);
my $answer = prompt 'Enter command';
@@ -824,7 +824,7 @@ EOF
} elsif (defined $command{"\u$answer"}) {
return $command{"\u$answer"};
- } elsif ("\u$answer" eq 'E') {
+ } elsif (("\u$answer" eq 'E') && win32()) {
toggle 'addon_editor';
return $command{'self'};
diff --git a/Master/tlpkg/installer/install-menu-wizard.pl b/Master/tlpkg/installer/install-menu-wizard.pl
index b62bcb0aa91..bcfbe93599c 100644
--- a/Master/tlpkg/installer/install-menu-wizard.pl
+++ b/Master/tlpkg/installer/install-menu-wizard.pl
@@ -219,8 +219,9 @@ sub ask_path {
$pa->place(-x => 0, -y => $ytmp + 30);
- $but_tw->place(-x => 0, -y => $ytmp + 60);
-
+ if (win32()) {
+ $but_tw->place(-x => 0, -y => $ytmp + 60);
+ }
#$cb->place(-x => $INNERWIDTH, -y => $INNERHEIGHT, -anchor => "se");