Author: btami Date: 2008-03-22 08:56:39 -0500 (Sat, 22 Mar 2008) New Revision: 9861
Modified: trunk/gnue-forms/src/uidrivers/win32/widgets/_base.py trunk/gnue-forms/src/uidrivers/win32/widgets/form/widget.py trunk/gnue-reports/src/adapters/destinations/printer/gdi.py trunk/gnue-reports/src/adapters/destinations/printer/win32raw.py Log: fix win32 PrintDialog usage Modified: trunk/gnue-forms/src/uidrivers/win32/widgets/_base.py =================================================================== --- trunk/gnue-forms/src/uidrivers/win32/widgets/_base.py 2008-03-19 10:14:05 UTC (rev 9860) +++ trunk/gnue-forms/src/uidrivers/win32/widgets/_base.py 2008-03-22 13:56:39 UTC (rev 9861) @@ -44,6 +44,7 @@ from PIL import Image as PILImage from PIL import ImageWin except: + print 'PIL not installen, no image support...' PILImage = None #TCN_SELCHANGE = (commctrl.TCN_FIRST - 1) Modified: trunk/gnue-forms/src/uidrivers/win32/widgets/form/widget.py =================================================================== --- trunk/gnue-forms/src/uidrivers/win32/widgets/form/widget.py 2008-03-19 10:14:05 UTC (rev 9860) +++ trunk/gnue-forms/src/uidrivers/win32/widgets/form/widget.py 2008-03-22 13:56:39 UTC (rev 9861) @@ -25,6 +25,7 @@ # NOTES: # +import os import struct import types @@ -36,9 +37,8 @@ import win32print from win32com.shell import shell -from PIL import Image, ImageWin, ImageGrab - from gnue.forms.uidrivers.win32 import dialogs +from gnue.forms.uidrivers.win32.PrintDialog import PrintDialog from gnue.forms.uidrivers.win32.common import * from gnue.forms.uidrivers.win32.widgets._base import UIHelper, Win32Window import wrappers @@ -369,6 +369,12 @@ def _ui_printout_(self, title, subtitle, user): + try: + from PIL import Image, ImageWin, ImageGrab + except: + print 'PIL not installen, no print support...' + return + print 'PrintForm start...' window = self.mainWindow @@ -380,8 +386,17 @@ bmp = Image.open ("tmp.bmp") print "original bitmap size =", bmp.size - - printer = win32print.GetDefaultPrinter() + + pDialog = PrintDialog() + pDialog.DoModal() + try: + # OK selected + printer = pDialog['deviceName'] + except KeyError: + # Cancel selected + return + #printer = win32print.GetDefaultPrinter() + print printer phandle = win32print.OpenPrinter(printer) Modified: trunk/gnue-reports/src/adapters/destinations/printer/gdi.py =================================================================== --- trunk/gnue-reports/src/adapters/destinations/printer/gdi.py 2008-03-19 10:14:05 UTC (rev 9860) +++ trunk/gnue-reports/src/adapters/destinations/printer/gdi.py 2008-03-22 13:56:39 UTC (rev 9861) @@ -32,7 +32,7 @@ from gnue.reports.base.GROutputAdapter import DestinationAdapter as Base from gnue.common.apps import GDebug -from gnue.forms.uidrivers.win32 import PrintDialog +from gnue.forms.uidrivers.win32.PrintDialog import PrintDialog class DestinationAdapter(Base, xml.sax.ContentHandler): Modified: trunk/gnue-reports/src/adapters/destinations/printer/win32raw.py =================================================================== --- trunk/gnue-reports/src/adapters/destinations/printer/win32raw.py 2008-03-19 10:14:05 UTC (rev 9860) +++ trunk/gnue-reports/src/adapters/destinations/printer/win32raw.py 2008-03-22 13:56:39 UTC (rev 9861) @@ -32,7 +32,7 @@ from gnue.reports import VERSION from gnue.reports.base.GROutputAdapter import DestinationAdapter as Base from gnue.common.apps import GDebug -from gnue.forms.uidrivers.win32 import PrintDialog +from gnue.forms.uidrivers.win32.PrintDialog import PrintDialog class DestinationAdapter(Base): _______________________________________________ commit-gnue mailing list commit-gnue@gnu.org http://lists.gnu.org/mailman/listinfo/commit-gnue