[gnue] r10212 - in trunk/gnue-forms: . src/input/displayHandlers src/uidrivers/qt3/widgets src/uidrivers/qt4/widgets src/uidrivers/wx/widgets

[reinhard]

Author: reinhard
Date: 2010-10-20 13:55:58 -0500 (Wed, 20 Oct 2010)
New Revision: 10212

Modified:
   trunk/gnue-forms/
   trunk/gnue-forms/src/input/displayHandlers/Image.py
   trunk/gnue-forms/src/uidrivers/qt3/widgets/image.py
   trunk/gnue-forms/src/uidrivers/qt4/widgets/image.py
   trunk/gnue-forms/src/uidrivers/wx/widgets/image.py
Log:
Don't show a black hole for missing images.



Property changes on: trunk/gnue-forms
___________________________________________________________________
Name: bzr:revision-info
   - timestamp: 2010-10-20 18:30:22.869999886 +0200
committer: Reinhard Müller <address@hidden>
properties: 
        branch-nick: forms

   + timestamp: 2010-10-20 18:54:11.900000095 +0200
committer: Reinhard Müller <address@hidden>
properties: 
        branch-nick: forms

Name: bzr:file-ids
   - src/GFObjects/GFBlock.py   
address@hidden:trunk%2Fgnue-forms:src%2FGFObjects%2FGFBlock.py

   + src/input/displayHandlers/Image.py 
address@hidden:trunk%2Fgnue-forms:src%2Finput%2FdisplayHandlers%2FImage.py
src/uidrivers/qt3/widgets/image.py      
address@hidden:trunk%2Fgnue-forms:src%2Fuidrivers%2Fqt3%2Fwidgets%2Fimage.py
src/uidrivers/qt4/widgets/image.py      
address@hidden:trunk%2Fgnue-forms:src%2Fuidrivers%2Fqt4%2Fwidgets%2Fimage.py
src/uidrivers/wx/widgets/image.py       
address@hidden:trunk%2Fgnue-forms:src%2Fuidrivers%2Fwx%2Fwidgets%2Fimage.py

Name: bzr:revision-id:v4
   - 3116 address@hidden
3117 address@hidden
3118 address@hidden
3119 address@hidden
3120 address@hidden
3121 address@hidden
3122 address@hidden
3123 address@hidden
3124 address@hidden
3125 address@hidden
3126 address@hidden
3127 address@hidden
3128 address@hidden
3129 address@hidden
3130 address@hidden
3131 address@hidden
3132 address@hidden
3133 address@hidden

   + 3116 address@hidden
3117 address@hidden
3118 address@hidden
3119 address@hidden
3120 address@hidden
3121 address@hidden
3122 address@hidden
3123 address@hidden
3124 address@hidden
3125 address@hidden
3126 address@hidden
3127 address@hidden
3128 address@hidden
3129 address@hidden
3130 address@hidden
3131 address@hidden
3132 address@hidden
3133 address@hidden
3134 address@hidden

Name: bzr:text-parents
   - src/GFObjects/GFBlock.py   address@hidden

   + src/input/displayHandlers/Image.py 
svn-v3-single1-dHJ1bmsvZ251ZS1mb3Jtcw..:3a364389-8fce-0310-8f11-cc363fde16c7:trunk%2Fgnue-forms:9956
src/uidrivers/qt3/widgets/image.py      
svn-v3-single1-dHJ1bmsvZ251ZS1mb3Jtcw..:3a364389-8fce-0310-8f11-cc363fde16c7:trunk%2Fgnue-forms:10117
src/uidrivers/qt4/widgets/image.py      
svn-v3-single1-dHJ1bmsvZ251ZS1mb3Jtcw..:3a364389-8fce-0310-8f11-cc363fde16c7:trunk%2Fgnue-forms:10117
src/uidrivers/wx/widgets/image.py       address@hidden


Modified: trunk/gnue-forms/src/input/displayHandlers/Image.py
===================================================================
--- trunk/gnue-forms/src/input/displayHandlers/Image.py 2010-10-20 17:51:44 UTC 
(rev 10211)
+++ trunk/gnue-forms/src/input/displayHandlers/Image.py 2010-10-20 18:55:58 UTC 
(rev 10212)
@@ -71,8 +71,8 @@
             image = PILImage.open(fileObject)
         
         except IOError:
-            image = PILImage.new("RGB", (1, 1, ))
+            image = None
     else:
-        image = PILImage.new("RGB", (1, 1, ))
+        image = None
 
     return image

Modified: trunk/gnue-forms/src/uidrivers/qt3/widgets/image.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/qt3/widgets/image.py 2010-10-20 17:51:44 UTC 
(rev 10211)
+++ trunk/gnue-forms/src/uidrivers/qt3/widgets/image.py 2010-10-20 18:55:58 UTC 
(rev 10212)
@@ -108,6 +108,11 @@
             return
 
         widget = self.widgets [index]
+
+        if value is None:
+            widget.setPixmap(None)
+            return
+
         scrx, scry = self.get_default_size()
         imgx, imgy = value.size
 

Modified: trunk/gnue-forms/src/uidrivers/qt4/widgets/image.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/qt4/widgets/image.py 2010-10-20 17:51:44 UTC 
(rev 10211)
+++ trunk/gnue-forms/src/uidrivers/qt4/widgets/image.py 2010-10-20 18:55:58 UTC 
(rev 10212)
@@ -108,6 +108,11 @@
             return
 
         widget = self.widgets [index]
+
+        if value is None:
+            widget.setPixmap(None)
+            return
+
         scrx, scry = self.get_default_size()
         imgx, imgy = value.size
 

Modified: trunk/gnue-forms/src/uidrivers/wx/widgets/image.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/wx/widgets/image.py  2010-10-20 17:51:44 UTC 
(rev 10211)
+++ trunk/gnue-forms/src/uidrivers/wx/widgets/image.py  2010-10-20 18:55:58 UTC 
(rev 10212)
@@ -71,9 +71,12 @@
 
     def SetValue(self, value):
 
-        image = wx.EmptyImage(value.size[0], value.size[1])
-        image.SetData(value.convert("RGB").tostring())
-        self.image = image
+        if value is not None:
+            image = wx.EmptyImage(value.size[0], value.size[1])
+            image.SetData(value.convert("RGB").tostring())
+            self.image = image
+        else:
+            self.image = None
         self.Refresh()