diff options
author | Norbert Preining <norbert@preining.info> | 2021-04-02 03:20:54 +0000 |
---|---|---|
committer | Norbert Preining <norbert@preining.info> | 2021-04-02 03:20:54 +0000 |
commit | 3f173002d4a4a84e7d1fa5a74755fdd00d08a9c2 (patch) | |
tree | 5ed380344702de1f9ab53b68b6c3bcd6b8458087 /systems/texlive/tlnet/tlpkg/installer/install-tl-gui.tcl | |
parent | f78ba658b3ecd56053fe0837a4404d0c6c16a707 (diff) |
CTAN sync 202104020320
Diffstat (limited to 'systems/texlive/tlnet/tlpkg/installer/install-tl-gui.tcl')
-rwxr-xr-x | systems/texlive/tlnet/tlpkg/installer/install-tl-gui.tcl | 69 |
1 files changed, 14 insertions, 55 deletions
diff --git a/systems/texlive/tlnet/tlpkg/installer/install-tl-gui.tcl b/systems/texlive/tlnet/tlpkg/installer/install-tl-gui.tcl index 14c4fa49a0..455641f4db 100755 --- a/systems/texlive/tlnet/tlpkg/installer/install-tl-gui.tcl +++ b/systems/texlive/tlnet/tlpkg/installer/install-tl-gui.tcl @@ -150,52 +150,7 @@ proc dblog {s} { close $db } -proc maybe_print_welcome {} { - # if the last non-empty line was "All done", then installation is completed. - # otherwise, it was help output or an interrupted installation. - # we allow for spurious empty lines at the end of the backend output. - - set all_done 0 - for {set i [.log.tx count -lines 1.0 end]} {$i > 0} {incr i -1} { - set l [.log.tx get ${i}.0 ${i}.end] - if {$l ne ""} { - if {[string range $l 0 11] eq "Installed on"} { - set all_done 1 - } - break - } - } - if {!$all_done} return - # need TEXDIR and this_platform in case of profile install - if {! [info exists ::vars(this_platform)] || \ - ! [info exists ::vars(TEXDIR)]} { - if [regexp {^Installed on platform (.*) at (.*)$} $l m p r] { - set ::vars(this_platform) $p - set ::vars(TEXDIR) $r - } else { - set ::vars(this_platform) "PLATFORM" - set ::vars(TEXDIR) "ROOT" - } - } - - .log.tx configure -state normal - .log.tx tag configure center -justify center - .log.tx delete ${i}.0 end - .log.tx insert end "\n\n" - .log.tx insert end [__ "Welcome to TeX Live!"] center - .log.tx insert end "\n\n" - # tags appear to interfere with --/::msgcat::mc !?! - set s [__ "See %s/index.html for links to documentation.\nThe TeX Live web site (https://tug.org/texlive/) contains any updates and corrections. TeX Live is a joint project of the TeX user groups around the world; please consider supporting it by joining the group best for you. The list of groups is available on the web at https://tug.org/usergroups.html." $::vars(TEXDIR)] - .log.tx insert end $s center - if {$::tcl_platform(platform) ne "windows"} { - .log.tx insert end "\n\n" - set s [__ "Add %s/texmf-dist/doc/man to MANPATH.\nAdd %s/texmf-dist/doc/info to INFOPATH.\nMost importantly, add %s/bin/%s\nto your PATH for current and future sessions." $::vars(TEXDIR) $::vars(TEXDIR) $::vars(TEXDIR) $::vars(this_platform)] - .log.tx insert end $s center - } - .log.tx insert end "\n" - .log.tx yview moveto 1 - if {$::tcl_platform(os) ne "Darwin"} {.log.tx configure -state disabled} -} +# welcome message now provided by install-tl # regular read_line proc read_line {} { @@ -256,7 +211,6 @@ proc read_line_cb {} { # This closes stdin of the child .close state !disabled if [winfo exists .abort] {.abort state disabled} - maybe_print_welcome } elseif {$len >= 0} { # regular output .log.tx configure -state normal @@ -952,6 +906,7 @@ proc select_binaries {} { .tlbin.lst insert {} end -id $b -values \ [list [mark_sym $::vars($bb)] [__ $::bin_descs($b)]] } + set_tree_col_width .tlbin.lst "desc" pgrid .tlbin.lst -in .tlbin.binsf -row 0 -column 0 -sticky news pgrid .tlbin.binsc -in .tlbin.binsf -row 0 -column 1 -sticky ns grid columnconfigure .tlbin.binsf 0 -weight 1 @@ -1001,14 +956,14 @@ proc select_scheme {} { ppack .tlschm.cancel -in .tlschm.buts -side right bind .tlschm <Escape> {.tlschm.cancel invoke} - # schemes list + # schemes list. use treeview rather than listbox for uniform formatting ttk::treeview .tlschm.lst -columns {desc} -show {} -selectmode browse \ -height [llength $::schemes_order] - .tlschm.lst column "desc" -stretch 1; # -minwidth $max_width ppack .tlschm.lst -in .tlschm.bg -fill both -expand 1 foreach s $::schemes_order { .tlschm.lst insert {} end -id $s -values [list [__ $::scheme_descs($s)]] } + set_tree_col_width .tlschm.lst "desc" # we already made sure that $::vars(selected_scheme) has a valid value .tlschm.lst selection set [list $::vars(selected_scheme)] @@ -1133,6 +1088,8 @@ proc select_collections {} { $wgt insert {} end -id $c -values \ [list [mark_sym $::vars($c)] [__ $::coll_descs($c)]] } + set_tree_col_width .tlcoll.lang "desc" + set_tree_col_width .tlcoll.other "desc" wm protocol .tlcoll WM_DELETE_WINDOW \ {cancel_or_destroy .tlcoll.cancel .tlcoll} @@ -1345,10 +1302,10 @@ proc abort_menu {} { } proc run_menu {} { - if [info exists ::env(dbgui)] { - #puts "\ndbgui: run_menu: advanced is now $::advanced" - #puts "dbgui: run_menu: alltrees is now $::alltrees" - } + #if [info exists ::env(dbgui)] { + # puts "\ndbgui: run_menu: advanced is now $::advanced" + # puts "dbgui: run_menu: alltrees is now $::alltrees" + #} wm withdraw . foreach c [winfo children .] { catch {destroy $c} @@ -1364,6 +1321,9 @@ proc run_menu {} { } } + # name in titlebar; should be redefined after any language switch + wm title . [__ "TeX Live Installer"] + # menu, for language selection and font scaling menu .mn . configure -menu .mn @@ -1641,7 +1601,7 @@ proc run_menu {} { } # instopt_letter - set ::lpapers {"A4" "letter"} + set ::lpapers {"A4" "Letter"} incr rw pgrid [ttk::label .paperl -text [__ "Default paper size"]] \ -in $curf -row $rw -column 0 -sticky w @@ -1983,7 +1943,6 @@ proc whataboutclose {} { proc main_prog {} { - wm title . [__ "TeX Live Installer"] wm protocol . WM_DELETE_WINDOW whataboutclose # handle some command-line arguments. |