diff options
| author | Sebastian Heinlein <sebastian.heinlein@web.de> | 2006-01-26 19:17:19 +0100 |
|---|---|---|
| committer | Sebastian Heinlein <sebastian.heinlein@web.de> | 2006-01-26 19:17:19 +0100 |
| commit | 31da72b447877118bd911ba9b4610bf3173f3f50 (patch) | |
| tree | df350d760262242eb9d9f80d880f4515df1ba6f4 /DistUpgrade | |
| parent | 2fbf1f8a238ce0e1a3f670584e821a5ea3079ec9 (diff) | |
| download | python-apt-31da72b447877118bd911ba9b4610bf3173f3f50.tar.gz | |
* Add a virtual step 5 "complete" and some hidden widgets to the main window. the effect: if the upgrade is complete all progress list points are checked
Diffstat (limited to 'DistUpgrade')
| -rw-r--r-- | DistUpgrade/DistUpgrade.glade | 47 | ||||
| -rw-r--r-- | DistUpgrade/DistUpgradeControler.py | 1 | ||||
| -rw-r--r-- | DistUpgrade/DistUpgradeView.py | 3 |
3 files changed, 49 insertions, 2 deletions
diff --git a/DistUpgrade/DistUpgrade.glade b/DistUpgrade/DistUpgrade.glade index affc7019..573ea66f 100644 --- a/DistUpgrade/DistUpgrade.glade +++ b/DistUpgrade/DistUpgrade.glade @@ -95,7 +95,7 @@ <child> <widget class="GtkTable" id="table_steps"> <property name="visible">True</property> - <property name="n_rows">4</property> + <property name="n_rows">5</property> <property name="n_columns">2</property> <property name="homogeneous">False</property> <property name="row_spacing">6</property> @@ -288,6 +288,51 @@ <property name="x_options">fill</property> </packing> </child> + + <child> + <widget class="GtkImage" id="image_step5"> + <property name="width_request">18</property> + <property name="height_request">18</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + </widget> + <packing> + <property name="left_attach">0</property> + <property name="right_attach">1</property> + <property name="top_attach">4</property> + <property name="bottom_attach">5</property> + <property name="x_options">fill</property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="label_step5"> + <property name="label" translatable="yes"></property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">4</property> + <property name="bottom_attach">5</property> + <property name="x_options">fill</property> + <property name="y_options"></property> + </packing> + </child> </widget> <packing> <property name="padding">0</property> diff --git a/DistUpgrade/DistUpgradeControler.py b/DistUpgrade/DistUpgradeControler.py index ea2de522..6ab77103 100644 --- a/DistUpgrade/DistUpgradeControler.py +++ b/DistUpgrade/DistUpgradeControler.py @@ -317,6 +317,7 @@ class DistUpgradeControler(object): self.doPostUpgrade() # done, ask for reboot + self._view.setStep(5) self._view.updateStatus(_("System upgrade is complete.")) # FIXME should we look into /var/run/reboot-required here? if self._view.confirmRestart(): diff --git a/DistUpgrade/DistUpgradeView.py b/DistUpgrade/DistUpgradeView.py index abc5b340..4c9103ba 100644 --- a/DistUpgrade/DistUpgradeView.py +++ b/DistUpgrade/DistUpgradeView.py @@ -38,11 +38,12 @@ class DistUpgradeView(object): """ pass def setStep(self, step): - """ we have 4 steps current for a upgrade: + """ we have 5 steps current for a upgrade: 1. Analyzing the system 2. Updating repository information 3. Performing the upgrade 4. Post upgrade stuff + 5. Complete """ pass def confirmChanges(self, summary, changes, downloadSize): |