Merge lp:~mterry/update-manager/dialogs into lp:update-manager

[Michael Terry]

This branch implements a lot of the special purpose dialogs in the Software Updates spec.
https://wiki.ubuntu.com/SoftwareUpdates

Specifically, the new release, unsupported release, errors, and no updates dialogs.

(whoops, resubmitted to include the prereq branch)

[Didier Roche-Tolomelli (didrocks)]

The branch looks good, nice work :)

+ print("Hello!")

+ print("Hello2!", self.window_main)

Aren't they debug info that you left over?

319 + except:
320 + pass
-> you don't want to add some logging info here?

Couldn't really get all the insight of the changes TBH, we should have a class diagram :)

review: Approve

[Michael Terry (mterry)]

I dropped the debugging prints that squeezed into my branch. About the except/pass, that was just copy/pasted from elsewhere in the code. So I didn't feel the need to change it.

=== modified file 'UpdateManager/Core/MetaRelease.py'
--- UpdateManager/Core/MetaRelease.py	2012-06-12 01:40:26 +0000
+++ UpdateManager/Core/MetaRelease.py	2012-06-18 20:03:30 +0000
@@ -42,7 +42,7 @@
 except ImportError:
     from urllib2 import HTTPError, Request, URLError, urlopen
 
-from .utils import get_lang, get_dist, get_dist_description, get_ubuntu_flavor
+from .utils import get_lang, get_dist, get_dist_version, get_ubuntu_flavor, get_ubuntu_flavor_name
 
 class Dist(object):
     def __init__(self, name, version, date, supported):
@@ -79,9 +79,11 @@
         self.forceDownload = forceDownload
         # information about the available dists
         self.downloading = True
+        self.upgradable_to = None
         self.new_dist = None
+        self.flavor_name = get_ubuntu_flavor_name()
         self.current_dist_name = get_dist()
-        self.current_dist_description = get_dist_description()
+        self.current_dist_version = get_dist_version()
         self.no_longer_supported = None
 
         # default (if the conf file is missing)
@@ -248,8 +250,10 @@
         # only warn if unsupported and a new dist is available (because 
         # the development version is also unsupported)
         if upgradable_to != "" and not current_dist.supported:
+            self.upgradable_to = upgradable_to
             self.dist_no_longer_supported(current_dist)
         if upgradable_to != "":
+            self.upgradable_to = upgradable_to
             self.new_dist_available(upgradable_to)
 
         # parsing done and sucessfully

=== modified file 'UpdateManager/Core/utils.py'
--- UpdateManager/Core/utils.py	2012-06-13 11:40:17 +0000
+++ UpdateManager/Core/utils.py	2012-06-18 20:03:30 +0000
@@ -210,16 +210,16 @@
   p.stdout.close()
   return dist
 
-def get_dist_description():
-  " return the description of the current runing distro "
+def get_dist_version():
+  " return the version of the current running distro "
   # support debug overwrite
-  desc = os.environ.get("META_RELEASE_FAKE_DESCRIPTION")
+  desc = os.environ.get("META_RELEASE_FAKE_VERSION")
   if desc:
-      logging.warn("using fake release description '%s' (because of META_RELEASE_FAKE_DESCRIPTION environment) " % desc)
+      logging.warn("using fake release version '%s' (because of META_RELEASE_FAKE_VERSION environment) " % desc)
       return desc
   # then check the real one
   from subprocess import Popen, PIPE
-  p = Popen(["lsb_release","-d","-s"], stdout=PIPE, universal_newlines=True)
+  p = Popen(["lsb_release","-r","-s"], stdout=PIPE, universal_newlines=True)
   res = p.wait()
   if res != 0:
     sys.stderr.write("lsb_release returned exitcode: %i\n" % res)
@@ -395,6 +395,8 @@
     # this will (of course) not work in a server environment, 
     # but the main use case for this is to show the right
     # release notes
+    # TODO: actually examine which meta packages are installed, like
+    # DistUpgrade/DistUpgradeCache.py does and use that to choose a flavor.
     denv = os.environ.get("DESKTOP_SESSION", "")
     if "gnome" in denv:
         return "ubuntu"
@@ -407,6 +409,17 @@
     # default to ubuntu if nothing more specific is found
     return "ubuntu"
 
