mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Teach git-gui to use the user-defined UI font everywhere.

Browse Source 
Some parts of git-gui were not respecting the default GUI font.
Most of them were catched and fixed.

Signed-off-by: Eygene Ryabinkin <rea-git@codelabs.ru>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
This commit is contained in:
Eygene Ryabinkin
2007-03-27 14:29:08 +04:00
committed by Shawn O. Pearce
parent e2a1bc67d3
commit 3cf0bad830
1 changed files with 45 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
git-gui.sh
View File

@ -242,6 +242,8 @@ proc error_popup {msg} {
if {[reponame] ne {}} { if {[reponame] ne {}} {
append title " ([reponame])" append title " ([reponame])"
} }
option add *Dialog.msg.font font_ui
option add *Button.font font_ui
set cmd [list tk_messageBox \ set cmd [list tk_messageBox \
-icon error \ -icon error \
-type ok \ -type ok \
@ -258,6 +260,8 @@ proc warn_popup {msg} {
if {[reponame] ne {}} { if {[reponame] ne {}} {
append title " ([reponame])" append title " ([reponame])"
} }
option add *Dialog.msg.font font_ui
option add *Button.font font_ui
set cmd [list tk_messageBox \ set cmd [list tk_messageBox \
-icon warning \ -icon warning \
-type ok \ -type ok \
@ -274,6 +278,8 @@ proc info_popup {msg {parent .}} {
if {[reponame] ne {}} { if {[reponame] ne {}} {
append title " ([reponame])" append title " ([reponame])"
} }
option add *Dialog.msg.font font_ui
option add *Button.font font_ui
tk_messageBox \ tk_messageBox \
-parent $parent \ -parent $parent \
-icon info \ -icon info \
@ -287,6 +293,8 @@ proc ask_popup {msg} {
if {[reponame] ne {}} { if {[reponame] ne {}} {
append title " ([reponame])" append title " ([reponame])"
} }
option add *Dialog.msg.font font_ui
option add *Button.font font_ui
return [tk_messageBox \ return [tk_messageBox \
-parent . \ -parent . \
-icon question \ -icon question \
@ -2116,7 +2124,10 @@ proc do_create_branch {} {
-value head \ -value head \
-variable create_branch_revtype \ -variable create_branch_revtype \
-font font_ui -font font_ui
eval tk_optionMenu $w.from.head_m create_branch_head $all_heads set lbranchm [eval tk_optionMenu $w.from.head_m create_branch_head \
$all_heads]
$lbranchm configure -font font_ui
$w.from.head_m configure -font font_ui
grid $w.from.head_r $w.from.head_m -sticky w grid $w.from.head_r $w.from.head_m -sticky w
set all_trackings [all_tracking_branches] set all_trackings [all_tracking_branches]
if {$all_trackings ne {}} { if {$all_trackings ne {}} {
@ -2126,9 +2137,11 @@ proc do_create_branch {} {
-value tracking \ -value tracking \
-variable create_branch_revtype \ -variable create_branch_revtype \
-font font_ui -font font_ui
eval tk_optionMenu $w.from.tracking_m \ set tbranchm [eval tk_optionMenu $w.from.tracking_m \
create_branch_trackinghead \ create_branch_trackinghead \
$all_trackings $all_trackings]
$tbranchm configure -font font_ui
$w.from.tracking_m configure -font font_ui
grid $w.from.tracking_r $w.from.tracking_m -sticky w grid $w.from.tracking_r $w.from.tracking_m -sticky w
} }
set all_tags [load_all_tags] set all_tags [load_all_tags]
@ -2139,9 +2152,11 @@ proc do_create_branch {} {
-value tag \ -value tag \
-variable create_branch_revtype \ -variable create_branch_revtype \
-font font_ui -font font_ui
eval tk_optionMenu $w.from.tag_m \ set tagsm [eval tk_optionMenu $w.from.tag_m \
create_branch_tag \ create_branch_tag \
$all_tags $all_tags]
$tagsm configure -font font_ui
$w.from.tag_m configure -font font_ui
grid $w.from.tag_r $w.from.tag_m -sticky w grid $w.from.tag_r $w.from.tag_m -sticky w
} }
radiobutton $w.from.exp_r \ radiobutton $w.from.exp_r \
@ -2335,7 +2350,11 @@ proc do_delete_branch {} {
-value head \ -value head \
-variable delete_branch_checktype \ -variable delete_branch_checktype \
-font font_ui -font font_ui
eval tk_optionMenu $w.validate.head_m delete_branch_head $all_heads set mergedlocalm [eval tk_optionMenu $w.validate.head_m \
delete_branch_head \
$all_heads]
$mergedlocalm configure -font font_ui
$w.validate.head_m configure -font font_ui
grid $w.validate.head_r $w.validate.head_m -sticky w grid $w.validate.head_r $w.validate.head_m -sticky w
set all_trackings [all_tracking_branches] set all_trackings [all_tracking_branches]
if {$all_trackings ne {}} { if {$all_trackings ne {}} {
@ -2345,9 +2364,11 @@ proc do_delete_branch {} {
-value tracking \ -value tracking \
-variable delete_branch_checktype \ -variable delete_branch_checktype \
-font font_ui -font font_ui
eval tk_optionMenu $w.validate.tracking_m \ set mergedtrackm [eval tk_optionMenu $w.validate.tracking_m \
delete_branch_trackinghead \ delete_branch_trackinghead \
$all_trackings $all_trackings]
$mergedtrackm configure -font font_ui
$w.validate.tracking_m configure -font font_ui
grid $w.validate.tracking_r $w.validate.tracking_m -sticky w grid $w.validate.tracking_r $w.validate.tracking_m -sticky w
} }
radiobutton $w.validate.always_r \ radiobutton $w.validate.always_r \
@ -2721,7 +2742,10 @@ proc do_push_anywhere {} {
-value remote \ -value remote \
-variable push_urltype \ -variable push_urltype \
-font font_ui -font font_ui
eval tk_optionMenu $w.dest.remote_m push_remote $all_remotes set remmenu [eval tk_optionMenu $w.dest.remote_m push_remote \
$all_remotes]
$remmenu configure -font font_ui
$w.dest.remote_m configure -font font_ui
grid $w.dest.remote_r $w.dest.remote_m -sticky w grid $w.dest.remote_r $w.dest.remote_m -sticky w
if {[lsearch -sorted -exact $all_remotes origin] != -1} { if {[lsearch -sorted -exact $all_remotes origin] != -1} {
set push_remote origin set push_remote origin
@ -4686,9 +4710,11 @@ proc do_options {} {
frame $w.global.$name frame $w.global.$name
label $w.global.$name.l -text "$text:" -font font_ui label $w.global.$name.l -text "$text:" -font font_ui
pack $w.global.$name.l -side left -anchor w -fill x pack $w.global.$name.l -side left -anchor w -fill x
eval tk_optionMenu $w.global.$name.family \ set fontmenu [eval tk_optionMenu $w.global.$name.family \
global_config_new(gui.$font^^family) \ global_config_new(gui.$font^^family) \
$all_fonts $all_fonts]
$w.global.$name.family configure -font font_ui
$fontmenu configure -font font_ui
spinbox $w.global.$name.size \ spinbox $w.global.$name.size \
-textvariable global_config_new(gui.$font^^size) \ -textvariable global_config_new(gui.$font^^size) \
-from 2 -to 80 -increment 1 \ -from 2 -to 80 -increment 1 \
@ -5083,18 +5109,18 @@ set ui_comm {}
# -- Menu Bar # -- Menu Bar
# #
menu .mbar -tearoff 0 menu .mbar -tearoff 0
.mbar add cascade -label Repository -menu .mbar.repository .mbar add cascade -label Repository -menu .mbar.repository -font font_ui
.mbar add cascade -label Edit -menu .mbar.edit .mbar add cascade -label Edit -menu .mbar.edit -font font_ui
if {[is_enabled branch]} { if {[is_enabled branch]} {
.mbar add cascade -label Branch -menu .mbar.branch .mbar add cascade -label Branch -menu .mbar.branch -font font_ui
} }
if {[is_enabled multicommit] || [is_enabled singlecommit]} { if {[is_enabled multicommit] || [is_enabled singlecommit]} {
.mbar add cascade -label Commit -menu .mbar.commit .mbar add cascade -label Commit -menu .mbar.commit -font font_ui
} }
if {[is_enabled transport]} { if {[is_enabled transport]} {
.mbar add cascade -label Merge -menu .mbar.merge .mbar add cascade -label Merge -menu .mbar.merge -font font_ui
.mbar add cascade -label Fetch -menu .mbar.fetch .mbar add cascade -label Fetch -menu .mbar.fetch -font font_ui
.mbar add cascade -label Push -menu .mbar.push .mbar add cascade -label Push -menu .mbar.push -font font_ui
} }
. configure -menu .mbar . configure -menu .mbar
@ -5370,7 +5396,7 @@ if {[is_MacOSX]} {
# -- Help Menu # -- Help Menu
# #
.mbar add cascade -label Help -menu .mbar.help .mbar add cascade -label Help -menu .mbar.help -font font_ui
menu .mbar.help menu .mbar.help
if {![is_MacOSX]} { if {![is_MacOSX]} {