{"thread":{"id":"21509","subject":"[gitk] [PATCH] 2/2 Merging master into dev","startedAt":"2009-11-06T23:28:01Z","lastAt":"2009-11-06T23:28:01Z","messageCount":1,"participants":["Pat Thoyts"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"127025","messageId":"87vdhnutby.fsf@users.sourceforge.net","threadId":"21509","inReplyTo":null,"subject":"[gitk] [PATCH] 2/2 Merging master into dev","fromName":"Pat Thoyts","fromEmail":"patthoyts@users.sourceforge.net","sentAt":"2009-11-06T23:28:01Z","receivedAt":"2009-11-06T23:28:01Z","isPatch":true,"sender":{"key":"patthoyts@users.sourceforge.net","avatar":"https://avatars.githubusercontent.com/u/30739?v=4"},"body":"\ncommit 2e67e0332adb6896df6e6a7d4d8aeff179d2b657\nAuthor: Pat Thoyts <patthoyts@users.sourceforge.net>\nDate:   Fri Nov 6 22:19:09 2009 +0000\n\n    Default to the system colours on Windows\n    \n    Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>\n\ndiff --git a/gitk b/gitk\nindex 6360077..e591d61 100755\n--- a/gitk\n+++ b/gitk\n@@ -10726,7 +10726,7 @@ proc doprefs {} {\n     ${NS}::label $top.cdisp -text [mc \"Colors: press to choose\"]\n     grid $top.cdisp - -sticky w -pady 10\n     label $top.ui -padx 40 -relief sunk -background $uicolor\n-    button $top.uibut -text [mc \"Interface\"] -font optionfont \\\n+    ${NS}::button $top.uibut -text [mc \"Interface\"] \\\n        -command [list choosecolor uicolor {} $top.ui [mc \"interface\"] setui]\n     grid x $top.uibut $top.ui -sticky w\n     label $top.bg -padx 40 -relief sunk -background $bgcolor\n@@ -11334,13 +11334,20 @@ if {[tk windowingsystem] eq \"aqua\"} {\n }\n \n set colors {green red blue magenta darkgrey brown orange}\n-set uicolor grey85\n-set bgcolor white\n-set fgcolor black\n+if {[tk windowingsystem] eq \"win32\"} {\n+    set uicolor SystemButtonFace\n+    set bgcolor SystemWindow\n+    set fgcolor SystemButtonText\n+    set selectbgcolor SystemHighlight\n+} else {\n+    set uicolor grey85\n+    set bgcolor white\n+    set fgcolor black\n+    set selectbgcolor gray85\n+}\n set diffcolors {red \"#00a000\" blue}\n set diffcontext 3\n set ignorespace 0\n-set selectbgcolor gray85\n set markbgcolor \"#e0e0ff\"\n \n set circlecolors {white blue gray blue blue}\n"}]}