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 <reinhard.muel...@bytewise.at>
properties:
branch-nick: forms
+ timestamp: 2010-10-20 18:54:11.900000095 +0200
committer: Reinhard Müller <reinhard.muel...@bytewise.at>
properties:
branch-nick: forms
Name: bzr:file-ids
- src/GFObjects/GFBlock.py
1...@3a364389-8fce-0310-8f11-cc363fde16c7:trunk%2Fgnue-forms:src%2FGFObjects%2FGFBlock.py
+ src/input/displayHandlers/Image.py
7...@3a364389-8fce-0310-8f11-cc363fde16c7:trunk%2Fgnue-forms:src%2Finput%2FdisplayHandlers%2FImage.py
src/uidrivers/qt3/widgets/image.py
8...@3a364389-8fce-0310-8f11-cc363fde16c7:trunk%2Fgnue-forms:src%2Fuidrivers%2Fqt3%2Fwidgets%2Fimage.py
src/uidrivers/qt4/widgets/image.py
9...@3a364389-8fce-0310-8f11-cc363fde16c7:trunk%2Fgnue-forms:src%2Fuidrivers%2Fqt4%2Fwidgets%2Fimage.py
src/uidrivers/wx/widgets/image.py
10...@3a364389-8fce-0310-8f11-cc363fde16c7:trunk%2Fgnue-forms:src%2Fuidrivers%2Fwx%2Fwidgets%2Fimage.py
Name: bzr:revision-id:v4
- 3116 reinhard.muel...@bytewise.at-20100426083500-vtmq0qvd7htz02zx
3117 reinhard.muel...@bytewise.at-20100512151744-2jx8tmtop30kl5n0
3118 reinhard.muel...@bytewise.at-20100705094014-ks9yv7b8gs6ychrb
3119 reinhard.muel...@bytewise.at-20100706085143-hyxadj30ayg28jpx
3120 reinhard.muel...@bytewise.at-20100706140804-sn3npws1ykm81ubx
3121 reinhard.muel...@bytewise.at-20100909134008-5p7jq048nkutldse
3122 reinhard.muel...@bytewise.at-20100923144753-e8hthxho7n5mwg9z
3123 reinhard.muel...@bytewise.at-20100929193018-7r3injoy8g28fwm6
3124 reinhard.muel...@bytewise.at-20100930073631-ilf6smgjt6mfvkpz
3125 reinhard.muel...@bytewise.at-20101011191957-yaj9rkqbervc91ac
3126 reinhard.muel...@bytewise.at-20101020084039-jmfxjbctt6vc2usd
3127 reinhard.muel...@bytewise.at-20101020124425-0dpprxsmanmaenty
3128 reinhard.muel...@bytewise.at-20101020124541-zppkmzww1lnsk8x4
3129 reinhard.muel...@bytewise.at-20101020141905-vjg7r3wihnm7mxam
3130 reinhard.muel...@bytewise.at-20101020143045-pf9ywx1s3hdqbsh7
3131 reinhard.muel...@bytewise.at-20101020143328-ctfmr3fpp5quq1eo
3132 reinhard.muel...@bytewise.at-20101020152139-rlllh9m2qn45atcz
3133 reinhard.muel...@bytewise.at-20101020163022-tgnjcv18nzrc5sfw
+ 3116 reinhard.muel...@bytewise.at-20100426083500-vtmq0qvd7htz02zx
3117 reinhard.muel...@bytewise.at-20100512151744-2jx8tmtop30kl5n0
3118 reinhard.muel...@bytewise.at-20100705094014-ks9yv7b8gs6ychrb
3119 reinhard.muel...@bytewise.at-20100706085143-hyxadj30ayg28jpx
3120 reinhard.muel...@bytewise.at-20100706140804-sn3npws1ykm81ubx
3121 reinhard.muel...@bytewise.at-20100909134008-5p7jq048nkutldse
3122 reinhard.muel...@bytewise.at-20100923144753-e8hthxho7n5mwg9z
3123 reinhard.muel...@bytewise.at-20100929193018-7r3injoy8g28fwm6
3124 reinhard.muel...@bytewise.at-20100930073631-ilf6smgjt6mfvkpz
3125 reinhard.muel...@bytewise.at-20101011191957-yaj9rkqbervc91ac
3126 reinhard.muel...@bytewise.at-20101020084039-jmfxjbctt6vc2usd
3127 reinhard.muel...@bytewise.at-20101020124425-0dpprxsmanmaenty
3128 reinhard.muel...@bytewise.at-20101020124541-zppkmzww1lnsk8x4
3129 reinhard.muel...@bytewise.at-20101020141905-vjg7r3wihnm7mxam
3130 reinhard.muel...@bytewise.at-20101020143045-pf9ywx1s3hdqbsh7
3131 reinhard.muel...@bytewise.at-20101020143328-ctfmr3fpp5quq1eo
3132 reinhard.muel...@bytewise.at-20101020152139-rlllh9m2qn45atcz
3133 reinhard.muel...@bytewise.at-20101020163022-tgnjcv18nzrc5sfw
3134 reinhard.muel...@bytewise.at-20101020165411-krluvclyw61ef9zp
Name: bzr:text-parents
- src/GFObjects/GFBlock.py
reinhard.muel...@bytewise.at-20100923144753-e8hthxho7n5mwg9z
+ 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
reinhard.muel...@bytewise.at-20101020143045-pf9ywx1s3hdqbsh7
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()
_______________________________________________
commit-gnue mailing list
commit-gnue@gnu.org
http://lists.gnu.org/mailman/listinfo/commit-gnue
