summaryrefslogtreecommitdiff
path: root/Master/tlpkg/installer
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2013-05-10 17:49:37 +0000
committerKarl Berry <karl@freefriends.org>2013-05-10 17:49:37 +0000
commitc57f4ad104711b6374cc0c4d41bc044519e04a91 (patch)
tree5783c30effa127132852028fa5761349ccbb2ff3 /Master/tlpkg/installer
parent650b657b19832c68d26e14726af630f1bc52b0f5 (diff)
merge collection-documentation-* into collection-lang*
git-svn-id: svn://tug.org/texlive/trunk@30372 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/tlpkg/installer')
-rw-r--r--Master/tlpkg/installer/install-menu-perltk.pl28
-rwxr-xr-xMaster/tlpkg/installer/install-menu-text.pl32
-rw-r--r--Master/tlpkg/installer/install-menu-wizard.pl2
3 files changed, 7 insertions, 55 deletions
diff --git a/Master/tlpkg/installer/install-menu-perltk.pl b/Master/tlpkg/installer/install-menu-perltk.pl
index 37e70eb5e74..bbb221085d5 100644
--- a/Master/tlpkg/installer/install-menu-perltk.pl
+++ b/Master/tlpkg/installer/install-menu-perltk.pl
@@ -1,7 +1,7 @@
#!/usr/bin/env perl
# $Id$
#
-# Copyright 2008, 2009, 2010, 2011, 2012 Norbert Preining
+# Copyright 2008-2013 Norbert Preining
# Copyright 2008 Reinhard Kotucha
# This file is licensed under the GNU General Public License version 2
# or any later version.
@@ -234,7 +234,8 @@ 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/texlive.png");
+ my $img = $fl->Photo(-format => 'png',
+ -file => "$::installerdir/tlpkg/installer/texlive.png");
$fl->Label(-image => $img, -background => "#0078b8")->pack(-expand => 1, -fill => "y");
$fl->Label(-text => "v$::installerrevision/$::menurevision", -background => "#0078b8")->pack;
@@ -863,9 +864,7 @@ sub menu_select_lang_collections {
my $f1 = $sw->Frame;
$f1->pack;
my $f1lang = $f1->Labelframe(-text => __("Select language support"));
- my $f1doc = $f1->Labelframe(-text => __("Select language-specific documentation"));
$f1lang->pack(-side => 'left', -padx => "2m", -pady => "2m", -ipadx => "2m", -ipady => "2m");
- $f1doc->pack(-side => 'right', -padx => "2m", -pady => "2m", -ipadx => "2m", -ipady => "2m", -expand => 1, -fill => "y");
my $f1langT = $f1lang->Frame; $f1langT->pack;
my $f1langL = $f1lang->Frame; $f1langL->pack;
my $f1langLa = $f1langL->Frame; $f1langLa->pack(-side => 'left');
@@ -896,27 +895,6 @@ sub menu_select_lang_collections {
$f1langB->Button(-text => __("Deselect All"),
-command => sub { deselect_collections(\%lvars, @collections_lang) })->pack(-side => 'right', -padx => "2m", -pady => "2m");
- my $f1docT = $f1doc->Frame; $f1docT->pack;
- my $f1docL = $f1doc->Frame; $f1docL->pack;
- my $f1docLa = $f1docL->Frame; $f1docLa->pack(-side => 'left');
- my $f1docLb = $f1docL->Frame; $f1docLb->pack(-side => 'right');
- my $doch = $#collections_lang_doc / 2;
- $i = 0;
- foreach my $coll (sort @collections_lang_doc) {
- my $tlpobj = $tlpdb->get_package("$coll");
- if ($i < $doch) {
- $f1docLa->Checkbutton(-variable => \$lvars{$coll}, -text => __($tlpobj->shortdesc))->pack(-anchor => 'w');
- } else {
- $f1docLb->Checkbutton(-variable => \$lvars{$coll}, -text => __($tlpobj->shortdesc))->pack(-anchor => 'w');
- }
- $i++;
- }
- my $f1docB = $f1doc->Frame;
- $f1docB->pack(-expand => 1, -side => "bottom");
- $f1docB->Button(-text => __("Select All"),
- -command => sub { select_collections(\%lvars, @collections_lang_doc) })->pack(-side => 'left', -padx => "2m", -pady => "2m");
- $f1docB->Button(-text => __("Deselect All"),
- -command => sub { deselect_collections(\%lvars, @collections_lang_doc) })->pack(-side => 'left', -padx => "2m", -pady => "2m");
my $f2 = $sw->Frame; $f2->pack(-expand => 'x');
my $okbutton = $f2->Button(-text => __("Ok"),
-command => sub {
diff --git a/Master/tlpkg/installer/install-menu-text.pl b/Master/tlpkg/installer/install-menu-text.pl
index 18d2fa66a0b..e963add563d 100755
--- a/Master/tlpkg/installer/install-menu-text.pl
+++ b/Master/tlpkg/installer/install-menu-text.pl
@@ -2,7 +2,7 @@
# $Id$
# install-menu-txt.pl
#
-# Copyright 2007, 2008, 2009, 2010, 2011 Norbert Preining, Karl Berry
+# Copyright 2007-2013 Norbert Preining, Karl Berry
# Copyright 2007, 2008 Reinhard Kotucha
# This file is licensed under the GNU General Public License version 2
# or any later version.
@@ -18,7 +18,6 @@ our $media;
our $previoustlpdb;
our @collections_std;
our @collections_lang;
-our @collections_lang_doc;
our $texlive_release;
my $MENU_CONTINUE = -1;
@@ -473,18 +472,14 @@ sub language_menu {
);
my @languages;
- my @lang_docs;
my @lang_keys=string_to_list "abcdefghijklmnopstuvwxyz0123456789";
- my @lang_doc_keys=string_to_list "ABCDEFGHIJKLMNOPSTUVWXYZ";
my %keyval;
my $lang_index=0;
- my $lang_doc_index=0;
my $lines;
menu_head 'Language support:';
@languages=sort @collections_lang;
- @lang_docs=sort @collections_lang_doc;
$lines=@languages/2;
++$lines if (@languages%2);
@@ -505,27 +500,6 @@ sub language_menu {
}
}
- print "\nLanguage-specific documentation:\n\n";
-
- $lines=@lang_docs/2;
- ++$lines if (@lang_docs%2);
- for my $index (0..$lines-1) {
- my $lang_doc=$lang_docs[$index];
- my $tlpobj = $tlpdb->get_package("$lang_doc");
- $keyval{$lang_doc_keys[$index]}="$lang_doc";
- printf " %s %s %-33s", $lang_doc_keys[$index], button($vars{"$lang_doc"}),
- substr($tlpobj->shortdesc,0,33);
- if (defined $lang_docs[$index+$lines]) {
- my $lang_doc=$lang_docs[$index+$lines];
- my $tlpobj = $tlpdb->get_package("$lang_doc");
- $keyval{$lang_doc_keys[$index+$lines]}="$lang_doc";
- printf " %s %s %-32s\n", $lang_doc_keys[$index+$lines],
- button($vars{"$lang_doc"}), substr($tlpobj->shortdesc,0,32);
- } else {
- print "\n";
- }
- }
-
other_options qw (+ - R Q diskspace);
my $answer = prompt 'Enter letter(s) to select language(s)';
@@ -533,12 +507,12 @@ sub language_menu {
foreach my $keystroke (@keystrokes) {
if ($keystroke eq '-') {
- for my $collection (@languages,@lang_docs) {
+ for my $collection (@languages) {
$vars{"$collection"}=0 if defined $vars{"$collection"};
}
}
if ($keystroke eq '+') {
- for my $collection (@languages,@lang_docs) {
+ for my $collection (@languages) {
$vars{"$collection"}=1 if defined $vars{"$collection"};
}
}
diff --git a/Master/tlpkg/installer/install-menu-wizard.pl b/Master/tlpkg/installer/install-menu-wizard.pl
index e44e29ed072..dac50904c4e 100644
--- a/Master/tlpkg/installer/install-menu-wizard.pl
+++ b/Master/tlpkg/installer/install-menu-wizard.pl
@@ -1,6 +1,6 @@
#!/usr/bin/env perl
# $Id$
-# Copyright 2009, 2010 Norbert Preining
+# Copyright 2009-2013 Norbert Preining
# This file is licensed under the GNU General Public License version 2
# or any later version.