summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2009-10-03 19:34:04 +0000
committerNorbert Preining <preining@logic.at>2009-10-03 19:34:04 +0000
commitee0db907454d2b4c776d6ef013cff27d6d23e94a (patch)
tree8cad3bbae32c7b19c71603518c377f96f3e944bf /Master
parentb5d732b5920ac3f1cf3a2d53344c03d540559b4a (diff)
make the "Install TeXworks" option visible again and make it the
same as collection-texworks selecting or not git-svn-id: svn://tug.org/texlive/trunk@15621 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/tlpkg/installer/install-menu-perltk.pl12
-rwxr-xr-xMaster/tlpkg/installer/install-menu-text.pl16
2 files changed, 14 insertions, 14 deletions
diff --git a/Master/tlpkg/installer/install-menu-perltk.pl b/Master/tlpkg/installer/install-menu-perltk.pl
index 2e0cbea1901..f9e6f769a4f 100644
--- a/Master/tlpkg/installer/install-menu-perltk.pl
+++ b/Master/tlpkg/installer/install-menu-perltk.pl
@@ -77,7 +77,7 @@ my $srcyesno = ( $vars{'option_src'} ? __("Yes") : __("No") );
my $deskintyesno = ( $vars{'option_desktop_integration'} ? __("Yes") : __("No") );
my $pathadjyesno = ( $vars{'option_path'} ? __("Yes") : __("No") );
my $fileassocyesno = $::fileassocdesc[$vars{'option_file_assocs'}];
-#my $editoryesno = ( $vars{'addon_editor'} ? __("Yes") : __("No") );
+my $editoryesno = ( $vars{'collection-texworks'} ? __("Yes") : __("No") );
my $adminallyesno = ( $vars{'option_w32_multi_user'} ? __("Yes") : __("No") );
my $docyesno = ( $vars{'option_doc'} ? __("Yes") : __("No") );
my $restrictedyesno = ( $vars{'option_write18_restricted'} ? __("Yes") : __("No") );
@@ -302,10 +302,10 @@ sub run_menu_perltk {
$fr->Button(-text => __("Toggle"), -command => sub { toggle_and_set_opt_variable(\$vars{'option_w32_multi_user'}, \$adminallyesno); })->grid(-row => $row, -column => 3, -sticky => "ew", -padx => "2m");
}
- # $row++;
- # $fr->Label(-text => __('Install TeXworks front end'), -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 => __("Toggle"), -command => sub { toggle_and_set_opt_variable(\$vars{'addon_editor'}, \$editoryesno); })->grid(-row => $row, -column => 3, -sticky => "ew", -padx => "2m");
+ $row++;
+ $fr->Label(-text => __('Install TeXworks front end'), -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 => __("Toggle"), -command => sub { toggle_and_set_opt_variable(\$vars{'collection-texworks'}, \$editoryesno); })->grid(-row => $row, -column => 3, -sticky => "ew", -padx => "2m");
}
# install/cancel buttons
@@ -836,6 +836,8 @@ sub callback_select_scheme {
}
sub callback_select_collection {
+ # special case for collection-texworks:
+ $editoryesno = ( $vars{'collection-texworks'} ? __("Yes") : __("No") );
calc_depends();
update_numbers();
menu_update_texts();
diff --git a/Master/tlpkg/installer/install-menu-text.pl b/Master/tlpkg/installer/install-menu-text.pl
index cc9780eefda..bc7ff0911b2 100755
--- a/Master/tlpkg/installer/install-menu-text.pl
+++ b/Master/tlpkg/installer/install-menu-text.pl
@@ -53,9 +53,7 @@ sub hbar {
sub toggle {
my $var=shift;
- my $val=$vars{$var};
- ++$val;
- $vars{$var}=$val%2;;
+ $vars{$var} = ($vars{$var} ? 0 : 1);
}
sub menu_head {
@@ -699,7 +697,7 @@ sub options_menu {
my $b_letter=button($vars{'option_letter'});
my $b_deskint=button($vars{'option_desktop_integration'});
my $b_admin=button($vars{'option_w32_multi_user'});
- #my $b_addoneditor=button($vars{'addon_editor'});
+ my $b_addoneditor=button($vars{'collection-texworks'});
my $b_restricted = button($vars{'option_write18_restricted'});
my $sys_bin=$vars{'option_sys_bin'};
@@ -753,7 +751,7 @@ 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 TeXworks front end: $b_addoneditor\n";
+ print " <W> install TeXworks front end: $b_addoneditor\n";
}
}
other_options qw(R Q diskspace);
@@ -844,8 +842,8 @@ EOF
} elsif (defined $command{"\u$answer"}) {
return $command{"\u$answer"};
- } elsif (("\u$answer" eq 'E') && ($::opt_all_options || win32())) {
- toggle 'addon_editor';
+ } elsif (("\u$answer" eq 'W') && ($::opt_all_options || win32())) {
+ toggle 'collection-texworks';
return $command{'self'};
} else {
@@ -885,7 +883,7 @@ sub main_menu {
my $b_letter=button($vars{'option_letter'});
my $b_deskint=button($vars{'option_desktop_integration'});
my $b_admin=button($vars{'option_w32_multi_user'});
- #my $b_addoneditor=button($vars{'addon_editor'});
+ my $b_addoneditor=button($vars{'collection-texworks'});
my $b_restricted = button($vars{'option_write18_restricted'});
my $warn_nobin;
@@ -1001,7 +999,7 @@ EOF
if (admin()) {
print " $b_admin make installation available to all users\n";
}
- #print" $b_addoneditor install TeXworks front end\n";
+ print" $b_addoneditor install TeXworks front end\n";
} else {
print " $b_path create symlinks to standard directories\n";
}