1. Stefan Saasen
  2. git

Commits

Shawn O. Pearce  committed debcd0f

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>

  • Participants
  • Parent commits fc816d7
  • Branches master

Comments (0)

Files changed (3)

File git-gui.sh

View file
  • Ignore whitespace
 	incr sz $amt
 	font configure $font -size $sz
 	font configure ${font}bold -size $sz
+	font configure ${font}italic -size $sz
 }
 
 ######################################################################
 	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
 		}
 		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
 	}
 }
 

File lib/blame.tcl

View file
  • Ignore whitespace
 		-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 \
 	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]

File lib/option.tcl

View file
  • Ignore whitespace
 		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)