@matheusbsbs / matheus-bagliano / commits / 3cf0bad830
Fork 0

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

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>

Eygene Ryabinkin committed Mar 27, 2007 at 14:29 UTC 3cf0bad830c93176acc6e6436da42e1936bb2282
1 file changed +45 -19
git-gui.sh
+45 -19
@@ -242,6 +242,8 @@ proc error_popup {msg} {
242 if {[reponame] ne {}} {
243 append title " ([reponame])"
244 }
245 + option add *Dialog.msg.font font_ui
246 + option add *Button.font font_ui
247 set cmd [list tk_messageBox \
248 -icon error \
249 -type ok \
@@ -258,6 +260,8 @@ proc warn_popup {msg} {
260 if {[reponame] ne {}} {
261 append title " ([reponame])"
262 }
263 + option add *Dialog.msg.font font_ui
264 + option add *Button.font font_ui
265 set cmd [list tk_messageBox \
266 -icon warning \
267 -type ok \
@@ -274,6 +278,8 @@ proc info_popup {msg {parent .}} {
278 if {[reponame] ne {}} {
279 append title " ([reponame])"
280 }
281 + option add *Dialog.msg.font font_ui
282 + option add *Button.font font_ui
283 tk_messageBox \
284 -parent $parent \
285 -icon info \
@@ -287,6 +293,8 @@ proc ask_popup {msg} {
293 if {[reponame] ne {}} {
294 append title " ([reponame])"
295 }
296 + option add *Dialog.msg.font font_ui
297 + option add *Button.font font_ui
298 return [tk_messageBox \
299 -parent . \
300 -icon question \
@@ -2116,7 +2124,10 @@ proc do_create_branch {} {
2124 -value head \
2125 -variable create_branch_revtype \
2126 -font font_ui
2119 - eval tk_optionMenu $w.from.head_m create_branch_head $all_heads
2127 + set lbranchm [eval tk_optionMenu $w.from.head_m create_branch_head \
2128 + $all_heads]
2129 + $lbranchm configure -font font_ui
2130 + $w.from.head_m configure -font font_ui
2131 grid $w.from.head_r $w.from.head_m -sticky w
2132 set all_trackings [all_tracking_branches]
2133 if {$all_trackings ne {}} {
@@ -2126,9 +2137,11 @@ proc do_create_branch {} {
2137 -value tracking \
2138 -variable create_branch_revtype \
2139 -font font_ui
2129 - eval tk_optionMenu $w.from.tracking_m \
2140 + set tbranchm [eval tk_optionMenu $w.from.tracking_m \
2141 create_branch_trackinghead \
2131 - $all_trackings
2142 + $all_trackings]
2143 + $tbranchm configure -font font_ui
2144 + $w.from.tracking_m configure -font font_ui
2145 grid $w.from.tracking_r $w.from.tracking_m -sticky w
2146 }
2147 set all_tags [load_all_tags]
@@ -2139,9 +2152,11 @@ proc do_create_branch {} {
2152 -value tag \
2153 -variable create_branch_revtype \
2154 -font font_ui
2142 - eval tk_optionMenu $w.from.tag_m \
2155 + set tagsm [eval tk_optionMenu $w.from.tag_m \
2156 create_branch_tag \
2144 - $all_tags
2157 + $all_tags]
2158 + $tagsm configure -font font_ui
2159 + $w.from.tag_m configure -font font_ui
2160 grid $w.from.tag_r $w.from.tag_m -sticky w
2161 }
2162 radiobutton $w.from.exp_r \
@@ -2335,7 +2350,11 @@ proc do_delete_branch {} {
2350 -value head \
2351 -variable delete_branch_checktype \
2352 -font font_ui
2338 - eval tk_optionMenu $w.validate.head_m delete_branch_head $all_heads
2353 + set mergedlocalm [eval tk_optionMenu $w.validate.head_m \
2354 + delete_branch_head \
2355 + $all_heads]
2356 + $mergedlocalm configure -font font_ui
2357 + $w.validate.head_m configure -font font_ui
2358 grid $w.validate.head_r $w.validate.head_m -sticky w
2359 set all_trackings [all_tracking_branches]
2360 if {$all_trackings ne {}} {
@@ -2345,9 +2364,11 @@ proc do_delete_branch {} {
2364 -value tracking \
2365 -variable delete_branch_checktype \
2366 -font font_ui
2348 - eval tk_optionMenu $w.validate.tracking_m \
2367 + set mergedtrackm [eval tk_optionMenu $w.validate.tracking_m \
2368 delete_branch_trackinghead \
2350 - $all_trackings
2369 + $all_trackings]
2370 + $mergedtrackm configure -font font_ui
2371 + $w.validate.tracking_m configure -font font_ui
2372 grid $w.validate.tracking_r $w.validate.tracking_m -sticky w
2373 }
2374 radiobutton $w.validate.always_r \
@@ -2721,7 +2742,10 @@ proc do_push_anywhere {} {
2742 -value remote \
2743 -variable push_urltype \
2744 -font font_ui
2724 - eval tk_optionMenu $w.dest.remote_m push_remote $all_remotes
2745 + set remmenu [eval tk_optionMenu $w.dest.remote_m push_remote \
2746 + $all_remotes]
2747 + $remmenu configure -font font_ui
2748 + $w.dest.remote_m configure -font font_ui
2749 grid $w.dest.remote_r $w.dest.remote_m -sticky w
2750 if {[lsearch -sorted -exact $all_remotes origin] != -1} {
2751 set push_remote origin
@@ -4686,9 +4710,11 @@ proc do_options {} {
4710 frame $w.global.$name
4711 label $w.global.$name.l -text "$text:" -font font_ui
4712 pack $w.global.$name.l -side left -anchor w -fill x
4689 - eval tk_optionMenu $w.global.$name.family \
4713 + set fontmenu [eval tk_optionMenu $w.global.$name.family \
4714 global_config_new(gui.$font^^family) \
4691 - $all_fonts
4715 + $all_fonts]
4716 + $w.global.$name.family configure -font font_ui
4717 + $fontmenu configure -font font_ui
4718 spinbox $w.global.$name.size \
4719 -textvariable global_config_new(gui.$font^^size) \
4720 -from 2 -to 80 -increment 1 \
@@ -5083,18 +5109,18 @@ set ui_comm {}
5109 # -- Menu Bar
5110 #
5111 menu .mbar -tearoff 0
5086 -.mbar add cascade -label Repository -menu .mbar.repository
5087 -.mbar add cascade -label Edit -menu .mbar.edit
5112 +.mbar add cascade -label Repository -menu .mbar.repository -font font_ui
5113 +.mbar add cascade -label Edit -menu .mbar.edit -font font_ui
5114 if {[is_enabled branch]} {
5089 - .mbar add cascade -label Branch -menu .mbar.branch
5115 + .mbar add cascade -label Branch -menu .mbar.branch -font font_ui
5116 }
5117 if {[is_enabled multicommit] || [is_enabled singlecommit]} {
5092 - .mbar add cascade -label Commit -menu .mbar.commit
5118 + .mbar add cascade -label Commit -menu .mbar.commit -font font_ui
5119 }
5120 if {[is_enabled transport]} {
5095 - .mbar add cascade -label Merge -menu .mbar.merge
5096 - .mbar add cascade -label Fetch -menu .mbar.fetch
5097 - .mbar add cascade -label Push -menu .mbar.push
5121 + .mbar add cascade -label Merge -menu .mbar.merge -font font_ui
5122 + .mbar add cascade -label Fetch -menu .mbar.fetch -font font_ui
5123 + .mbar add cascade -label Push -menu .mbar.push -font font_ui
5124 }
5125 . configure -menu .mbar
5126
@@ -5370,7 +5396,7 @@ if {[is_MacOSX]} {
5396
5397 # -- Help Menu
5398 #
5373 -.mbar add cascade -label Help -menu .mbar.help
5399 +.mbar add cascade -label Help -menu .mbar.help -font font_ui
5400 menu .mbar.help
5401
5402 if {![is_MacOSX]} {