git-gui: Display the "Loading annotation..." message in italic

If the user clicks on a line region that we haven't yet received
an annotation for from git-blame we show them "Loading annotation".
But I don't want the user to confuse this loading message with a
commit whose first line is "Loading annotation" and think we messed
up our display somehow.  Since we never use italics for anything
else, I'm going with the idea that italic slant can be used to show
data is missing/elided out at the time being.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

diff --git a/git-gui.sh b/git-gui.sh
index 6a5e2dc16030080ddd70a9f3d87170737ccb8eda..dfb4b955eb1d33fdd90b25e1e575ed86949bbd9f 100755 (executable)
--- a/git-gui.sh
+++ b/git-gui.sh
@@ -1024,6 +1024,7 @@ proc incr_font_size {font {amt 1}} {
        incr sz $amt
        font configure $font -size $sz
        font configure ${font}bold -size $sz
+       font configure ${font}italic -size $sz
 }
 
 ######################################################################
@@ -1216,8 +1217,10 @@ catch {
        destroy .dummy
 }
 
+font create font_uiitalic
 font create font_uibold
 font create font_diffbold
+font create font_diffitalic
 
 foreach class {Button Checkbutton Entry Label
                Labelframe Listbox Menu Message
@@ -1249,8 +1252,10 @@ proc apply_config {} {
                }
                foreach {cn cv} [font configure $font] {
                        font configure ${font}bold $cn $cv
+                       font configure ${font}italic $cn $cv
                }
                font configure ${font}bold -weight bold
+               font configure ${font}italic -slant italic
        }
 }
 

diff --git a/lib/blame.tcl b/lib/blame.tcl
index 0531450820805356a81cc796776a0fed59d7f74b..0641ea6d373d1e47ebf029818b5772629f68a238 100644 (file)
--- a/lib/blame.tcl
+++ b/lib/blame.tcl
@@ -194,6 +194,9 @@ constructor new {i_commit i_path} {
                -xscrollcommand [list $w.file_pane.cm.sbx set] \
                -yscrollcommand [list $w.file_pane.cm.sby set] \
                -font font_diff
+       $w_cviewer tag conf still_loading \
+               -font font_uiitalic \
+               -justify center
        $w_cviewer tag conf header_key \
                -tabs {3c} \
                -background $active_color \
@@ -624,7 +627,7 @@ method _showcommit {lno} {
        set dat [lindex $amov_data $lno]
        if {$dat eq {}} {
                set cmit {}
-               $w_cviewer insert end "Loading annotation..."
+               $w_cviewer insert end "Loading annotation..." still_loading
        } else {
                set cmit [lindex $dat 0]
                set file [lindex $dat 1]

diff --git a/lib/option.tcl b/lib/option.tcl
index 11dd9be6b95c2a1fd0155e49c45b5946aabf5f9e..b29e14e64dd305922f82556e8e445be42a9fbb38 100644 (file)
--- a/lib/option.tcl
+++ b/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)