From 26b072b5c12ff3f3d2f1a1e068ebbce1dc8ca5ce Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 19 Dec 2009 01:36:23 +0000 Subject: [PATCH] where-vessels: provide feature to cut-and-paste island names --- yarrg/where-vessels | 54 +++++++++++++++++++++++++++++++++++++-------- 1 file changed, 45 insertions(+), 9 deletions(-) diff --git a/yarrg/where-vessels b/yarrg/where-vessels index 219126d..47cd6ed 100755 --- a/yarrg/where-vessels +++ b/yarrg/where-vessels @@ -387,7 +387,7 @@ proc show-report-decode {code} { switch -exact $notown { 0 { report-set own "Yours" } 1 { report-set own "Other pirate's" } - 2 { report-set own "Owner not specified in notes" } + 2 { report-set own "Owner unknown" } default { report-set own "?? $notown" } } @@ -727,7 +727,7 @@ proc redraw-needed {} { } proc draw {} { - global chart found isleloc canvas redraw_after + global chart found isleloc canvas redraw_after islandnames catch { after cancel $redraw_after } catch { unset redraw_after } @@ -740,6 +740,7 @@ proc draw {} { eval chart-got/$proc [lrange $l 1 end] } + set islandnames {} set lastislandname {} foreach key [lsort [array names found]] { set c [llength $found($key)] @@ -753,6 +754,7 @@ proc draw {} { set x [coord $x] set y [coord $y] set lastislandname $islandname + lappend islandnames $islandname # debug "START Y $y" } @@ -763,6 +765,8 @@ proc draw {} { } panner::updatecanvas-bbox .cp.ctrl.pan + + islandnames-update } @@ -770,7 +774,7 @@ proc draw {} { proc parser-control-create {w base invokebuttontext etl_title} { frame $w - button $w.do -text $invokebuttontext -command invoke_$base + button $w.do -text $invokebuttontext -command invoke_$base -pady 3 frame $w.resframe -width 120 -height 32 button $w.resframe.res -text {} -anchor nw \ @@ -905,6 +909,28 @@ proc reparse {base varname old fulldesc okshow noneshow parse ok} { } } +#---------- island names selection etc. ---------- + +proc islandnames-update {} { + global islandnames + .islands.count configure -text [format "ships at %d island(s)" \ + [llength $islandnames]] +} + +proc islandnames-select {} { + .islands.clip configure -relief sunken -state disabled + selection own -command islandnames-deselect .islands.clip +} +proc islandnames-deselect {} { + .islands.clip configure -relief raised -state normal +} + +proc islandnames-handler {offset maxchars} { + global islandnames + return [string range [join $islandnames ", "] \ + $offset [expr {$offset+$maxchars-1}]] +} + #---------- main user interface ---------- proc widgets-setup {} { @@ -924,8 +950,9 @@ proc widgets-setup {} { #----- control panels and filter ----- frame .cp - frame .filter -relief groove -bd 2 - pack .cp .filter -side top + frame .filter -relief groove -bd 2 -padx 1 + frame .islands -pady 2 + pack .cp .filter .islands -side top label .filter.title -text Filter grid configure .filter.title -row 0 -column 0 -columnspan 2 @@ -940,12 +967,12 @@ proc widgets-setup {} { panner::canvas-scroll-bbox .f.c panner::create .cp.ctrl.pan .f.c 120 120 $debug - pack .cp.ctrl.pan -side top -pady 10 -padx 5 + pack .cp.ctrl.pan -side top -pady 0 -padx 5 frame .cp.ctrl.zoom pack .cp.ctrl.zoom -side top - button .cp.ctrl.zoom.out -text - -font {Courier 16} -command {zoom /2} - button .cp.ctrl.zoom.in -text + -font {Courier 16} -command {zoom *2} + button .cp.ctrl.zoom.out -text - -font {Courier 16} -command {zoom /2} -pady 0 + button .cp.ctrl.zoom.in -text + -font {Courier 16} -command {zoom *2} -pady 0 pack .cp.ctrl.zoom.out .cp.ctrl.zoom.in -side left parser-control-create .cp.ctrl.acquire \ @@ -960,6 +987,14 @@ proc widgets-setup {} { pack .cp.ctrl.notes -side top -pady 2 + #----- island name count and copy ----- + + label .islands.count + button .islands.clip -text "copy island names" -pady 2 -padx 2 \ + -command islandnames-select + selection handle .islands.clip islandnames-handler + pack .islands.count .islands.clip -side left + #----- decoding etc. report ----- frame .cp.report @@ -980,7 +1015,8 @@ proc widgets-setup {} { listbox .cp.report.list -height 5 pack .cp.report.island .cp.report.abbrev .cp.report.details \ - .cp.report.list .cp.report.code -side top + .cp.report.list -side top + #pack .cp.report.code -side top pack configure .cp.report.details -fill x foreach sw {inport class subclass lock own xabbrev} { -- 2.30.2