diff options
-rw-r--r-- | Master/tlpkg/installer/install-menu-wizard.pl | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/Master/tlpkg/installer/install-menu-wizard.pl b/Master/tlpkg/installer/install-menu-wizard.pl index e1408df8266..3684c951ef3 100644 --- a/Master/tlpkg/installer/install-menu-wizard.pl +++ b/Master/tlpkg/installer/install-menu-wizard.pl @@ -410,8 +410,8 @@ sub load_remote_screen { my $labela = $fmain->Label(-text => __('Please wait while the repository database is loaded.'))->place(-x => 0, -y => 50); my $labelb = $fmain->Label(-text => __('This will take some time!'))->place(-x => 0, -y => 150); $prv->placeForget; - $can->placeForget; - $nxt->configure(-text => __('Cancel'), + $nxt->placeForget; + $can->configure(-text => __('Cancel'), -command => sub { $return = $MENU_ABORT; $mw->destroy; }); $mw->update; if (!only_load_remote($remote_path)) { @@ -438,7 +438,8 @@ repository: %s', $TeXLive::TLConfig::ReleaseYear, $texlive_release)); $rb -= 30; $prv->place(-x => $rb, -y => ($MHEIGHT - $BOTTOM), -anchor => "se"); - $can->place(-x => $LEFT, -y => ($MHEIGHT - $BOTTOM), -anchor => "sw"); + $nxt->place(-x => ($MWIDTH - $RIGHT) , + -y => ($MHEIGHT - $BOTTOM), -anchor => "se")->focus(); } sub ask_path { @@ -701,9 +702,9 @@ sub wizard_installation_window { # change the buttons so that the Prev disappears, the Next becomes # Cancel, and the Cancel button disappears $prv->placeForget; - $can->placeForget; - $nxt->configure(-text => __('Cancel'), - -command => sub { $return = $MENU_ABORT; $mw->destroy; }); + $nxt->placeForget; + #$can->configure(-text => __('Cancel'), + # -command => sub { $return = $MENU_ABORT; $mw->destroy; }); calc_depends(); do_installation(); $::progress->value(110); @@ -726,8 +727,11 @@ sub wizard_installation_window { $::progressw->see("end"); $::progressw->tagAdd("centered", $linechar, "end"); $::progressw->tagConfigure("centered", -justify => "center"); + my $rb = $MWIDTH - $RIGHT; $nxt->configure(-text => __('Finish'), -command => sub { $mw->destroy; }); + $nxt->place(-x => ($MWIDTH - $RIGHT) , + -y => ($MHEIGHT - $BOTTOM), -anchor => "se")->focus(); } ################### END OF MODULE RETURN 1 FOR REQUIRE ########### |