diff options
author | Norbert Preining <preining@logic.at> | 2009-07-02 12:24:15 +0000 |
---|---|---|
committer | Norbert Preining <preining@logic.at> | 2009-07-02 12:24:15 +0000 |
commit | ca3b20eb67ceac98bce99cf9bb22f483d3c87d10 (patch) | |
tree | 8cfc7695ccb981d8d9d756d8c51196ed4da0be62 /Master | |
parent | 99023f11581b7751b1ea23d1f44fc433713cfcf1 (diff) |
make the perltk installer behave exactely like the text mode installer
exhibiting all the options (some only for windows)
git-svn-id: svn://tug.org/texlive/trunk@14068 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r-- | Master/tlpkg/installer/install-menu-perltk.pl | 32 | ||||
-rw-r--r-- | Master/tlpkg/installer/install-translations.pl | 1 | ||||
-rw-r--r-- | Master/tlpkg/installer/installer-options.txt | 8 |
3 files changed, 31 insertions, 10 deletions
diff --git a/Master/tlpkg/installer/install-menu-perltk.pl b/Master/tlpkg/installer/install-menu-perltk.pl index 20cd75148c2..2654427d430 100644 --- a/Master/tlpkg/installer/install-menu-perltk.pl +++ b/Master/tlpkg/installer/install-menu-perltk.pl @@ -71,7 +71,10 @@ my $letteryesno = ( $vars{'option_letter'} ? $text{'yes'} : $text{'no'} ); my $fmtyesno = ( $vars{'option_fmt'} ? $text{'yes'} : $text{'no'} ); my $srcyesno = ( $vars{'option_src'} ? $text{'yes'} : $text{'no'} ); my $deskintyesno = ( $vars{'option_desktop_integration'} ? $text{'yes'} : $text{'no'} ); +my $pathadjyesno = ( $vars{'option_path'} ? $text{'yes'} : $text{'no'} ); +my $fileassocsyesno = ( $vars{'option_file_assocs'} ? $text{'yes'} : $text{'no'} ); my $editoryesno = ( $vars{'addon_editor'} ? $text{'yes'} : $text{'no'} ); +my $adminallyesno = ( $vars{'option_w32_multi_user'} ? $text{'yes'} : $text{'no'} ); my $docyesno = ( $vars{'option_doc'} ? $text{'yes'} : $text{'no'} ); $::run_menu = \&run_menu_perltk; @@ -261,16 +264,33 @@ sub run_menu_perltk { } $row++; - $fr->Label(-text => $labels{'desktop_integration'}, -anchor => 'w')->grid(-row => $row, -column => 1, -sticky => 'w'); - $fr->Label(-anchor => 'w', -textvariable => \$deskintyesno)->grid(-row => $row, -column => 2, -padx => "2m"); + $fr->Label(-text => $labels{'pathadj'}, -anchor => 'w')->grid(-row => $row, -column => 1, -sticky => 'w'); + $fr->Label(-anchor => 'w', -textvariable => \$pathadjyesno)->grid(-row => $row, -column => 2, -padx => "2m"); if (unix()) { $fr->Button(-text => $text{'change'}, -command => sub { menu_select_symlink(); })->grid(-row => $row, -column => 3, -sticky => "ew", -padx => "2m"); } else { - $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"); + $fr->Button(-text => $text{'toggle'}, -command => sub { toggle_and_set_opt_variable(\$vars{'option_path'}, \$pathadjyesno); })->grid(-row => $row, -column => 3, -sticky => "ew", -padx => "2m"); } if (win32()) { $row++; + $fr->Label(-text => $labels{'desktop_integration'}, -anchor => 'w')->grid(-row => $row, -column => 1, -sticky => 'w'); + $fr->Label(-anchor => 'w', -textvariable => \$deskintyesno)->grid(-row => $row, -column => 2, -padx => "2m"); + $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{'fileassocs'}, -anchor => 'w')->grid(-row => $row, -column => 1, -sticky => 'w'); + $fr->Label(-anchor => 'w', -textvariable => \$fileassocsyesno)->grid(-row => $row, -column => 2, -padx => "2m"); + $fr->Button(-text => $text{'toggle'}, -command => sub { toggle_and_set_opt_variable(\$vars{'option_file_assocs'}, \$fileassocsyesno); })->grid(-row => $row, -column => 3, -sticky => "ew", -padx => "2m"); + + if (admin()) { + $row++; + $fr->Label(-text => $labels{'w32admallusers'}, -anchor => 'w')->grid(-row => $row, -column => 1, -sticky => 'w'); + $fr->Label(-anchor => 'w', -textvariable => \$adminallyesno)->grid(-row => $row, -column => 2, -padx => "2m"); + $fr->Button(-text => $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 => $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"); @@ -603,7 +623,7 @@ sub menu_select_lang_collections { sub menu_select_symlink { our ($lbin,$lman,$linfo); - our $osym = $vars{'option_desktop_integration'}; + our $osym = $vars{'option_path'}; our ($binlab,$binb,$manlab,$manb,$infolab,$infob); sub set_unset_buttons { $lbin = ($osym ? $vars{'sys_bin'} : ''); @@ -637,8 +657,8 @@ sub menu_select_symlink { $vars{'sys_info'} = $linfo; $vars{'sys_man'} = $lman; } - $vars{'option_desktop_integration'} = $osym; - toggle_and_set_opt_variable(\$vars{'option_desktop_integration'}, \$deskintyesno); + $vars{'option_path'} = $osym; + toggle_and_set_opt_variable(\$vars{'option_path'}, \$pathadjyesno); } my $sw = $mainwindow->Toplevel(-title => $labels{'symlink'}); $sw->transient($mainwindow); diff --git a/Master/tlpkg/installer/install-translations.pl b/Master/tlpkg/installer/install-translations.pl index fe09f5b9158..a01d93719eb 100644 --- a/Master/tlpkg/installer/install-translations.pl +++ b/Master/tlpkg/installer/install-translations.pl @@ -123,6 +123,7 @@ our %labels = (binsys => 'Binary system(s)', symlink => 'Create symlinks in system directories', desktop_integration => 'Desktop integration', fileassocs => 'Change file associations', + w32admallusers => 'Installation for all users', pathadj => 'Adjust path', addon_editor => 'Install TeXworks front end', ); diff --git a/Master/tlpkg/installer/installer-options.txt b/Master/tlpkg/installer/installer-options.txt index 8d46509e9f3..521ff375d1c 100644 --- a/Master/tlpkg/installer/installer-options.txt +++ b/Master/tlpkg/installer/installer-options.txt @@ -15,20 +15,20 @@ option_fmt 1 x x option_letter 0 x x x use letter -option_file_assocs 0 w32 (w32) w32 +option_file_assocs 0 w32 w32 w32 file associations postaction -option_desktop_integration 0 (1 w32) w32 x 1) w32 +option_desktop_integration 0 (1 w32) w32 w32 w32 shortcuts etc currently effects w32 only option_post_code 1 postaction code -option_w32_multi_user 1 w32 (w32) ?? +option_w32_multi_user 1 w32 w32 ?? sysadmin as multi user -option_path 0 x (x) w32?? +option_path 0 x x w32?? path adjustment (unix symlinks, w32 reg) |