mirror of
https://github.com/git/git.git
synced 2026-01-23 07:17:18 +09:00
Merge branch 'ml/abandon-old-version'
* ml/abandon-old-version: gitk: restore ui colors after cancelling config dialog gitk: set config dialog color swatches in one place Signed-off-by: Johannes Sixt <j6t@kdbg.org>
This commit is contained in:
Johannes Sixt
commit
e51b17efec
73
gitk
73
gitk
@ -11720,57 +11720,63 @@ proc prefspage_colors {notebook} {
|
||||
grid $page.cdisp - -sticky w -pady 10
|
||||
label $page.ui -padx 40 -relief sunk -background $uicolor
|
||||
ttk::button $page.uibut -text [mc "Interface"] \
|
||||
-command [list choosecolor uicolor {} $page.ui [mc "interface"] setui]
|
||||
-command [list choosecolor uicolor {} $page [mc "interface"]]
|
||||
grid x $page.uibut $page.ui -sticky w
|
||||
label $page.bg -padx 40 -relief sunk -background $bgcolor
|
||||
ttk::button $page.bgbut -text [mc "Background"] \
|
||||
-command [list choosecolor bgcolor {} $page.bg [mc "background"] setbg]
|
||||
-command [list choosecolor bgcolor {} $page [mc "background"]]
|
||||
grid x $page.bgbut $page.bg -sticky w
|
||||
label $page.fg -padx 40 -relief sunk -background $fgcolor
|
||||
ttk::button $page.fgbut -text [mc "Foreground"] \
|
||||
-command [list choosecolor fgcolor {} $page.fg [mc "foreground"] setfg]
|
||||
-command [list choosecolor fgcolor {} $page [mc "foreground"]]
|
||||
grid x $page.fgbut $page.fg -sticky w
|
||||
label $page.diffold -padx 40 -relief sunk -background [lindex $diffcolors 0]
|
||||
ttk::button $page.diffoldbut -text [mc "Diff: old lines"] \
|
||||
-command [list choosecolor diffcolors 0 $page.diffold [mc "diff old lines"] \
|
||||
[list $ctext tag conf d0 -foreground]]
|
||||
-command [list choosecolor diffcolors 0 $page [mc "diff old lines"]]
|
||||
grid x $page.diffoldbut $page.diffold -sticky w
|
||||
label $page.diffoldbg -padx 40 -relief sunk -background [lindex $diffbgcolors 0]
|
||||
ttk::button $page.diffoldbgbut -text [mc "Diff: old lines bg"] \
|
||||
-command [list choosecolor diffbgcolors 0 $page.diffoldbg \
|
||||
[mc "diff old lines bg"] \
|
||||
[list $ctext tag conf d0 -background]]
|
||||
-command [list choosecolor diffbgcolors 0 $page [mc "diff old lines bg"]]
|
||||
grid x $page.diffoldbgbut $page.diffoldbg -sticky w
|
||||
label $page.diffnew -padx 40 -relief sunk -background [lindex $diffcolors 1]
|
||||
ttk::button $page.diffnewbut -text [mc "Diff: new lines"] \
|
||||
-command [list choosecolor diffcolors 1 $page.diffnew [mc "diff new lines"] \
|
||||
[list $ctext tag conf dresult -foreground]]
|
||||
-command [list choosecolor diffcolors 1 $page [mc "diff new lines"]]
|
||||
grid x $page.diffnewbut $page.diffnew -sticky w
|
||||
label $page.diffnewbg -padx 40 -relief sunk -background [lindex $diffbgcolors 1]
|
||||
ttk::button $page.diffnewbgbut -text [mc "Diff: new lines bg"] \
|
||||
-command [list choosecolor diffbgcolors 1 $page.diffnewbg \
|
||||
[mc "diff new lines bg"] \
|
||||
[list $ctext tag conf dresult -background]]
|
||||
-command [list choosecolor diffbgcolors 1 $page [mc "diff new lines bg"]]
|
||||
grid x $page.diffnewbgbut $page.diffnewbg -sticky w
|
||||
label $page.hunksep -padx 40 -relief sunk -background [lindex $diffcolors 2]
|
||||
ttk::button $page.hunksepbut -text [mc "Diff: hunk header"] \
|
||||
-command [list choosecolor diffcolors 2 $page.hunksep \
|
||||
[mc "diff hunk header"] \
|
||||
[list $ctext tag conf hunksep -foreground]]
|
||||
-command [list choosecolor diffcolors 2 $page [mc "diff hunk header"]]
|
||||
grid x $page.hunksepbut $page.hunksep -sticky w
|
||||
label $page.markbgsep -padx 40 -relief sunk -background $markbgcolor
|
||||
ttk::button $page.markbgbut -text [mc "Marked line bg"] \
|
||||
-command [list choosecolor markbgcolor {} $page.markbgsep \
|
||||
[mc "marked line background"] \
|
||||
[list $ctext tag conf omark -background]]
|
||||
-command [list choosecolor markbgcolor {} $page [mc "marked line background"]]
|
||||
grid x $page.markbgbut $page.markbgsep -sticky w
|
||||
label $page.selbgsep -padx 40 -relief sunk -background $selectbgcolor
|
||||
ttk::button $page.selbgbut -text [mc "Select bg"] \
|
||||
-command [list choosecolor selectbgcolor {} $page.selbgsep [mc "background"] setselbg]
|
||||
-command [list choosecolor selectbgcolor {} $page [mc "background"]]
|
||||
grid x $page.selbgbut $page.selbgsep -sticky w
|
||||
return $page
|
||||
}
|
||||
|
||||
proc prefspage_set_colorswatches {page} {
|
||||
global uicolor bgcolor fgcolor ctext diffcolors selectbgcolor markbgcolor
|
||||
global diffbgcolors
|
||||
|
||||
$page.ui configure -background $uicolor
|
||||
$page.bg configure -background $bgcolor
|
||||
$page.fg configure -background $fgcolor
|
||||
$page.diffold configure -background [lindex $diffcolors 0]
|
||||
$page.diffoldbg configure -background [lindex $diffbgcolors 0]
|
||||
$page.diffnew configure -background [lindex $diffcolors 1]
|
||||
$page.diffnewbg configure -background [lindex $diffbgcolors 1]
|
||||
$page.hunksep configure -background [lindex $diffcolors 2]
|
||||
$page.markbgsep configure -background $markbgcolor
|
||||
$page.selbgsep configure -background $selectbgcolor
|
||||
}
|
||||
|
||||
proc prefspage_fonts {notebook} {
|
||||
set page [create_prefs_page $notebook.fonts]
|
||||
ttk::label $page.cfont -text [mc "Fonts: press to choose"] -font mainfontbold
|
||||
@ -11838,15 +11844,15 @@ proc choose_extdiff {} {
|
||||
}
|
||||
}
|
||||
|
||||
proc choosecolor {v vi w x cmd} {
|
||||
proc choosecolor {v vi prefspage x} {
|
||||
global $v
|
||||
|
||||
set c [tk_chooseColor -initialcolor [lindex [set $v] $vi] \
|
||||
-title [mc "Gitk: choose color for %s" $x]]
|
||||
if {$c eq {}} return
|
||||
$w conf -background $c
|
||||
lset $v $vi $c
|
||||
eval $cmd $c
|
||||
set_gui_colors
|
||||
prefspage_set_colorswatches $prefspage
|
||||
}
|
||||
|
||||
proc setselbg {c} {
|
||||
@ -11899,6 +11905,22 @@ proc setfg {c} {
|
||||
$canv itemconf markid -outline $c
|
||||
}
|
||||
|
||||
proc set_gui_colors {} {
|
||||
global uicolor bgcolor fgcolor ctext diffcolors selectbgcolor markbgcolor
|
||||
global diffbgcolors
|
||||
|
||||
setui $uicolor
|
||||
setbg $bgcolor
|
||||
setfg $fgcolor
|
||||
$ctext tag conf d0 -foreground [lindex $diffcolors 0]
|
||||
$ctext tag conf d0 -background [lindex $diffbgcolors 0]
|
||||
$ctext tag conf dresult -foreground [lindex $diffcolors 1]
|
||||
$ctext tag conf dresult -background [lindex $diffbgcolors 1]
|
||||
$ctext tag conf hunksep -foreground [lindex $diffcolors 2]
|
||||
$ctext tag conf omark -background $markbgcolor
|
||||
setselbg $selectbgcolor
|
||||
}
|
||||
|
||||
proc prefscan {} {
|
||||
global oldprefs prefstop
|
||||
global {*}$::config_variables
|
||||
@ -11909,6 +11931,7 @@ proc prefscan {} {
|
||||
catch {destroy $prefstop}
|
||||
unset prefstop
|
||||
fontcan
|
||||
set_gui_colors
|
||||
}
|
||||
|
||||
proc prefsok {} {
|
||||
@ -12624,8 +12647,6 @@ eval font create textfontbold [fontflags textfont 1]
|
||||
parsefont uifont $uifont
|
||||
eval font create uifont [fontflags uifont]
|
||||
|
||||
setui $uicolor
|
||||
|
||||
setoptions
|
||||
|
||||
# check that we can find a .git directory somewhere...
|
||||
@ -12814,6 +12835,8 @@ if {[tk windowingsystem] eq "win32"} {
|
||||
focus -force .
|
||||
}
|
||||
|
||||
set_gui_colors
|
||||
|
||||
getcommits {}
|
||||
|
||||
# Local variables:
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user