From: Ian Jackson <ian@liberator.relativity.greenend.org.uk>
Date: Wed, 24 Jun 2009 17:35:36 +0000 (+0100)
Subject: do not show unicode data for island pixmaps
X-Git-Tag: 1.9.2~90^2~35
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.web-live.git;a=commitdiff_plain;h=85fa433798311b75536b4196d8a64ab69050a9fb

do not show unicode data for island pixmaps
---

diff --git a/pctb/TODO b/pctb/TODO
index b3ab72e..1e8e4b1 100644
--- a/pctb/TODO
+++ b/pctb/TODO
@@ -1,4 +1,3 @@
-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 81a480e..aab8b66 100755
--- a/pctb/dictionary-manager
+++ b/pctb/dictionary-manager
@@ -274,6 +274,11 @@ proc required/char {} {
     startup_cursor
 }
 
+proc approve_showentry_xinfo/char {w def} {
+    set unic [string2unicodenames $def]
+    label $w -text $unic
+}
+
 #========== PIXMAPS ==========
 
 #---------- pixmap database read and write ----------
@@ -406,6 +411,10 @@ proc required/pixmap {} {
     }
 }
 
+proc approve_showentry_xinfo/pixmap {w def} {
+    label $w -image image/empty
+}
+
 #========== UPLOADS TO DICTIONARY SERVER ==========
 
 proc upload_init {} {
@@ -916,14 +925,7 @@ proc remote-serv/take {yesno file dict} {
 
     must_gets_exactly stdin confirmed
 
-    if {![string compare pixmap $dict]} {
-	set reqkind pixmap
-	debug "DICT PIXMAP"
-    } elseif {[regexp {^(char)([1-9]\d*)$} $dict dummy reqkind rows]} {
-	debug "DICT CHAR rqk=$reqkind r=$rows."
-    } else {
-	error "$dict ?"
-    }
+    manyset [dict2_reqkind_rows reqkind rows]
     
     if {$yesno} {
 	read_database $dictdir/master-$dict.txt
@@ -984,6 +986,18 @@ proc regsub-data {exp subspec args} {
     }
 }
 
+proc dict2_reqkind_rows {dict} {
+    if {![string compare pixmap $dict]} {
+	return {pixmap {}}
+	debug "DICT PIXMAP"
+    } elseif {[regexp {^(char)([1-9]\d*)$} $dict dummy reqkind rows]} {
+	debug "DICT CHAR rqk=$reqkind r=$rows."
+	return [list $reqkind rows]
+    } else {
+	error "$dict ?"
+    }
+}
+
 proc chop_counted {var} {
     upvar 1 $var val
     global data
@@ -1018,8 +1032,18 @@ proc approve_compare {fd1 fd2} {
     return [string compare $sv1 $sv2]
 }
 
+proc string2unicodenames {str} {
+    return [exec perl -e {
+	use Unicode::CharName qw(uname);
+	$ARGV[0] =~ s/^ //;
+	foreach $_ (split //,$ARGV[0]) {
+	    print uname(ord),"\n" or die $!
+	}
+    } " $str"]
+}
+
 proc approve_showentry {ix file specdata} {
-    global approve_ixes
+    global approve_ixes reqkind
     
     approve_decompose_data $specdata
 
@@ -1043,14 +1067,8 @@ 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
+    manyset [dict2_reqkind_rows $dict] reqkind
+    approve_showentry_xinfo/$reqkind $wb-xinfo $def
 
     if {$ix} {
 	label $wb-div -bd 1 -relief sunken -image image/empty
@@ -1061,7 +1079,7 @@ proc approve_showentry {ix file specdata} {
     button $wb-act.rej -text Reject -command [list approve_reject $ix]
     pack $wb-act.rej
 
-    grid $wb-def $wb-image $wb-unicode $wb-act $wb-inf -padx 3
+    grid $wb-def $wb-image $wb-xinfo $wb-act $wb-inf -padx 3
     grid configure $wb-image -ipadx 3 -ipady 3 -sticky w
 
     lappend approve_ixes $ix