Merge branch 'maint' of git://repo.or.cz/git-gui into maint
* 'maint' of git://repo.or.cz/git-gui: (46 commits) git-gui: Changed blame header bar background to match main window git-gui: Favor the original annotations over the recent ones git-gui: Improve our labeling of blame annotation types git-gui: Use three colors for the blame viewer background git-gui: Jump to original line in blame viewer git-gui: Display both commits in our tooltips git-gui: Run blame twice on the same file and display both outputs git-gui: Display the "Loading annotation..." message in italic git-gui: Rename fields in blame viewer to better descriptions git-gui: Label the uncommitted blame history entry git-gui: Switch internal blame structure to Tcl lists git-gui: Cleanup redundant column management in blame viewer git-gui: Better document our blame variables git-gui: Remove unused commit_list from blame viewer git-gui: Automatically expand the line number column as needed git-gui: Make the line number column slightly wider in blame git-gui: Use lighter colors in blame view git-gui: Remove unnecessary space between columns in blame viewer git-gui: Remove the loaded column from the blame viewer git-gui: Clip the commit summaries in the blame history menu ...
This commit is contained in:
Junio C Hamano
commit
c288a2f131
@ -20,6 +20,22 @@ You should have received a copy of the GNU General Public License
|
||||
along with this program; if not, write to the Free Software
|
||||
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA}
|
||||
|
||||
######################################################################
|
||||
##
|
||||
## Tcl/Tk sanity check
|
||||
|
||||
if {[catch {package require Tcl 8.4} err]
|
||||
|| [catch {package require Tk 8.4} err]
|
||||
} {
|
||||
catch {wm withdraw .}
|
||||
tk_messageBox \
|
||||
-icon error \
|
||||
-type ok \
|
||||
-title "git-gui: fatal error" \
|
||||
-message $err
|
||||
exit 1
|
||||
}
|
||||
|
||||
######################################################################
|
||||
##
|
||||
## configure our library
|
||||
@ -1008,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
|
||||
}
|
||||
|
||||
######################################################################
|
||||
@ -1200,12 +1217,14 @@ 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
|
||||
Radiobutton Text} {
|
||||
Radiobutton Spinbox Text} {
|
||||
option add *$class.font font_ui
|
||||
}
|
||||
unset class
|
||||
@ -1233,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
|
||||
}
|
||||
}
|
||||
|
||||
@ -1600,7 +1621,7 @@ unset browser doc_path doc_url
|
||||
|
||||
# -- Standard bindings
|
||||
#
|
||||
bind . <Destroy> do_quit
|
||||
bind . <Destroy> {if {{%W} eq {.}} do_quit}
|
||||
bind all <$M1B-Key-q> do_quit
|
||||
bind all <$M1B-Key-Q> do_quit
|
||||
bind all <$M1B-Key-w> {destroy [winfo toplevel %W]}
|
||||
@ -1715,7 +1736,7 @@ pack .vpane -anchor n -side top -fill both -expand 1
|
||||
#
|
||||
frame .vpane.files.index -height 100 -width 200
|
||||
label .vpane.files.index.title -text {Staged Changes (Will Be Committed)} \
|
||||
-background green
|
||||
-background lightgreen
|
||||
text $ui_index -background white -borderwidth 0 \
|
||||
-width 20 -height 10 \
|
||||
-wrap none \
|
||||
@ -1735,7 +1756,7 @@ pack $ui_index -side left -fill both -expand 1
|
||||
#
|
||||
frame .vpane.files.workdir -height 100 -width 200
|
||||
label .vpane.files.workdir.title -text {Unstaged Changes (Will Not Be Committed)} \
|
||||
-background red
|
||||
-background lightsalmon
|
||||
text $ui_workdir -background white -borderwidth 0 \
|
||||
-width 20 -height 10 \
|
||||
-wrap none \
|
||||
@ -1752,10 +1773,8 @@ pack $ui_workdir -side left -fill both -expand 1
|
||||
.vpane.files add .vpane.files.workdir -sticky nsew
|
||||
|
||||
foreach i [list $ui_index $ui_workdir] {
|
||||
$i tag conf in_diff -font font_uibold
|
||||
$i tag conf in_sel \
|
||||
-background [$i cget -foreground] \
|
||||
-foreground [$i cget -background]
|
||||
$i tag conf in_diff -background lightgray
|
||||
$i tag conf in_sel -background lightgray
|
||||
}
|
||||
unset i
|
||||
|
||||
@ -1913,18 +1932,18 @@ proc trace_current_diff_path {varname args} {
|
||||
}
|
||||
trace add variable current_diff_path write trace_current_diff_path
|
||||
|
||||
frame .vpane.lower.diff.header -background orange
|
||||
frame .vpane.lower.diff.header -background gold
|
||||
label .vpane.lower.diff.header.status \
|
||||
-background orange \
|
||||
-background gold \
|
||||
-width $max_status_desc \
|
||||
-anchor w \
|
||||
-justify left
|
||||
label .vpane.lower.diff.header.file \
|
||||
-background orange \
|
||||
-background gold \
|
||||
-anchor w \
|
||||
-justify left
|
||||
label .vpane.lower.diff.header.path \
|
||||
-background orange \
|
||||
-background gold \
|
||||
-anchor w \
|
||||
-justify left
|
||||
pack .vpane.lower.diff.header.status -side left
|
||||
@ -2038,17 +2057,17 @@ lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
|
||||
$ctxm add separator
|
||||
$ctxm add command \
|
||||
-label {Show Less Context} \
|
||||
-command {if {$repo_config(gui.diffcontext) >= 2} {
|
||||
-command {if {$repo_config(gui.diffcontext) >= 1} {
|
||||
incr repo_config(gui.diffcontext) -1
|
||||
reshow_diff
|
||||
}}
|
||||
lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
|
||||
$ctxm add command \
|
||||
-label {Show More Context} \
|
||||
-command {
|
||||
-command {if {$repo_config(gui.diffcontext) < 99} {
|
||||
incr repo_config(gui.diffcontext)
|
||||
reshow_diff
|
||||
}
|
||||
}}
|
||||
lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
|
||||
$ctxm add separator
|
||||
$ctxm add command -label {Options...} \
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -201,12 +201,14 @@ proc do_create_branch {} {
|
||||
pack $w.desc -anchor nw -fill x -pady 5 -padx 5
|
||||
|
||||
labelframe $w.from -text {Starting Revision}
|
||||
radiobutton $w.from.head_r \
|
||||
-text {Local Branch:} \
|
||||
-value head \
|
||||
-variable create_branch_revtype
|
||||
eval tk_optionMenu $w.from.head_m create_branch_head $all_heads
|
||||
grid $w.from.head_r $w.from.head_m -sticky w
|
||||
if {$all_heads ne {}} {
|
||||
radiobutton $w.from.head_r \
|
||||
-text {Local Branch:} \
|
||||
-value head \
|
||||
-variable create_branch_revtype
|
||||
eval tk_optionMenu $w.from.head_m create_branch_head $all_heads
|
||||
grid $w.from.head_r $w.from.head_m -sticky w
|
||||
}
|
||||
set all_trackings [all_tracking_branches]
|
||||
if {$all_trackings ne {}} {
|
||||
set create_branch_trackinghead [lindex $all_trackings 0]
|
||||
|
||||
@ -145,7 +145,7 @@ proc show_diff {path w {lno {}}} {
|
||||
|
||||
lappend cmd -p
|
||||
lappend cmd --no-color
|
||||
if {$repo_config(gui.diffcontext) > 0} {
|
||||
if {$repo_config(gui.diffcontext) >= 0} {
|
||||
lappend cmd "-U$repo_config(gui.diffcontext)"
|
||||
}
|
||||
if {$w eq $ui_index} {
|
||||
|
||||
@ -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)
|
||||
@ -173,7 +176,7 @@ proc do_options {} {
|
||||
{i-1..5 merge.verbosity {Merge Verbosity}}
|
||||
|
||||
{b gui.trustmtime {Trust File Modification Timestamps}}
|
||||
{i-1..99 gui.diffcontext {Number of Diff Context Lines}}
|
||||
{i-0..99 gui.diffcontext {Number of Diff Context Lines}}
|
||||
{t gui.newbranchtemplate {New Branch Name Template}}
|
||||
} {
|
||||
set type [lindex $option 0]
|
||||
|
||||
Loading…
Reference in New Issue
Block a user