git-gui: use themed tk widgets with Tk 8.5
This patch enables the use of themed Tk widgets with Tk 8.5 and above. These make a significant difference on Windows in making the application appear native. On Windows and MacOSX ttk defaults to the native look as much as possible. On X11 the user may select a theme using the TkTheme XRDB resource class by adding an line to the .Xresources file. The set of installed theme names is available using the Tk command 'ttk::themes'. The default on X11 is similar to the current un-themed style - a kind of thin bordered motif look. A new git config variable 'gui.usettk' may be set to disable this if the user prefers the classic Tk look. Using Tk 8.4 will also avoid the use of themed widgets as these are only available since 8.5. Some support is included for Tk 8.6 features (themed spinbox and native font chooser for MacOSX and Windows). Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
This commit is contained in:

committed by
Shawn O. Pearce

parent
ab2d3b0d7d
commit
c80d7be5e1
@ -71,11 +71,13 @@ proc ask_popup {msg} {
|
||||
}
|
||||
|
||||
proc hook_failed_popup {hook msg {is_fatal 1}} {
|
||||
global use_ttk NS
|
||||
set w .hookfail
|
||||
toplevel $w
|
||||
Dialog $w
|
||||
wm withdraw $w
|
||||
|
||||
frame $w.m
|
||||
label $w.m.l1 -text "$hook hook failed:" \
|
||||
${NS}::frame $w.m
|
||||
${NS}::label $w.m.l1 -text "$hook hook failed:" \
|
||||
-anchor w \
|
||||
-justify left \
|
||||
-font font_uibold
|
||||
@ -87,10 +89,10 @@ proc hook_failed_popup {hook msg {is_fatal 1}} {
|
||||
-width 80 -height 10 \
|
||||
-font font_diff \
|
||||
-yscrollcommand [list $w.m.sby set]
|
||||
scrollbar $w.m.sby -command [list $w.m.t yview]
|
||||
${NS}::scrollbar $w.m.sby -command [list $w.m.t yview]
|
||||
pack $w.m.l1 -side top -fill x
|
||||
if {$is_fatal} {
|
||||
label $w.m.l2 \
|
||||
${NS}::label $w.m.l2 \
|
||||
-text [mc "You must correct the above errors before committing."] \
|
||||
-anchor w \
|
||||
-justify left \
|
||||
@ -104,7 +106,7 @@ proc hook_failed_popup {hook msg {is_fatal 1}} {
|
||||
$w.m.t insert 1.0 $msg
|
||||
$w.m.t conf -state disabled
|
||||
|
||||
button $w.ok -text OK \
|
||||
${NS}::button $w.ok -text OK \
|
||||
-width 15 \
|
||||
-command "destroy $w"
|
||||
pack $w.ok -side bottom -anchor e -pady 10 -padx 10
|
||||
@ -112,5 +114,6 @@ proc hook_failed_popup {hook msg {is_fatal 1}} {
|
||||
bind $w <Visibility> "grab $w; focus $w"
|
||||
bind $w <Key-Return> "destroy $w"
|
||||
wm title $w [strcat "[appname] ([reponame]): " [mc "error"]]
|
||||
wm deiconify $w
|
||||
tkwait window $w
|
||||
}
|
||||
|
Reference in New Issue
Block a user