* merged with sebastian

* fixed a bug in the conffile() prompt detection

3 files changed, 10 insertions, 8 deletions

diff --git a/DistUpgrade/DistUpgrade.glade b/DistUpgrade/DistUpgrade.glade
index 7df9503e..00b04644 100644
--- a/DistUpgrade/DistUpgrade.glade
+++ b/DistUpgrade/DistUpgrade.glade
@@ -12,6 +12,7 @@
   <property name="modal">False</property>
   <property name="resizable">False</property>
   <property name="destroy_with_parent">False</property>
+  <property name="icon">update-manager.png</property>
   <property name="decorated">True</property>
   <property name="skip_taskbar_hint">False</property>
   <property name="skip_pager_hint">False</property>
@@ -315,8 +316,8 @@
 		  <property name="orientation">GTK_PROGRESS_LEFT_TO_RIGHT</property>
 		  <property name="fraction">0</property>
 		  <property name="pulse_step">0.10000000149</property>
-		  <property name="text" translatable="yes"> </property>
-		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+		  <property name="text" translatable="yes">    </property>
+		  <property name="ellipsize">PANGO_ELLIPSIZE_END</property>
 		</widget>
 		<packing>
 		  <property name="padding">0</property>
@@ -338,7 +339,7 @@
 		  <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="ellipsize">PANGO_ELLIPSIZE_END</property>
 		  <property name="width_chars">-1</property>
 		  <property name="single_line_mode">False</property>
 		  <property name="angle">0</property>
diff --git a/DistUpgrade/DistUpgradeControler.py b/DistUpgrade/DistUpgradeControler.py
index 238934bc..db6168ef 100644
--- a/DistUpgrade/DistUpgradeControler.py
+++ b/DistUpgrade/DistUpgradeControler.py
@@ -280,15 +280,17 @@ class DistUpgradeControler(object):
         if not self.askDistUpgrade():
             self.abort()
 
-        self._view.updateStatus(_("Performing the upgrade"))            
+        self._view.updateStatus(_("Upgrading"))            
         if not self.doDistUpgrade():
             self.abort()
             
         # do post-upgrade stuff
         self._view.setStep(4)
+        self._view.updateStatus(_("Searching for obsolete software"))            
         self.doPostUpgrade()
 
         # done, ask for reboot
+        self._view.updateStatus(_("System upgrade is complete."))            
         # FIXME should we look into /var/run/reboot-required here?
         if self._view.confirmRestart():
             subprocess.call(["reboot"])
diff --git a/DistUpgrade/DistUpgradeViewGtk.py b/DistUpgrade/DistUpgradeViewGtk.py
index fe002b15..171aafa5 100644
--- a/DistUpgrade/DistUpgradeViewGtk.py
+++ b/DistUpgrade/DistUpgradeViewGtk.py
@@ -119,9 +119,7 @@ class GtkInstallProgressAdapter(InstallProgress):
         # FIXME: add support for the timeout
         # of the terminal (to display something useful then)
         # -> longer term, move this code into python-apt 
-        #self.label_status.show()
         self.label_status.set_text(_("Installing updates ..."))
-        #self.progress.show()
         self.progress.set_fraction(0.0)
         self.progress.set_text(" ")
         self.expander.set_sensitive(True)
@@ -154,7 +152,7 @@ class GtkInstallProgressAdapter(InstallProgress):
         dialog.run()
         dialog.destroy()
     def conffile(self, current, new):
-        self.expander.set_expanded=True
+        self.expander.set_expanded(True)
         pass
     def fork(self):
         pid = self.term.forkpty(envv=self.env)
@@ -168,7 +166,8 @@ class GtkInstallProgressAdapter(InstallProgress):
         return self.apt_status
     def finishUpdate(self):
         #self.progress.hide()
-        self.label_status.set_text("")
+        #self.label_status.set_text("")
+        pass
     def updateInterface(self):
         InstallProgress.updateInterface(self)
         self.progress.set_fraction(self.percent/100.0)