diff options
Diffstat (limited to 'Master/tlpkg/installer/install-menu-wizard.pl')
-rw-r--r-- | Master/tlpkg/installer/install-menu-wizard.pl | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/Master/tlpkg/installer/install-menu-wizard.pl b/Master/tlpkg/installer/install-menu-wizard.pl index 3ae564e7e82..8978209b9c1 100644 --- a/Master/tlpkg/installer/install-menu-wizard.pl +++ b/Master/tlpkg/installer/install-menu-wizard.pl @@ -25,6 +25,8 @@ our $MENU_ALREADYDONE = 3; my $return = $MENU_INSTALL; +my $custom = 0; + require Tk; require Tk::Dialog; require Tk::DialogBox; @@ -295,7 +297,7 @@ sub reset_start { $can->configure(-text => "Cancel", -command => sub { $mw->destroy; do_cleanup(); exit(1); }); $prv->configure(-text => "< Back", -command => \&run_menu); - $nxt->configure(-text => "Next >", -command => \&ask_scheme); + $nxt->configure(-text => "Next >", -command => \&ask_path); pack_buttons("cancel", "next"); } @@ -319,8 +321,8 @@ sub ask_scheme { $bf->pack(-expand => 1, -fill => "both"); unpack_buttons(); - $nxt->configure(-command => \&ask_path, -text => "Next >"); - $prv->configure(-text => "< Back", -command => \&reset_start); + $nxt->configure(-command => \&ask_go, -text => "Next >"); + $prv->configure(-text => "< Back", -command => \&ask_path); pack_buttons("cancel", "prev", "next"); } @@ -331,7 +333,9 @@ sub ask_path { my $af = $fmain->Frame; my $bf = $fmain->Frame; + my $cf = $fmain->Frame; $af->pack(-expand => 1, -fill => "both"); + $cf->pack(-expand => 1, -fill => "both"); $bf->pack(-expand => 1, -fill => "both"); my $lab = $af->Label(-text => "Destination Folder:"); @@ -341,12 +345,17 @@ sub ask_path { my $but = $af->Button(-text => "Change", -command => \&change_path, -relief => "ridge", -width => 10); $but->pack(-side => "right"); + my $pa = $cf->Checkbutton(-text => "Use letter-size paper instead of A4 by default", -variable => \$vars{"option_letter"}); + my $cb = $cf->Checkbutton(-text => "Further customization", -variable => \$custom); + $pa->pack(-anchor => "w"); + $cb->pack(-anchor => "w"); + my $inf = $bf->Label(-text => "The destination folder will contain the installation.\nIt is recommended to keep the year as last component."); $inf->pack(-padx => "3m", -pady => "3m"); unpack_buttons(); - $nxt->configure(-command => \&ask_go); - $prv->configure(-text => "< Back", -command => \&ask_scheme); + $nxt->configure(-command => sub { $custom ? ask_scheme() : ask_go() ; }); + $prv->configure(-text => "< Back", -command => \&ask_path); pack_buttons("cancel", "prev", "next"); } |