dabo Commit
Revision 6091
Date: 2010-10-07 17:27:53 -0700 (Thu, 07 Oct 2010)
Author: Paul
Trac: http://trac.dabodev.com/changeset/6091

Changed:
U   trunk/dabo/dReportWriter.py
U   trunk/dabo/ui/uiwx/dReportProgress.py

Log:
Just a few very minor changes to dReportProgress, as I'm expanding its use
in my app to also show progress during the data gathering stage, which in 
practice takes about as much time as running the report.


Diff:
Modified: trunk/dabo/dReportWriter.py
===================================================================
--- trunk/dabo/dReportWriter.py 2010-10-07 22:48:50 UTC (rev 6090)
+++ trunk/dabo/dReportWriter.py 2010-10-08 00:27:53 UTC (rev 6091)
@@ -45,6 +45,7 @@
        def _showProgress(self):
                win = self.ProgressControl
                if win:
+                       win.Caption = "Processing Report..."
                        win.updateProgress(0, len(self.Cursor))
                        win.show()
                        win.Form.fitToSizer()

Modified: trunk/dabo/ui/uiwx/dReportProgress.py
===================================================================
--- trunk/dabo/ui/uiwx/dReportProgress.py       2010-10-07 22:48:50 UTC (rev 
6090)
+++ trunk/dabo/ui/uiwx/dReportProgress.py       2010-10-08 00:27:53 UTC (rev 
6091)
@@ -14,13 +14,12 @@
        def afterInit(self):
                ms = self.Sizer = dabo.ui.dBorderSizer(self, "v", 
DefaultBorder=5)
                self.gauge = dGauge(self, Size=(75,12))
-               lblTitle = dLabel(self, Caption="Processing report...", 
FontBold=True)
+               lblTitle = dLabel(self, Name="lblTitle", Caption="", 
FontBold=True)
                butCancel = dButton(self, Name="butCancelReportProgress", 
CancelButton=False,
                                Caption="Cancel", Enabled=False, 
OnHit=self.onCancel)
                ms.append(lblTitle)
                ms.append(self.gauge, "expand")
                ms.append(butCancel, alignment="right")
-               self.fitToSizer()
                self.Visible = False
 
        def show(self):
@@ -42,8 +41,8 @@
                                self.oldCancel.Enabled = True
                        self.oldCancel.CancelButton = True
 
-       def updateProgress(self, val, range):
-               self.gauge.Range = range
+       def updateProgress(self, val, range_):
+               self.gauge.Range = range_
                self.gauge.Value = val
                self.gauge.refresh()
 
@@ -51,16 +50,30 @@
                evt.stop()  ## keep dialogs from automatically being closed.
                if not self.Visible:
                        return
-               self.ReportWriter.cancel()
+               self.ProcessObject.cancel()
 
 
-       def _getReportWriter(self):
-               self._reportWriter = getattr(self, "_reportWriter", None)
-               return self._reportWriter
+       def _getCaption(self):
+               return self.lblTitle.Caption
 
-       def _setReportWriter(self, val):
-               self._reportWriter = val
+       def _setCaption(self, val):
+               self.lblTitle.Caption = val
+               self.fitToSizer()
 
-       ReportWriter = property(_getReportWriter, _setReportWriter, None,
-                       _("""Specifies the dReportWriter instance."""))
 
+       def _getProcessObject(self):
+               self._processObject = getattr(self, "_processObject", None)
+               return self._processObject
+
+       def _setProcessObject(self, val):
+               self._processObject = val
+
+
+
+       Caption = property(_getCaption, _setCaption, None,
+                       _("""Specifies the caption of the progress bar."""))
+
+       ProcessObject = property(_getProcessObject, _setProcessObject, None,
+                       _("""Specifies the object that is processing (a 
dReportWriter instance, for example)."""))
+
+



_______________________________________________
Post Messages to: [email protected]
Subscription Maintenance: http://leafe.com/mailman/listinfo/dabo-dev
Searchable Archives: http://leafe.com/archives/search/dabo-dev
This message: 
http://leafe.com/archives/byMID/[email protected]

Reply via email to