summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2009-07-02 09:50:45 +0000
committerNorbert Preining <preining@logic.at>2009-07-02 09:50:45 +0000
commit08303067e0c586e8b101a3aca218ab9cef6b0c92 (patch)
tree308a6f6f70933eabd6e0e84f6505d94fcefcd433
parent311ebb01b559c419ed2e4133d25d507af781e613 (diff)
work on the options screen of the installer
git-svn-id: svn://tug.org/texlive/trunk@14065 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/tlpkg/installer/install-menu-wizard.pl51
-rw-r--r--Master/tlpkg/installer/install-translations.pl2
-rw-r--r--Master/tlpkg/installer/installer-options.txt28
3 files changed, 33 insertions, 48 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 );
diff --git a/Master/tlpkg/installer/install-translations.pl b/Master/tlpkg/installer/install-translations.pl
index 6a68fc78f21..fe09f5b9158 100644
--- a/Master/tlpkg/installer/install-translations.pl
+++ b/Master/tlpkg/installer/install-translations.pl
@@ -122,6 +122,8 @@ our %labels = (binsys => 'Binary system(s)',
optsrc => 'Install font/macro source tree',
symlink => 'Create symlinks in system directories',
desktop_integration => 'Desktop integration',
+ fileassocs => 'Change file associations',
+ pathadj => 'Adjust path',
addon_editor => 'Install TeXworks front end',
);
diff --git a/Master/tlpkg/installer/installer-options.txt b/Master/tlpkg/installer/installer-options.txt
index b96d10ae807..cb33dbd2099 100644
--- a/Master/tlpkg/installer/installer-options.txt
+++ b/Master/tlpkg/installer/installer-options.txt
@@ -1,3 +1,5 @@
+(last status change 2009-07-02)
+
%vars key default text perltk wizard
description
----------------------------------------------------------------------------
@@ -13,40 +15,36 @@ option_fmt 1 x x
option_letter 0 x x x
use letter
-option_file_assocs 0 x
+option_file_assocs 0 x (x) w32
file associations postaction
-option_desktop_integration 0 (1 w32) x 1) x 2)
+option_desktop_integration 0 (1 w32) w32 x 1) w32
shortcuts etc
currently effects w32 only
option_post_code 1
postaction code
-option_w32_multi_user 1 x
+option_w32_multi_user 1 x (x) ??
sysadmin as multi user
-option_path 0 x
+option_path 0 x (x) w32??
path adjustment
-sys_bin/man/info /usr/local/...
+sys_bin/man/info /u/l/... x x
unix link dests (if option_path == 1)
-addon_editor 0 x x x 3)
+addon_editor 0 x x -
install texworks
+(x) are things that should be done
+?? are things I am not sure
+- are things that are not relevant
Comments:
-1) in the text mode the desktop_integration is shown only on w32, where
- it actually is the only thing done (but one could imagine adding
- code for desktop integration un unix, too)
-
-2) in perltk mode the desktop_integration is shown for all, but on unix
+1) in perltk mode the desktop_integration is shown for all, but on unix
it triggers the link destination (so option_path)
-3) in wizard mode texworks will be installed in any case now since it is
- part of collection-extrabin, so the question is useless.
-
Question/Statements:
- perltk is wrong to mix desktop_integration with path_adjustments!
@@ -54,6 +52,8 @@ Question/Statements:
- perltk should show desktop_integration only for w32 (as long as we
only support actions there)
- wizard should not ask for texworks
+ done
- wizard should ask for file_assocs, desktop_integration, path
+ done
- should the wizard ask for w32_multi_user?