picolisp

commit becdee3a1748c4e1194214a3b7dec6f3313ba875
parent 629b586ab011b9b4801f8eaa7f4936c98327fbb2
Author: Alexander Burger <abu@software-lab.de>
Date:   Wed,  6 Mar 2013 13:31:51 +0100

'+Img' class generalized
Diffstat:
M
app/item.l
 | 
4
++--
M
ersatz/picolisp.jar
 | 
0

M
lib/form.l
 | 
25
+++++++++++++++++++------
M
src/vers.h
 | 
2
+-
M
src64/version.l
 | 
4
++--

5 files changed, 24 insertions(+), 11 deletions(-)
diff --git a/app/item.l b/app/item.l
@@ -1,4 +1,4 @@
-# 05feb12abu
+# 05mar13abu
 # (c) Software Lab. Alexander Burger
 
 (must "Item" Item)
@@ -28,7 +28,7 @@
                         (put!> (: home top 1 obj) 'jpg NIL) ) )
                   ((: drop) (blob! (: home obj) 'jpg @)) ) ) ) )
       (<spread> NIL (editButton T))
-      (gui '(+Img)
+      (gui '(+Upd +Img)
          '(and (: home obj jpg) (allow (blob (: home obj) 'jpg)))
          ,"Picture" ) ) )
 
diff --git a/ersatz/picolisp.jar b/ersatz/picolisp.jar
Binary files differ.
diff --git a/lib/form.l b/lib/form.l
@@ -1,4 +1,4 @@
-# 27feb13abu
+# 05mar13abu
 # (c) Software Lab. Alexander Burger
 
 # *PRG *Top *Gui *Btn *Get *Got *Form *Evt *Lock *Spans
@@ -1481,19 +1481,32 @@
 
 
 (class +Img +gui)
-# img alt url
+# img alt url dx dy
 
-(dm T (Exe Alt)
-   (=: img Exe)
+(dm T (Alt Url DX DY)
    (=: alt Alt)
+   (=: url Url)
+   (=: dx DX)
+   (=: dy DY)
    (super) )
 
 (dm js> ()
-   (ht:Fmt (sesId (or (eval (: img)) "@img/no.png"))) )
+   (ht:Fmt (sesId (or (: img) "@img/no.png"))) )
 
 (dm show> ("Var")
    (showFld
-      (<img> (or (eval (: img)) "@img/no.png") (eval (: alt))) ) )
+      (<img>
+         (or (: img) "@img/no.png")
+         (eval (: alt))
+         (eval (: url))
+         (: dx)
+         (: dy) ) ) )
+
+(dm set> (Val Dn)
+   (=: img Val) )
+
+(dm val> ()
+   (: img) )
 
 
 (class +Icon)
diff --git a/src/vers.h b/src/vers.h
@@ -1 +1 @@
-static byte Version[4] = {3,1,1,15};
+static byte Version[4] = {3,1,1,16};
diff --git a/src64/version.l b/src64/version.l
@@ -1,6 +1,6 @@
-# 01mar13abu
+# 06mar13abu
 # (c) Software Lab. Alexander Burger
 
-(de *Version 3 1 1 15)
+(de *Version 3 1 1 16)
 
 # vi:et:ts=3:sw=3