diffcore-rename: cache file deltas

diff --git a/git-gui/lib/option.tcl b/git-gui/lib/option.tcl
index 17fcc65f78b5e09b77738508ca4db76d9a05a8f0..063f5df6f7cd709e25a8f9c0ede263a3d10f5d8d 100644 (file)
--- a/git-gui/lib/option.tcl
+++ b/git-gui/lib/option.tcl
@@ -15,6 +15,9 @@ proc save_config {} {
                font configure ${font}bold \
                        -family $global_config_new(gui.$font^^family) \
                        -size $global_config_new(gui.$font^^size)
+               font configure ${font}italic \
+                       -family $global_config_new(gui.$font^^family) \
+                       -size $global_config_new(gui.$font^^size)
                set global_config_new(gui.$name) [font configure $font]
                unset global_config_new(gui.$font^^family)
                unset global_config_new(gui.$font^^size)
@@ -52,7 +55,7 @@ proc save_config {} {
 }
 
 proc do_about {} {
-       global appvers copyright
+       global appvers copyright oguilib
        global tcl_patchLevel tk_patchLevel
 
        set w .about_dialog
@@ -91,6 +94,11 @@ $copyright" \
                append v ", Tk version $tk_patchLevel"
        }
 
+       set d {}
+       append d "git wrapper: $::_git\n"
+       append d "git exec dir: [gitexec]\n"
+       append d "git-gui lib: $oguilib"
+
        label $w.vers \
                -text $v \
                -padx 5 -pady 5 \
@@ -100,6 +108,15 @@ $copyright" \
                -relief solid
        pack $w.vers -side top -fill x -padx 5 -pady 5
 
+       label $w.dirs \
+               -text $d \
+               -padx 5 -pady 5 \
+               -justify left \
+               -anchor w \
+               -borderwidth 1 \
+               -relief solid
+       pack $w.dirs -side top -fill x -padx 5 -pady 5
+
        menu $w.ctxm -tearoff 0
        $w.ctxm add command \
                -label {Copy} \
@@ -171,9 +188,12 @@ proc do_options {} {
 
                {b merge.summary {Summarize Merge Commits}}
                {i-1..5 merge.verbosity {Merge Verbosity}}
+               {b merge.diffstat {Show Diffstat After Merge}}
 
                {b gui.trustmtime  {Trust File Modification Timestamps}}
-               {i-1..99 gui.diffcontext {Number of Diff Context Lines}}
+               {b gui.pruneduringfetch {Prune Tracking Branches During Fetch}}
+               {b gui.matchtrackingbranch {Match Tracking Branches}}
+               {i-0..99 gui.diffcontext {Number of Diff Context Lines}}
                {t gui.newbranchtemplate {New Branch Name Template}}
                } {
                set type [lindex $option 0]
@@ -235,17 +255,23 @@ proc do_options {} {
 
                frame $w.global.$name
                label $w.global.$name.l -text "$text:"
-               pack $w.global.$name.l -side left -anchor w -fill x
-               eval tk_optionMenu $w.global.$name.family \
-                       global_config_new(gui.$font^^family) \
-                       $all_fonts
-               spinbox $w.global.$name.size \
-                       -textvariable global_config_new(gui.$font^^size) \
-                       -from 2 -to 80 -increment 1 \
-                       -width 3
-               bind $w.global.$name.size <FocusIn> {%W selection range 0 end}
-               pack $w.global.$name.size -side right -anchor e
-               pack $w.global.$name.family -side right -anchor e
+               button $w.global.$name.b \
+                       -text [mc "Change Font"] \
+                       -command [list \
+                               choose_font::pick \
+                               $w \
+                               [mc "Choose %s" $text] \
+                               global_config_new(gui.$font^^family) \
+                               global_config_new(gui.$font^^size) \
+                               ]
+               label $w.global.$name.f -textvariable global_config_new(gui.$font^^family)
+               label $w.global.$name.s -textvariable global_config_new(gui.$font^^size)
+               label $w.global.$name.pt -text [mc "pt."]
+               pack $w.global.$name.l -side left -anchor w
+               pack $w.global.$name.b -side right -anchor e
+               pack $w.global.$name.pt -side right -anchor w
+               pack $w.global.$name.s -side right -anchor w
+               pack $w.global.$name.f -side right -anchor w
                pack $w.global.$name -side top -anchor w -fill x
        }