dabo Commit
Revision 7061
Date: 2012-01-27 15:10:40 -0800 (Fri, 27 Jan 2012)
Author: Paul
Trac: http://trac.dabodev.com/changeset/7061
Changed:
U trunk/dabo/dReportWriter.py
U trunk/dabo/ui/uiwx/dReportProgress.py
Log:
Minor to trivial tweaks to the report progress control
Diff:
Modified: trunk/dabo/dReportWriter.py
===================================================================
--- trunk/dabo/dReportWriter.py 2012-01-20 22:42:02 UTC (rev 7060)
+++ trunk/dabo/dReportWriter.py 2012-01-27 23:10:40 UTC (rev 7061)
@@ -35,7 +35,7 @@
def _onReportEnd(self):
super(dReportWriter, self)._onReportEnd()
self.raiseEvent(dabo.dEvents.ReportEnd)
- self._hideProgress()
+ #self._hideProgress() ## Let the form controlling the progress
gauge do this (less blinky)
def _onReportIteration(self):
super(dReportWriter, self)._onReportIteration()
@@ -45,11 +45,10 @@
def _showProgress(self):
win = self.ProgressControl
if win:
- win.Caption = "Processing Report..."
+ win.Caption = "Processing %s..." %
self.ReportForm.getProp("Title")
win.updateProgress(0, len(self.Cursor))
win.show()
win.Form.fitToSizer()
- #dabo.ui.yieldUI() ## getting wxYield called
recursively, sometimes. Doesn't appear to be needed, here
def _updateProgress(self):
win = self.ProgressControl
Modified: trunk/dabo/ui/uiwx/dReportProgress.py
===================================================================
--- trunk/dabo/ui/uiwx/dReportProgress.py 2012-01-20 22:42:02 UTC (rev
7060)
+++ trunk/dabo/ui/uiwx/dReportProgress.py 2012-01-27 23:10:40 UTC (rev
7061)
@@ -25,23 +25,25 @@
def show(self):
self.oldCancel = self.Form.FindWindowById(wx.ID_CANCEL)
+ butCancel = self.butCancelReportProgress
if self.oldCancel:
self.oldCancelEnabled = self.oldCancel.Enabled
self.oldCancel.Enabled = False
self.oldCancel.CancelButton = False
- self.butCancelReportProgress.Enabled = True
- self.butCancelReportProgress.CancelButton = True
+ butCancel.Enabled = True
+ butCancel.CancelButton = True
self.oldFocus = self.Form.ActiveControl
self.setFocus() ## Ensures a pressed 'esc' will register on
our cancel button
self.Visible = True
def hide(self):
+ butCancel = self.butCancelReportProgress
self.Visible = False
if self.oldFocus:
self.oldFocus.setFocus() ## Let 'esc' register on the
form instead of our cancel button
- self.butCancelReportProgress.Enabled = False
- self.butCancelReportProgress.CancelButton = False
+ butCancel.Enabled = False
+ butCancel.CancelButton = False
if self.oldCancel:
if self.oldCancelEnabled:
self.oldCancel.Enabled = True
_______________________________________________
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]
