git-gui: Makes chooser set 'gitdir' to the resolved path

diff --git a/lib/choose_font.tcl b/lib/choose_font.tcl
index b69215c91eb0a12592278025121560e5539776a9..ebe50bd7d07e8a430096dc8f5813c781839bd0f6 100644 (file)
--- a/lib/choose_font.tcl
+++ b/lib/choose_font.tcl
@@ -17,6 +17,7 @@ variable all_families [list]  ; # All fonts known to Tk
 
 constructor pick {path title a_family a_size} {
        variable all_families
+       global use_ttk NS
 
        set v_family $a_family
        set v_size $a_size
@@ -27,34 +28,36 @@ constructor pick {path title a_family a_size} {
        set f_family $pv_family
        set f_size $pv_size
 
-       make_toplevel top w
+       make_dialog top w
+       wm withdraw $top
        wm title $top "[appname] ([reponame]): $title"
        wm geometry $top "+[winfo rootx $path]+[winfo rooty $path]"
 
-       label $w.header -text $title -font font_uibold
+       ${NS}::label $w.header -text $title -font font_uibold -anchor center
        pack $w.header -side top -fill x
 
-       frame $w.buttons
-       button $w.buttons.select \
+       ${NS}::frame $w.buttons
+       ${NS}::button $w.buttons.select \
                -text [mc Select] \
                -default active \
                -command [cb _select]
-       button $w.buttons.cancel \
+       ${NS}::button $w.buttons.cancel \
                -text [mc Cancel] \
                -command [list destroy $w]
        pack $w.buttons.select -side right
        pack $w.buttons.cancel -side right -padx 5
        pack $w.buttons -side bottom -fill x -pady 10 -padx 10
 
-       frame $w.inner
+       ${NS}::frame $w.inner
 
-       frame $w.inner.family
-       label $w.inner.family.l \
+       ${NS}::frame $w.inner.family
+       ${NS}::label $w.inner.family.l \
                -text [mc "Font Family"] \
                -anchor w
        set w_family $w.inner.family.v
        text $w_family \
                -background white \
+               -foreground black \
                -borderwidth 1 \
                -relief sunken \
                -cursor $::cursor_ptr \
@@ -62,16 +65,17 @@ constructor pick {path title a_family a_size} {
                -width 30 \
                -height 10 \
                -yscrollcommand [list $w.inner.family.sby set]
-       scrollbar $w.inner.family.sby -command [list $w_family yview]
+       rmsel_tag $w_family
+       ${NS}::scrollbar $w.inner.family.sby -command [list $w_family yview]
        pack $w.inner.family.l -side top -fill x
        pack $w.inner.family.sby -side right -fill y
        pack $w_family -fill both -expand 1
 
-       frame $w.inner.size
-       label $w.inner.size.l \
+       ${NS}::frame $w.inner.size
+       ${NS}::label $w.inner.size.l \
                -text [mc "Font Size"] \
                -anchor w
-       spinbox $w.inner.size.v \
+       tspinbox $w.inner.size.v \
                -textvariable @f_size \
                -from 2 -to 80 -increment 1 \
                -width 3
@@ -84,17 +88,19 @@ constructor pick {path title a_family a_size} {
        grid columnconfigure $w.inner 0 -weight 1
        pack $w.inner -fill both -expand 1 -padx 5 -pady 5
 
-       frame $w.example
-       label $w.example.l \
+       ${NS}::frame $w.example
+       ${NS}::label $w.example.l \
                -text [mc "Font Example"] \
                -anchor w
        set w_example $w.example.t
        text $w_example \
                -background white \
+               -foreground black \
                -borderwidth 1 \
                -relief sunken \
                -height 3 \
                -width 40
+       rmsel_tag $w_example
        $w_example tag conf example -justify center
        $w_example insert end [mc "This is example text.\nIf you like this text, it can be your font."] example
        $w_example conf -state disabled
@@ -108,11 +114,10 @@ constructor pick {path title a_family a_size} {
 
        $w_family tag conf pick
        $w_family tag bind pick <Button-1> [cb _pick_family %x %y]\;break
-       $w_family tag conf cpck -background lightgray
        foreach f $all_families {
                set sel [list pick]
                if {$f eq $f_family} {
-                       lappend sel cpck
+                       lappend sel in_sel
                }
                $w_family insert end "$f\n" $sel
        }
@@ -126,6 +131,7 @@ constructor pick {path title a_family a_size} {
                grab $w
                focus $w
        "
+       wm deiconify $w
        tkwait window $w
 }
 
@@ -145,8 +151,8 @@ method _pick_family {x y} {
        set i [lindex [split [$w_family index @$x,$y] .] 0]
        set n [lindex $all_families [expr {$i - 1}]]
        if {$n ne {}} {
-               $w_family tag remove cpck 0.0 end
-               $w_family tag add cpck $i.0 [expr {$i + 1}].0
+               $w_family tag remove in_sel 0.0 end
+               $w_family tag add in_sel $i.0 [expr {$i + 1}].0
                set f_family $n
                _update $this
        }