mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'pt/gitk'

Browse Source 
* pt/gitk:
  gitk: fix setting font display with new tabbed dialog layout.
  gitk: fix tabbed preferences construction when using tcl 8.4
This commit is contained in:
Junio C Hamano
2012-04-02 15:06:25 -07:00
parent d82829b612 39ddf99c1d
commit ca2b71a00b
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
gitk-git/gitk
View File

@ -10795,7 +10795,7 @@ proc fontok {} {
if {$fontparam(slant) eq "italic"} { if {$fontparam(slant) eq "italic"} {
lappend fontpref($f) "italic" lappend fontpref($f) "italic"
} }
set w $prefstop.$f set w $prefstop.notebook.fonts.$f
$w conf -text $fontparam(family) -font $fontpref($f) $w conf -text $fontparam(family) -font $fontpref($f)
fontcan fontcan
@ -11012,6 +11012,7 @@ proc doprefs {} {
lappend pages [prefspage_general $notebook] [mc "General"] lappend pages [prefspage_general $notebook] [mc "General"]
lappend pages [prefspage_colors $notebook] [mc "Colors"] lappend pages [prefspage_colors $notebook] [mc "Colors"]
lappend pages [prefspage_fonts $notebook] [mc "Fonts"] lappend pages [prefspage_fonts $notebook] [mc "Fonts"]
set col 0
foreach {page title} $pages { foreach {page title} $pages {
if {$use_notebook} { if {$use_notebook} {
$notebook add $page -text $title $notebook add $page -text $title