another texworks round

- create a collection-texworks
- move texworks from c-binextra to c-texworks
- remove all mentioning of texworks in the installer 
- add collection-texworks to scheme-full


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

2 files changed, 9 insertions, 9 deletions

diff --git a/Master/tlpkg/installer/install-menu-perltk.pl b/Master/tlpkg/installer/install-menu-perltk.pl
index 8312cedaef6..2e0cbea1901 100644
--- a/Master/tlpkg/installer/install-menu-perltk.pl
+++ b/Master/tlpkg/installer/install-menu-perltk.pl
@@ -77,7 +77,7 @@ my $srcyesno = ( $vars{'option_src'} ? __("Yes") : __("No") );
 my $deskintyesno = ( $vars{'option_desktop_integration'} ? __("Yes") : __("No") );
 my $pathadjyesno = ( $vars{'option_path'} ? __("Yes") : __("No") );
 my $fileassocyesno = $::fileassocdesc[$vars{'option_file_assocs'}];
-my $editoryesno = ( $vars{'addon_editor'} ? __("Yes") : __("No") );
+#my $editoryesno = ( $vars{'addon_editor'} ? __("Yes") : __("No") );
 my $adminallyesno = ( $vars{'option_w32_multi_user'} ? __("Yes") : __("No") );
 my $docyesno = ( $vars{'option_doc'} ? __("Yes") : __("No") );
 my $restrictedyesno = ( $vars{'option_write18_restricted'} ? __("Yes") : __("No") );
@@ -302,10 +302,10 @@ sub run_menu_perltk {
       $fr->Button(-text => __("Toggle"), -command => sub { toggle_and_set_opt_variable(\$vars{'option_w32_multi_user'}, \$adminallyesno); })->grid(-row => $row, -column => 3, -sticky => "ew", -padx => "2m");
     }
 
-    $row++;
-    $fr->Label(-text => __('Install TeXworks front end'), -anchor => 'w')->grid(-row => $row, -column => 1, -sticky => 'w');
-    $fr->Label(-anchor => 'w', -textvariable => \$editoryesno)->grid(-row => $row, -column => 2, -padx => "2m");
-    $fr->Button(-text => __("Toggle"), -command => sub { toggle_and_set_opt_variable(\$vars{'addon_editor'}, \$editoryesno); })->grid(-row => $row, -column => 3, -sticky => "ew", -padx => "2m");
+  #  $row++;
+  #  $fr->Label(-text => __('Install TeXworks front end'), -anchor => 'w')->grid(-row => $row, -column => 1, -sticky => 'w');
+  #  $fr->Label(-anchor => 'w', -textvariable => \$editoryesno)->grid(-row => $row, -column => 2, -padx => "2m");
+  #  $fr->Button(-text => __("Toggle"), -command => sub { toggle_and_set_opt_variable(\$vars{'addon_editor'}, \$editoryesno); })->grid(-row => $row, -column => 3, -sticky => "ew", -padx => "2m");
   }
 
   # install/cancel buttons
diff --git a/Master/tlpkg/installer/install-menu-text.pl b/Master/tlpkg/installer/install-menu-text.pl
index ba14da66d2e..cc9780eefda 100755
--- a/Master/tlpkg/installer/install-menu-text.pl
+++ b/Master/tlpkg/installer/install-menu-text.pl
@@ -699,7 +699,7 @@ sub options_menu {
   my $b_letter=button($vars{'option_letter'});
   my $b_deskint=button($vars{'option_desktop_integration'});
   my $b_admin=button($vars{'option_w32_multi_user'});
-  my $b_addoneditor=button($vars{'addon_editor'});
+  #my $b_addoneditor=button($vars{'addon_editor'});
   my $b_restricted = button($vars{'option_write18_restricted'});
 
   my $sys_bin=$vars{'option_sys_bin'};
@@ -753,7 +753,7 @@ EOF
         # if we are admin we allow normal user installation, too
         print " <U> make installation available to all users: $b_admin\n";
       }
-      print " <E> install TeXworks front end:               $b_addoneditor\n";
+      #print " <E> install TeXworks front end:               $b_addoneditor\n";
     }
   }
   other_options qw(R Q diskspace);
@@ -885,7 +885,7 @@ sub main_menu {
   my $b_letter=button($vars{'option_letter'});
   my $b_deskint=button($vars{'option_desktop_integration'});
   my $b_admin=button($vars{'option_w32_multi_user'});
-  my $b_addoneditor=button($vars{'addon_editor'});
+  #my $b_addoneditor=button($vars{'addon_editor'});
   my $b_restricted = button($vars{'option_write18_restricted'});
 
   my $warn_nobin;
@@ -1001,7 +1001,7 @@ EOF
       if (admin()) {
         print "   $b_admin make installation available to all users\n";
       }
-      print"   $b_addoneditor install TeXworks front end\n";
+      #print"   $b_addoneditor install TeXworks front end\n";
     } else {
       print "   $b_path create symlinks to standard directories\n";
     }