kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

gitk: Default to the system colours on Windows 

Also convert a button to use the themed widget set.

Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
Signed-off-by: Paul Mackerras <paulus@samba.org>
main
Pat Thoyts 2009-11-06 23:28:01 +00:00 committed by Paul Mackerras
parent 7a0ebbf829
commit 1924d1bc0d
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
gitk
View File

@ -10732,7 +10732,7 @@ proc doprefs {} {
${NS}::label $top.cdisp -text [mc "Colors: press to choose"] ${NS}::label $top.cdisp -text [mc "Colors: press to choose"]
grid $top.cdisp - -sticky w -pady 10 grid $top.cdisp - -sticky w -pady 10
label $top.ui -padx 40 -relief sunk -background $uicolor label $top.ui -padx 40 -relief sunk -background $uicolor
button $top.uibut -text [mc "Interface"] -font optionfont \ ${NS}::button $top.uibut -text [mc "Interface"] \
-command [list choosecolor uicolor {} $top.ui [mc "interface"] setui] -command [list choosecolor uicolor {} $top.ui [mc "interface"] setui]
grid x $top.uibut $top.ui -sticky w grid x $top.uibut $top.ui -sticky w
label $top.bg -padx 40 -relief sunk -background $bgcolor label $top.bg -padx 40 -relief sunk -background $bgcolor
@ -11350,13 +11350,20 @@ if {[tk windowingsystem] eq "aqua"} {
} }


set colors {green red blue magenta darkgrey brown orange} set colors {green red blue magenta darkgrey brown orange}
set uicolor grey85 if {[tk windowingsystem] eq "win32"} {
set bgcolor white set uicolor SystemButtonFace
set fgcolor black set bgcolor SystemWindow
set fgcolor SystemButtonText
set selectbgcolor SystemHighlight
} else {
set uicolor grey85
set bgcolor white
set fgcolor black
set selectbgcolor gray85
}
set diffcolors {red "#00a000" blue} set diffcolors {red "#00a000" blue}
set diffcontext 3 set diffcontext 3
set ignorespace 0 set ignorespace 0
set selectbgcolor gray85
set markbgcolor "#e0e0ff" set markbgcolor "#e0e0ff"


set circlecolors {white blue gray blue blue} set circlecolors {white blue gray blue blue}