+def get_ubuntu_flavor_name():
+    flavor = get_ubuntu_flavor()
+    if flavor == "kubuntu":
+        return "Kubuntu"
+    elif flavor == "xubuntu":
+        return "Xubuntu"
+    elif flavor == "lubuntu":
+        return "Lubuntu"
+    else:
+        return "Ubuntu"
+
 def error(parent, summary, message):
   from gi.repository import Gtk, Gdk
   d = Gtk.MessageDialog(parent=parent,

=== added file 'UpdateManager/Dialogs.py'
--- UpdateManager/Dialogs.py	1970-01-01 00:00:00 +0000
+++ UpdateManager/Dialogs.py	2012-06-18 20:03:30 +0000
@@ -0,0 +1,237 @@
+# Dialogs.py
+# -*- coding: utf-8 -*-
+#  
+#  Copyright (c) 2012 Canonical
+#  
+#  Author: Michael Terry <[e-mail]>
+# 
+#  This program is free software; you can redistribute it and/or 
+#  modify it under the terms of the GNU General Public License as 
+#  published by the Free Software Foundation; either version 2 of the
+#  License, or (at your option) any later version.
+# 
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+# 
+#  You should have received a copy of the GNU General Public License
+#  along with this program; if not, write to the Free Software
+#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+#  USA
+
+from __future__ import absolute_import, print_function
+
+from gi.repository import Gtk
+from gi.repository import GObject
+GObject.threads_init()
+
+import warnings
+warnings.filterwarnings("ignore", "Accessed deprecated property", DeprecationWarning)
+
+import dbus
+import os
+import subprocess
+import sys
+import time
+from .SimpleGtk3builderApp import SimpleGtkbuilderApp
+from .DistUpgradeFetcher import DistUpgradeFetcherGtk
+from .GtkProgress import GtkAcquireProgress
+
+from gettext import gettext as _
+
+class Dialog(SimpleGtkbuilderApp):
+  def __init__(self, window_main):
+    self.window_main = window_main
+    self.focus_button = None
+    SimpleGtkbuilderApp.__init__(self, self.window_main.datadir+"/gtkbuilder/Dialog.ui",
+                                 "update-manager")
+
+  def main(self):
+    self.window_main.push(self.pane_dialog, self)
+    if self.focus_button:
+      self.focus_button.grab_focus()
+
+  def run(self, parent=None):
+    if self.focus_button:
+      self.focus_button.grab_focus()
+    if parent:
+      self.window_dialog.set_transient_for(parent)
+      self.window_dialog.set_modal(True)
+    self.window_dialog.run()
+
+  def close(self):
+    sys.exit(0) # By default, exit the app
+
+  def add_button(self, label, callback, secondary=False):
+    # from_stock tries stock first and falls back to mnemonic
+    button = Gtk.Button.new_from_stock(label)
+    button.connect("clicked", lambda x: callback())
+    button.show()
+    self.buttonbox.add(button)
+    self.buttonbox.set_child_secondary(button, secondary)
+    return button
+
+  def add_settings_button(self):
+    if os.path.exists("/usr/bin/software-properties-gtk"):
+      return self.add_button(_("Settings…"), self.on_settings_button_clicked, secondary=True)
+    else:
+      return None
+
+  def on_settings_button_clicked(self):
+    cmd = ["/usr/bin/software-properties-gtk",
+           "--open-tab","2",
+           # FIXME: once get_xid() is available via introspections, add 
+           #        this back
+           #"--toplevel", "%s" % self.window_main.get_window().get_xid() 
+          ]
+    self.window_main.set_sensitive(False)
+    p = subprocess.Popen(cmd)
+    while p.poll() is None:
+        while Gtk.events_pending():
+            Gtk.main_iteration()
+        time.sleep(0.05)
+    self.window_main.set_sensitive(True)
+
+  def set_header(self, label):
+    self.label_header.set_label(label)
+
+  def set_desc(self, label):
+    self.label_desc.set_label(label)
+    self.label_desc.set_visible(bool(label))
+
+
+class NoUpdatesDialog(Dialog):
+  def __init__(self, window_main):
+    Dialog.__init__(self, window_main)
+    self.set_header(_("The software on this computer is up to date."))
+    self.add_settings_button()
+    self.focus_button = self.add_button(Gtk.STOCK_OK, self.close)
+
+
+class DistUpgradeDialog(Dialog):
+  def __init__(self, window_main, meta_release):
+    Dialog.__init__(self, window_main)
+    self.meta_release = meta_release
+    self.set_header(_("The software on this computer is up to date."))
+    # Translators: these are Ubuntu version names like "Ubuntu 12.04"
+    self.set_desc(_("However, %s %s is now available (you have %s).") % (
+                  meta_release.flavor_name,
+                  meta_release.upgradable_to.version,
+                  meta_release.current_dist_version))
+    self.add_settings_button()
+    self.add_button(_("Upgrade…"), self.upgrade)
+    self.focus_button = self.add_button(Gtk.STOCK_OK, self.close)
+
+  def upgrade(self):
+    progress = GtkAcquireProgress(self.window_main, self.window_main.datadir,
+                                  _("Downloading the release upgrade tool"))
+    fetcher = DistUpgradeFetcherGtk(new_dist=self.meta_release.upgradable_to,
+                                    parent=self.window_main,
+                                    progress=progress,
+                                    datadir=self.window_main.datadir)
+    if self.window_main.options.sandbox:
+      fetcher.run_options.append("--sandbox")
+    fetcher.run()
+
+
+class UnsupportedDialog(DistUpgradeDialog):
+  def __init__(self, window_main, meta_release):
+    DistUpgradeDialog.__init__(self, window_main, meta_release)
+    # Translators: this is an Ubuntu version name like "Ubuntu 12.04"
+    self.set_header(_("Software updates are no longer provided for %s %s.") % (
+                    meta_release.flavor_name,
+                    meta_release.current_dist_version))
+    # Translators: this is an Ubuntu version name like "Ubuntu 12.04"
+    self.set_desc(_("To stay secure, you should upgrade to %s %s.") % (
+                  meta_release.flavor_name,
+                  meta_release.upgradable_to.version))
+    print("Hello!")
+
+  def run(self, parent):
+    # This field is used in tests/test_end_of_life.py
+    print("Hello2!", self.window_main)
+    self.window_main.no_longer_supported_nag = self.window_dialog
+    DistUpgradeDialog.run(self, parent)
+
+
+class PartialUpgradeDialog(Dialog):
+  def __init__(self, window_main):
+    Dialog.__init__(self, window_main)
+    self.set_header(_("Not all updates can be installed"))
+    self.set_desc(_("""Run a partial upgrade, to install as many updates as possible. 
+
+This can be caused by:
+ * A previous upgrade which didn't complete
+ * Problems with some of the installed software
+ * Unofficial software packages not provided by Ubuntu
+ * Normal changes of a pre-release version of Ubuntu"""))
+    self.add_settings_button()
+    self.add_button(_("_Partial Upgrade"), self.upgrade)
+    self.focus_button = self.add_button(_("_Continue"), Gtk.main_quit)
+
+  def upgrade(self):
+    os.execl("/usr/bin/gksu",
+             "/usr/bin/gksu", "--desktop",
+             "/usr/share/applications/update-manager.desktop",
+             "--", "/usr/bin/update-manager", "--dist-upgrade")
+
+  def main(self):
+    Dialog.main(self)
+    # Block progress until user has answered this question
+    Gtk.main()
+
+
+class ErrorDialog(Dialog):
+  def __init__(self, window_main, header, desc=None):
+    Dialog.__init__(self, window_main)
+    self.set_header(header)
+    if desc:
+      self.set_desc(desc)
+      self.label_desc.set_selectable(True)
+    self.add_settings_button()
+    self.focus_button = self.add_button(Gtk.STOCK_OK, self.close)
+
+  def main(self):
+    Dialog.main(self)
+    # The label likes to start selecting everything (b/c it got focus before
+    # we switched to our default button).
+    self.label_desc.select_region(0, 0)
+    # Since errors usually are outside the normal flow, we'll guarantee that
+    # we don't continue with normal code flow by running our own loop here.
+    # We won't screw anything up because the only thing this dialog will do
+    # is exit.
+    Gtk.main()
+
+
+class NeedRestartDialog(Dialog):
+  def __init__(self, window_main):
+    Dialog.__init__(self, window_main)
+    self.set_header(_("The computer needs to restart to finish installing updates."))
+    self.focus_button = self.add_button(_("_Restart"), self.restart)
+
+  def restart(self, *args, **kwargs):
+    self._request_reboot_via_session_manager()
+
+  def _request_reboot_via_session_manager(self):
+    try:
+        bus = dbus.SessionBus()
+        proxy_obj = bus.get_object("org.gnome.SessionManager",
+                                   "/org/gnome/SessionManager")
+        iface = dbus.Interface(proxy_obj, "org.gnome.SessionManager")
+        iface.RequestReboot()
+    except dbus.DBusException:
+        self._request_reboot_via_consolekit()
+    except:
+        pass
+
+  def _request_reboot_via_consolekit(self):
+    try:
+        bus = dbus.SystemBus()
+        proxy_obj = bus.get_object("org.freedesktop.ConsoleKit",
+                                   "/org/freedesktop/ConsoleKit/Manager")
+        iface = dbus.Interface(proxy_obj, "org.freedesktop.ConsoleKit.Manager")
+        iface.Restart()
+    except dbus.DBusException:
+        pass
+

=== modified file 'UpdateManager/DistUpgradeFetcher.py'
--- UpdateManager/DistUpgradeFetcher.py	2012-06-12 01:40:26 +0000
+++ UpdateManager/DistUpgradeFetcher.py	2012-06-18 20:03:30 +0000
@@ -26,6 +26,7 @@
 from .ReleaseNotesViewer import ReleaseNotesViewer
 from .Core.utils import error, inhibit_sleep, allow_sleep
 from .Core.DistUpgradeFetcherCore import DistUpgradeFetcherCore
+from .SimpleGtk3builderApp import SimpleGtkbuilderApp
 from gettext import gettext as _
 try:
     from urllib.request import urlopen
@@ -38,10 +39,11 @@
 
 class DistUpgradeFetcherGtk(DistUpgradeFetcherCore):
 
-    def __init__(self, new_dist, progress, parent):
+    def __init__(self, new_dist, progress, parent, datadir):
         DistUpgradeFetcherCore.__init__(self,new_dist,progress)
-        self.parent = parent
-        self.window_main = parent.window_main
+        uifile = datadir + "gtkbuilder/ReleaseNotes.ui"
+        self.widgets = SimpleGtkbuilderApp(uifile, "update-manager")
+        self.window_main = parent
 
     def error(self, summary, message):
         return error(self.window_main, summary, message)
@@ -76,9 +78,9 @@
               from .ReleaseNotesViewerWebkit import ReleaseNotesViewerWebkit
               webkit_release_notes = ReleaseNotesViewerWebkit(self.new_dist.releaseNotesHtmlUri)
               webkit_release_notes.show()
-              self.parent.scrolled_notes.add(webkit_release_notes)
-              res = self.parent.dialog_release_notes.run()
-              self.parent.dialog_release_notes.hide()
+              self.widgets.scrolled_notes.add(webkit_release_notes)
+              res = self.widgets.dialog_release_notes.run()
+              self.widgets.dialog_release_notes.hide()
               if res == Gtk.ResponseType.OK:
                   return True
               return False
@@ -105,10 +107,10 @@
               notes = release_notes.read().decode("UTF-8", "replace")
               textview_release_notes = ReleaseNotesViewer(notes)
               textview_release_notes.show()
-              self.parent.scrolled_notes.add(textview_release_notes)
-              self.parent.dialog_release_notes.set_transient_for(self.window_main)
-              res = self.parent.dialog_release_notes.run()
-              self.parent.dialog_release_notes.hide()
+              self.widgets.scrolled_notes.add(textview_release_notes)
+              self.widgets.dialog_release_notes.set_transient_for(self.window_main)
+              res = self.widgets.dialog_release_notes.run()
+              self.widgets.dialog_release_notes.hide()
           except HTTPError:
               primary = "<span weight=\"bold\" size=\"larger\">%s</span>" % \
                         _("Could not find the release notes")
@@ -139,8 +141,3 @@
               return True
       return False
 
-if __name__ == "__main__":
-    error(None, "summary","message")
-    d = DistUpgradeFetcherGtk(None,None)
-    print(d.authenticate('/tmp/Release','/tmp/Release.gpg'))
-

=== modified file 'UpdateManager/GtkProgress.py'
--- UpdateManager/GtkProgress.py	2012-06-12 11:50:29 +0000
+++ UpdateManager/GtkProgress.py	2012-06-18 20:03:30 +0000
@@ -23,123 +23,27 @@
 
 from gi.repository import Gtk, Gdk
 import apt
-import apt_pkg
 from gettext import gettext as _
 from .Core.utils import humanize_size
-
-# intervals of the start up progress
-# 3x caching and menu creation
-STEPS_UPDATE_CACHE = [33, 66, 100]
-#STEPS_UPDATE_CACHE = [25, 50, 75, 100]
-
-class GtkOpProgressInline(apt.progress.base.OpProgress):
-    def __init__(self, progressbar, parent,                  
-                 steps=STEPS_UPDATE_CACHE):
-        # steps
-        self.all_steps = steps
-        self._init_steps()
-        # the progressbar to use
-        self._progressbar = progressbar
-        self._parent = parent
-        self._window = None
-    def _init_steps(self):
-        self.steps = self.all_steps[:]
-        self.base = 0
-        self.old = 0
-        self.next = int(self.steps.pop(0))
-    def update(self, percent=None):
-        super(GtkOpProgressInline, self).update(percent)
-        self._progressbar.show()
-        self._parent.set_sensitive(False)
-        # if the old percent was higher, a new progress was started
-        if self.old > self.percent:
-            # set the borders to the next interval
-            self.base = self.next
-            try:
-                self.next = int(self.steps.pop(0))
-            except:
-                pass
-        progress = self.base + self.percent/100 * (self.next - self.base)
-        self.old = self.percent
-        if abs(self.percent-self._progressbar.get_fraction()*100.0) > 0.5:
-            self._progressbar.set_text("%s" % self.op)
-            self._progressbar.set_fraction(progress/100.0)
-        while Gtk.events_pending():
-            Gtk.main_iteration()
-    def done(self):
-        """ one sub-step is done """
-        pass
-    def all_done(self):
-        """ all steps are completed (called by the parent) """
-        self._parent.set_sensitive(True)
-        self._progressbar.hide()
-        self._init_steps()
-
-class GtkOpProgressWindow(apt.progress.base.OpProgress):
-    def __init__(self, host_window, progressbar, status, parent,
-                 steps=STEPS_UPDATE_CACHE):
-        # used for the "one run progressbar"
-        self.steps = steps[:]
-        self.base = 0
-        self.old = 0
-        self.next = int(self.steps.pop(0))
-
-        self._parent = parent
-        self._window = host_window
-        self._status = status
-        self._progressbar = progressbar
-        # Do not show the close button 
-        self._window.realize()
-        self._window.set_title("")
-        host_window.get_window().set_functions(Gdk.WMFunction.MOVE)
-        self._window.set_transient_for(parent)
-
-    def update(self, percent=None):
-        super(GtkOpProgressWindow, self).update(percent)
-        #print(self.percent)
-        #print(self.Op)
-        #print(self.SubOp)
-        # only show progress bar if the parent is not iconified (#353195)
-        state = self._parent.window.get_state()
-        if not (state  & Gdk.WINDOW_STATE_ICONIFIED):
-            self._window.show()
-        self._parent.set_sensitive(False)
-        # if the old percent was higher, a new progress was started
-        if self.old > self.percent:
-            # set the borders to the next interval
-            self.base = self.next
-            try:
-                self.next = int(self.steps.pop(0))
-            except:
-                pass
-        progress = self.base + self.percent/100 * (self.next - self.base)
-        self.old = self.percent
-        if abs(self.percent-self._progressbar.get_fraction()*100.0) > 0.1:
-            self._status.set_markup("<i>%s</i>" % self.op)
-            self._progressbar.set_fraction(progress/100.0)
-        while Gtk.events_pending():
-            Gtk.main_iteration()
-
-    def done(self):
-        self._parent.set_sensitive(True)
-    def hide(self):
-        self._window.hide()
+from .SimpleGtk3builderApp import SimpleGtkbuilderApp
 
 class GtkAcquireProgress(apt.progress.base.AcquireProgress):
-    def __init__(self, parent, summary="", descr=""):
+    def __init__(self, parent, datadir, summary="", descr=""):
+        uifile = datadir + "gtkbuilder/AcquireProgress.ui"
+        self.widgets = SimpleGtkbuilderApp(uifile, "update-manager")
         # if this is set to false the download will cancel
         self._continue = True
         # init vars here
         # FIXME: find a more elegant way, this sucks
-        self.summary = parent.label_fetch_summary
-        self.status = parent.label_fetch_status
+        self.summary = self.widgets.label_fetch_summary
+        self.status = self.widgets.label_fetch_status
         # we need to connect the signal manual here, it won't work
         # from the main window auto-connect
-        parent.button_fetch_cancel.connect(
+        self.widgets.button_fetch_cancel.connect(
             "clicked", self.on_button_fetch_cancel_clicked)
-        self.progress = parent.progressbar_fetch
-        self.window_fetch = parent.window_fetch
-        self.window_fetch.set_transient_for(parent.window_main)
+        self.progress = self.widgets.progressbar_fetch
+        self.window_fetch = self.widgets.window_fetch
+        self.window_fetch.set_transient_for(parent)
         self.window_fetch.realize()
         self.window_fetch.get_window().set_functions(Gdk.WMFunction.MOVE)
         # set summary
@@ -183,28 +87,3 @@
             Gtk.main_iteration()
         return self._continue
 
-if __name__ == "__main__":
-    import apt
-    from .SimpleGtkbuilderApp import SimpleGtkbuilderApp
-
-    class MockParent(SimpleGtkbuilderApp):
-        """Mock parent for the fetcher that just loads the UI file"""
-        def __init__(self):
-            SimpleGtkbuilderApp.__init__(self, "../data/gtkbuilder/UpdateManager.ui", "update-manager")
-
-    # create mock parent and fetcher
-    parent = MockParent()
-    acquire_progress = GtkAcquireProgress(parent, "summary", "long detailed description")
-    #acquire_progress = GtkAcquireProgress(parent)
-
-    # download lists
-    cache = apt.Cache()
-    res = cache.update(acquire_progress)
-    # generate a dist-upgrade (to feed data to the fetcher) and get it
-    cache.upgrade()
-    pm = apt_pkg.PackageManager(cache._depcache)
-    fetcher = apt_pkg.Acquire(acquire_progress)
-    res = cache._fetch_archives(fetcher, pm)
-    print(res)
-    
-    

=== modified file 'UpdateManager/InstallProgress.py'
--- UpdateManager/InstallProgress.py	2012-06-18 20:03:30 +0000
+++ UpdateManager/InstallProgress.py	2012-06-18 20:03:30 +0000
@@ -29,10 +29,6 @@
 
 from __future__ import absolute_import, print_function
 
-from gi.repository import Gtk
-#from gi.repository import Gio
-from gi.repository import GLib
-
 import warnings
 warnings.filterwarnings("ignore", "Accessed deprecated property", DeprecationWarning)
 
@@ -41,10 +37,6 @@
 
 from .backend import get_backend
 
-from gettext import gettext as _
-from gettext import ngettext
-
-from UpdateManager.UpdatesAvailable import UpdatesAvailable
 from .Core.utils import (inhibit_sleep,
                          allow_sleep)
 
@@ -93,7 +85,7 @@
 
     # Either launch main dialog and continue or quit altogether
     if success:
-      self.window_main.start_available()
+      self.window_main.start_available(allow_restart=True)
     else:
       sys.exit(0)
 

=== modified file 'UpdateManager/MetaReleaseGObject.py'
--- UpdateManager/MetaReleaseGObject.py	2012-05-01 14:01:29 +0000
+++ UpdateManager/MetaReleaseGObject.py	2012-06-18 20:03:30 +0000
@@ -30,8 +30,10 @@
                                 (GObject.TYPE_PYOBJECT,)),
         'dist_no_longer_supported' : (GObject.SignalFlags.RUN_LAST,
                                       None,
-                                      ())
-
+                                      ()),
+        'done_downloading' : (GObject.SignalFlags.RUN_LAST,
+                              None,
+                              ())
         }
 
     def __init__(self, useDevelopmentRelease=False, useProposed=False):
