diff options
| -rw-r--r-- | DistUpgrade/DistUpgrade.glade | 33 | ||||
| -rw-r--r-- | DistUpgrade/DistUpgrade.py | 28 |
2 files changed, 54 insertions, 7 deletions
diff --git a/DistUpgrade/DistUpgrade.glade b/DistUpgrade/DistUpgrade.glade index bdd11f5d..0235edcc 100644 --- a/DistUpgrade/DistUpgrade.glade +++ b/DistUpgrade/DistUpgrade.glade @@ -24,18 +24,18 @@ <widget class="GtkVBox" id="vbox1"> <property name="visible">True</property> <property name="homogeneous">False</property> - <property name="spacing">0</property> + <property name="spacing">6</property> <child> - <widget class="GtkLabel" id="label_status"> + <widget class="GtkLabel" id="label2"> <property name="visible">True</property> - <property name="label" translatable="yes"><b>Upgrading</b></property> + <property name="label" translatable="yes"><big><b>Distribution upgrade</b></big></property> <property name="use_underline">False</property> <property name="use_markup">True</property> <property name="justify">GTK_JUSTIFY_LEFT</property> <property name="wrap">False</property> <property name="selectable">False</property> - <property name="xalign">0</property> + <property name="xalign">0.5</property> <property name="yalign">0.5</property> <property name="xpad">0</property> <property name="ypad">0</property> @@ -67,6 +67,31 @@ </child> <child> + <widget class="GtkLabel" id="label_status"> + <property name="visible">True</property> + <property name="label" translatable="yes"></property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> <placeholder/> </child> </widget> diff --git a/DistUpgrade/DistUpgrade.py b/DistUpgrade/DistUpgrade.py index 7e8242bd..26ae8ae0 100644 --- a/DistUpgrade/DistUpgrade.py +++ b/DistUpgrade/DistUpgrade.py @@ -31,7 +31,7 @@ class DistUpgradeView(object): on the current view """ pass - def askYesNoQuestion(self,msg): + def askYesNoQuestion(self, summary, msg): pass def error(self, summary, msg): pass @@ -47,16 +47,29 @@ class GtkDistUpgradeView(DistUpgradeView,SimpleGladeApp): def getOpCacheProgress(self): return self._opCacheProgress def updateStatus(self, msg): - self.label_status.set_markup("<b>%s</b>" % msg) + self.label_status.set_markup("%s" % msg) def error(self, summary, msg): dialog = gtk.MessageDialog(self.window_main, 0, gtk.MESSAGE_ERROR, gtk.BUTTONS_OK,"") - msg=("<big><b>%s</b></big>\n\n%s"%(summary,msg)) + msg="<big><b>%s</b></big>\n\n%s" % (summary,msg) dialog.set_markup(msg) dialog.vbox.set_spacing(6) dialog.run() dialog.destroy() return False + def askYesNoQuestion(self, summary, msg): + msg = "<big><b>%s</b></big>\n\n%s" % (summary,msg) + dialog = gtk.MessageDialog(parent=self.window_main, + flags=gtk.DIALOG_MODAL, + type=gtk.MESSAGE_QUESTION, + buttons=gtk.BUTTONS_YES_NO) + dialog.set_markup(msg) + res = dialog.run() + dialog.destroy() + if res == gtk.RESPONSE_YES: + return True + return False + class DistUpgradeControler(object): def __init__(self, distUpgradeView): @@ -147,6 +160,13 @@ class DistUpgradeControler(object): return False return True + def doPreUpgrade(self): + pass + + def doDistUpgrade(self): + self._view.askYesNoQuestion(_("Do the upgrade"), + _("lala lala")) + def breezyUpgrade(self): # sanity check (check for ubuntu-desktop, brokenCache etc) self._view.updateStatus(_("Checking the system")) @@ -166,8 +186,10 @@ class DistUpgradeControler(object): self._cache = apt.Cache(self._view.getOpCacheProgress()) # do pre-upgrade stuff + self.doPreUpgrade() # calc the dist-upgrade and see if the removals are ok/expected + self.doDistUpgrade() # do the dist-upgrade |