summaryrefslogtreecommitdiff
path: root/Master/tlpkg/installer/install-menu-perltk.pl
diff options
context:
space:
mode:
authorSiep Kroonenberg <siepo@cybercomm.nl>2018-04-29 14:52:02 +0000
committerSiep Kroonenberg <siepo@cybercomm.nl>2018-04-29 14:52:02 +0000
commit6ce5ae90e515f240707be95e88cfebfb89408bab (patch)
tree2d4bbdcdf2c2fd4478af69810d33a721f69d7fde /Master/tlpkg/installer/install-menu-perltk.pl
parent15605b628826392909b2230fd4716d43a61df365 (diff)
Browser dialog for TEXDIR
git-svn-id: svn://tug.org/texlive/trunk@47481 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/tlpkg/installer/install-menu-perltk.pl')
-rw-r--r--Master/tlpkg/installer/install-menu-perltk.pl31
1 files changed, 11 insertions, 20 deletions
diff --git a/Master/tlpkg/installer/install-menu-perltk.pl b/Master/tlpkg/installer/install-menu-perltk.pl
index c90344cb6a4..65598d42c0c 100644
--- a/Master/tlpkg/installer/install-menu-perltk.pl
+++ b/Master/tlpkg/installer/install-menu-perltk.pl
@@ -5,11 +5,6 @@
# Copyright 2008 Reinhard Kotucha
# This file is licensed under the GNU General Public License version 2
# or any later version.
-#
-# TODO:
-# - make the fancy selector the default, at least on unix
-# - for w32 find out the necessary files for the fancy selector and move
-# them to the installer perl package
use strict;
$^W = 1;
@@ -22,14 +17,8 @@ require Tk;
require Tk::Dialog;
require Tk::DialogBox;
require Tk::PNG;
-#require Tk::ROText;
-#require Tk::ProgressBar;
require Tk::BrowseEntry;
-if ($::alternative_selector) {
- require Tk::DirTree;
-}
-
use utf8;
no utf8;
@@ -53,6 +42,8 @@ our %TRANS;
require("TeXLive/trans.pl");
load_translations();
+require("$::installerdir/tlpkg/installer/texdirsel.pl");
+
# @fileassocdesc also defined in install-tl
$::fileassocdesc[0] = __("None");
$::fileassocdesc[1] = __("Only new");
@@ -69,7 +60,7 @@ if (win32() && is_seven()) { $::deskintdesc[2] = __("Launcher entry"); }
$::yesno[0] = __('No');
$::yesno[1] = __('Yes');
-my $mw;
+our $mw;
my $subframe;
my $mainwindow;
my $bin_toggle_button;
@@ -119,6 +110,8 @@ my $docyesno;
my $restrictedyesno;
my $adjustrepoyesno;
+my $sep = ($^O =~ /^MSWin32/) ? "\\" : "/";
+
$::run_menu = \&run_menu_perltk;
@@ -378,16 +371,9 @@ Please select a different mirror.',
$texdirtext = $fr->Label(-anchor => 'w')
->grid(-row => $row, -column => 2, -padx => "2m");
if (!$opt_in_place) {
- if ($::alternative_selector) {
$texdir_toggle_button = $fr->Button(
- -text => __("Change"), -command => sub { menu_edit_texdir("TEXDIR"); })
+ -text => __("Change"), -command => \&change_path)
->grid(-row => $row, -column => 3, -sticky => "ew", -padx => "2m");
- } else {
- $texdir_toggle_button = $fr->Button(
- -text => __("Change"),
- -command => sub { menu_edit_vars_value("TEXDIR"); })
- ->grid(-row => $row, -column => 3, -sticky => "ew", -padx => "2m");
- }
}
@@ -1184,6 +1170,11 @@ sub callback_select_systems() {
menu_update_texts();
}
+sub callback_change_texdir {
+ my $val = shift;
+ callback_edit_directories('TEXDIR', $val);
+}
+
sub callback_edit_directories {
my ($key,$val) = @_;
my $home = getenv('HOME');