@@ -43,13 +45,13 @@
 
     def check(self):
         # check if we have a metarelease_information file
-        keepRuning = True
         if self.no_longer_supported is not None:
-            keepRuning = False
             self.emit("dist_no_longer_supported")
         if self.new_dist is not None:
-            keepRuning = False
-            self.emit("new_dist_available", self.new_dist)            
-        return keepRuning
-
+            self.emit("new_dist_available", self.new_dist)
+        if self.downloading:
+            return True
+        else:
+            self.emit("done_downloading")
+            return False
 

=== modified file 'UpdateManager/UpdateManager.py'
--- UpdateManager/UpdateManager.py	2012-06-18 20:03:30 +0000
+++ UpdateManager/UpdateManager.py	2012-06-18 20:03:30 +0000
@@ -24,10 +24,14 @@
 
 from gi.repository import Gtk
 from gi.repository import Gdk
+from gi.repository import Gio
+from gi.repository import GLib
 
 import warnings
 warnings.filterwarnings("ignore", "Accessed deprecated property", DeprecationWarning)
 
+import apt_pkg
+import os
 import sys
 from gettext import gettext as _
 
@@ -37,11 +41,23 @@
 DBusGMainLoop(set_as_default=True)
 
 from .UnitySupport import UnitySupport
+from .Dialogs import (DistUpgradeDialog,
+                      ErrorDialog,
+                      NeedRestartDialog,
+                      NoUpdatesDialog,
+                      PartialUpgradeDialog,
+                      UnsupportedDialog)
 from .InstallProgress import InstallProgress
+from .MetaReleaseGObject import MetaRelease
 from .UpdateProgress import UpdateProgress
 from .UpdatesAvailable import UpdatesAvailable
 from .Core.AlertWatcher import AlertWatcher
+from .Core.MyCache import MyCache
 from .Core.roam import NetworkManagerHelper
