where-vessels: fix layout of filtering

diff --git a/yarrg/where-vessels b/yarrg/where-vessels
index 39d83064fecf99d7c58700adc6d4810a43e7b7fb..ae8fb5520325066b134011566c178f5ed7650264 100755 (executable)
--- a/yarrg/where-vessels
+++ b/yarrg/where-vessels
@@ -200,7 +200,7 @@ proc display-note-infos {} {
     debug "display-note-infos $nmissing [array size notes]"
 
     if {[llength $note_infos]} {
-       set tiny "[llength $note_infos] warnings"
+       set tiny "[llength $note_infos] warning(s)"
     } elseif {$nmissing && [array size notes]} {
        set tiny "$nmissing missing"
     } else {
@@ -232,7 +232,7 @@ proc display-note-infos {} {
        }
     }
 
-    parser-control-failed-core .ctrl.notes notes \
+    parser-control-failed-core .cp.ctrl.notes notes \
        white blue 0 \
        $tiny \
        "[llength $note_infos] warning(s);\
@@ -695,7 +695,7 @@ proc draw {} {
 #      debug "NEW Y $y"
     }
 
-    panner::updatecanvas-bbox .ctrl.pan
+    panner::updatecanvas-bbox .cp.ctrl.pan
 }
 
 
@@ -823,13 +823,13 @@ proc reparse {base varname old fulldesc okshow noneshow parse ok} {
     manyset [errexpect-catch {
        uplevel 1 $parse
        if {[string length [string trim $var]]} {
-           parser-control-ok .ctrl.$base $base $okshow
+           parser-control-ok .cp.ctrl.$base $base $okshow
        } else {
-           parser-control-none .ctrl.$base $base $noneshow
+           parser-control-none .cp.ctrl.$base $base $noneshow
        }
     }] failed emsg lno ei
     if {$failed} {
-       parser-control-failed-expected .ctrl.$base $base \
+       parser-control-failed-expected .cp.ctrl.$base $base \
            $emsg $lno $ei $fulldesc $var
        set var $old
        uplevel 1 $parse
@@ -854,83 +854,85 @@ proc widgets-setup {} {
     pack $canvas -expand 1 -fill both
     pack .f -expand 1 -fill both -side left
 
-    #----- filter -----
+    #----- control panels and filter -----
 
+    frame .cp
     frame .filter -relief groove -bd 2
-    pack .filter -side bottom
+    pack .cp .filter -side top
 
     label .filter.title -text Filter
     grid configure .filter.title -row 0 -column 0 -columnspan 2
 
     #----- control panel -----
 
-    frame .ctrl
-    pack .ctrl -side left -anchor n
+    frame .cp.ctrl
+    pack .cp.ctrl -side left -anchor n
 
     debug "BBOX [$canvas bbox all]"
 
     panner::canvas-scroll-bbox .f.c
-    panner::create .ctrl.pan .f.c 120 120 $debug
+    panner::create .cp.ctrl.pan .f.c 120 120 $debug
 
-    pack .ctrl.pan -side top -pady 10 -padx 5
-    frame .ctrl.zoom
-    pack .ctrl.zoom -side top
+    pack .cp.ctrl.pan -side top -pady 10 -padx 5
+    frame .cp.ctrl.zoom
+    pack .cp.ctrl.zoom -side top
 
-    button .ctrl.zoom.out -text - -font {Courier 16} -command {zoom /2}
-    button .ctrl.zoom.in  -text + -font {Courier 16} -command {zoom *2}
-    pack .ctrl.zoom.out .ctrl.zoom.in -side left
+    button .cp.ctrl.zoom.out -text - -font {Courier 16} -command {zoom /2}
+    button .cp.ctrl.zoom.in  -text + -font {Courier 16} -command {zoom *2}
+    pack .cp.ctrl.zoom.out .cp.ctrl.zoom.in -side left
 
-    parser-control-create .ctrl.acquire \
+    parser-control-create .cp.ctrl.acquire \
        acquire Acquire \
        "Clipboard parsing error" \
        
-    pack .ctrl.acquire -side top -pady 2
+    pack .cp.ctrl.acquire -side top -pady 2
 
-    parser-control-create .ctrl.notes \
+    parser-control-create .cp.ctrl.notes \
        notes "Reload notes" \
        "Vessel notes loading report" \
        
-    pack .ctrl.notes -side top -pady 2
+    pack .cp.ctrl.notes -side top -pady 2
 
     #----- decoding etc. report -----
 
-    frame .report
-    pack .report -side left -anchor n
+    frame .cp.report
+    pack .cp.report -side left -anchor n
 
-    label .report.island -text { }
+    label .cp.report.island -text { }
 
-    frame .report.abbrev -background black
+    frame .cp.report.abbrev -background black
     glset report_abbrev {         }
-    entry .report.abbrev.abbrev -state readonly \
+    entry .cp.report.abbrev.abbrev -state readonly \
        -textvariable report_abbrev \
        -borderwidth 0 -relief flat -width 0 \
        -highlightbackground white \
        -readonlybackground white -foreground black
-    pack .report.abbrev.abbrev -side left -padx 1 -pady 1
+    pack .cp.report.abbrev.abbrev -side left -padx 1 -pady 1
 
-    frame .report.code
-    label .report.code.lab -text Code:
+    frame .cp.report.code
+    label .cp.report.code.lab -text Code:
     glset report_code { }
-    entry .report.code.code -state readonly -textvariable report_code -width 15
-    pack .report.code.lab .report.code.code -side left
-    frame .report.details -bd 2 -relief groove -padx 2 -pady 2
+    entry .cp.report.code.code -state readonly \
+       -textvariable report_code -width 15
+    pack .cp.report.code.lab .cp.report.code.code -side left
+    frame .cp.report.details -bd 2 -relief groove -padx 2 -pady 2
 
-    listbox .report.list -height 5
+    listbox .cp.report.list -height 5
 
-    pack .report.island .report.abbrev .report.details \
-       .report.list .report.code -side top
-    pack configure .report.details -fill x
+    pack .cp.report.island .cp.report.abbrev .cp.report.details \
+       .cp.report.list .cp.report.code -side top
+    pack configure .cp.report.details -fill x
 
     foreach sw {inport class subclass lock own xabbrev} {
-       label .report.details.$sw -text { }
-       pack .report.details.$sw -side top -anchor w
+       label .cp.report.details.$sw -text { }
+       pack .cp.report.details.$sw -side top -anchor w
     }
 }
 
-proc report-set {sw val} { .report.details.$sw configure -text $val }
+proc report-set {sw val} { .cp.report.details.$sw configure -text $val }
 
 proc show-report {islandname code} {
-    .report.island configure -text $islandname
+    .cp.report.island configure -text $islandname
     glset report_code $code
     glset report_abbrev [code2abbrev $code]
 
@@ -939,11 +941,11 @@ proc show-report {islandname code} {
     set kk "$islandname $code"
     upvar #0 found($kk) k
 
-    .report.list delete 0 end
+    .cp.report.list delete 0 end
 
     foreach entry $k {
        manyset $entry vid name
-       .report.list insert end $name
+       .cp.report.list insert end $name
     }
 }
 
@@ -963,7 +965,7 @@ proc invoke_acquire {} {
     if {[catch {
        set clipboard [clipboard get]
     } emsg]} {
-       parser-control-failed-unexpected .ctrl.acquire acquire \
+       parser-control-failed-unexpected .cp.ctrl.acquire acquire \
            $emsg "fetching clipboard:\n\n$errorInfo"
        return
     }
@@ -984,7 +986,7 @@ proc invoke_notes {} {
     if {[catch {
        load-notes
     } emsg]} {
-       parser-control-failed-unexpected .ctrl.notes notes \
+       parser-control-failed-unexpected .cp.ctrl.notes notes \
            $emsg "loading $notes_loc:\n\n$errorInfo"
        return
     }