summaryrefslogtreecommitdiff
path: root/Master/tlpkg/installer/install-menu-wizard.pl
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2009-07-03 15:27:37 +0000
committerNorbert Preining <preining@logic.at>2009-07-03 15:27:37 +0000
commit9167358afb2bd622448cf97615899cba00556bc5 (patch)
tree941e6c12cbc2bcfbc51f5097b67ac9e8d9ba7faf /Master/tlpkg/installer/install-menu-wizard.pl
parente14a9d60c5f2c2734d18d1d5e4f8464633ab9a60 (diff)
the "Tokyo-Vienna-cramped-flight-commit":
- unify installer keys of the %vars hash to always use option_ prefix if it is an option - unify the layout of things in 00texlive.installation so that user settable things look like opt_$key:vallue, and internal things setting_$key:vale - add list of supported options to TLConfig, with type definitions - use a unified option call $tlpdb->option($key [, $value, $value]) instead of many different $tlpdb->option_foo_bar - adapt install-tl, uninstall-w32, tlmgr, tlpkg/bin, TeXLive::*, installer plugins, to use this new function instead - make the setting_platform:XXXXX (formerly platform:XXXXX) in 00texlive.installation only optional. It is not saved into the TLPDB if the *default* platform as returned by TeXLive::TLUtils::platform() (thus calling config.guess on unix). Only if you override the platform in the installer with -force-arch then this value is set in the TLPDB - implement TLMedia->platform that checks first the included TLPDB for option("platform"), and if that is not given determines the platform using TLUtils::platform(). - move the add_symlinks and remove_symlinks from TLPDB to TLMedia - sanatize the installer modules: perltk is now equivalent to text - tlmgr: . output of tlmgr option [show] does now show all the set options, but ignores irrelevant ones for the respective platform (sys_bin/man/info for win32, desktop_integration etc for unix) . option handling rewritten in a general way so that we only have to add new options to TLConfig::%TLPDBOptionXXXXX . setting an option is verified against the types of the options . implement tlmgr option showall that shows also options that are currently not set/saved in the TLPDB - TLUtils: honor the w32_multi_user setting also for shortcuts and menu items - tlmgrgui: . implement support for most options that are set in the TLPDB . add buttons to remove/add symlinks git-svn-id: svn://tug.org/texlive/trunk@14083 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/tlpkg/installer/install-menu-wizard.pl')
-rw-r--r--Master/tlpkg/installer/install-menu-wizard.pl16
1 files changed, 14 insertions, 2 deletions
diff --git a/Master/tlpkg/installer/install-menu-wizard.pl b/Master/tlpkg/installer/install-menu-wizard.pl
index 5048c182d6d..1c716a137de 100644
--- a/Master/tlpkg/installer/install-menu-wizard.pl
+++ b/Master/tlpkg/installer/install-menu-wizard.pl
@@ -202,7 +202,7 @@ sub ask_path {
$fmain->Label(-text => $text{'pathinfo'},
- -justify => "left")->place(-x => 0, -y => 30);
+ -justify => "left")->place(-x => 0, -y => 20);
my $ytmp = 100;
$lab->place(-x => 0, -y => $ytmp, -anchor => "w");
@@ -304,6 +304,10 @@ sub ask_options {
$_->destroy;
}
$counter->configure(-text => "3/5");
+
+ my $inf = $fmain->Label(-text => $text{"optiontitle"}, -justify => "left");
+ $inf->place(-x => 0, -y => 20);
+
my $bletter = $fmain->Checkbutton(-text => $labels{'optletter'},
-variable => \$vars{"option_letter"});
@@ -316,6 +320,9 @@ sub ask_options {
my $bpath = $fmain->Checkbutton(-text => $labels{'pathadj'},
-variable => \$vars{"option_path"});
+ my $bmulti = $fmain->Checkbutton(-text => $labels{'multiuser'},
+ -variable => \$vars{"option_w32_multi_user"});
+
calc_depends();
@@ -331,6 +338,11 @@ sub ask_options {
$ytmp += 50;
$bpath->place(-x => 0, -y => $ytmp);
+
+ if (admin()) {
+ $ytmp += 50;
+ $bmulti->place(-x => 0, -y => $ytmp);
+ }
}
$prv->configure(-text => $text{'prev'}, -command => \&ask_path );
@@ -351,7 +363,7 @@ sub ask_go {
$_->destroy;
}
$counter->configure(-text => "4/5");
- my $inf = $fmain->Label(-justify => "left", -text => $text{'readyinst'} . "\n\n" . $text{'destfolder'} . ": $dest");
+ my $inf = $fmain->Label(-justify => "left", -text => $text{'readyinst'} . "\n\n" . $text{'destfolder'} . " $dest");
$inf->place(-x => 0, -y => 100);