diff options
Diffstat (limited to 'Master/tlpkg/installer/install-menu-perltk.pl')
-rw-r--r-- | Master/tlpkg/installer/install-menu-perltk.pl | 28 |
1 files changed, 11 insertions, 17 deletions
diff --git a/Master/tlpkg/installer/install-menu-perltk.pl b/Master/tlpkg/installer/install-menu-perltk.pl index 5d1134c64a0..93c3ba90b5a 100644 --- a/Master/tlpkg/installer/install-menu-perltk.pl +++ b/Master/tlpkg/installer/install-menu-perltk.pl @@ -1,7 +1,8 @@ #!/usr/bin/env perl # $Id$ # -# Copyright 2008 Norbert Preining, Reinhard Kotucha +# Copyright 2008, 2009 Norbert Preining +# Copyright 2008 Reinhard Kotucha # This file is licensed under the GNU General Public License version 2 # or any later version. # @@ -62,7 +63,6 @@ my $texmfsysconfigtext; my $texmfhometext; my $texdirtext; my $langcoltext; -my $symlinktext; my $optletterstate; my $optfmtstate; my $optsrcstate; @@ -70,6 +70,7 @@ my $optdocstate; 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 $docyesno = ( $vars{'option_doc'} ? $text{'yes'} : $text{'no'} ); $::run_menu = \&run_menu_perltk; @@ -258,15 +259,13 @@ sub run_menu_perltk { $fr->Button(-text => $text{'toggle'}, -command => sub { toggle_and_set_opt_variable(\$vars{'option_src'}, \$srcyesno); })->grid(-row => $row, -column => 3, -sticky => "ew", -padx => "2m"); } + $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"); if (unix()) { - $row++; - # Symlinks - $fr->Label(-text => "------- $text{'sysint'} -------")->grid(-row => $row, -column => 1,-columnspan => 3); - - $row++; - $fr->Label(-text => $labels{'symlink'}, -anchor => 'w')->grid(-row => $row, -column => 1, -sticky => 'w'); - $symlinktext = $fr->Label(-anchor => 'w')->grid(-row => $row, -column => 2, -padx => "2m"); $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"); } # install/cancel buttons @@ -596,7 +595,7 @@ sub menu_select_lang_collections { sub menu_select_symlink { our ($lbin,$lman,$linfo); - our $osym = $vars{'option_symlinks'}; + our $osym = $vars{'option_desktop_integration'}; our ($binlab,$binb,$manlab,$manb,$infolab,$infob); sub set_unset_buttons { $lbin = ($osym ? $vars{'sys_bin'} : ''); @@ -630,8 +629,8 @@ sub menu_select_symlink { $vars{'sys_info'} = $linfo; $vars{'sys_man'} = $lman; } - $vars{'option_symlinks'} = $osym; - menu_update_texts(); + $vars{'option_desktop_integration'} = $osym; + toggle_and_set_opt_variable(\$vars{'option_desktop_integration'}, \$deskintyesno); } my $sw = $mainwindow->Toplevel(-title => $labels{'symlink'}); $sw->transient($mainwindow); @@ -695,10 +694,6 @@ sub menu_set_text { $w->configure(-text => $t, @_); } -sub menu_set_symlink_text { - menu_set_text($symlinktext, (($vars{'option_symlinks'})?$text{'yes'}:$text{'no'})); -} - sub menu_set_schemebutton_text { menu_set_text($schemebutton, "$vars{'selected_scheme'}"); } @@ -762,7 +757,6 @@ sub menu_update_texts { $optfmtstate = ($vars{'option_fmt'} ? $text{'yes'} : $text{'no'}); $optsrcstate = ($vars{'option_src'} ? $text{'yes'} : $text{'no'}); $optdocstate = ($vars{'option_doc'} ? $text{'yes'} : $text{'no'}); - if (unix()) { menu_set_symlink_text; }; } sub callback_select_scheme { |