From d13d763085c8d17139ceac218e29f2f95bf3260b Mon Sep 17 00:00:00 2001 From: Jeremy Katz Date: Wed, 7 Mar 2007 21:36:41 +0000 Subject: 2007-03-07 Jeremy Katz * iw/progress_gui.py (InstallProgressWindow.setShowPercentage): Add method to say that we should just show the percentage in the progress bar like newt does. If this is set, ignore any calls to set_text(). * textw/progress_text.py (InstallProgressWindow.setShowPercentage): Placeholder method, doesn't actually do anything for text mode given the way newt works. * cmdline.py (progressDisplay.setShowPercentage): Add placeholder here too. --- ChangeLog | 10 ++++++++++ cmdline.py | 2 ++ iw/progress_gui.py | 11 +++++++++++ textw/progress_text.py | 3 +++ 4 files changed, 26 insertions(+) diff --git a/ChangeLog b/ChangeLog index 9d006f8c4..cf22b6fd4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,15 @@ 2007-03-07 Jeremy Katz + * iw/progress_gui.py (InstallProgressWindow.setShowPercentage): + Add method to say that we should just show the percentage in the + progress bar like newt does. If this is set, ignore any calls to + set_text(). + * textw/progress_text.py + (InstallProgressWindow.setShowPercentage): Placeholder method, + doesn't actually do anything for text mode given the way newt works. + * cmdline.py (progressDisplay.setShowPercentage): Add placeholder + here too. + * po/: Refresh-po * backend.py (AnacondaBackend.initLog): Don't open the install log diff --git a/cmdline.py b/cmdline.py index f87329b4f..2bde8b6e4 100644 --- a/cmdline.py +++ b/cmdline.py @@ -141,6 +141,8 @@ class progressDisplay: def processEvents(self): pass + def setShowPercentage(self, val): + pass def get_fraction(self): return self.pct def set_fraction(self, pct): diff --git a/iw/progress_gui.py b/iw/progress_gui.py index 710860449..ec987c240 100644 --- a/iw/progress_gui.py +++ b/iw/progress_gui.py @@ -36,6 +36,7 @@ class InstallProgressWindow (InstallWindow): ics.setNextEnabled (False) self._updateChange = 0.01 + self._showPercentage = False def processEvents(self): gui.processEvents() @@ -46,6 +47,8 @@ class InstallProgressWindow (InstallWindow): cur = self.get_fraction() if pct - cur > self._updateChange: self.progress.set_fraction(pct) + if self._showPercentage: + self.progress.set_text("%d %" %(pct * 100,)) self.processEvents() def set_label(self, txt): @@ -54,12 +57,20 @@ class InstallProgressWindow (InstallWindow): self.processEvents() def set_text(self, txt): + if self._showPercentage: + log.debug("Setting progress text with showPercentage set") + return self.progress.set_text(txt) self.processEvents() def renderCallback(self): self.intf.icw.nextClicked() + def setShowPercentage(self, val): + if val not in (True, False): + raise ValueError, "Invalid value passed to setShowPercentage" + self._showPercentage = val + def _getRnotes(self): langs = [] pixmaps = [] diff --git a/textw/progress_text.py b/textw/progress_text.py index 007314203..f99ee9890 100644 --- a/textw/progress_text.py +++ b/textw/progress_text.py @@ -70,6 +70,9 @@ class InstallProgressWindow: self.grid.draw() self.screen.refresh() + def setShowPercentage(self, val): + pass + def get_fraction(self): return self.pct -- cgit