diff options
author | Norbert Preining <preining@logic.at> | 2017-04-16 02:13:17 +0000 |
---|---|---|
committer | Norbert Preining <preining@logic.at> | 2017-04-16 02:13:17 +0000 |
commit | 6953459a76c7d73e4cd1a2bfb57878c8f66e98fb (patch) | |
tree | c70ac38cf6a90f66d4ef3242e7dc4a08415ee13a /Master/tlpkg/installer/install-menu-perltk.pl | |
parent | 219afd32966778a9ba24a031a7a820c3288b4eba (diff) |
more variable standardization for installer options
we now use instopt_ as prefix for installer only options that
are not saved into the TLPDB.
git-svn-id: svn://tug.org/texlive/trunk@43824 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/tlpkg/installer/install-menu-perltk.pl')
-rw-r--r-- | Master/tlpkg/installer/install-menu-perltk.pl | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/Master/tlpkg/installer/install-menu-perltk.pl b/Master/tlpkg/installer/install-menu-perltk.pl index fd3cf112309..8f6a6ea3e88 100644 --- a/Master/tlpkg/installer/install-menu-perltk.pl +++ b/Master/tlpkg/installer/install-menu-perltk.pl @@ -127,18 +127,18 @@ $::run_menu = \&run_menu_perltk; # ################################################################## sub setup_perltk_local_strings { - $portableyesno = $::yesno[$vars{'portable'}]; - $letteryesno = $::letterdesc[$vars{'option_letter'}]; - $fmtyesno = $::yesno[$vars{'option_fmt'}]; - $srcyesno = $::yesno[$vars{'option_src'}]; + $portableyesno = $::yesno[$vars{'instopt_portable'}]; + $letteryesno = $::letterdesc[$vars{'instopt_letter'}]; + $fmtyesno = $::yesno[$vars{'option_create_formats'}]; + $srcyesno = $::yesno[$vars{'option_install_srcfiles'}]; $deskintyesno = $::deskintdesc[$vars{'option_desktop_integration'}]; $pathadjyesno = $::yesno[$vars{'option_path'}]; $fileassocyesno = $::fileassocdesc[$vars{'option_file_assocs'}]; $editoryesno = $::yesno[$vars{'collection-texworks'}]; $adminallyesno = $::yesno[$vars{'option_w32_multi_user'}]; - $docyesno = $::yesno[$vars{'option_doc'}]; + $docyesno = $::yesno[$vars{'option_install_docfiles'}]; $restrictedyesno = $::yesno[$vars{'option_write18_restricted'}]; - $adjustrepoyesno = $::yesno[$vars{'adjustrepo'}]; + $adjustrepoyesno = $::yesno[$vars{'instopt_adjustrepo'}]; } sub menu_abort { @@ -442,7 +442,7 @@ Please select a different mirror.', -command => sub { menu_edit_vars_value("TEXMFHOME"); }) ->grid(-row => $row, -column => 3, -sticky => "ew", -padx => "2m"); - if ($vars{'portable'}) { + if ($vars{'instopt_portable'}) { for my $b ( $tmflocalbutton, $tmfsysvarbutton, $tmfsysconfigbutton, $tmfhomebutton) { $b->configure(-state => 'disabled') @@ -464,7 +464,7 @@ Please select a different mirror.', -text => __("Toggle"), -command => sub { toggle_and_set_opt_variable( - \$vars{'option_letter'}, \$letteryesno, \@::letterdesc); }) + \$vars{'instopt_letter'}, \$letteryesno, \@::letterdesc); }) ->grid(-row => $row, -column => 3, -sticky => "ew", -padx => "2m"); $row++; @@ -491,7 +491,7 @@ Please select a different mirror.', $format_toggle_button = $fr->Button( -text => __("Toggle"), -command => sub { - toggle_and_set_opt_variable(\$vars{'option_fmt'}, \$fmtyesno); }) + toggle_and_set_opt_variable(\$vars{'option_create_formats'}, \$fmtyesno); }) ->grid(-row => $row, -column => 3, -sticky => "ew", -padx => "2m"); if ($vars{'doc_splitting_supported'} and !$opt_in_place) { @@ -503,7 +503,7 @@ Please select a different mirror.', $doc_files_toggle_button = $fr->Button( -text => __("Toggle"), -command => sub { - toggle_and_set_opt_variable(\$vars{'option_doc'}, \$docyesno); }) + toggle_and_set_opt_variable(\$vars{'option_install_docfiles'}, \$docyesno); }) ->grid(-row => $row, -column => 3, -sticky => "ew", -padx => "2m"); } @@ -516,7 +516,7 @@ Please select a different mirror.', $src_files_toggle_button = $fr->Button( -text => __("Toggle"), -command => sub { - toggle_and_set_opt_variable(\$vars{'option_src'}, \$srcyesno); }) + toggle_and_set_opt_variable(\$vars{'option_install_srcfiles'}, \$srcyesno); }) ->grid(-row => $row, -column => 3, -sticky => "ew", -padx => "2m"); } @@ -605,11 +605,11 @@ Please select a different mirror.', -text => __("Toggle"), -command => sub { toggle_and_set_opt_variable( - \$vars{'adjustrepo'}, \$adjustrepoyesno); }) + \$vars{'instopt_adjustrepo'}, \$adjustrepoyesno); }) ->grid(-row => $row, -column => 3, -sticky => "ew", -padx => "2m"); } - if ($vars{'portable'}) { + if ($vars{'instopt_portable'}) { for $b ($pathbutton, $deskintbutton, $assocbutton, $adminbutton) { $b->configure(-state => 'disabled') if $b; } @@ -1151,10 +1151,10 @@ sub menu_update_texts { menu_set_collections_text; menu_set_binbutton_text; menu_set_schemebutton_text; - $optletterstate = $::letterdesc[$vars{'option_letter'}]; - $optfmtstate = ($vars{'option_fmt'} ? __("Yes") : __("No")); - $optsrcstate = ($vars{'option_src'} ? __("Yes") : __("No")); - $optdocstate = ($vars{'option_doc'} ? __("Yes") : __("No")); + $optletterstate = $::letterdesc[$vars{'instopt_letter'}]; + $optfmtstate = ($vars{'option_create_formats'} ? __("Yes") : __("No")); + $optsrcstate = ($vars{'option_install_srcfiles'} ? __("Yes") : __("No")); + $optdocstate = ($vars{'option_install_docfiles'} ? __("Yes") : __("No")); } sub callback_select_scheme { @@ -1232,8 +1232,8 @@ sub callback_edit_var() { sub toggle_portable { my $td = $vars{'TEXDIR'}; my $b; - if ($vars{'portable'}) { - $vars{'portable'} = 0; + if ($vars{'instopt_portable'}) { + $vars{'instopt_portable'} = 0; $portableyesno = __('No'); # enable some buttons for $b ( @@ -1244,7 +1244,7 @@ sub toggle_portable { $b->configure(-state => 'normal') if $b; } } else { - $vars{'portable'} = 1; + $vars{'instopt_portable'} = 1; $portableyesno = __('Yes'); # disable some buttons. These should get a name first. for $b ( |