diff options
author | Karl Berry <karl@freefriends.org> | 2013-05-11 16:14:33 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2013-05-11 16:14:33 +0000 |
commit | 7033bbab7d1e6ece677121219fae978a79d2196b (patch) | |
tree | b01701c136ca26d132f69dbcaead46a95f3164a2 /Master/tlpkg/installer/install-menu-perltk.pl | |
parent | ac93d0106be1df6cc3cd1bfb0101ef7db97a2706 (diff) |
merge language menu into regular collections menu
git-svn-id: svn://tug.org/texlive/trunk@30398 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/tlpkg/installer/install-menu-perltk.pl')
-rw-r--r-- | Master/tlpkg/installer/install-menu-perltk.pl | 79 |
1 files changed, 0 insertions, 79 deletions
diff --git a/Master/tlpkg/installer/install-menu-perltk.pl b/Master/tlpkg/installer/install-menu-perltk.pl index bbb221085d5..c78710a6ee1 100644 --- a/Master/tlpkg/installer/install-menu-perltk.pl +++ b/Master/tlpkg/installer/install-menu-perltk.pl @@ -36,8 +36,6 @@ no utf8; our %vars; our $tlpdb; our @collections_std; -our @collections_lang; -our @collections_lang_doc; our $texlive_release; our @media_available; our $media; @@ -66,7 +64,6 @@ my $mainwindow; my $bin_toggle_button; my $scheme_toggle_button; my $collection_toggle_button; -my $langcoll_toggle_button; my $portable_toggle_button; my $texdir_toggle_button; my $paper_toggle_button; @@ -94,7 +91,6 @@ my $texmfsysvartext; my $texmfsysconfigtext; my $texmfhometext; my $texdirtext; -my $langcoltext; my $optletterstate; my $optfmtstate; my $optsrcstate; @@ -195,7 +191,6 @@ sub change_button_state { $bin_toggle_button->configure(-state => $what); $scheme_toggle_button->configure(-state => $what); $collection_toggle_button->configure(-state => $what); - $langcoll_toggle_button->configure(-state => $what); $portable_toggle_button->configure(-state => $what); $texdir_toggle_button->configure(-state => $what); $texdir_toggle_button->configure(-state => $what); @@ -356,12 +351,6 @@ Please select a different mirror.', $TeXLive::TLConfig::ReleaseYear, $texlive_re $collection_toggle_button = $fr->Button(-text => __("Change"), -command => sub { menu_select_standard_collections(); })->grid(-row => $row, -column => 3, -sticky => "ew", -padx => "2m"); $row++; - # lang collection line - $fr->Label(-text => __('Language collections'), -anchor => 'w')->grid(-row => $row, -column => 1, -sticky => 'w'); - $langcoltext = $fr->Label(-anchor => 'w')->grid(-row => $row, -column => 2, -padx => "2m"); - $langcoll_toggle_button = $fr->Button( -text => __("Change"), -command => sub { menu_select_lang_collections(); })->grid(-row => $row, -column => 3, -sticky => "ew", -padx => "2m"); - - $row++; $collectionstext = $fr->Label(); $collectionstext->grid(-row => $row, -column => 1, -columnspan => 3); } @@ -857,67 +846,6 @@ sub menu_select_standard_collections { $sw->bind('<Escape>' => [ $cancelbutton, 'Invoke']); } -sub menu_select_lang_collections { - my $sw = $mainwindow->Toplevel(-title => __('Language collections')); - $sw->transient($mainwindow); - $sw->grab(); - my $f1 = $sw->Frame; - $f1->pack; - my $f1lang = $f1->Labelframe(-text => __("Select language support")); - $f1lang->pack(-side => 'left', -padx => "2m", -pady => "2m", -ipadx => "2m", -ipady => "2m"); - my $f1langT = $f1lang->Frame; $f1langT->pack; - my $f1langL = $f1lang->Frame; $f1langL->pack; - my $f1langLa = $f1langL->Frame; $f1langLa->pack(-side => 'left'); - my $f1langLb = $f1langL->Frame; $f1langLb->pack(-side => 'right'); - my $langh = $#collections_lang / 2; - my $i = 0; - my %lvars = %vars; - my %tcl; - for my $cl (@collections_lang) { - my $tlpobj = $tlpdb->get_package($cl); - $tcl{__($tlpobj->shortdesc)} = $cl; - } - foreach my $tcoll (sort keys %tcl) { - my $coll = $tcl{$tcoll}; - if ($i < $langh) { - $f1langLa->Checkbutton(-variable => \$lvars{$coll}, -text => $tcoll) - ->pack(-anchor => 'w'); - } else { - $f1langLb->Checkbutton(-variable => \$lvars{$coll}, -text => $tcoll) - ->pack(-anchor => 'w'); - } - $i++; - } - my $f1langB = $f1lang->Frame; - $f1langB->pack(-expand => 'x'); - $f1langB->Button(-text => __("Select All"), - -command => sub { select_collections(\%lvars, @collections_lang) })->pack(-side => 'left', -padx => "2m", -pady => "2m")->focus(); - $f1langB->Button(-text => __("Deselect All"), - -command => sub { deselect_collections(\%lvars, @collections_lang) })->pack(-side => 'right', -padx => "2m", -pady => "2m"); - - my $f2 = $sw->Frame; $f2->pack(-expand => 'x'); - my $okbutton = $f2->Button(-text => __("Ok"), - -command => sub { - # we call the update only if something has changed - my $changed = 0; - for my $k (keys %lvars) { - if ($vars{$k} ne $lvars{$k}) { - $changed = 1; - last; - } - } - if ($changed) { - %vars = %lvars; - callback_select_collection(); - } - $sw->destroy; - })->pack(-side => 'left', -padx => "2m", -pady => "2m"); - my $cancelbutton = $f2->Button(-text => __("Cancel"), - -command => sub { $sw->destroy })->pack(-side => 'right', -padx => "2m", -pady => "2m"); - $sw->bind('<Return>' => [ $okbutton, 'Invoke']); - $sw->bind('<Escape>' => [ $cancelbutton, 'Invoke']); -} - sub menu_select_symlink { our ($lbin,$lman,$linfo); our $osym = $vars{'option_path'}; @@ -1065,13 +993,6 @@ sub menu_set_collections_text { } sub menu_set_pathes_text { - if (check_on_lang_collection_installed()) { - # good - menu_set_text($langcoltext, ""); - } else { - # bad - menu_set_text($langcoltext, __("(no language collection selected!)"), -foreground => "red"); - } if (TeXLive::TLUtils::texdir_check($vars{'TEXDIR'})) { menu_set_text($texdirtext, native_slashify($vars{'TEXDIR'}), -foreground => "black"); } else { |