- start wizard support for options

- use 2009 in image for perltk and wizard installer
- add supported options overview document
- add tl2009 image


git-svn-id: svn://tug.org/texlive/trunk@14064 c570f23f-e606-0410-a88d-b1316a301751

4 files changed, 133 insertions, 12 deletions

diff --git a/Master/tlpkg/installer/install-menu-perltk.pl b/Master/tlpkg/installer/install-menu-perltk.pl
index a23d4e7bc5a..20cd75148c2 100644
--- a/Master/tlpkg/installer/install-menu-perltk.pl
+++ b/Master/tlpkg/installer/install-menu-perltk.pl
@@ -138,7 +138,7 @@ sub run_menu_perltk {
 
   # image frame on the left
   my $fl = $mw->Frame(-background => "#0078b8");
-  my $img = $fl->Photo(-format => 'png', -file => "$::installerdir/tlpkg/installer/texlive2008.png");
+  my $img = $fl->Photo(-format => 'png', -file => "$::installerdir/tlpkg/installer/texlive2009-wizard.png");
   $fl->Label(-image => $img, -background => "#0078b8")->pack(-expand => 1, -fill => "y");
   $fl->Label(-text => "v$::installerrevision/$::menurevision", -background => "#0078b8")->pack;
 
diff --git a/Master/tlpkg/installer/install-menu-wizard.pl b/Master/tlpkg/installer/install-menu-wizard.pl
index bcfbe93599c..2313bf356ab 100644
--- a/Master/tlpkg/installer/install-menu-wizard.pl
+++ b/Master/tlpkg/installer/install-menu-wizard.pl
@@ -117,7 +117,7 @@ sub run_menu_wizard {
 
   $dest = $vars{'TEXDIR'};
 
-  my $img = $mw->Photo(-format => 'png', -file => "$::installerdir/tlpkg/installer/texlive2008-wizard.png");
+  my $img = $mw->Photo(-format => 'png', -file => "$::installerdir/tlpkg/installer/texlive2009-wizard.png");
   $mw->Label(-image => $img, -background => "#0078b8")->place(-x => 0, -y => 0);
 
   $ftitle = $mw->Frame(-height => $TITLEHEIGHT, -width => $INNERWIDTH);
@@ -131,7 +131,7 @@ sub run_menu_wizard {
 
   $tit->place(-x => 0, -y => 0);
 
-  $counter = $ftitle->Label(-text => "1/4");
+  $counter = $ftitle->Label(-text => "1/5");
   $counter->place(-x => $INNERWIDTH, -y => 0, -anchor => "ne");
 
   $fmain = $mw->Frame(-height => $INNERHEIGHT, -width => $INNERWIDTH);
@@ -160,7 +160,7 @@ sub reset_start {
   for ($fmain->children) {
     $_->destroy;
   }
-  $counter->configure(-text => "1/4");
+  $counter->configure(-text => "1/5");
   $prv->placeForget;
 
   my $inf = $fmain->Label(-text => $text{'wizhello'}, -justify => "left");
@@ -176,7 +176,7 @@ sub ask_path {
   for ($fmain->children) {
     $_->destroy;
   }
-  $counter->configure(-text => "2/4");
+  $counter->configure(-text => "2/5");
   my $lab = $fmain->Label(-text => $text{'destfolder'});
   my $val = $fmain->Label(-textvar => \$dest);
   my $but = $fmain->Button(-text => $text{'change'}, -command => \&change_path,
@@ -184,8 +184,9 @@ sub ask_path {
 
   my $pa = $fmain->Checkbutton(-text => $labels{'optletter'}, 
                                -variable => \$vars{"option_letter"});
-  my $but_tw = $fmain->Checkbutton(-text => $labels{'addon_editor'},
-                                   -variable => \$vars{"addon_editor"});
+  # texworks will be anyway installed in scheme-full
+  #my $but_tw = $fmain->Checkbutton(-text => $labels{'addon_editor'},
+  #                                -variable => \$vars{"addon_editor"});
 
   #
   # disable the "Advanced Configuration" button switching to the 
@@ -219,9 +220,9 @@ sub ask_path {
 
 
   $pa->place(-x => 0, -y => $ytmp + 30);
-  if (win32()) {
-    $but_tw->place(-x => 0, -y => $ytmp + 60);
-  }
+  #if (win32()) {
+  #  $but_tw->place(-x => 0, -y => $ytmp + 60);
+  #}
 
   #$cb->place(-x => $INNERWIDTH, -y => $INNERHEIGHT, -anchor => "se");
 
@@ -230,7 +231,7 @@ sub ask_path {
              )->place(-x => 0, -y => $fmain->height, -anchor => "sw");
 
   $prv->configure(-text => $text{'prev'}, -command => \&reset_start );
-  $nxt->configure(-text => $text{'next'}, -command => \&ask_go );
+  $nxt->configure(-text => $text{'next'}, -command => \&ask_options );
 
   my $rb = $MWIDTH - $RIGHT;
   $rb -= $nxt->width;
@@ -299,13 +300,74 @@ sub callback_change_texdir {
   check_show_warning();
 }
 
+################## OPTIONS SCREEN ################################
+
+sub ask_options {
+  for ($fmain->children) {
+    $_->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 $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();
+
+
+  $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");
+
+  $but->place(-x => $INNERWIDTH, -y => $ytmp, -anchor => "e");
+
+  $warning = $fmain->Label(-foreground => "red");
+  check_show_warning();
+  $ytmp += ($lineskip + 10);
+  $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);
+  #}
+
+  #$cb->place(-x => $INNERWIDTH, -y => $INNERHEIGHT, -anchor => "se");
+
+  $fmain->Label(-text => "$text{'diskreq'}: $vars{'total_size'} MB", 
+                -justify => "left"
+             )->place(-x => 0, -y => $fmain->height, -anchor => "sw");
+
+  $prv->configure(-text => $text{'prev'}, -command => \&ask_path );
+  $nxt->configure(-text => $text{'next'}, -command => \&ask_go );
+
+  my $rb = $MWIDTH - $RIGHT;
+  $rb -= $nxt->width;
+  $rb -= 30;
+
+  $prv->place(-x => $rb, -y => ($MHEIGHT - $BOTTOM), -anchor => "se");
+}
+
+
 ################## INSTALL SCREEN #############################
 
 sub ask_go {
   for ($fmain->children) {
     $_->destroy;
   }
-  $counter->configure(-text => "3/4");
+  $counter->configure(-text => "4/5");
   my $inf = $fmain->Label(-justify => "left", -text => $text{'readyinst'} . "\n\n" . $text{'destfolder'} . ":   $dest");
 
   $inf->place(-x => 0, -y => 100);
diff --git a/Master/tlpkg/installer/installer-options.txt b/Master/tlpkg/installer/installer-options.txt
new file mode 100644
index 00000000000..b96d10ae807
--- /dev/null
+++ b/Master/tlpkg/installer/installer-options.txt
@@ -0,0 +1,59 @@
+%vars key                     default      text   perltk   wizard
+   description
+----------------------------------------------------------------------------
+option_doc                    1             x       x
+   install doc files
+
+option_src                    1             x       x
+   install src files
+
+option_fmt                    1             x       x
+   create all formats
+
+option_letter                 0             x       x         x
+   use letter
+
+option_file_assocs            0             x
+   file associations postaction
+
+option_desktop_integration    0 (1 w32)     x 1)    x 2)
+   shortcuts etc
+   currently effects w32 only
+
+option_post_code              1
+   postaction code
+
+option_w32_multi_user         1             x
+   sysadmin as multi user
+
+option_path                   0             x
+   path adjustment
+
+sys_bin/man/info              /usr/local/...
+   unix link dests (if option_path == 1)
+
+addon_editor                  0             x       x         x 3)
+   install texworks
+
+
+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
+   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!
+  it should have separate questions
+- perltk should show desktop_integration only for w32 (as long as we
+  only support actions there)
+- wizard should not ask for texworks
+- wizard should ask for file_assocs, desktop_integration, path
+- should the wizard ask for w32_multi_user?
+
diff --git a/Master/tlpkg/installer/texlive2009-wizard.png b/Master/tlpkg/installer/texlive2009-wizard.png
new file mode 100644
index 00000000000..9a0b3ba53b1
--- /dev/null
+++ b/Master/tlpkg/installer/texlive2009-wizard.png