diff options
Diffstat (limited to 'Master/tlpkg/installer/install-menu-wizard.pl')
| -rw-r--r-- | Master/tlpkg/installer/install-menu-wizard.pl | 51 |
1 files changed, 17 insertions, 34 deletions
diff --git a/Master/tlpkg/installer/install-menu-wizard.pl b/Master/tlpkg/installer/install-menu-wizard.pl index 2313bf356ab..5048c182d6d 100644 --- a/Master/tlpkg/installer/install-menu-wizard.pl +++ b/Master/tlpkg/installer/install-menu-wizard.pl @@ -182,8 +182,6 @@ sub ask_path { my $but = $fmain->Button(-text => $text{'change'}, -command => \&change_path, -relief => "ridge", -width => 10); - my $pa = $fmain->Checkbutton(-text => $labels{'optletter'}, - -variable => \$vars{"option_letter"}); # texworks will be anyway installed in scheme-full #my $but_tw = $fmain->Checkbutton(-text => $labels{'addon_editor'}, # -variable => \$vars{"addon_editor"}); @@ -219,7 +217,6 @@ sub ask_path { $warning->place(-x => 0, -y => $ytmp, -anchor => "w"); - $pa->place(-x => 0, -y => $ytmp + 30); #if (win32()) { # $but_tw->place(-x => 0, -y => $ytmp + 60); #} @@ -307,48 +304,34 @@ sub ask_options { $_->destroy; } $counter->configure(-text => "3/5"); - my $lab = $fmain->Label(-text => $text{'destfolder'}); - my $val = $fmain->Label(-textvar => \$dest); - my $but = $fmain->Button(-text => $text{'change'}, -command => \&change_path, - -relief => "ridge", -width => 10); + my $bletter = $fmain->Checkbutton(-text => $labels{'optletter'}, + -variable => \$vars{"option_letter"}); my $bdesk = $fmain->Checkbutton(-text => $labels{'desktop_integration'}, -variable => \$vars{"option_desktop_integration"}); - my $pa = $fmain->Checkbutton(-text => $labels{'optletter'}, - -variable => \$vars{"option_letter"}); - #my $but_tw = $fmain->Checkbutton(-text => $labels{'addon_editor'}, - # -variable => \$vars{"addon_editor"}); - - calc_depends(); - + my $bassocs = $fmain->Checkbutton(-text => $labels{'fileassocs'}, + -variable => \$vars{"option_file_assocs"}); - $fmain->Label(-text => $text{'pathinfo'}, - -justify => "left")->place(-x => 0, -y => 30); - - my $ytmp = 100; - $lab->place(-x => 0, -y => $ytmp, -anchor => "w"); - $ytmp += ($lineskip + 10); - $val->place(-x => 0, -y => $ytmp, -anchor => "w"); + my $bpath = $fmain->Checkbutton(-text => $labels{'pathadj'}, + -variable => \$vars{"option_path"}); - $but->place(-x => $INNERWIDTH, -y => $ytmp, -anchor => "e"); + calc_depends(); - $warning = $fmain->Label(-foreground => "red"); - check_show_warning(); - $ytmp += ($lineskip + 10); - $warning->place(-x => 0, -y => $ytmp, -anchor => "w"); + my $ytmp = 60; + $bletter->place(-x => 0, -y => $ytmp); - $pa->place(-x => 0, -y => $ytmp + 30); - #if (win32()) { - # $but_tw->place(-x => 0, -y => $ytmp + 60); - #} + if (win32()) { + $ytmp += 50; + $bdesk->place(-x => 0, -y => $ytmp); - #$cb->place(-x => $INNERWIDTH, -y => $INNERHEIGHT, -anchor => "se"); + $ytmp += 50; + $bassocs->place(-x => 0, -y => $ytmp); - $fmain->Label(-text => "$text{'diskreq'}: $vars{'total_size'} MB", - -justify => "left" - )->place(-x => 0, -y => $fmain->height, -anchor => "sw"); + $ytmp += 50; + $bpath->place(-x => 0, -y => $ytmp); + } $prv->configure(-text => $text{'prev'}, -command => \&ask_path ); $nxt->configure(-text => $text{'next'}, -command => \&ask_go ); |