import new upstream

1 files changed, 9 insertions, 27 deletions

diff --git a/widget_image.h b/widget_image.h
index 96c25eb..07121ee 100644
--- a/widget_image.h
+++ b/widget_image.h
@@ -1,4 +1,5 @@
-/* $Id: widget_image.h,v 1.4 2006/04/09 14:17:50 reinelt Exp $
+/* $Id: widget_image.h 728 2007-01-14 11:14:38Z michael $
+ * $URL: https://ssl.bulix.org/svn/lcd4linux/branches/0.10.1/widget_image.h $
  *
  * image widget handling
  *
@@ -21,43 +22,24 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- *
- * $Log: widget_image.h,v $
- * Revision 1.4  2006/04/09 14:17:50  reinelt
- * autoconf/library fixes, image and graphic display inversion
- *
- * Revision 1.3  2006/02/25 13:36:33  geronet
- * updated indent.sh, applied coding style
- *
- * Revision 1.2  2006/02/08 04:55:05  reinelt
- * moved widget registration to drv_generic_graphic
- *
- * Revision 1.1  2006/01/22 09:16:11  reinelt
- * Image Widget framework added
- *
  */
 
 
 #ifndef _WIDGET_IMAGE_H_
 #define _WIDGET_IMAGE_H_
 
+#include "property.h"
 #include "rgb.h"
 
 typedef struct WIDGET_IMAGE {
+    void *gdImage;		/* raw gd image */
     RGBA *bitmap;		/* image bitmap */
     int width, height;		/* size of the image */
-    char *file_expr;		/* expression for image filename */
-    void *file_tree;		/* pre-compiled expression for image filename */
-    char *file;			/* evaluated filename */
-    char *update_expr;		/* expression for update interval */
-    void *update_tree;		/* pre-compiled expression for update interval */
-    int update;			/* update interval (msec) */
-    char *visible_expr;		/* expression for visibility */
-    void *visible_tree;		/* pre-compiled expression for visibility */
-    int visible;		/* image visible? */
-    char *inverted_expr;	/* expression for inversion */
-    void *inverted_tree;	/* pre-compiled expression for inversion */
-    int inverted;		/* image inverted? */
+    PROPERTY file;		/* image filename */
+    PROPERTY update;		/* update interval */
+    PROPERTY reload;		/* reload image on update? */
+    PROPERTY visible;		/* image visible? */
+    PROPERTY inverted;		/* image inverted? */
 } WIDGET_IMAGE;
 
 extern WIDGET_CLASS Widget_Image;