Merge branch 'ks/recursive-rename-add-identical'

diff --git a/git-gui/lib/sshkey.tcl b/git-gui/lib/sshkey.tcl
index 82a1a80ff4cf4e9f89d916c3052d731637acb6c9..5f75bc96b3504bdd67ae3500cfdd30f7d4fcb32a 100644 (file)
--- a/git-gui/lib/sshkey.tcl
+++ b/git-gui/lib/sshkey.tcl
@@ -15,7 +15,7 @@ proc find_ssh_key {} {
 }
 
 proc do_ssh_key {} {
-       global sshkey_title have_tk85 sshkey_fd
+       global sshkey_title have_tk85 sshkey_fd use_ttk NS
 
        set w .sshkey_dialog
        if {[winfo exists $w]} {
@@ -23,7 +23,7 @@ proc do_ssh_key {} {
                return
        }
 
-       toplevel $w
+       Dialog $w
        wm transient $w .
 
        set finfo [find_ssh_key]
@@ -35,9 +35,9 @@ proc do_ssh_key {} {
                set gen_state   disabled
        }
 
-       frame $w.header -relief flat
-       label $w.header.lbl -textvariable sshkey_title -anchor w
-       button $w.header.gen -text [mc "Generate Key"] \
+       ${NS}::frame $w.header
+       ${NS}::label $w.header.lbl -textvariable sshkey_title -anchor w
+       ${NS}::button $w.header.gen -text [mc "Generate Key"] \
                -command [list make_ssh_key $w] -state $gen_state
        pack $w.header.lbl -side left -expand 1 -fill x
        pack $w.header.gen -side right
@@ -46,14 +46,16 @@ proc do_ssh_key {} {
        text $w.contents -width 60 -height 10 -wrap char -relief sunken
        pack $w.contents -fill both -expand 1
        if {$have_tk85} {
-               $w.contents configure -inactiveselectbackground darkblue
+               set clr darkblue
+               if {$use_ttk} { set clr [ttk::style lookup . -selectbackground] }
+               $w.contents configure -inactiveselectbackground $clr
        }
 
-       frame $w.buttons
-       button $w.buttons.close -text [mc Close] \
+       ${NS}::frame $w.buttons
+       ${NS}::button $w.buttons.close -text [mc Close] \
                -default active -command [list destroy $w]
        pack $w.buttons.close -side right
-       button $w.buttons.copy -text [mc "Copy To Clipboard"] \
+       ${NS}::button $w.buttons.copy -text [mc "Copy To Clipboard"] \
                -command [list tk_textCopy $w.contents]
        pack $w.buttons.copy -side left
        pack $w.buttons -side bottom -fill x -pady 5 -padx 5