From 5d73a0332e39db8a773b1c3af989ed268c1f99e2 Mon Sep 17 00:00:00 2001 From: Sebastian Heinlein Date: Mon, 23 Jan 2006 22:28:54 +0100 Subject: * show the update dialog on the center of the screen * minor alignment and spacing issues * set an urgency hint on starting * unset sensitive instead of hiding the terminal expander * add a nice dialog "confirm_restart" * nicer status messages * remove the second status label (label_extra_status) show speed and files in the label_status and only the time in the progress bar --- DistUpgrade/DistUpgradeControler.py | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'DistUpgrade/DistUpgradeControler.py') diff --git a/DistUpgrade/DistUpgradeControler.py b/DistUpgrade/DistUpgradeControler.py index bea1e40f..0fdb8bbd 100644 --- a/DistUpgrade/DistUpgradeControler.py +++ b/DistUpgrade/DistUpgradeControler.py @@ -222,11 +222,7 @@ class DistUpgradeControler(object): self.cache.commit(fprogress,iprogress) def askForReboot(self): - return self._view.askYesNoQuestion(_("Reboot required"), - _("The upgrade is finished now. " - "A reboot is required to " - "now, do you want to do this " - "now?")) + return self._view.confirm_restart() def abort(self): """ abort the upgrade, cleanup (as much as possible) """ @@ -237,7 +233,7 @@ class DistUpgradeControler(object): # this is the core def dapperUpgrade(self): # sanity check (check for ubuntu-desktop, brokenCache etc) - self._view.updateStatus(_("Checking the system")) + self._view.updateStatus(_("Checking update system")) self._view.setStep(1) self.openCache() if not self.cache.sanityCheck(self._view): @@ -256,16 +252,17 @@ class DistUpgradeControler(object): self.abort() # then open the cache (again) - self._view.updateStatus(_("Reading cache")) + self._view.updateStatus(_("Checking update system")) self.openCache() # calc the dist-upgrade and see if the removals are ok/expected # do the dist-upgrade self._view.setStep(3) - self._view.updateStatus(_("Performing the upgrade")) + self._view.updateStatus(_("Asking for confirmation")) if not self.askDistUpgrade(): self.abort() - + + self._view.updateStatus(_("Performing the upgrade")) if not self.doDistUpgrade(): self.abort() -- cgit v1.2.3