wip matching context selection

[ypp-sc-tools.db-test.git] / pctb / dictionary-manager

diff --git a/pctb/dictionary-manager b/pctb/dictionary-manager
index aab8b66d097703ffc7f1474d20fd9abc83576879..9d92a66b78d04218db1214d2ee7e2045d783c882 100755 (executable)
--- a/pctb/dictionary-manager
+++ b/pctb/dictionary-manager
@@ -123,6 +123,7 @@ static unsigned char csr_bits[] = {
     entry .d.csr.csr.e -bd 0
     pack .d.csr.csr.l -side left
 
+    frame .d.seldict
     frame .d.mi.csr_0 -bg white -width 1
     frame .d.mi.csr_1 -bg white -width 1
     frame .d.pe
@@ -262,10 +263,15 @@ proc required/char {} {
     foreach {min max contexts got} $glyphsdone {
        show_context maxh $min $contexts
     }
+
+    destroy [winfo children .d.seldict]
+    label .d.seldict.title -text {Select matching context:}
+    pack .d.seldict.title -side left
+
     show_context maxh $unk_l $unk_contexts
     .d.ctx configure -height $maxh
     pack forget .d.pe
-    pack .d.csr -side top -before .d.mi
+    pack .d.seldict .d.csr -side top -before .d.mi
     pack .d.got .d.ctx -side top -after .d.mi
     focus .d
 
@@ -385,7 +391,7 @@ proc required/pixmap {} {
     place forget .d.mi.csr_0
     place forget .d.mi.csr_1
 
-    pack forget .d.csr .d.got
+    pack forget .d.seldict .d.csr .d.got
     pack .d.pe -side top -before .d.mi -pady 2
     .d configure -takefocus 0
     #-pady 2 -fill x
@@ -738,8 +744,8 @@ proc recursor/text {} {
     focus .d.csr.csr.e
     bind .d.csr.csr.e <Key-Return> {
        set strq [.d.csr.csr.e get]
-       if {[regexp -line {^(?:[!-[]|[]-~]|\\\\|\\x[0-9a-f]{2})+} $strq]} {
-           RETURN_RESULT DEFINE "$cur_0 $cur_1 $strq"
+       if {[string length $strq]} {
+           RETURN_RESULT DEFINE [list $cur_0 $cur_1 $strq]
        }
     }
     bind .d.csr.csr.e <Key-Escape> {