From: Ian Jackson <ian@liberator.relativity.greenend.org.uk>
Date: Tue, 23 Jun 2009 18:58:08 +0000 (+0100)
Subject: Merge ijackson@chiark:/home/ijackson/things/ypp-sc-tools.pctb-dict-test
X-Git-Tag: 1.9.2~90^2~36
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.web-live.git;a=commitdiff_plain;h=0ae7e17eb009e215cfd61b7193816caa0108f43c;hp=3063e05a93fb97a5eca7f26c38da94fa4000406e

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

diff --git a/pctb/TODO b/pctb/TODO
index 1e8e4b1..b3ab72e 100644
--- 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 7284b37..81a480e 100755
--- 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 67ca722..e83f685 100755
--- 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 35cf0d9..b80cb96 100644
--- 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;