+from .Core.UpdateList import UpdateList
+
+# file that signals if we need to reboot
+REBOOT_REQUIRED_FILE = "/var/run/reboot-required"
 
 class UpdateManager(Gtk.Window):
   """ This class is the main window and work flow controller.  Panes will add
@@ -55,6 +71,9 @@
     self.options = options
     self.unity = UnitySupport()
     self.controller = None
+    self.cache = None
+    self.update_list = None
+    self.meta_release = None
 
     # Basic GTK+ parameters
     self.set_title(_("Software Updater"))
@@ -69,7 +88,7 @@
     self._setup_dbus()
 
     # deal with no-focus-on-map
-    if self.options.no_focus_on_map:
+    if self.options and self.options.no_focus_on_map:
         self.set_focus_on_map(False)
         self.iconify()
         self.stick()
@@ -78,6 +97,11 @@
         self.initial_focus_id = self.connect(
             "focus-in-event", self.on_initial_focus_in)
 
+    # Look for a new release in a thread
+    self.meta_release = MetaRelease(self.options and self.options.devel_release,
+                                    self.options and self.options.use_proposed)
+
+
   def on_initial_focus_in(self, widget, event):
       """callback run on initial focus-in (if started unmapped)"""
       self.unstick()
@@ -132,20 +156,132 @@
     if self.options.no_update:
       self.start_available()
       return
-    self._start_pane(UpdateProgress)
-
-  def start_available(self):
-    self._start_pane(UpdatesAvailable)
+
+    self._start_pane(UpdateProgress(self))
+
+  def start_available(self, allow_restart=False):
+    # If restart is needed, show that.  Else show no-update-needed.  Else
+    # actually show the available updates.
+    if allow_restart and os.path.exists(REBOOT_REQUIRED_FILE):
+        self._start_pane(NeedRestartDialog(self))
+        return
+
+    self._look_busy()
+    self.refresh_cache()
+
+    if self.cache.install_count == 0:
+      if not self._check_meta_release():
+        self._start_pane(NoUpdatesDialog(self))
+    else:
+      self._start_pane(UpdatesAvailable(self))
 
   def start_install(self):
-    self._start_pane(InstallProgress)
-
-  def _start_pane(self, pane_class):
+    self._start_pane(InstallProgress(self))
+
+  def start_error(self, header, desc):
+    self._start_pane(ErrorDialog(self, header, desc))
+
+  def _start_pane(self, pane):
+    self._look_busy()
+    pane.main()
+
+  def _look_busy(self):
     self.set_sensitive(False)
     if self.get_window() is not None:
       self.get_window().set_cursor(Gdk.Cursor.new(Gdk.CursorType.WATCH))
-    pane = pane_class(self)
-    pane.main()
+
+  def _check_meta_release(self):
+    if self.meta_release is None:
+      return False
+
+    if self.meta_release.downloading:
+      # Block until we get an answer
+      GLib.idle_add(self._meta_release_wait_idle)
+      Gtk.main()
+
+    # Check if there is anything to upgrade to or a known-broken upgrade
+    next = self.meta_release.upgradable_to
+    if not next or next.upgrade_broken:
+      return False
+
+    # Check for end-of-life
+    if self.meta_release.no_longer_supported:
+      self._start_pane(UnsupportedDialog(self, self.meta_release))
+      return True
+
+    # Check for new fresh release
+    settings = Gio.Settings("com.ubuntu.update-manager")
+    if (self.meta_release.new_dist and
+        (self.options.check_dist_upgrades or
+         settings.get_boolean("check-dist-upgrades"))):
+      self._start_pane(DistUpgradeDialog(self, self.meta_release))
+      return True
+
+    return False
+
+  def _meta_release_wait_idle(self):
+    # 'downloading' is changed in a thread, but the signal 'done_downloading'
+    # is done in our thread's event loop.  So we know that it won't fire while
+    # we're in this function.
+    if not self.meta_release.downloading:
+      Gtk.main_quit()
+    else:
+      self.meta_release.connect("done_downloading", Gtk.main_quit)
+    return False
+
+  # fixme: we should probably abstract away all the stuff from libapt
+  def refresh_cache(self):
+    # get the lock
+    try:
+      apt_pkg.pkgsystem_lock()
+    except SystemError:
+      pass
+
+    try:
+      if self.cache is None:
+        self.cache = MyCache(None)
+      else:
+        self.cache.open(None)
+        self.cache._initDepCache()
+    except AssertionError:
+      # if the cache could not be opened for some reason,
+      # let the release upgrader handle it, it deals
+      # a lot better with this
+      self._start_pane(PartialUpgradeDialog(self))
+      # we assert a clean cache
+      header = _("Software index is broken")
+      desc = _("It is impossible to install or remove any software. "
+               "Please use the package manager \"Synaptic\" or run "
+               "\"sudo apt-get install -f\" in a terminal to fix "
+               "this issue at first.")
+      self.start_error(header, desc)
+    except SystemError as e:
+      header = _("Could not initialize the package information")
+      desc = _("An unresolvable problem occurred while "
+               "initializing the package information.\n\n"
+               "Please report this bug against the 'update-manager' "
+               "package and include the following error message:\n") + e
+      self.start_error(header, desc)
+
+    # Let the Gtk event loop breath if it hasn't had a chance.
+    while Gtk.events_pending():
+      Gtk.main_iteration()
+
+    self.update_list = UpdateList(self)
+    try:
+      self.update_list.update(self.cache)
+    except SystemError as e:
+      header = _("Could not calculate the upgrade")
+      desc = _("An unresolvable problem occurred while "
+               "calculating the upgrade.\n\n"
+               "Please report this bug against the 'update-manager' "
+               "package and include the following error message:\n") + e
+      self.start_error(header, desc)
+
+    self.unity.set_updates_count(self.cache.install_count)
+
+    if self.update_list.distUpgradeWouldDelete > 0:
+      self._start_pane(PartialUpgradeDialog(self))
 
   def _setup_dbus(self):
     """ this sets up a dbus listener if none is installed alread """

=== modified file 'UpdateManager/UpdateProgress.py'
--- UpdateManager/UpdateProgress.py	2012-06-18 20:03:30 +0000
+++ UpdateManager/UpdateProgress.py	2012-06-18 20:03:30 +0000
@@ -29,9 +29,6 @@
 
 from __future__ import absolute_import, print_function
 
-from gi.repository import Gtk
-from gi.repository import GLib
-
 import warnings
 warnings.filterwarnings("ignore", "Accessed deprecated property", DeprecationWarning)
 
@@ -40,10 +37,6 @@
 
 from .backend import get_backend
 
-from gettext import gettext as _
-from gettext import ngettext
-
-from UpdateManager.UpdatesAvailable import UpdatesAvailable
 from .Core.utils import (inhibit_sleep,
                          allow_sleep)
 

=== modified file 'UpdateManager/UpdatesAvailable.py'
--- UpdateManager/UpdatesAvailable.py	2012-06-18 20:03:30 +0000
+++ UpdateManager/UpdatesAvailable.py	2012-06-18 20:03:30 +0000
@@ -41,9 +41,7 @@
 
 import apt_pkg
 
-import sys
 import os
-import stat
 import re
 import logging
 import operator
@@ -52,29 +50,17 @@
 import threading
 import xml.sax.saxutils
 
-import dbus
-
-from .GtkProgress import GtkAcquireProgress, GtkOpProgressInline
-from .backend import get_backend
-
 from gettext import gettext as _
 from gettext import ngettext
 
 
-from .Core.utils import (humanize_size,
-                         on_battery,
-                         inhibit_sleep,
-                         allow_sleep)
-from .Core.UpdateList import UpdateList
-from .Core.MyCache import MyCache
+from .Core.utils import humanize_size
 from .Core.AlertWatcher import AlertWatcher
 
 from DistUpgrade.DistUpgradeCache import NotEnoughFreeSpaceError
-from .DistUpgradeFetcher import DistUpgradeFetcherGtk
 
 from .ChangelogViewer import ChangelogViewer
 from .SimpleGtk3builderApp import SimpleGtkbuilderApp
-from .MetaReleaseGObject import MetaRelease
 from .UnitySupport import UnitySupport
 
 
@@ -86,43 +72,18 @@
 # list constants
 (LIST_CONTENTS, LIST_NAME, LIST_PKG, LIST_ORIGIN, LIST_TOGGLE_CHECKED) = range(5)
 
-# file that signals if we need to reboot
-REBOOT_REQUIRED_FILE = "/var/run/reboot-required"
-
 # NetworkManager enums
 from .Core.roam import NetworkManagerHelper
 
-def show_dist_no_longer_supported_dialog(parent=None):
-    """ show a no-longer-supported dialog """
-    msg = "<big><b>%s</b></big>\n\n%s" % (
-        _("Your Ubuntu release is not supported anymore."),
-        _("You will not get any further security fixes or critical "
-          "updates. "
-          "Please upgrade to a later version of Ubuntu."))
-    dialog = Gtk.MessageDialog(parent, 0, Gtk.MessageType.WARNING,
-                               Gtk.ButtonsType.CLOSE,"")
-    dialog.set_title("")
-    dialog.set_markup(msg)
-    button = Gtk.LinkButton(uri="http://www.ubuntu.com/releaseendoflife",
-                            label=_("Upgrade information"))
-    button.show()
-    dialog.get_content_area().pack_end(button, True, True, 0)
-    # this data used in the test to get the dialog
-    if parent:
-        parent.no_longer_supported_nag = dialog
-    dialog.run()
-    dialog.destroy()
-    if parent:
-        del parent.no_longer_supported_nag
-
-
 class UpdatesAvailable(SimpleGtkbuilderApp):
 
   def __init__(self, app):
     self.window_main = app
     self.datadir = app.datadir
     self.options = app.options
-    SimpleGtkbuilderApp.__init__(self, self.datadir+"gtkbuilder/UpdateManager.ui",
+    self.cache = app.cache
+    self.list = app.update_list
+    SimpleGtkbuilderApp.__init__(self, self.datadir+"/gtkbuilder/UpdateManager.ui",
                                  "update-manager")
 
     # Used for inhibiting power management
@@ -195,25 +156,11 @@
     if not os.path.exists("/usr/bin/software-properties-gtk"):
         self.button_settings.set_sensitive(False)
 
-    # check if there is a new reboot required notification
-    if os.path.exists(REBOOT_REQUIRED_FILE):
-        self.show_reboot_required_info()
-
-    self.window_main.push(self.pane_updates_available, self)
-
     # init show version
     self.show_versions = self.settings.get_boolean("show-versions")
     # init summary_before_name
     self.summary_before_name = self.settings.get_boolean("summary-before-name")
 
-    # get progress object
-    self.progress = GtkOpProgressInline(
-        self.progressbar_cache_inline, self.window_main)
-
-    # deal with no-focus-on-map
-    if self.options.no_focus_on_map and self.progress._window:
-        self.progress._window.set_focus_on_map(False)
-
     # Create Unity launcher quicklist
     # FIXME: instead of passing parent we really should just send signals
     self.unity = UnitySupport(parent=self)
@@ -228,16 +175,6 @@
     self.select_all_updgrades (None)
     self.on_button_install_clicked (None)
 
-  def warn_on_battery(self):
-      """check and warn if on battery"""
-      if on_battery():
-          self.dialog_on_battery.set_transient_for(self.window_main)
-          self.dialog_on_battery.set_title("")
-          res = self.dialog_on_battery.run()
-          self.dialog_on_battery.hide()
-          if res != Gtk.ResponseType.YES:
-              sys.exit()
-
   def install_column_view_func(self, cell_layout, renderer, model, iter, data):
     pkg = model.get_value(iter, LIST_PKG)
     if pkg is None:
@@ -484,9 +421,6 @@
       self.refresh_updates_count()
       num_updates = self.cache.install_count
 
-      # setup unity stuff
-      self.unity.set_updates_count(num_updates)
-
       if num_updates == 0:
           text_header= _("The software on this computer is up to date.")
           self.label_downsize.set_text("\n")
@@ -502,7 +436,9 @@
           # show different text on first run (UX team suggestion)
           firstrun = self.settings.get_boolean("first-run")
           if firstrun:
-              text_header = _("Updated software has been issued since %s was released. Do you want to install it now?") % self.meta.current_dist_description
+              flavor = self.window_main.meta_release.flavor_name
+              version = self.window_main.meta_release.current_dist_version
+              text_header = _("Updated software has been issued since %s %s was released. Do you want to install it now?") % (flavor, version)
               self.settings.set_boolean("first-run", False)
           else:
               text_header = _("Updated software is available for this computer. Do you want to install it now?")
@@ -551,6 +487,7 @@
         while Gtk.events_pending():
             Gtk.main_iteration()
         time.sleep(0.05)
+    self.window_main.refresh_cache()
     self.fillstore()
 
   def on_button_install_clicked(self, widget):
@@ -567,45 +504,14 @@
         self.cache.checkFreeSpace()
     except NotEnoughFreeSpaceError as e:
         for req in e.free_space_required_list:
-            self.error(err_sum, err_long % (req.size_total,
-                                            req.dir,
-                                            req.size_needed,
-                                            req.dir))
+            self.window_main.start_error(err_sum, err_long % (req.size_total,
+                                                              req.dir,
+                                                              req.size_needed,
+                                                              req.dir))
         return
     except SystemError as e:
         logging.exception("free space check failed")
     self.window_main.start_install()
-    
-  def on_button_restart_required_clicked(self, button=None):
-      self._request_reboot_via_session_manager()
-
-  def show_reboot_required_info(self):
-    self.frame_restart_required.show()
-    self.label_restart_required.set_text(_("The computer needs to restart to "
-                                       "finish installing updates. Please "
-                                       "save your work before continuing."))
-
-  def _request_reboot_via_session_manager(self):
-    try:
-        bus = dbus.SessionBus()
-        proxy_obj = bus.get_object("org.gnome.SessionManager",
-                                   "/org/gnome/SessionManager")
-        iface = dbus.Interface(proxy_obj, "org.gnome.SessionManager")
-        iface.RequestReboot()
-    except dbus.DBusException:
-        self._request_reboot_via_consolekit()
-    except:
-        pass
-
-  def _request_reboot_via_consolekit(self):
-    try:
-        bus = dbus.SystemBus()
-        proxy_obj = bus.get_object("org.freedesktop.ConsoleKit",
-                                   "/org/freedesktop/ConsoleKit/Manager")
-        iface = dbus.Interface(proxy_obj, "org.freedesktop.ConsoleKit.Manager")
-        iface.Restart()
-    except dbus.DBusException:
-        pass
 
   def _on_network_alert(self, watcher, state):
       # do not set the buttons to sensitive/insensitive until NM
@@ -737,216 +643,48 @@
     # disconnect the view first
     self.treeview_update.set_model(None)
     self.store.clear()
-    
     # clean most objects
     self.dl_size = 0
-    try:
-        self.initCache()
-    except SystemError as e:
-        msg = ("<big><b>%s</b></big>\n\n%s\n'%s'" %
-               (_("Could not initialize the package information"),
-                _("An unresolvable problem occurred while "
-                  "initializing the package information.\n\n"
-                  "Please report this bug against the 'update-manager' "
-                  "package and include the following error message:\n"),
-                e)
-               )
-        dialog = Gtk.MessageDialog(self.window_main,
-                                   0, Gtk.MessageType.ERROR,
-                                   Gtk.ButtonsType.CLOSE,"")
-        dialog.set_markup(msg)
-        dialog.get_content_area().set_spacing(6)
-        dialog.run()
-        dialog.destroy()
-        sys.exit(1)
-    self.list = UpdateList(self)
-    
-    while Gtk.events_pending():
-        Gtk.main_iteration()
 
-    # fill them again
-    try:
-        self.list.update(self.cache)
-    except SystemError as e:
-        msg = ("<big><b>%s</b></big>\n\n%s\n'%s'" %
-               (_("Could not calculate the upgrade"),
-                _("An unresolvable problem occurred while "
-                  "calculating the upgrade.\n\n"
-                  "Please report this bug against the 'update-manager' "
-                  "package and include the following error message:"),
-                e)
-               )
-        dialog = Gtk.MessageDialog(self.window_main,
-                                   0, Gtk.MessageType.ERROR,
-                                   Gtk.ButtonsType.CLOSE,"")
-        dialog.set_markup(msg)
-        dialog.get_content_area().set_spacing(6)
-        dialog.run()
-        dialog.destroy()
-    if self.list.num_updates > 0:
-      #self.treeview_update.set_model(None)
-      self.scrolledwindow_update.show()
-      origin_list = sorted(
-        self.list.pkgs, key=operator.attrgetter("importance"), reverse=True)
-      for origin in origin_list:
-        self.store.append(['<b><big>%s</big></b>' % origin.description,
-                           origin.description, None, origin,True])
-        for pkg in self.list.pkgs[origin]:
-          name = xml.sax.saxutils.escape(pkg.name)
-          if not pkg.is_installed:
-              name += _(" (New install)")
-          summary = xml.sax.saxutils.escape(getattr(pkg.candidate, "summary", None))
-          if self.summary_before_name:
-              contents = "%s\n<small>%s</small>" % (summary, name)
-          else:
-              contents = "<b>%s</b>\n<small>%s</small>" % (name, summary)
-          #TRANSLATORS: the b stands for Bytes
-          size = _("(Size: %s)") % humanize_size(getattr(pkg.candidate, "size", 0))
-          installed_version = getattr(pkg.installed, "version", None)
-          candidate_version = getattr(pkg.candidate, "version", None)
-          if installed_version is not None:
-              version = _("From version %(old_version)s to %(new_version)s") %\
-                  {"old_version" : installed_version,
-                   "new_version" : candidate_version}
-          else:
-              version = _("Version %s") % candidate_version
-          if self.show_versions:
-              contents = "%s\n<small>%s %s</small>" % (contents, version, size)
-          else:
-              contents = "%s <small>%s</small>" % (contents, size)
-          self.store.append([contents, pkg.name, pkg, None, True])
-      self.treeview_update.set_model(self.store)
+    self.scrolledwindow_update.show()
+    origin_list = sorted(
+      self.list.pkgs, key=operator.attrgetter("importance"), reverse=True)
+    for origin in origin_list:
+      self.store.append(['<b><big>%s</big></b>' % origin.description,
+                         origin.description, None, origin,True])
+      for pkg in self.list.pkgs[origin]:
+        name = xml.sax.saxutils.escape(pkg.name)
+        if not pkg.is_installed:
+            name += _(" (New install)")
+        summary = xml.sax.saxutils.escape(getattr(pkg.candidate, "summary", None))
+        if self.summary_before_name:
+            contents = "%s\n<small>%s</small>" % (summary, name)
+        else:
+            contents = "<b>%s</b>\n<small>%s</small>" % (name, summary)
+        #TRANSLATORS: the b stands for Bytes
+        size = _("(Size: %s)") % humanize_size(getattr(pkg.candidate, "size", 0))
+        installed_version = getattr(pkg.installed, "version", None)
+        candidate_version = getattr(pkg.candidate, "version", None)
+        if installed_version is not None:
+            version = _("From version %(old_version)s to %(new_version)s") %\
+                {"old_version" : installed_version,
+                 "new_version" : candidate_version}
+        else:
+            version = _("Version %s") % candidate_version
+        if self.show_versions:
+            contents = "%s\n<small>%s %s</small>" % (contents, version, size)
+        else:
+            contents = "%s <small>%s</small>" % (contents, size)
+        self.store.append([contents, pkg.name, pkg, None, True])
+    self.treeview_update.set_model(self.store)
     self.update_count()
     self.setBusy(False)
     while Gtk.events_pending():
       Gtk.main_iteration()
-    self.check_all_updates_installable()
     self.refresh_updates_count()
     return False
 
-  def dist_no_longer_supported(self, meta_release):
-    show_dist_no_longer_supported_dialog(self.window_main)
-
-  def error(self, summary, details):
-      " helper function to display a error message "
-      msg = ("<big><b>%s</b></big>\n\n%s\n" % (summary, details) )
-      dialog = Gtk.MessageDialog(self.window_main,
-                                 0, Gtk.MessageType.ERROR,
-                                 Gtk.ButtonsType.CLOSE,"")
-      dialog.set_markup(msg)
-      dialog.get_content_area().set_spacing(6)
-      dialog.run()
-      dialog.destroy()
-
-  def on_button_dist_upgrade_clicked(self, button):
-      #print("on_button_dist_upgrade_clicked")
-      if self.new_dist.upgrade_broken:
-          return self.error(
-              _("Release upgrade not possible right now"),
-              _("The release upgrade can not be performed currently, "
-                "please try again later. The server reported: '%s'") % self.new_dist.upgrade_broken)
-      fetcher = DistUpgradeFetcherGtk(new_dist=self.new_dist, parent=self, progress=GtkAcquireProgress(self, _("Downloading the release upgrade tool")))
-      if self.options.sandbox:
-          fetcher.run_options.append("--sandbox")
-      fetcher.run()
-      
-  def new_dist_available(self, meta_release, upgradable_to):
-    self.frame_new_release.show()
-    self.label_new_release.set_markup(_("<b>New Ubuntu release '%s' is available</b>") % upgradable_to.version)
-    self.new_dist = upgradable_to
-    
-
-  # fixme: we should probably abstract away all the stuff from libapt
-  def initCache(self): 
-    # get the lock
-    try:
-        apt_pkg.pkgsystem_lock()
-    except SystemError:
-        pass
-        #d = Gtk.MessageDialog(parent=self.window_main,
-        #                      flags=Gtk.DialogFlags.MODAL,
-        #                      type=Gtk.MessageType.ERROR,
-        #                      buttons=Gtk.ButtonsType.CLOSE)
-        #d.set_markup("<big><b>%s</b></big>\n\n%s" % (
-        #    _("Only one software management tool is allowed to "
-        #      "run at the same time"),
-        #    _("Please close the other application e.g. 'aptitude' "
-        #      "or 'Synaptic' first.")))
-        #print("error from apt: '%s'" % e)
-        #d.set_title("")
-        #res = d.run()
-        #d.destroy()
-        #sys.exit()
-
-    try:
-        if hasattr(self, "cache"):
-            self.cache.open(self.progress)
-            self.cache._initDepCache()
-        else:
-            self.cache = MyCache(self.progress)
-            # FIXME: make this next line more elegant in a future branch by
-            # moving the cache to a central location, probably UpdateManager.py
-            self.window_main.cache = self.cache
-    except AssertionError:
-        # if the cache could not be opened for some reason,
-        # let the release upgrader handle it, it deals
-        # a lot better with this
-        self.ask_run_partial_upgrade()
-        # we assert a clean cache
-        msg=("<big><b>%s</b></big>\n\n%s"% \
-             (_("Software index is broken"),
-              _("It is impossible to install or remove any software. "
-                "Please use the package manager \"Synaptic\" or run "
-                "\"sudo apt-get install -f\" in a terminal to fix "
-                "this issue at first.")))
-        dialog = Gtk.MessageDialog(self.window_main,
-                                   0, Gtk.MessageType.ERROR,
-                                   Gtk.ButtonsType.CLOSE,"")
-        dialog.set_markup(msg)
-        dialog.get_content_area().set_spacing(6)
-        dialog.run()
-        dialog.destroy()
-        sys.exit(1)
-    else:
-        self.progress.all_done()
-
-  def check_all_updates_installable(self):
-    """ Check if all available updates can be installed and suggest
-        to run a distribution upgrade if not """
-    if self.list.distUpgradeWouldDelete > 0:
-        self.ask_run_partial_upgrade()
-
-  def ask_run_partial_upgrade(self):
-      self.dialog_dist_upgrade.set_transient_for(self.window_main)
-      self.dialog_dist_upgrade.set_title("")
-      res = self.dialog_dist_upgrade.run()
-      self.dialog_dist_upgrade.hide()
-      if res == Gtk.ResponseType.YES:
-          os.execl("/usr/bin/gksu",
-                   "/usr/bin/gksu", "--desktop",
-                   "/usr/share/applications/update-manager.desktop",
-                   "--", "/usr/bin/update-manager", "--dist-upgrade")
-      return False
-
-  def check_metarelease(self):
-      " check for new meta-release information "
-      settings = Gio.Settings("com.ubuntu.update-manager")
-      self.meta = MetaRelease(self.options.devel_release,
-                              self.options.use_proposed)
-      self.meta.connect("dist_no_longer_supported",self.dist_no_longer_supported)
-      # check if we are interessted in dist-upgrade information
-      # (we are not by default on dapper)
-      if (self.options.check_dist_upgrades or
-          settings.get_boolean("check-dist-upgrades")):
-          self.meta.connect("new_dist_available",self.new_dist_available)
-      
-
   def main(self):
-    # check for new distributin information
-    self.check_metarelease()
-
-    while Gtk.events_pending():
-      Gtk.main_iteration()
-
+    self.window_main.push(self.pane_updates_available, self)
     self.fillstore()
     self.alert_watcher.check_alert_state()

=== modified file 'UpdateManager/backend/InstallBackendAptdaemon.py'
--- UpdateManager/backend/InstallBackendAptdaemon.py	2012-06-18 20:03:30 +0000
+++ UpdateManager/backend/InstallBackendAptdaemon.py	2012-06-18 20:03:30 +0000
@@ -11,9 +11,10 @@
 from aptdaemon import client, errors
 from defer import inline_callbacks
 from aptdaemon.gtk3widgets import (AptCancelButton,
+                                   AptConfigFileConflictDialog, 
                                    AptDetailsExpander,
                                    AptErrorDialog,
-                                   AptProgressDialog,
+                                   AptMediumRequiredDialog,
                                    AptProgressBar)
 from aptdaemon.enums import (EXIT_SUCCESS,
                              EXIT_FAILED,
@@ -41,7 +42,7 @@
         self.button_cancel = None
 
     def close(self):
-        if button_cancel:
+        if self.button_cancel:
             self.button_cancel.clicked()
             return True
         else:
@@ -110,7 +111,7 @@
     def _run_in_dialog(self, trans, action, header, show_details, close_on_done):
         builder = Gtk.Builder()
         builder.set_translation_domain("update-manager")
-        builder.add_from_file(self.datadir+"gtkbuilder/UpdateProgress.ui")
+        builder.add_from_file(self.datadir+"/gtkbuilder/UpdateProgress.ui")
 
         label_header = builder.get_object("label_header")
         label_header.set_label(header)
@@ -226,6 +227,4 @@
 if __name__ == "__main__":
     b = InstallBackendAptdaemon(None)
     b.commit(["2vcard"], [], False)
-
-    from gi.repository import Gtk
     Gtk.main()

=== modified file 'check-new-release-gtk'
--- check-new-release-gtk	2012-06-13 22:45:57 +0000
+++ check-new-release-gtk	2012-06-18 20:03:30 +0000
@@ -72,7 +72,9 @@
   FETCH_TIMEOUT = 20
 
   def __init__(self, options):
-    SimpleGtkbuilderApp.__init__(self, options.datadir+"/gtkbuilder/UpgradePromptDialog.ui", "update-manager")
+    self.options = options
+    self.datadir = options.datadir
+    SimpleGtkbuilderApp.__init__(self, self.datadir+"/gtkbuilder/UpgradePromptDialog.ui", "update-manager")
     self.new_dist = None
     logging.debug("running with devel=%s proposed=%s" % (
             options.devel_release, options.proposed_release))
@@ -107,9 +109,9 @@
     self.show_uri(html_uri)
     # show alert on unsupported distros
     if meta_release.no_longer_supported is not None:
-        from UpdateManager.UpdateManager import show_dist_no_longer_supported_dialog
-        self.window_main.realize()
-        show_dist_no_longer_supported_dialog(self.window_main)
+        from UpdateManager.Dialogs import UnsupportedDialog
+        dialog = UnsupportedDialog(self, meta_release)
+        dialog.run(self.window_main)
   
   def build_ui(self):
     from gi.repository import WebKit
@@ -123,9 +125,11 @@
 
   def on_button_upgrade_now_clicked(self, button):
     logging.debug("upgrade now")
-    progress=UpdateManager.GtkProgress.GtkAcquireProgress(self, _("Downloading the release upgrade tool"))
+    progress=UpdateManager.GtkProgress.GtkAcquireProgress(self, self.datadir,
+                                                          _("Downloading the release upgrade tool"))
     fetcher = DistUpgradeFetcher(new_dist=self.new_dist, 
                                  parent=self,
+                                 datadir=self.datadir,
                                  progress=progress)
     res = fetcher.run()
     res # pyflakes

=== added file 'data/gtkbuilder/AcquireProgress.ui'
--- data/gtkbuilder/AcquireProgress.ui	1970-01-01 00:00:00 +0000
+++ data/gtkbuilder/AcquireProgress.ui	2012-06-18 20:03:30 +0000
@@ -0,0 +1,161 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <!-- interface-requires gtk+ 3.0 -->
+  <object class="GtkWindow" id="window_fetch">
+    <property name="can_focus">False</property>
+    <property name="border_width">6</property>
+    <property name="modal">True</property>
+    <property name="window_position">center-on-parent</property>
+    <property name="default_width">400</property>
+    <property name="type_hint">dialog</property>
+    <property name="skip_taskbar_hint">True</property>
+    <property name="skip_pager_hint">True</property>
+    <child>
+      <object class="GtkVBox" id="pane_fetch">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="spacing">6</property>
+        <child>
+          <object class="GtkVBox" id="vbox7">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="border_width">6</property>
+            <property name="spacing">12</property>
+            <child>
+              <object class="GtkLabel" id="label_fetch_summary">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="xalign">0</property>
+                <property name="use_markup">True</property>
+                <property name="wrap">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkVBox" id="vbox8">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="spacing">6</property>
+                <child>
+                  <object class="GtkProgressBar" id="progressbar_fetch">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="pulse_step">0.10000000149</property>
+                  </object>
+                  <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">False</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="label_fetch_status">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="xalign">0</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkExpander" id="expander1">
+                <property name="can_focus">True</property>
+                <property name="spacing">6</property>
+                <child>
+                  <object class="GtkVBox" id="vbox9">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="spacing">6</property>
+                    <child>
+                      <object class="GtkScrolledWindow" id="scrolledwindow6">
+                        <property name="height_request">200</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="shadow_type">in</property>
+                        <child>
+                          <object class="GtkTreeView" id="treeview1">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="enable_search">False</property>
+                            <child internal-child="selection">
+                              <object class="GtkTreeSelection" id="treeview-selection"/>
+                            </child>
+                          </object>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="expand">True</property>
+                        <property name="fill">True</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                  </object>
+                </child>
+                <child type="label">
+                  <object class="GtkLabel" id="label19">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="label" translatable="yes">Show progress of individual files</property>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
+                <property name="position">2</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkHButtonBox" id="hbuttonbox7">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="layout_style">end</property>
+            <child>
+              <object class="GtkButton" id="button_fetch_cancel">
+                <property name="label">gtk-cancel</property>
+                <property name="use_action_appearance">False</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="border_width">5</property>
+                <property name="use_action_appearance">False</property>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+  </object>
+</interface>

=== added file 'data/gtkbuilder/Dialog.ui'
--- data/gtkbuilder/Dialog.ui	1970-01-01 00:00:00 +0000
+++ data/gtkbuilder/Dialog.ui	2012-06-18 20:03:30 +0000
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <!-- interface-requires gtk+ 3.0 -->
+  <object class="GtkDialog" id="window_dialog">
+    <property name="can_focus">False</property>
+    <property name="type_hint">dialog</property>
+    <child internal-child="vbox">
+      <object class="GtkBox" id="dialog-vbox1">
+        <property name="can_focus">False</property>
+        <property name="orientation">vertical</property>
+        <child internal-child="action_area">
+          <object class="GtkButtonBox" id="dialog-action_area1">
+            <property name="can_focus">False</property>
+            <property name="layout_style">end</property>
+            <child>
+              <placeholder/>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="pack_type">end</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkGrid" id="pane_dialog">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="hexpand">True</property>
+            <property name="vexpand">True</property>
+            <property name="border_width">12</property>
+            <property name="row_spacing">12</property>
+            <property name="column_spacing">12</property>
+            <child>
+              <object class="GtkImage" id="image_logo">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="yalign">0</property>
+                <property name="pixel_size">48</property>
+                <property name="icon_name">system-software-update</property>
+              </object>
+              <packing>
+                <property name="left_attach">0</property>
+                <property name="top_attach">0</property>
+                <property name="width">1</property>
+                <property name="height">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="label_header">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="margin_top">6</property>
+                <property name="hexpand">True</property>
+                <property name="xalign">0</property>
+                <property name="yalign">0</property>
+                <property name="wrap">True</property>
+                <property name="width_chars">40</property>
+                <property name="max_width_chars">40</property>
+                <attributes>
+                  <attribute name="weight" value="bold"/>
+                  <attribute name="scale" value="1.25"/>
+                </attributes>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="top_attach">0</property>
+                <property name="width">1</property>
+                <property name="height">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="label_desc">
+                <property name="can_focus">False</property>
+                <property name="no_show_all">True</property>
+                <property name="hexpand">True</property>
+                <property name="vexpand">True</property>
+                <property name="xalign">0</property>
+                <property name="yalign">0</property>
+                <property name="wrap">True</property>
+                <property name="max_width_chars">40</property>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="top_attach">1</property>
+                <property name="width">1</property>
+                <property name="height">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButtonBox" id="buttonbox">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="hexpand">True</property>
+                <property name="spacing">6</property>
+                <property name="homogeneous">True</property>
+                <property name="layout_style">end</property>
+                <child>
+                  <placeholder/>
+                </child>
+              </object>
+              <packing>
+                <property name="left_attach">0</property>
+                <property name="top_attach">2</property>
+                <property name="width">2</property>
+                <property name="height">1</property>
+              </packing>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+  </object>
+</interface>

=== added file 'data/gtkbuilder/ReleaseNotes.ui'
--- data/gtkbuilder/ReleaseNotes.ui	1970-01-01 00:00:00 +0000
+++ data/gtkbuilder/ReleaseNotes.ui	2012-06-18 20:03:30 +0000
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <!-- interface-requires gtk+ 3.0 -->
+  <object class="GtkDialog" id="dialog_release_notes">
+    <property name="can_focus">False</property>
+    <property name="border_width">6</property>
+    <property name="title" translatable="yes">Release Notes</property>
+    <property name="modal">True</property>
+    <property name="window_position">center-on-parent</property>
+    <property name="default_width">600</property>
+    <property name="default_height">500</property>
+    <property name="type_hint">dialog</property>
+    <child internal-child="vbox">
+      <object class="GtkBox" id="dialog-vbox">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="orientation">vertical</property>
+        <property name="spacing">6</property>
+        <child internal-child="action_area">
+          <object class="GtkButtonBox" id="dialog-action_area">
+            <property name="can_focus">False</property>
+            <child>
+              <object class="GtkButton" id="okbutton1">
+                <property name="label">gtk-cancel</property>
+                <property name="use_action_appearance">False</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_action_appearance">False</property>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="button2">
+                <property name="label" translatable="yes">_Upgrade</property>
+                <property name="use_action_appearance">False</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="has_default">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_action_appearance">False</property>
+                <property name="use_underline">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="pack_type">end</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkScrolledWindow" id="scrolled_notes">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="border_width">6</property>
+            <property name="shadow_type">in</property>
+            <child>
+              <placeholder/>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+    <action-widgets>
+      <action-widget response="-6">okbutton1</action-widget>
+      <action-widget response="-5">button2</action-widget>
+    </action-widgets>
+  </object>
+</interface>

=== modified file 'data/gtkbuilder/UpdateManager.ui'
--- data/gtkbuilder/UpdateManager.ui	2012-06-18 20:03:30 +0000
+++ data/gtkbuilder/UpdateManager.ui	2012-06-18 20:03:30 +0000
@@ -1,622 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <!-- interface-requires gtk+ 3.0 -->
-  <object class="GtkWindow" id="dialog_cacheprogress">
-    <property name="can_focus">False</property>
-    <property name="border_width">6</property>
-    <property name="resizable">False</property>
-    <property name="modal">True</property>
-    <property name="window_position">center-on-parent</property>
-    <property name="type_hint">dialog</property>
-    <property name="skip_taskbar_hint">True</property>
-    <property name="skip_pager_hint">True</property>
-    <child>
-      <object class="GtkVBox" id="vbox14">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="border_width">6</property>
-        <property name="spacing">12</property>
-        <child>
-          <object class="GtkLabel" id="label_cache_progress_title">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="xalign">0</property>
-            <property name="yalign">0</property>
-            <property name="label" translatable="yes">&lt;big&gt;&lt;b&gt;Starting Software Updater&lt;/b&gt;&lt;/big&gt;</property>
-            <property name="use_markup">True</property>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">False</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkLabel" id="label22">
-            <property name="can_focus">False</property>
-            <property name="xalign">0</property>
-            <property name="label" translatable="yes">Software updates correct errors, eliminate security vulnerabilities and provide new features.</property>
-            <property name="use_markup">True</property>
-            <property name="wrap">True</property>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">False</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkVBox" id="vbox16">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="spacing">6</property>
-            <child>
-              <object class="GtkProgressBar" id="progressbar_cache">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="pulse_step">0.10000000149</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="label_cache">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="xalign">0</property>
-                <property name="ellipsize">end</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">False</property>
-            <property name="position">2</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-  </object>
-  <object class="GtkDialog" id="dialog_dist_upgrade">
-    <property name="can_focus">False</property>
-    <property name="border_width">6</property>
-    <property name="resizable">False</property>
-    <property name="modal">True</property>
-    <property name="window_position">center-on-parent</property>
-    <property name="type_hint">dialog</property>
-    <property name="skip_taskbar_hint">True</property>
-    <property name="skip_pager_hint">True</property>
-    <property name="urgency_hint">True</property>
-    <child internal-child="vbox">
-      <object class="GtkBox" id="dialog-vbox5">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="spacing">12</property>
-        <child internal-child="action_area">
-          <object class="GtkButtonBox" id="dialog-action_area5">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="layout_style">end</property>
-            <child>
-              <object class="GtkButton" id="cancelbutton2">
-                <property name="label" translatable="yes">_Partial Upgrade</property>
-                <property name="use_action_appearance">False</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="can_default">True</property>
-                <property name="receives_default">False</property>
-                <property name="use_action_appearance">False</property>
-                <property name="use_underline">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkButton" id="okbutton3">
-                <property name="label">gtk-close</property>
-                <property name="use_action_appearance">False</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="can_default">True</property>
-                <property name="has_default">True</property>
-                <property name="receives_default">False</property>
-                <property name="use_action_appearance">False</property>
-                <property name="use_stock">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="pack_type">end</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkHBox" id="hbox20">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="border_width">6</property>
-            <property name="spacing">12</property>
-            <child>
-              <object class="GtkImage" id="image15">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="xalign">0</property>
-                <property name="yalign">0</property>
-                <property name="stock">gtk-dialog-warning</property>
-                <property name="icon-size">6</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkVBox" id="vbox18">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="spacing">12</property>
-                <child>
-                  <object class="GtkLabel" id="label30">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="xalign">0</property>
-                    <property name="label" translatable="yes">&lt;big&gt;&lt;b&gt;Not all updates can be installed&lt;/b&gt;&lt;/big&gt;</property>
-                    <property name="use_markup">True</property>
-                    <property name="selectable">True</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="label31">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Run a partial upgrade, to install as many updates as possible. 
-
-This can be caused by:
- * A previous upgrade which didn't complete
- * Problems with some of the installed software
- * Unofficial software packages not provided by Ubuntu
- * Normal changes of a pre-release version of Ubuntu</property>
-                    <property name="wrap">True</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="expand">True</property>
-                <property name="fill">True</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">True</property>
-            <property name="fill">True</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-    <action-widgets>
-      <action-widget response="-8">cancelbutton2</action-widget>
-      <action-widget response="-7">okbutton3</action-widget>
-    </action-widgets>
-  </object>
-  <object class="GtkDialog" id="dialog_on_battery">
-    <property name="can_focus">False</property>
-    <property name="border_width">6</property>
-    <property name="resizable">False</property>
-    <property name="modal">True</property>
-    <property name="window_position">center-on-parent</property>
-    <property name="type_hint">dialog</property>
-    <property name="skip_taskbar_hint">True</property>
-    <property name="skip_pager_hint">True</property>
-    <property name="urgency_hint">True</property>
-    <child internal-child="vbox">
-      <object class="GtkBox" id="dialog-vbox6">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="spacing">12</property>
-        <child internal-child="action_area">
-          <object class="GtkButtonBox" id="dialog-action_area6">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="layout_style">end</property>
-            <child>
-              <object class="GtkButton" id="button_on_battery_close">
-                <property name="label">gtk-cancel</property>
-                <property name="use_action_appearance">False</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="can_default">True</property>
-                <property name="has_default">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
-                <property name="use_stock">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkButton" id="button_on_battery_continue">
-                <property name="label" translatable="yes">Co_ntinue</property>
-                <property name="use_action_appearance">False</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="can_default">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
-                <property name="use_underline">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="pack_type">end</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkHBox" id="hbox201">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="border_width">6</property>
-            <property name="spacing">12</property>
-            <child>
-              <object class="GtkImage" id="image16">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="xalign">0</property>
-                <property name="yalign">0</property>
-                <property name="stock">gtk-dialog-warning</property>
-                <property name="icon-size">6</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkVBox" id="vbox19">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="spacing">12</property>
-                <child>
-                  <object class="GtkLabel" id="label35">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="xalign">0</property>
-                    <property name="label" translatable="yes">&lt;big&gt;&lt;b&gt;Running on battery&lt;/b&gt;&lt;/big&gt;</property>
-                    <property name="use_markup">True</property>
-                    <property name="selectable">True</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="label36">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Your system is running on battery. Are you sure you want to continue?</property>
-                    <property name="wrap">True</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="expand">True</property>
-                <property name="fill">True</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">True</property>
-            <property name="fill">True</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-    <action-widgets>
-      <action-widget response="-7">button_on_battery_close</action-widget>
-      <action-widget response="-8">button_on_battery_continue</action-widget>
-    </action-widgets>
-  </object>
-  <object class="GtkDialog" id="dialog_release_notes">
-    <property name="can_focus">False</property>
-    <property name="border_width">6</property>
-    <property name="title" translatable="yes">Release Notes</property>
-    <property name="modal">True</property>
-    <property name="window_position">center-on-parent</property>
-    <property name="default_width">600</property>
-    <property name="default_height">500</property>
-    <property name="type_hint">dialog</property>
-    <child internal-child="vbox">
-      <object class="GtkBox" id="dialog-vbox33">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="spacing">6</property>
-        <child internal-child="action_area">
-          <object class="GtkButtonBox" id="dialog-action_area33">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="layout_style">end</property>
-            <child>
-              <object class="GtkButton" id="okbutton1">
-                <property name="label">gtk-cancel</property>
-                <property name="use_action_appearance">False</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="can_default">True</property>
-                <property name="receives_default">False</property>
-                <property name="use_action_appearance">False</property>
-                <property name="use_stock">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkButton" id="button2">
-                <property name="label" translatable="yes">_Upgrade</property>
-                <property name="use_action_appearance">False</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="has_focus">True</property>
-                <property name="can_default">True</property>
-                <property name="has_default">True</property>
-                <property name="receives_default">False</property>
-                <property name="use_action_appearance">False</property>
-                <property name="use_underline">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="pack_type">end</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkScrolledWindow" id="scrolled_notes">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="border_width">6</property>
-            <property name="shadow_type">in</property>
-            <child>
-              <placeholder/>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">True</property>
-            <property name="fill">True</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-    <action-widgets>
-      <action-widget response="-6">okbutton1</action-widget>
-      <action-widget response="-5">button2</action-widget>
-    </action-widgets>
-  </object>
   <object class="GtkImage" id="image-apply">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <property name="stock">gtk-apply</property>
   </object>
-  <object class="GtkWindow" id="window_fetch">
-    <property name="can_focus">False</property>
-    <property name="border_width">6</property>
-    <property name="modal">True</property>
-    <property name="window_position">center-on-parent</property>
-    <property name="default_width">400</property>
-    <property name="type_hint">dialog</property>
-    <property name="skip_taskbar_hint">True</property>
-    <property name="skip_pager_hint">True</property>
-    <child>
-      <object class="GtkVBox" id="vbox6">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="spacing">6</property>
-        <child>
-          <object class="GtkVBox" id="vbox7">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="border_width">6</property>
-            <property name="spacing">12</property>
-            <child>
-              <object class="GtkLabel" id="label_fetch_summary">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="xalign">0</property>
-                <property name="use_markup">True</property>
-                <property name="wrap">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkVBox" id="vbox8">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="spacing">6</property>
-                <child>
-                  <object class="GtkProgressBar" id="progressbar_fetch">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="pulse_step">0.10000000149</property>
-                  </object>
-                  <packing>
-                    <property name="expand">True</property>
-                    <property name="fill">False</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="label_fetch_status">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkExpander" id="expander1">
-                <property name="can_focus">True</property>
-                <property name="spacing">6</property>
-                <child>
-                  <object class="GtkVBox" id="vbox9">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="spacing">6</property>
-                    <child>
-                      <object class="GtkScrolledWindow" id="scrolledwindow6">
-                        <property name="height_request">200</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="shadow_type">in</property>
-                        <child>
-                          <object class="GtkTreeView" id="treeview1">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="enable_search">False</property>
-                            <child internal-child="selection">
-                              <object class="GtkTreeSelection" id="treeview-selection1"/>
-                            </child>
-                          </object>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">True</property>
-                        <property name="fill">True</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                  </object>
-                </child>
-                <child type="label">
-                  <object class="GtkLabel" id="label19">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Show progress of individual files</property>
-                  </object>
-                </child>
-              </object>
-              <packing>
-                <property name="expand">True</property>
-                <property name="fill">True</property>
-                <property name="position">2</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">True</property>
-            <property name="fill">True</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkHButtonBox" id="hbuttonbox7">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="layout_style">end</property>
-            <child>
-              <object class="GtkButton" id="button_fetch_cancel">
-                <property name="label">gtk-cancel</property>
-                <property name="use_action_appearance">False</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">False</property>
-                <property name="border_width">5</property>
-                <property name="use_action_appearance">False</property>
-                <property name="use_stock">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-  </object>
   <object class="GtkWindow" id="window_updates_available">
     <property name="can_focus">False</property>
     <child>
@@ -676,120 +65,6 @@
               </packing>
             </child>
             <child>
-              <object class="GtkFrame" id="frame_new_release">
-                <property name="can_focus">False</property>
-                <property name="label_xalign">0</property>
-                <property name="shadow_type">in</property>
-                <child>
-                  <object class="GtkAlignment" id="alignment5">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <child>
-                      <object class="GtkHBox" id="hbox_new_release">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="border_width">6</property>
-                        <property name="spacing">6</property>
-                        <child>
-                          <object class="GtkLabel" id="label_new_release">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="xalign">0</property>
-                            <property name="use_markup">True</property>
-                          </object>
-                          <packing>
-                            <property name="expand">True</property>
-                            <property name="fill">True</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkButton" id="button_dist_upgrade">
-                            <property name="label" translatable="yes">U_pgrade</property>
-                            <property name="use_action_appearance">False</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">True</property>
-                            <property name="use_action_appearance">False</property>
-                            <property name="use_underline">True</property>
-                            <signal name="clicked" handler="on_button_dist_upgrade_clicked" swapped="no"/>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                    </child>
-                  </object>
-                </child>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkFrame" id="frame_restart_required">
-                <property name="can_focus">False</property>
-                <property name="label_xalign">0</property>
-                <property name="shadow_type">in</property>
-                <child>
-                  <object class="GtkAlignment" id="alignment11">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <child>
-                      <object class="GtkHBox" id="hbox_reboot">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="border_width">6</property>
-                        <property name="spacing">6</property>
-                        <child>
-                          <object class="GtkLabel" id="label_restart_required">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="xalign">0</property>
-                            <property name="use_markup">True</property>
-                            <property name="wrap">True</property>
-                            <property name="selectable">True</property>
-                          </object>
-                          <packing>
-                            <property name="expand">True</property>
-                            <property name="fill">True</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkButton" id="button_restart_required">
-                            <property name="label" translatable="yes">_Restart Now</property>
-                            <property name="use_action_appearance">False</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">True</property>
-                            <property name="use_action_appearance">False</property>
-                            <property name="use_underline">True</property>
-                            <signal name="clicked" handler="on_button_restart_required_clicked" swapped="no"/>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                    </child>
-                  </object>
-                </child>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">2</property>
-              </packing>
-            </child>
-            <child>
               <object class="GtkExpander" id="expander_details">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
@@ -947,7 +222,7 @@
               <packing>
                 <property name="expand">True</property>
                 <property name="fill">True</property>
-                <property name="position">3</property>
+                <property name="position">2</property>
               </packing>
             </child>
             <child>
@@ -1143,17 +418,7 @@
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">True</property>
-                <property name="position">4</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkProgressBar" id="progressbar_cache_inline">
-                <property name="can_focus">False</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">5</property>
+                <property name="position">3</property>
               </packing>
             </child>
           </object>
@@ -1197,8 +462,8 @@
                 <property name="receives_default">True</property>
                 <property name="use_action_appearance">False</property>
                 <property name="use_stock">True</property>
+                <accelerator key="W" signal="clicked" modifiers="GDK_CONTROL_MASK"/>
                 <accelerator key="Q" signal="clicked" modifiers="GDK_CONTROL_MASK"/>
-                <accelerator key="W" signal="clicked" modifiers="GDK_CONTROL_MASK"/>
               </object>
               <packing>
                 <property name="expand">False</property>

=== modified file 'tests/interactive_fetch_release_upgrader.py'
--- tests/interactive_fetch_release_upgrader.py	2012-05-01 23:20:42 +0000
+++ tests/interactive_fetch_release_upgrader.py	2012-06-18 20:03:30 +0000
@@ -64,14 +64,17 @@
         self.assertTrue(self.new_dist is not None)
         
     def testdownloading(self):
-        parent = UpdateManager("/usr/share/update-manager/")
+        parent = UpdateManager("/usr/share/update-manager/", None)
         progress = GtkAcquireProgress(parent,
+                                      "/usr/share/update-manager/",
                                       _("Downloading the upgrade "
                                         "tool"),
                                       _("The upgrade tool will "
                                         "guide you through the "
                                         "upgrade process."))
-        fetcher = DistUpgradeFetcherGtk(self.new_dist, parent=parent, progress=progress)
+        fetcher = DistUpgradeFetcherGtk(self.new_dist, parent=parent,
+                                        progress=progress,
+                                        datadir="/usr/share/update-manager/")
         self.assertTrue(fetcher.showReleaseNotes())
         self.assertTrue(fetcher.fetchDistUpgrader())
         self.assertTrue(fetcher.extractDistUpgrader())

=== modified file 'tests/test_end_of_life.py'
--- tests/test_end_of_life.py	2012-06-11 16:17:31 +0000
+++ tests/test_end_of_life.py	2012-06-18 20:03:30 +0000
@@ -23,7 +23,8 @@
         def _nag_dialog_close_helper(checker):
             # this helper is called to verify that the nag dialog appears
             # and that it 
-            dialog = getattr(checker.window_main, "no_longer_supported_nag", None)
+            dialog = getattr(checker, "no_longer_supported_nag", None)
+            print("testing", checker, dialog)
             self.assertNotEqual(dialog, None)
             dialog.response(Gtk.ResponseType.DELETE_EVENT)
             self.dialog_called = True