diff options
Diffstat (limited to 'Master/tlpkg/installer/install-menu-wizard.pl')
-rw-r--r-- | Master/tlpkg/installer/install-menu-wizard.pl | 32 |
1 files changed, 5 insertions, 27 deletions
diff --git a/Master/tlpkg/installer/install-menu-wizard.pl b/Master/tlpkg/installer/install-menu-wizard.pl index dd58e0edd66..8cc4008e73c 100644 --- a/Master/tlpkg/installer/install-menu-wizard.pl +++ b/Master/tlpkg/installer/install-menu-wizard.pl @@ -14,6 +14,7 @@ $::menurevision = $1; require("TeXLive/trans.pl"); load_translations(); +require("$::installerdir/tlpkg/installer/texdirsel.pl"); # # the following lists define which options are shown in the Option screen @@ -82,10 +83,9 @@ my $can; my $prv; my $nxt; my $img; -my $dest; my $dest_display; my $warning; -my $mw; +our $mw; my $usedfont; my $fmain; my $fbuttons; @@ -418,8 +418,7 @@ sub ask_path { $counter->configure(-text => "2/4"); - $dest = $vars{'TEXDIR'}; - $dest_display = native_slashify($dest); + $dest_display = native_slashify($vars{'TEXDIR'}); my $lab = $fmain->Label(-text => __('Destination folder:')); my $val = $fmain->Label(-textvar => \$dest_display); @@ -491,27 +490,6 @@ sub check_show_warning { $nxt->configure(-state => "disabled"); } } - -sub change_path { - my $val = $dest; - my $sw = $mw->Toplevel(-title => "Changing TEXDIR"); - $sw->transient($mw); - $sw->grab(); - $sw->Label(-text => __('Enter path for') . " TEXDIR: ")->pack(-padx => "2m", -pady => "2m"); - my $entry = $sw->Entry(-text => native_slashify($val), -width => 60); - $entry->pack(-padx => "2m", -pady => "2m")->focus(); - my $f = $sw->Frame; - my $okbutton = $f->Button(-text => __('Ok'), -width => 10, - -relief => "ridge", - -command => sub { $val = forward_slashify($entry->get); callback_change_texdir($val) ; $sw->destroy })->pack(-side => 'left', -padx => "2m", -pady => "2m"); - my $cancelbutton = $f->Button(-text => __('Cancel'), -relief => "ridge", - -width => 10, - -command => sub { $sw->destroy })->pack(-side => 'right', -padx => "2m", -pady => "2m"); - $f->pack(-expand => 'x'); - # bindings - $sw->bind('<Return>' => [ $okbutton, 'Invoke']); - $sw->bind('<Escape>' => [ $cancelbutton, 'Invoke']); -} sub callback_change_texdir { my ($val) = @_; @@ -540,8 +518,8 @@ sub callback_change_texdir { $vars{'TEXMFSYSVAR'}="$texdirnoslash/texmf-var"; $vars{'TEXMFSYSCONFIG'}="$texdirnoslash/texmf-config"; } - $dest = $vars{'TEXDIR'}; - $dest_display = native_slashify($dest); # useful as -textvar value in Labels + #$dest = $vars{'TEXDIR'}; + $dest_display = native_slashify($vars{'TEXDIR'}); # useful as -textvar value in Labels check_show_warning(); } |