Re: gitk: Failure of new tabbed preferences dialog

From: Junio C Hamano <gitster@pobox.com>
Date: Apr 2, 2012, 22:03 UTC
Message-ID: <7vzkatdc51.fsf@alter.siamese.dyndns.org>
In-Reply-To: <7vty12gl8r.fsf@alter.siamese.dyndns.org>

Paul, Ramsay and Pat noticed and fixed two buglets that made the "Font" setting dialog unusable in the version in 1.7.10-rc3. I've queued the fixes below, tested them (before and after applying the patches) locally.

I would like to merge them and tag 1.7.10-rc4 tonight.

In order to keep us in sync, could you please pull back from me? The branch "pt/gitk" corresponds to your repository (i.e. without the rest of git.git, and gitk-git/Makefile as the top-level Makefile).

Thanks.

-- -- --

The following changes since commit b2b76d10696d945bf19318831b64d009d119e051:

  gitk: Teach gitk to respect log.showroot (2012-03-24 16:44:12 +1100)

are available in the git repository at:

  git://github.com/gitster/git.git pt/gitk

for you to fetch changes up to 39ddf99c1db8b230ec7bdefc6ce3c769d1cf4ab6:

  gitk: fix setting font display with new tabbed dialog layout. (2012-04-02 10:21:10 -0700)

----------------------------------------------------------------
Pat Thoyts (2):
      gitk: fix tabbed preferences construction when using tcl 8.4
      gitk: fix setting font display with new tabbed dialog layout.

 gitk |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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