{"thread":{"id":"7424","subject":"[PATCH 1/4] Teach git-gui to use the user-defined UI font everywhere.","startedAt":"2007-03-27T10:29:09Z","lastAt":"2007-03-27T10:29:09Z","messageCount":1,"participants":["Eygene Ryabinkin"],"isPatch":true,"patchVersion":1,"patchTotal":4},"messages":[{"id":"38128","messageId":"20070327102908.GO14837@codelabs.ru","threadId":"7424","inReplyTo":null,"subject":"[PATCH 1/4] Teach git-gui to use the user-defined UI font everywhere.","fromName":"Eygene Ryabinkin","fromEmail":"rea-git@codelabs.ru","sentAt":"2007-03-27T10:29:09Z","receivedAt":"2007-03-27T10:29:09Z","isPatch":true,"sender":{"key":"rea-git@codelabs.ru","avatar":null},"body":"Some parts of git-gui were not respecting the default GUI font.\nMost of them were catched and fixed.\n\nSigned-off-by: Eygene Ryabinkin <rea-git@codelabs.ru>\n---\n git-gui/git-gui.sh |   64 ++++++++++++++++++++++++++++++++++++---------------\n 1 files changed, 45 insertions(+), 19 deletions(-)\n\ndiff --git a/git-gui/git-gui.sh b/git-gui/git-gui.sh\nindex 60e79ca..8157184 100755\n--- a/git-gui/git-gui.sh\n+++ b/git-gui/git-gui.sh\n@@ -242,6 +242,8 @@ proc error_popup {msg} {\n \tif {[reponame] ne {}} {\n \t\tappend title \" ([reponame])\"\n \t}\n+\toption add *Dialog.msg.font font_ui\n+\toption add *Button.font font_ui\n \tset cmd [list tk_messageBox \\\n \t\t-icon error \\\n \t\t-type ok \\\n@@ -258,6 +260,8 @@ proc warn_popup {msg} {\n \tif {[reponame] ne {}} {\n \t\tappend title \" ([reponame])\"\n \t}\n+\toption add *Dialog.msg.font font_ui\n+\toption add *Button.font font_ui\n \tset cmd [list tk_messageBox \\\n \t\t-icon warning \\\n \t\t-type ok \\\n@@ -274,6 +278,8 @@ proc info_popup {msg {parent .}} {\n \tif {[reponame] ne {}} {\n \t\tappend title \" ([reponame])\"\n \t}\n+\toption add *Dialog.msg.font font_ui\n+\toption add *Button.font font_ui\n \ttk_messageBox \\\n \t\t-parent $parent \\\n \t\t-icon info \\\n@@ -287,6 +293,8 @@ proc ask_popup {msg} {\n \tif {[reponame] ne {}} {\n \t\tappend title \" ([reponame])\"\n \t}\n+\toption add *Dialog.msg.font font_ui\n+\toption add *Button.font font_ui\n \treturn [tk_messageBox \\\n \t\t-parent . \\\n \t\t-icon question \\\n@@ -2116,7 +2124,10 @@ proc do_create_branch {} {\n \t\t-value head \\\n \t\t-variable create_branch_revtype \\\n \t\t-font font_ui\n-\teval tk_optionMenu $w.from.head_m create_branch_head $all_heads\n+\tset lbranchm [eval tk_optionMenu $w.from.head_m create_branch_head \\\n+\t\t$all_heads]\n+\t$lbranchm configure -font font_ui\n+\t$w.from.head_m configure -font font_ui\n \tgrid $w.from.head_r $w.from.head_m -sticky w\n \tset all_trackings [all_tracking_branches]\n \tif {$all_trackings ne {}} {\n@@ -2126,9 +2137,11 @@ proc do_create_branch {} {\n \t\t\t-value tracking \\\n \t\t\t-variable create_branch_revtype \\\n \t\t\t-font font_ui\n-\t\teval tk_optionMenu $w.from.tracking_m \\\n+\t\tset tbranchm [eval tk_optionMenu $w.from.tracking_m \\\n \t\t\tcreate_branch_trackinghead \\\n-\t\t\t$all_trackings\n+\t\t\t$all_trackings]\n+\t\t$tbranchm configure -font font_ui\n+\t\t$w.from.tracking_m configure -font font_ui\n \t\tgrid $w.from.tracking_r $w.from.tracking_m -sticky w\n \t}\n \tset all_tags [load_all_tags]\n@@ -2139,9 +2152,11 @@ proc do_create_branch {} {\n \t\t\t-value tag \\\n \t\t\t-variable create_branch_revtype \\\n \t\t\t-font font_ui\n-\t\teval tk_optionMenu $w.from.tag_m \\\n+\t\tset tagsm [eval tk_optionMenu $w.from.tag_m \\\n \t\t\tcreate_branch_tag \\\n-\t\t\t$all_tags\n+\t\t\t$all_tags]\n+\t\t$tagsm configure -font font_ui\n+\t\t$w.from.tag_m configure -font font_ui\n \t\tgrid $w.from.tag_r $w.from.tag_m -sticky w\n \t}\n \tradiobutton $w.from.exp_r \\\n@@ -2335,7 +2350,11 @@ proc do_delete_branch {} {\n \t\t-value head \\\n \t\t-variable delete_branch_checktype \\\n \t\t-font font_ui\n-\teval tk_optionMenu $w.validate.head_m delete_branch_head $all_heads\n+\tset mergedlocalm [eval tk_optionMenu $w.validate.head_m \\\n+\t\tdelete_branch_head \\\n+\t\t$all_heads]\n+\t$mergedlocalm configure -font font_ui\n+\t$w.validate.head_m configure -font font_ui\n \tgrid $w.validate.head_r $w.validate.head_m -sticky w\n \tset all_trackings [all_tracking_branches]\n \tif {$all_trackings ne {}} {\n@@ -2345,9 +2364,11 @@ proc do_delete_branch {} {\n \t\t\t-value tracking \\\n \t\t\t-variable delete_branch_checktype \\\n \t\t\t-font font_ui\n-\t\teval tk_optionMenu $w.validate.tracking_m \\\n+\t\tset mergedtrackm [eval tk_optionMenu $w.validate.tracking_m \\\n \t\t\tdelete_branch_trackinghead \\\n-\t\t\t$all_trackings\n+\t\t\t$all_trackings]\n+\t\t$mergedtrackm configure -font font_ui\n+\t\t$w.validate.tracking_m configure -font font_ui\n \t\tgrid $w.validate.tracking_r $w.validate.tracking_m -sticky w\n \t}\n \tradiobutton $w.validate.always_r \\\n@@ -2721,7 +2742,10 @@ proc do_push_anywhere {} {\n \t\t\t-value remote \\\n \t\t\t-variable push_urltype \\\n \t\t\t-font font_ui\n-\t\teval tk_optionMenu $w.dest.remote_m push_remote $all_remotes\n+\t\tset remmenu [eval tk_optionMenu $w.dest.remote_m push_remote \\\n+\t\t\t$all_remotes]\n+\t\t$remmenu configure -font font_ui\n+\t\t$w.dest.remote_m configure -font font_ui\n \t\tgrid $w.dest.remote_r $w.dest.remote_m -sticky w\n \t\tif {[lsearch -sorted -exact $all_remotes origin] != -1} {\n \t\t\tset push_remote origin\n@@ -4686,9 +4710,11 @@ proc do_options {} {\n \t\tframe $w.global.$name\n \t\tlabel $w.global.$name.l -text \"$text:\" -font font_ui\n \t\tpack $w.global.$name.l -side left -anchor w -fill x\n-\t\teval tk_optionMenu $w.global.$name.family \\\n+\t\tset fontmenu [eval tk_optionMenu $w.global.$name.family \\\n \t\t\tglobal_config_new(gui.$font^^family) \\\n-\t\t\t$all_fonts\n+\t\t\t$all_fonts]\n+\t\t$w.global.$name.family configure -font font_ui\n+\t\t$fontmenu configure -font font_ui\n \t\tspinbox $w.global.$name.size \\\n \t\t\t-textvariable global_config_new(gui.$font^^size) \\\n \t\t\t-from 2 -to 80 -increment 1 \\\n@@ -5083,18 +5109,18 @@ set ui_comm {}\n # -- Menu Bar\n #\n menu .mbar -tearoff 0\n-.mbar add cascade -label Repository -menu .mbar.repository\n-.mbar add cascade -label Edit -menu .mbar.edit\n+.mbar add cascade -label Repository -menu .mbar.repository -font font_ui\n+.mbar add cascade -label Edit -menu .mbar.edit -font font_ui\n if {[is_enabled branch]} {\n-\t.mbar add cascade -label Branch -menu .mbar.branch\n+\t.mbar add cascade -label Branch -menu .mbar.branch -font font_ui\n }\n if {[is_enabled multicommit] || [is_enabled singlecommit]} {\n-\t.mbar add cascade -label Commit -menu .mbar.commit\n+\t.mbar add cascade -label Commit -menu .mbar.commit -font font_ui\n }\n if {[is_enabled transport]} {\n-\t.mbar add cascade -label Merge -menu .mbar.merge\n-\t.mbar add cascade -label Fetch -menu .mbar.fetch\n-\t.mbar add cascade -label Push -menu .mbar.push\n+\t.mbar add cascade -label Merge -menu .mbar.merge -font font_ui\n+\t.mbar add cascade -label Fetch -menu .mbar.fetch -font font_ui\n+\t.mbar add cascade -label Push -menu .mbar.push -font font_ui\n }\n . configure -menu .mbar\n \n@@ -5370,7 +5396,7 @@ if {[is_MacOSX]} {\n \n # -- Help Menu\n #\n-.mbar add cascade -label Help -menu .mbar.help\n+.mbar add cascade -label Help -menu .mbar.help -font font_ui\n menu .mbar.help\n \n if {![is_MacOSX]} {\n-- \n1.5.0.3-dirty\n"}]}