Merge ijackson@chiark:/home/ijackson/things/ypp-sc-tools.pctb-dict-test

diff --git a/pctb/TODO b/pctb/TODO
index 1e8e4b125173914e0d5ba373286b3b86d8a2a213..b3ab72e7c3082c86f7a34bb0aa553fac91e8c6c2 100644 (file)
--- a/pctb/TODO
+++ b/pctb/TODO
@@ -1,3 +1,4 @@
+do not show unicode data for island pixmaps
 install/test dictionary upload/approval
 onboard ship island name horizontal trim
 write real uploader

diff --git a/pctb/dictionary-manager b/pctb/dictionary-manager
index 7284b374cc666852e7d4562372562f4ebe4c258d..81a480ef476a0278f84f6a7bd6a1f85e66899efa 100755 (executable)
--- a/pctb/dictionary-manager
+++ b/pctb/dictionary-manager
@@ -488,7 +488,7 @@ proc maybe_upload_entry {im def} {
 
     set query [eval ::http::formatQuery $pl]
     regsub -all {%0d} $query {} query
-    debug "DB-UPDATE QUERY [string range $query 0 200]..."
+    debug "DB-UPDATE QUERY $query"
 
     if {[regexp {^\.?/} $url]} {
        set cmd [list $url $query]
@@ -1043,11 +1043,25 @@ proc approve_showentry {ix file specdata} {
     image create photo approve/$ix -data $ppm
     label $wb-image -image approve/$ix -bd 2 -relief sunken
 
+    set unic [exec perl -e {
+       use Unicode::CharName qw(uname);
+       $ARGV[0] =~ s/^ //;
+       foreach $_ (split //,$ARGV[0]) {
+           print uname(ord),"\n" or die $!
+       }
+    } " $def"]
+    label $wb-unicode -text $unic
+
+    if {$ix} {
+       label $wb-div -bd 1 -relief sunken -image image/empty
+       grid configure $wb-div -columnspan 5 -sticky ew -padx 5
+    }
+
     frame $wb-act
     button $wb-act.rej -text Reject -command [list approve_reject $ix]
     pack $wb-act.rej
 
-    grid $wb-def $wb-image $wb-act $wb-inf -padx 3
+    grid $wb-def $wb-image $wb-unicode $wb-act $wb-inf -padx 3
     grid configure $wb-image -ipadx 3 -ipady 3 -sticky w
 
     lappend approve_ixes $ix
@@ -1143,6 +1157,8 @@ proc main/approve {} {
     pack .right -side right
     pack .ok -side bottom
 
+    image create bitmap image/empty
+
     set approve_page 0
     approve_fetch_list
 }

diff --git a/pctb/dictionary-pixmap-options b/pctb/dictionary-pixmap-options
index 67ca72264d95414b881710e385ed435d2ed30b77..e83f685a7275d0ae103042dab646e9f2b09fb674 100755 (executable)
--- a/pctb/dictionary-pixmap-options
+++ b/pctb/dictionary-pixmap-options
@@ -105,7 +105,7 @@ Land {On land} {
     Booty  Booty
     Ahoy!  Ahoy!
 }
-Ship {On board a ship} {
+Vessel {On board a ship} {
     Crew   Crew
     Vessel Vessel
     Ye     Ye

diff --git a/pctb/structure.c b/pctb/structure.c
index 35cf0d9507da3335dbe47df403e9992808bc8e85..b80cb96bda5150844548f32f9ec74962085fb022 100644 (file)
--- a/pctb/structure.c
+++ b/pctb/structure.c
@@ -534,7 +534,7 @@ void find_islandname(void) {
 
   identify_rgbimage(ri, sunshiner, sunshine, "sunshine widget");
   
-  if (!memcmp(sunshine,"Ship ",5)) {
+  if (!memcmp(sunshine,"Vessel ",5)) {
     Rect islandnamer;
     
     islandnamer.tl.x= cim->w - 1034 +  885;