git-gui: add regexp search mode to the searchbar
It's off by default, but can be enabled via the config gui.search.regexp. Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>maint
parent
0a0243d733
commit
e9144d5555
|
@ -7,6 +7,8 @@ field w
|
||||||
field ctext
|
field ctext
|
||||||
|
|
||||||
field searchstring {}
|
field searchstring {}
|
||||||
|
field regexpsearch
|
||||||
|
field default_regexpsearch
|
||||||
field casesensitive
|
field casesensitive
|
||||||
field default_casesensitive
|
field default_casesensitive
|
||||||
field searchdirn -forwards
|
field searchdirn -forwards
|
||||||
|
@ -19,6 +21,7 @@ constructor new {i_w i_text args} {
|
||||||
set w $i_w
|
set w $i_w
|
||||||
set ctext $i_text
|
set ctext $i_text
|
||||||
|
|
||||||
|
set default_regexpsearch [is_config_true gui.search.regexp]
|
||||||
if {[is_config_true gui.search.smartcase]} {
|
if {[is_config_true gui.search.smartcase]} {
|
||||||
set default_casesensitive 0
|
set default_casesensitive 0
|
||||||
} else {
|
} else {
|
||||||
|
@ -30,10 +33,13 @@ constructor new {i_w i_text args} {
|
||||||
entry $w.ent -textvariable ${__this}::searchstring -background lightgreen
|
entry $w.ent -textvariable ${__this}::searchstring -background lightgreen
|
||||||
${NS}::button $w.bn -text [mc Next] -command [cb find_next]
|
${NS}::button $w.bn -text [mc Next] -command [cb find_next]
|
||||||
${NS}::button $w.bp -text [mc Prev] -command [cb find_prev]
|
${NS}::button $w.bp -text [mc Prev] -command [cb find_prev]
|
||||||
${NS}::checkbutton $w.cs -text [mc Case-Sensitive] \
|
${NS}::checkbutton $w.re -text [mc RegExp] \
|
||||||
|
-variable ${__this}::regexpsearch -command [cb _incrsearch]
|
||||||
|
${NS}::checkbutton $w.cs -text [mc Case] \
|
||||||
-variable ${__this}::casesensitive -command [cb _incrsearch]
|
-variable ${__this}::casesensitive -command [cb _incrsearch]
|
||||||
pack $w.l -side left
|
pack $w.l -side left
|
||||||
pack $w.cs -side right
|
pack $w.cs -side right
|
||||||
|
pack $w.re -side right
|
||||||
pack $w.bp -side right
|
pack $w.bp -side right
|
||||||
pack $w.bn -side right
|
pack $w.bn -side right
|
||||||
pack $w.ent -side left -expand 1 -fill x
|
pack $w.ent -side left -expand 1 -fill x
|
||||||
|
@ -52,6 +58,7 @@ constructor new {i_w i_text args} {
|
||||||
method show {} {
|
method show {} {
|
||||||
if {![visible $this]} {
|
if {![visible $this]} {
|
||||||
grid $w
|
grid $w
|
||||||
|
set regexpsearch $default_regexpsearch
|
||||||
set casesensitive $default_casesensitive
|
set casesensitive $default_casesensitive
|
||||||
}
|
}
|
||||||
focus -force $w.ent
|
focus -force $w.ent
|
||||||
|
@ -106,6 +113,9 @@ method _do_search {start {mlenvar {}} {dir {}} {endbound {}}} {
|
||||||
upvar $mlenvar mlen
|
upvar $mlenvar mlen
|
||||||
lappend cmd -count mlen
|
lappend cmd -count mlen
|
||||||
}
|
}
|
||||||
|
if {$regexpsearch} {
|
||||||
|
lappend cmd -regexp
|
||||||
|
}
|
||||||
if {!$casesensitive} {
|
if {!$casesensitive} {
|
||||||
lappend cmd -nocase
|
lappend cmd -nocase
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue