{"thread":{"id":"21508","subject":"[gitk] [PATCH] 1/2 Merging master into dev","startedAt":"2009-11-06T23:27:54Z","lastAt":"2009-11-06T23:27:54Z","messageCount":1,"participants":["Pat Thoyts"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"127024","messageId":"87y6mjutc5.fsf@users.sourceforge.net","threadId":"21508","inReplyTo":null,"subject":"[gitk] [PATCH] 1/2 Merging master into dev","fromName":"Pat Thoyts","fromEmail":"patthoyts@users.sourceforge.net","sentAt":"2009-11-06T23:27:54Z","receivedAt":"2009-11-06T23:27:54Z","isPatch":true,"sender":{"key":"patthoyts@users.sourceforge.net","avatar":"https://avatars.githubusercontent.com/u/30739?v=4"},"body":"\ncommit 0dd59acf864aedc131e8b9daccc93afd8252a292\nMerge: aa43561 8d84995\nAuthor: Pat Thoyts <patthoyts@users.sourceforge.net>\nDate:   Fri Nov 6 15:35:48 2009 +0000\n\n    Merged master into dev\n    \n    Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>\n\ndiff --cc gitk\nindex c0f38ad,db5ec54..6360077\n--- a/gitk\n+++ b/gitk\n@@@ -1810,13 -1787,10 +1810,13 @@@ proc make_transient {window origin} \n      }\n  }\n  \n- proc show_error {w top msg} {\n+ proc show_error {w top msg {mc mc}} {\n +    global NS\n +    if {![info exists NS]} {set NS \"\"}\n +    if {[wm state $top] eq \"withdrawn\"} { wm deiconify $top }\n      message $w.m -text $msg -justify center -aspect 400\n      pack $w.m -side top -fill x -padx 20 -pady 20\n-     ${NS}::button $w.ok -default active -text [mc OK] -command \"destroy $top\"\n -    button $w.ok -text [$mc OK] -command \"destroy $top\"\n++    ${NS}::button $w.ok -default active -text [$mc OK] -command \"destroy $top\"\n      pack $w.ok -side bottom -fill x\n      bind $top <Visibility> \"grab $top; focus $top\"\n      bind $top <Key-Return> \"destroy $top\"\n@@@ -2616,9 -2519,9 +2616,9 @@@ proc savestuff {w} \n      global maxwidth showneartags showlocalchanges\n      global viewname viewfiles viewargs viewargscmd viewperm nextviewnum\n      global cmitmode wrapcomment datetimeformat limitdiffs\n-     global colors bgcolor fgcolor diffcolors diffcontext selectbgcolor\n+     global colors uicolor bgcolor fgcolor diffcolors diffcontext selectbgcolor\n -    global autoselect extdifftool perfile_attrs markbgcolor\n -    global hideremotes\n +    global autoselect extdifftool perfile_attrs markbgcolor use_ttk\n +    global hideremotes want_ttk\n  \n      if {$stuffsaved} return\n      if {![winfo viewable .]} return\n@@@ -2642,7 -2546,7 +2643,8 @@@\n  \tputs $f [list set showlocalchanges $showlocalchanges]\n  \tputs $f [list set datetimeformat $datetimeformat]\n  \tputs $f [list set limitdiffs $limitdiffs]\n +\tputs $f [list set want_ttk $want_ttk]\n+ \tputs $f [list set uicolor $uicolor]\n  \tputs $f [list set bgcolor $bgcolor]\n  \tputs $f [list set fgcolor $fgcolor]\n  \tputs $f [list set colors $colors]\n@@@ -10630,11 -10443,11 +10651,11 @@@ proc chg_fontparam {v sub op} \n  }\n  \n  proc doprefs {} {\n -    global maxwidth maxgraphpct\n +    global maxwidth maxgraphpct use_ttk NS\n      global oldprefs prefstop showneartags showlocalchanges\n-     global bgcolor fgcolor ctext diffcolors selectbgcolor markbgcolor\n+     global uicolor bgcolor fgcolor ctext diffcolors selectbgcolor markbgcolor\n      global tabstop limitdiffs autoselect extdifftool perfile_attrs\n -    global hideremotes\n +    global hideremotes want_ttk have_ttk\n  \n      set top .gitkprefs\n      set prefstop $top\n@@@ -10643,69 -10456,65 +10664,73 @@@\n  \treturn\n      }\n      foreach v {maxwidth maxgraphpct showneartags showlocalchanges \\\n -\t\t   limitdiffs tabstop perfile_attrs hideremotes} {\n +\t\t   limitdiffs tabstop perfile_attrs hideremotes want_ttk} {\n  \tset oldprefs($v) [set $v]\n      }\n -    toplevel $top\n +    ttk_toplevel $top\n      wm title $top [mc \"Gitk preferences\"]\n      make_transient $top .\n -    label $top.ldisp -text [mc \"Commit list display options\"]\n +    ${NS}::label $top.ldisp -text [mc \"Commit list display options\"]\n      grid $top.ldisp - -sticky w -pady 10\n -    label $top.spacer -text \" \"\n -    label $top.maxwidthl -text [mc \"Maximum graph width (lines)\"] \\\n -\t-font optionfont\n +    ${NS}::label $top.spacer -text \" \"\n +    ${NS}::label $top.maxwidthl -text [mc \"Maximum graph width (lines)\"]\n      spinbox $top.maxwidth -from 0 -to 100 -width 4 -textvariable maxwidth\n      grid $top.spacer $top.maxwidthl $top.maxwidth -sticky w\n -    label $top.maxpctl -text [mc \"Maximum graph width (% of pane)\"] \\\n -\t-font optionfont\n +    ${NS}::label $top.maxpctl -text [mc \"Maximum graph width (% of pane)\"]\n      spinbox $top.maxpct -from 1 -to 100 -width 4 -textvariable maxgraphpct\n      grid x $top.maxpctl $top.maxpct -sticky w\n -    checkbutton $top.showlocal -text [mc \"Show local changes\"] \\\n -\t-font optionfont -variable showlocalchanges\n +    ${NS}::checkbutton $top.showlocal -text [mc \"Show local changes\"] \\\n +\t-variable showlocalchanges\n      grid x $top.showlocal -sticky w\n -    checkbutton $top.autoselect -text [mc \"Auto-select SHA1\"] \\\n -\t-font optionfont -variable autoselect\n +    ${NS}::checkbutton $top.autoselect -text [mc \"Auto-select SHA1\"] \\\n +\t-variable autoselect\n      grid x $top.autoselect -sticky w\n +    ${NS}::checkbutton $top.hideremotes -text [mc \"Hide remote refs\"] \\\n +\t-variable hideremotes\n +    grid x $top.hideremotes -sticky w\n  \n -    label $top.ddisp -text [mc \"Diff display options\"]\n +    ${NS}::label $top.ddisp -text [mc \"Diff display options\"]\n      grid $top.ddisp - -sticky w -pady 10\n -    label $top.tabstopl -text [mc \"Tab spacing\"] -font optionfont\n +    ${NS}::label $top.tabstopl -text [mc \"Tab spacing\"]\n      spinbox $top.tabstop -from 1 -to 20 -width 4 -textvariable tabstop\n      grid x $top.tabstopl $top.tabstop -sticky w\n -    checkbutton $top.ntag -text [mc \"Display nearby tags\"] \\\n -\t-font optionfont -variable showneartags\n +    ${NS}::checkbutton $top.ntag -text [mc \"Display nearby tags\"] \\\n +\t-variable showneartags\n      grid x $top.ntag -sticky w\n -    checkbutton $top.hideremotes -text [mc \"Hide remote refs\"] \\\n -\t-font optionfont -variable hideremotes\n -    grid x $top.hideremotes -sticky w\n -    checkbutton $top.ldiff -text [mc \"Limit diffs to listed paths\"] \\\n -\t-font optionfont -variable limitdiffs\n +    ${NS}::checkbutton $top.ldiff -text [mc \"Limit diffs to listed paths\"] \\\n +\t-variable limitdiffs\n      grid x $top.ldiff -sticky w\n -    checkbutton $top.lattr -text [mc \"Support per-file encodings\"] \\\n -\t-font optionfont -variable perfile_attrs\n +    ${NS}::checkbutton $top.lattr -text [mc \"Support per-file encodings\"] \\\n +\t-variable perfile_attrs\n      grid x $top.lattr -sticky w\n  \n -    entry $top.extdifft -textvariable extdifftool\n -    frame $top.extdifff\n -    label $top.extdifff.l -text [mc \"External diff tool\" ] -font optionfont \\\n -\t-padx 10\n -    button $top.extdifff.b -text [mc \"Choose...\"] -font optionfont \\\n -\t-command choose_extdiff\n +    ${NS}::entry $top.extdifft -textvariable extdifftool\n +    ${NS}::frame $top.extdifff\n +    ${NS}::label $top.extdifff.l -text [mc \"External diff tool\" ]\n +    ${NS}::button $top.extdifff.b -text [mc \"Choose...\"] -command choose_extdiff\n      pack $top.extdifff.l $top.extdifff.b -side left\n -    grid x $top.extdifff $top.extdifft -sticky w\n +    pack configure $top.extdifff.l -padx 10\n +    grid x $top.extdifff $top.extdifft -sticky ew\n +\n +    ${NS}::label $top.lgen -text [mc \"General options\"]\n +    grid $top.lgen - -sticky w -pady 10\n +    ${NS}::checkbutton $top.want_ttk -variable want_ttk \\\n +\t-text [mc \"Use themed widgets\"]\n +    if {$have_ttk} {\n +\t${NS}::label $top.ttk_note -text [mc \"(change requires restart)\"]\n +    } else {\n +\t${NS}::label $top.ttk_note -text [mc \"(currently unavailable)\"]\n +    }\n +    grid x $top.want_ttk $top.ttk_note -sticky w\n  \n -    label $top.cdisp -text [mc \"Colors: press to choose\"]\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+        -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 -    button $top.bgbut -text [mc \"Background\"] -font optionfont \\\n +    ${NS}::button $top.bgbut -text [mc \"Background\"] \\\n  \t-command [list choosecolor bgcolor {} $top.bg [mc \"background\"] setbg]\n      grid x $top.bgbut $top.bg -sticky w\n      label $top.fg -padx 40 -relief sunk -background $fgcolor\n"}]}