gitk: Merge branch 'dev' into master

Signed-off-by: Paul Mackerras <paulus@samba.org>

diff --cc gitk
index d5f0a88d78784accc3c45bea4fd02f98428b09b7,c0f38adb9b3774f00cc1f0810589b5906cea8d77..ff6b680c7bca141bad805bc0b5a36e4bac5c3028
--- 1/gitk
--- 2/gitk
+++ b/gitk
@@@ -1787,10 -1810,13 +1810,13 @@@ proc make_transient {window origin} 
      }
  }
  
 -proc show_error {w top msg} {
 +proc show_error {w top msg {mc mc}} {
+     global NS
+     if {![info exists NS]} {set NS ""}
+     if {[wm state $top] eq "withdrawn"} { wm deiconify $top }
      message $w.m -text $msg -justify center -aspect 400
      pack $w.m -side top -fill x -padx 20 -pady 20
-     button $w.ok -text [$mc OK] -command "destroy $top"
 -    ${NS}::button $w.ok -default active -text [mc OK] -command "destroy $top"
++    ${NS}::button $w.ok -default active -text [$mc OK] -command "destroy $top"
      pack $w.ok -side bottom -fill x
      bind $top <Visibility> "grab $top; focus $top"
      bind $top <Key-Return> "destroy $top"
@@@ -2519,9 -2616,9 +2616,9 @@@ proc savestuff {w} 
      global maxwidth showneartags showlocalchanges
      global viewname viewfiles viewargs viewargscmd viewperm nextviewnum
      global cmitmode wrapcomment datetimeformat limitdiffs
 -    global colors bgcolor fgcolor diffcolors diffcontext selectbgcolor
 +    global colors uicolor bgcolor fgcolor diffcolors diffcontext selectbgcolor
-     global autoselect extdifftool perfile_attrs markbgcolor
-     global hideremotes
+     global autoselect extdifftool perfile_attrs markbgcolor use_ttk
+     global hideremotes want_ttk
  
      if {$stuffsaved} return
      if {![winfo viewable .]} return
@@@ -2546,7 -2642,7 +2643,8 @@@
        puts $f [list set showlocalchanges $showlocalchanges]
        puts $f [list set datetimeformat $datetimeformat]
        puts $f [list set limitdiffs $limitdiffs]
 +      puts $f [list set uicolor $uicolor]
+       puts $f [list set want_ttk $want_ttk]
        puts $f [list set bgcolor $bgcolor]
        puts $f [list set fgcolor $fgcolor]
        puts $f [list set colors $colors]
@@@ -10449,11 -10630,11 +10657,11 @@@ proc chg_fontparam {v sub op} 
  }
  
  proc doprefs {} {
-     global maxwidth maxgraphpct
+     global maxwidth maxgraphpct use_ttk NS
      global oldprefs prefstop showneartags showlocalchanges
 -    global bgcolor fgcolor ctext diffcolors selectbgcolor markbgcolor
 +    global uicolor bgcolor fgcolor ctext diffcolors selectbgcolor markbgcolor
      global tabstop limitdiffs autoselect extdifftool perfile_attrs
-     global hideremotes
+     global hideremotes want_ttk have_ttk
  
      set top .gitkprefs
      set prefstop $top
@@@ -10462,65 -10643,69 +10670,73 @@@
        return
      }
      foreach v {maxwidth maxgraphpct showneartags showlocalchanges \
-                  limitdiffs tabstop perfile_attrs hideremotes} {
+                  limitdiffs tabstop perfile_attrs hideremotes want_ttk} {
        set oldprefs($v) [set $v]
      }
-     toplevel $top
+     ttk_toplevel $top
      wm title $top [mc "Gitk preferences"]
      make_transient $top .
-     label $top.ldisp -text [mc "Commit list display options"]
+     ${NS}::label $top.ldisp -text [mc "Commit list display options"]
      grid $top.ldisp - -sticky w -pady 10
-     label $top.spacer -text " "
-     label $top.maxwidthl -text [mc "Maximum graph width (lines)"] \
-       -font optionfont
+     ${NS}::label $top.spacer -text " "
+     ${NS}::label $top.maxwidthl -text [mc "Maximum graph width (lines)"]
      spinbox $top.maxwidth -from 0 -to 100 -width 4 -textvariable maxwidth
      grid $top.spacer $top.maxwidthl $top.maxwidth -sticky w
-     label $top.maxpctl -text [mc "Maximum graph width (% of pane)"] \
-       -font optionfont
+     ${NS}::label $top.maxpctl -text [mc "Maximum graph width (% of pane)"]
      spinbox $top.maxpct -from 1 -to 100 -width 4 -textvariable maxgraphpct
      grid x $top.maxpctl $top.maxpct -sticky w
-     checkbutton $top.showlocal -text [mc "Show local changes"] \
-       -font optionfont -variable showlocalchanges
+     ${NS}::checkbutton $top.showlocal -text [mc "Show local changes"] \
+       -variable showlocalchanges
      grid x $top.showlocal -sticky w
-     checkbutton $top.autoselect -text [mc "Auto-select SHA1"] \
-       -font optionfont -variable autoselect
+     ${NS}::checkbutton $top.autoselect -text [mc "Auto-select SHA1"] \
+       -variable autoselect
      grid x $top.autoselect -sticky w
+     ${NS}::checkbutton $top.hideremotes -text [mc "Hide remote refs"] \
+       -variable hideremotes
+     grid x $top.hideremotes -sticky w
  
-     label $top.ddisp -text [mc "Diff display options"]
+     ${NS}::label $top.ddisp -text [mc "Diff display options"]
      grid $top.ddisp - -sticky w -pady 10
-     label $top.tabstopl -text [mc "Tab spacing"] -font optionfont
+     ${NS}::label $top.tabstopl -text [mc "Tab spacing"]
      spinbox $top.tabstop -from 1 -to 20 -width 4 -textvariable tabstop
      grid x $top.tabstopl $top.tabstop -sticky w
-     checkbutton $top.ntag -text [mc "Display nearby tags"] \
-       -font optionfont -variable showneartags
+     ${NS}::checkbutton $top.ntag -text [mc "Display nearby tags"] \
+       -variable showneartags
      grid x $top.ntag -sticky w
-     checkbutton $top.hideremotes -text [mc "Hide remote refs"] \
-       -font optionfont -variable hideremotes
-     grid x $top.hideremotes -sticky w
-     checkbutton $top.ldiff -text [mc "Limit diffs to listed paths"] \
-       -font optionfont -variable limitdiffs
+     ${NS}::checkbutton $top.ldiff -text [mc "Limit diffs to listed paths"] \
+       -variable limitdiffs
      grid x $top.ldiff -sticky w
-     checkbutton $top.lattr -text [mc "Support per-file encodings"] \
-       -font optionfont -variable perfile_attrs
+     ${NS}::checkbutton $top.lattr -text [mc "Support per-file encodings"] \
+       -variable perfile_attrs
      grid x $top.lattr -sticky w
  
-     entry $top.extdifft -textvariable extdifftool
-     frame $top.extdifff
-     label $top.extdifff.l -text [mc "External diff tool" ] -font optionfont \
-       -padx 10
-     button $top.extdifff.b -text [mc "Choose..."] -font optionfont \
-       -command choose_extdiff
+     ${NS}::entry $top.extdifft -textvariable extdifftool
+     ${NS}::frame $top.extdifff
+     ${NS}::label $top.extdifff.l -text [mc "External diff tool" ]
+     ${NS}::button $top.extdifff.b -text [mc "Choose..."] -command choose_extdiff
      pack $top.extdifff.l $top.extdifff.b -side left
-     grid x $top.extdifff $top.extdifft -sticky w
+     pack configure $top.extdifff.l -padx 10
+     grid x $top.extdifff $top.extdifft -sticky ew
+ 
+     ${NS}::label $top.lgen -text [mc "General options"]
+     grid $top.lgen - -sticky w -pady 10
+     ${NS}::checkbutton $top.want_ttk -variable want_ttk \
+       -text [mc "Use themed widgets"]
+     if {$have_ttk} {
+       ${NS}::label $top.ttk_note -text [mc "(change requires restart)"]
+     } else {
+       ${NS}::label $top.ttk_note -text [mc "(currently unavailable)"]
+     }
+     grid x $top.want_ttk $top.ttk_note -sticky w
  
-     label $top.cdisp -text [mc "Colors: press to choose"]
+     ${NS}::label $top.cdisp -text [mc "Colors: press to choose"]
      grid $top.cdisp - -sticky w -pady 10
 +    label $top.ui -padx 40 -relief sunk -background $uicolor
 +    button $top.uibut -text [mc "Interface"] -font optionfont \
 +       -command [list choosecolor uicolor {} $top.ui [mc "interface"] setui]
 +    grid x $top.uibut $top.ui -sticky w
      label $top.bg -padx 40 -relief sunk -background $bgcolor
-     button $top.bgbut -text [mc "Background"] -font optionfont \
+     ${NS}::button $top.bgbut -text [mc "Background"] \
        -command [list choosecolor bgcolor {} $top.bg [mc "background"] setbg]
      grid x $top.bgbut $top.bg -sticky w
      label $top.fg -padx 40 -relief sunk -background $fgcolor