summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2014-01-26 22:50:34 +0000
committerNorbert Preining <preining@logic.at>2014-01-26 22:50:34 +0000
commitf55661d9175af3ebd2fb16598834291cd96dfed3 (patch)
tree3750dd0f3941ef25a42c24d604d0893e5f253bc1 /Master
parent3175bd685e6f2d5899cb5aa1c295a657faf57246 (diff)
some changes to the wizard installer, all internal reshuffling
git-svn-id: svn://tug.org/texlive/trunk@32797 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/tlpkg/installer/install-menu-wizard.pl68
1 files changed, 24 insertions, 44 deletions
diff --git a/Master/tlpkg/installer/install-menu-wizard.pl b/Master/tlpkg/installer/install-menu-wizard.pl
index dac50904c4e..c5a527c9f33 100644
--- a/Master/tlpkg/installer/install-menu-wizard.pl
+++ b/Master/tlpkg/installer/install-menu-wizard.pl
@@ -11,13 +11,20 @@ my $svnrev = '$Revision: 11925 $';
$svnrev =~ m/: ([0-9]+) /;
$::menurevision = $1;
+require("TeXLive/trans.pl");
+
+
#
# the following lists define which options are shown in the Option screen
# for unix and windows. On W32 with admin privileges both @w32 list options
# are shown
-my @unix_opts = qw/letter/;
-my @w32_opts = qw/letter desktop_integration/;
-my @w32_admin_opts = qw/w32_multi_user/;
+# the values are keys into the %vars array
+my @unix_opts = qw/option_letter/;
+my @w32_opts = qw/option_letter
+ option_desktop_integration
+ collection-texworks
+ /;
+my @w32_admin_opts = qw/option_w32_multi_user/;
my @opts_list = ();
if (win32()) {
@@ -28,6 +35,18 @@ if (win32()) {
} else {
push @opts_list, @unix_opts;
}
+my %opts_to_str = (
+ "option_letter" => __("Default paper size"),
+ "option_desktop_integration" => __("Add menu shortcuts"),
+ "option_file_assocs" => __("Change file associations"),
+ "option_path" => __("Adjust PATH setting in registry"),
+ "option_w32_multi_user" => __("Installation for all users"),
+ "collection-texworks" => __("Install TeXworks front end"),
+);
+my %opts_choices = (
+ "option_letter" => ["A4", "letter"],
+);
+
our %vars;
@@ -87,8 +106,6 @@ my $BUTTONSHEIGHT = 50;
my $INNERWIDTH = ($MWIDTH - $LEFT - $RIGHT);
my $INNERHEIGHT = ($MHEIGHT - $TOP - $TITLEHEIGHT - $BOTTOM - $BUTTONSHEIGHT);
-require("TeXLive/trans.pl");
-
# the main installer runs %{$::run_menu}
$::run_menu = \&run_menu_wizard;
@@ -560,20 +577,6 @@ sub callback_change_texdir {
################## OPTIONS SCREEN ################################
-my %opts_to_str = (
- "letter" => __("Default paper size"),
- "desktop_integration" => __("Add menu shortcuts"),
- "file_assocs" => __("Change file associations"),
- "path" => __("Adjust PATH setting in registry"),
- "w32_multi_user" => __("Installation for all users"),
-);
-
-# options choices: if there is an entry, use radio buttons,
-# otherwise a checkbutton
-my %opts_choices = (
- "letter" => ["A4", "letter"],
-);
-
sub ask_options {
for ($fmain->children) {
$_->destroy;
@@ -583,34 +586,11 @@ sub ask_options {
my $inf = $fmain->Label(-text => __("This screen allows you to configure some options"), -justify => "left");
$inf->place(-x => 0, -y => 20);
-# my %opt_cb;
-#
-# $opt_cb{"letter"} = $fmain->Checkbutton(
-# -text => __("Use letter size instead of A4 by default"),
-# -variable => \$vars{"option_letter"});
-#
-# $opt_cb{"desktop_integration"} = $fmain->Checkbutton(
-# -text => __("Add shortcuts to menu and desktop"),
-## -variable => \$vars{"option_desktop_integration"});
-#
-# $opt_cb{"file_assocs"} = $fmain->Checkbutton(
-# -text => __('Change file associations'),
-## -variable => \$vars{"option_file_assocs"});
-#
-# $opt_cb{"path"} = $fmain->Checkbutton(
-# -text => __('Adjust PATH setting in registry'),
-# -variable => \$vars{"option_path"});
-#
-# $opt_cb{"w32_multi_user"} = $fmain->Checkbutton(
-## -text => __('Installation for all users'),
-# -variable => \$vars{"option_w32_multi_user"});
-#
calc_depends();
my $ytmp = 60;
for my $o (@opts_list) {
- # $opt_cb{$o}->place(-x => 0, -y => $ytmp);
if (exists($opts_choices{$o})) {
my $fopt = $fmain->Frame()->place(-x => 0, -y => $ytmp);
$fopt->Label(
@@ -619,13 +599,13 @@ sub ask_options {
for (my $i = 0; $i < @{$opts_choices{$o}}; $i++) {
$fopt->Radiobutton(
-text => __($opts_choices{$o}->[$i]),
- -variable => \$vars{"option_$o"},
+ -variable => \$vars{$o},
-value => $i,
)->pack(-side => 'left');
}
} else {
$fmain->Checkbutton(-text => $opts_to_str{$o},
- -variable => \$vars{"option_$o"})->place(-x => 0, -y => $ytmp);
+ -variable => \$vars{$o})->place(-x => 0, -y => $ytmp);
}
$ytmp += 50;
}