From a3f1e0a0c64f886a5b90aaf970c11dfe16ca3e6a Mon Sep 17 00:00:00 2001 From: Sebastian Heinlein Date: Tue, 24 Jan 2006 22:17:43 +0100 Subject: * New glade based error dialog * Wording: error dialog and status messages * Do not hide the progressbar at the end --- DistUpgrade/DistUpgrade.glade | 165 ++++++++++++++++++++++++++++++++++++ DistUpgrade/DistUpgradeControler.py | 4 +- DistUpgrade/DistUpgradeViewGtk.py | 75 +++++++--------- 3 files changed, 198 insertions(+), 46 deletions(-) (limited to 'DistUpgrade') diff --git a/DistUpgrade/DistUpgrade.glade b/DistUpgrade/DistUpgrade.glade index 00b04644..7710fa5e 100644 --- a/DistUpgrade/DistUpgrade.glade +++ b/DistUpgrade/DistUpgrade.glade @@ -858,4 +858,169 @@ + + 6 + + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_CENTER_ON_PARENT + False + False + False + True + True + True + GDK_WINDOW_TYPE_HINT_DIALOG + GDK_GRAVITY_NORTH_WEST + True + True + False + + + + True + False + 12 + + + + True + GTK_BUTTONBOX_END + + + + True + True + True + True + _Report Bug + True + GTK_RELIEF_NORMAL + True + -8 + + + + + + True + True + True + True + gtk-close + True + GTK_RELIEF_NORMAL + True + -7 + + + + + 0 + False + True + GTK_PACK_END + + + + + + 6 + True + False + 12 + + + + True + gtk-dialog-error + 6 + 0 + 0 + 0 + 0 + + + 0 + False + True + + + + + + True + False + 0 + + + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + True + + + + + + True + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + GTK_SHADOW_IN + GTK_CORNER_TOP_LEFT + + + + True + True + False + False + False + True + False + False + False + + + + + 0 + True + True + + + + + 0 + True + True + + + + + 0 + True + True + + + + + + diff --git a/DistUpgrade/DistUpgradeControler.py b/DistUpgrade/DistUpgradeControler.py index db6168ef..a0f5a642 100644 --- a/DistUpgrade/DistUpgradeControler.py +++ b/DistUpgrade/DistUpgradeControler.py @@ -251,7 +251,7 @@ class DistUpgradeControler(object): # this is the core def dapperUpgrade(self): # sanity check (check for ubuntu-desktop, brokenCache etc) - self._view.updateStatus(_("Checking update system")) + self._view.updateStatus(_("Checking package manager")) self._view.setStep(1) self.openCache() if not self.cache.sanityCheck(self._view): @@ -270,7 +270,7 @@ class DistUpgradeControler(object): self.abort() # then open the cache (again) - self._view.updateStatus(_("Checking update system")) + self._view.updateStatus(_("Checking package manager")) self.openCache() # calc the dist-upgrade and see if the removals are ok/expected diff --git a/DistUpgrade/DistUpgradeViewGtk.py b/DistUpgrade/DistUpgradeViewGtk.py index d798befa..9230098f 100644 --- a/DistUpgrade/DistUpgradeViewGtk.py +++ b/DistUpgrade/DistUpgradeViewGtk.py @@ -49,7 +49,6 @@ class GtkOpProgress(apt.progress.OpProgress): while gtk.events_pending(): gtk.main_iteration() def done(self): - #self.progressbar.hide() self.progressbar.set_text(" ") @@ -80,9 +79,8 @@ class GtkFetchProgressAdapter(apt.progress.FetchProgress): self.progress.set_fraction(0) self.status.show() def stop(self): - #self.progress.hide() self.progress.set_text(" ") - self.status.set_text("") + self.status.set_text(_("Download is complete")) def pulse(self): # FIXME: move the status_str and progress_str into python-apt # (python-apt need i18n first for this) @@ -119,7 +117,7 @@ class GtkInstallProgressAdapter(InstallProgress): # FIXME: add support for the timeout # of the terminal (to display something useful then) # -> longer term, move this code into python-apt - self.label_status.set_text(_("Installing updates ...")) + self.label_status.set_text(_("Installing updates")) self.progress.set_fraction(0.0) self.progress.set_text(" ") self.expander.set_sensitive(True) @@ -127,30 +125,25 @@ class GtkInstallProgressAdapter(InstallProgress): self.env = ["VTE_PTY_KEEP_FD=%s"% self.writefd, "DEBIAN_FRONTEND=gnome", "APT_LISTCHANGES_FRONTEND=none"] + def error(self, pkg, errormsg): - dialog = gtk.MessageDialog(self.parent.window_main, 0, - gtk.MESSAGE_ERROR, - gtk.BUTTONS_OK,"") - summary = _("Error installing '%s'" % pkg) - msg = _("During the install a error occured. This is usually a bug " - "in the packages, please report it. See the message below " - "for more information. ") - msg="%s\n\n%s" % (summary,msg) - dialog.set_markup(msg) - dialog.vbox.set_spacing(6) + self.dialog_error.set_transient_for(self.window_main) + + self.expander_terminal.set_expanded(True) + + summary = _("Could not install '%s'" % pkg) + msg = _("The upgrade will abort now. Please report the bug.") + msg="%s\n\n%s" % (summary, msg) + self.label_error.set_markup(msg) + if errormsg != None: - scroll = gtk.ScrolledWindow() - scroll.set_size_request(400,200) - textview = gtk.TextView() - textview.set_cursor_visible(False) - textview.set_editable(False) - textview.get_buffer().set_text(errormsg) - textview.show() - scroll.add(textview) - scroll.show() - dialog.vbox.pack_end(scroll) - dialog.run() - dialog.destroy() + self.treeview_error_extended.get_buffer().set_text(errormsg) + self.scroll_error_extended.show() + + self.dialog_error.run() + self.dialog_error.destroy() + return False + def conffile(self, current, new): self.expander.set_expanded=True pass @@ -165,7 +158,6 @@ class GtkInstallProgressAdapter(InstallProgress): self.updateInterface() return self.apt_status def finishUpdate(self): - self.progress.hide() self.label_status.set_text("") def updateInterface(self): InstallProgress.updateInterface(self) @@ -236,24 +228,19 @@ class GtkDistUpgradeView(DistUpgradeView,SimpleGladeApp): label.set_property("attributes",attrlist) def error(self, summary, msg, extended_msg=None): - dialog = gtk.MessageDialog(self.window_main, 0, gtk.MESSAGE_ERROR, - gtk.BUTTONS_OK,"") - msg="%s\n\n%s" % (summary,msg) - dialog.set_markup(msg) - dialog.vbox.set_spacing(6) + self.dialog_error.set_transient_for(self.window_main) + + self.expander_terminal.set_expanded(True) + + msg="%s\n\n%s" % (summary, msg) + self.label_error.set_markup(msg) + if extended_msg != None: - scroll = gtk.ScrolledWindow() - scroll.set_size_request(400,200) - textview = gtk.TextView() - textview.set_cursor_visible(False) - textview.set_editable(False) - textview.get_buffer().set_text(extended_msg) - textview.show() - scroll.add(textview) - scroll.show() - dialog.vbox.pack_end(scroll) - dialog.run() - dialog.destroy() + self.treeview_error_extended.get_buffer().set_text(extended_msg) + self.scroll_error_extended.show() + + self.dialog_error.run() + self.dialog_error.destroy() return False def confirmChanges(self, summary, changes, downloadSize): -- cgit v1.2.3 From 2e75667c58e1ceeafb57c45bb09d48f3d4d52817 Mon Sep 17 00:00:00 2001 From: Sebastian Heinlein Date: Tue, 24 Jan 2006 22:18:51 +0100 Subject: * Hide non functional bug report button --- DistUpgrade/DistUpgrade.glade | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'DistUpgrade') diff --git a/DistUpgrade/DistUpgrade.glade b/DistUpgrade/DistUpgrade.glade index 7710fa5e..1464c0f2 100644 --- a/DistUpgrade/DistUpgrade.glade +++ b/DistUpgrade/DistUpgrade.glade @@ -887,8 +887,7 @@ GTK_BUTTONBOX_END - - True + True True True -- cgit v1.2.3 From a576717a3c84e635779bc63299a6372fd4ef20d0 Mon Sep 17 00:00:00 2001 From: Sebastian Heinlein Date: Wed, 25 Jan 2006 00:49:43 +0100 Subject: * Change the progress bar to pulse mode during caching, otherwise the progress bar restarts too often * Wording: - "Upgrading to Ubuntu 'Dapper' 6.04" in the header - Mention the download in the step 3 * Fixed new error dialog - nice test case: dpkg -i --force-all libnotify0_0.3.0-0ubuntu2_i386.deb * Set position of the main window to center always. the terminal is quite huge, so the window has to be moved anyway if you expand the terminal I am not sure about this behavior. So please take a look at it * Initial glade work on a new dialog_obsolete --- DistUpgrade/DistUpgrade.glade | 326 +++++++++++++++++++++++++++++++------- DistUpgrade/DistUpgradeViewGtk.py | 25 ++- 2 files changed, 288 insertions(+), 63 deletions(-) (limited to 'DistUpgrade') diff --git a/DistUpgrade/DistUpgrade.glade b/DistUpgrade/DistUpgrade.glade index 1464c0f2..58aa10ad 100644 --- a/DistUpgrade/DistUpgrade.glade +++ b/DistUpgrade/DistUpgrade.glade @@ -8,7 +8,7 @@ True Upgrading Ubuntu GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_CENTER + GTK_WIN_POS_CENTER_ALWAYS False False False @@ -39,7 +39,7 @@ True - <span weight="bold" size="x-large">Upgrading Ubuntu</span> + <span weight="bold" size="x-large">Upgrading to Ubuntu "Dapper" 6.04</span> False True GTK_JUSTIFY_LEFT @@ -161,7 +161,7 @@ True - Preparing upgrade + Preparing the upgrade False False GTK_JUSTIFY_LEFT @@ -189,7 +189,7 @@ True - Upgrading software channels + Modifing the software channels False False GTK_JUSTIFY_LEFT @@ -217,7 +217,7 @@ True - Upgrading the system + Downloading and installing the upgrades False False GTK_JUSTIFY_LEFT @@ -439,43 +439,6 @@ True - - - - 6 - GTK_BUTTONBOX_END - 6 - - - - True - True - True - gtk-cancel - True - GTK_RELIEF_NORMAL - True - - - - - - True - True - True - gtk-media-pause - True - GTK_RELIEF_NORMAL - True - - - - - 0 - True - True - - @@ -949,17 +912,18 @@ True False - 0 + 12 True + True False - False + True GTK_JUSTIFY_LEFT - False - False + True + True 0 0.5 0 @@ -977,7 +941,7 @@ - + True GTK_POLICY_AUTOMATIC GTK_POLICY_AUTOMATIC @@ -985,16 +949,22 @@ GTK_CORNER_TOP_LEFT - + True True - False - False - False - True - False - False - False + False + False + True + GTK_JUSTIFY_LEFT + GTK_WRAP_NONE + True + 4 + 4 + 0 + 4 + 4 + 0 + @@ -1022,4 +992,250 @@ + + 6 + + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_CENTER_ON_PARENT + False + 500 + 400 + False + False + True + True + True + GDK_WINDOW_TYPE_HINT_DIALOG + GDK_GRAVITY_NORTH_WEST + True + True + False + + + + True + False + 6 + + + + True + GTK_BUTTONBOX_END + + + + True + True + True + gtk-cancel + True + GTK_RELIEF_NORMAL + True + -6 + + + + + + True + True + True + _Continue + True + GTK_RELIEF_NORMAL + True + -8 + + + + + 0 + False + True + GTK_PACK_END + + + + + + 6 + True + False + 12 + + + + True + False + 12 + + + + True + gtk-dialog-question + 6 + 0 + 0 + 0 + 0 + + + 0 + False + True + + + + + + True + False + 12 + + + + True + <b><big>Start the upgrade?</big></b> + False + True + GTK_JUSTIFY_LEFT + True + False + 0 + 0 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + + True + The upgrade of your system requires + + ... to download 2000 MByte + + ... to install 23 new packages + ... to remove 19 packages + ... to update 200 packages + +This is you last chance to cancel the upgrade. + False + False + GTK_JUSTIFY_LEFT + True + False + 0 + 0 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + + True + True + False + 0 + + + + 400 + 200 + True + True + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + GTK_SHADOW_IN + GTK_CORNER_TOP_LEFT + + + + True + True + False + False + False + True + False + False + False + + + + + + + + True + Details + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + label_item + + + + + 0 + False + False + + + + + 0 + False + False + + + + + 0 + False + False + + + + + 0 + True + True + + + + + + diff --git a/DistUpgrade/DistUpgradeViewGtk.py b/DistUpgrade/DistUpgradeViewGtk.py index 9230098f..95d6fdab 100644 --- a/DistUpgrade/DistUpgradeViewGtk.py +++ b/DistUpgrade/DistUpgradeViewGtk.py @@ -42,12 +42,16 @@ from gettext import gettext as _ class GtkOpProgress(apt.progress.OpProgress): def __init__(self, progressbar): self.progressbar = progressbar + self.progressbar.set_pulse_step(0.01) + self.progressbar.pulse() + def update(self, percent): - #self._progressbar.show() - #self.progressbar.set_text(self.op) - self.progressbar.set_fraction(percent/100.0) + # self.progressbar.set_text(self.op) +# self.progressbar.set_fraction(percent/100.0) + self.progressbar.pulse() while gtk.events_pending(): gtk.main_iteration() + def done(self): self.progressbar.set_text(" ") @@ -137,9 +141,10 @@ class GtkInstallProgressAdapter(InstallProgress): self.label_error.set_markup(msg) if errormsg != None: - self.treeview_error_extended.get_buffer().set_text(errormsg) - self.scroll_error_extended.show() - + buffer = self.textview_error.get_buffer() + buffer.set_text(errormsg) + self.scroll_error.show() + self.dialog_error.run() self.dialog_error.destroy() return False @@ -226,8 +231,10 @@ class GtkDistUpgradeView(DistUpgradeView,SimpleGladeApp): #attr = pango.AttrStyle(pango.STYLE_ITALIC, 0, -1) attrlist.insert(attr) label.set_property("attributes",attrlist) + def error(self, summary, msg, extended_msg=None): + self.dialog_error.set_transient_for(self.window_main) self.expander_terminal.set_expanded(True) @@ -236,10 +243,12 @@ class GtkDistUpgradeView(DistUpgradeView,SimpleGladeApp): self.label_error.set_markup(msg) if extended_msg != None: - self.treeview_error_extended.get_buffer().set_text(extended_msg) - self.scroll_error_extended.show() + buffer = self.textview_error.get_buffer() + buffer.set_text(extended_msg) + self.scroll_error.show() self.dialog_error.run() + self.dialog_error.show() self.dialog_error.destroy() return False -- cgit v1.2.3 From 04314c42545fa783b12c9c7b7ec88200afa5e3f2 Mon Sep 17 00:00:00 2001 From: Sebastian Heinlein Date: Wed, 25 Jan 2006 11:44:07 +0100 Subject: DistUpgrade: * set position of main window to "center" and not "center always" Update Manager: * Hopefully fix the close/cancel issue #28932: - Move the install button next to the update treeview. So it is no longer a global action of the dialog and separated from the close button. - Use a close button instead of the cancel button * Check if automatic internet updates is disabled and show an information about the need of reloading as the case may be * unset sensitive of main window during caching * Do not set a title in the download dialog * Show only the time in the progress bar * Use "Downloading file X of Y with 122/s" in the status label * Do not set the update treeview unsensitive during the download of the package related changelog --- DistUpgrade/DistUpgrade.glade | 2 +- UpdateManager/GtkProgress.py | 22 ++- UpdateManager/UpdateManager.py | 25 +++- data/UpdateManager.glade | 322 ++++++++++++++++++++++++++++++----------- 4 files changed, 268 insertions(+), 103 deletions(-) (limited to 'DistUpgrade') diff --git a/DistUpgrade/DistUpgrade.glade b/DistUpgrade/DistUpgrade.glade index 58aa10ad..affc7019 100644 --- a/DistUpgrade/DistUpgrade.glade +++ b/DistUpgrade/DistUpgrade.glade @@ -8,7 +8,7 @@ True Upgrading Ubuntu GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_CENTER_ALWAYS + GTK_WIN_POS_CENTER False False False diff --git a/UpdateManager/GtkProgress.py b/UpdateManager/GtkProgress.py index d25149e4..025858e3 100644 --- a/UpdateManager/GtkProgress.py +++ b/UpdateManager/GtkProgress.py @@ -27,7 +27,7 @@ import apt_pkg from gettext import gettext as _ class GtkOpProgress(apt.OpProgress): - def __init__(self, window,progressbar, parent): + def __init__(self, window, progressbar, parent): self._parent = parent self._window = window self._progressbar = progressbar @@ -37,11 +37,13 @@ class GtkOpProgress(apt.OpProgress): #print self.Op #print self.SubOp self._window.show() + self._parent.set_sensitive(False) self._progressbar.set_text(self.op) self._progressbar.set_fraction(percent/100.0) while gtk.events_pending(): gtk.main_iteration() def done(self): + self._parent.set_sensitive(True) self._window.hide() class GtkFetchProgress(apt.progress.FetchProgress): @@ -59,7 +61,6 @@ class GtkFetchProgress(apt.progress.FetchProgress): if self.summary != "": self.summary.set_markup("%s \n\n%s" % (summary, descr)) - self.window_fetch.set_title(summary) def start(self): self.progress.set_fraction(0) self.window_fetch.show() @@ -69,15 +70,20 @@ class GtkFetchProgress(apt.progress.FetchProgress): self._continue = False def pulse(self): apt.progress.FetchProgress.pulse(self) - if self.currentCPS > 0: - self.status.set_text(_("Download rate: %s/s - %s remaining" % (apt_pkg.SizeToStr(self.currentCPS), apt_pkg.TimeToStr(self.eta)))) - else: - self.status.set_text(_("Download rate: unkown")) - self.progress.set_fraction(self.percent/100.0) currentItem = self.currentItems + 1 if currentItem > self.totalItems: currentItem = self.totalItems - self.progress.set_text(_("Downloading file %li of %li" % (currentItem, self.totalItems))) + if self.currentCPS > 0: + self.status.set_text(_("Downloading file %li of %li with %s/s" + % (currentItem, self.totalItems, + apt_pkg.SizeToStr(self.currentCPS)))) + else: + self.status.set_text(_("Downloading file %li of %li with unknown " + "speed") % (currentItem, self.totalItems)) + self.progress.set_fraction(self.percent/100.0) +# self.progress.set_text(_("Time remaining %s" % (apt_pkg.TimeToStr(self.eta)))) + self.progress.set_text(_("Time remaining")) + while gtk.events_pending(): gtk.main_iteration() return self._continue diff --git a/UpdateManager/UpdateManager.py b/UpdateManager/UpdateManager.py index d2c2bc54..89f4989e 100644 --- a/UpdateManager/UpdateManager.py +++ b/UpdateManager/UpdateManager.py @@ -213,12 +213,13 @@ class UpdateList: class UpdateManager(SimpleGladeApp): def __init__(self, datadir): - + self.datadir = datadir SimpleGladeApp.__init__(self, datadir+"glade/UpdateManager.glade", None, domain="update-manager") self.gnome_program = gnome.init("update-manager", "0.41") + self.packages = [] self.dl_size = 0 @@ -281,7 +282,7 @@ class UpdateManager(SimpleGladeApp): self.gconfclient = gconf.client_get_default() # restore state self.restore_state() - + def set_changes_buffer(self, changes_buffer, text, name, srcpkg): changes_buffer.set_text("") @@ -342,7 +343,6 @@ class UpdateManager(SimpleGladeApp): self.set_changes_buffer(changes_buffer, changes[0], name, changes[1]) else: if self.expander_details.get_expanded(): - self.treeview_update.set_sensitive(False) self.hbox_footer.set_sensitive(False) lock = thread.allocate_lock() lock.acquire() @@ -360,7 +360,6 @@ class UpdateManager(SimpleGladeApp): # download finished (or canceld, or time-out) button.hide() button.disconnect(id); - self.treeview_update.set_sensitive(True) self.hbox_footer.set_sensitive(True) if self.cache.all_changes.has_key(name): @@ -391,7 +390,7 @@ class UpdateManager(SimpleGladeApp): text_download = "" self.expander_details.set_sensitive(False) self.treeview_update.set_sensitive(False) - self.label_downsize.hide() + self.label_downsize.set_text="" self.button_cancel.grab_default() else: text_header = ""+gettext.ngettext("You can install one update", "You can install %s updates" % len(self.store), len(self.store))+"" @@ -399,8 +398,8 @@ class UpdateManager(SimpleGladeApp): text_download = _("Download size: %s" % apt_pkg.SizeToStr(self.dl_size)) self.expander_details.set_sensitive(True) self.treeview_update.set_sensitive(True) - self.label_downsize.show() self.button_install.grab_default() + self.label_header.set_markup(text_header) self.label_downsize.set_markup(text_download) @@ -863,6 +862,19 @@ class UpdateManager(SimpleGladeApp): self.cache._depcache.ReadPinFile(SYNAPTIC_PINFILE) self.cache._depcache.Init() + + def check_auto_update(self): + # Check if automatic update is enabled. If not show a dialog to inform + # the user about the need of manual "reloads" + update_days = apt_pkg.Config.FindI("APT::Periodic::Update-Package-Lists") + if update_days < 1: + self.dialog_manual_update.set_transient_for(self.window_main) + res = self.dialog_manual_update.run() + self.dialog_manual_update.hide() + if res == gtk.RESPONSE_YES: + self.on_button_reload_clicked(None) + + def main(self): self.meta = MetaRelease() self.meta.connect("new_dist_available",self.new_dist_available) @@ -875,4 +887,5 @@ class UpdateManager(SimpleGladeApp): gtk.main_iteration() self.fillstore() + self.check_auto_update() gtk.main() diff --git a/data/UpdateManager.glade b/data/UpdateManager.glade index c9b50999..78e5cb79 100644 --- a/data/UpdateManager.glade +++ b/data/UpdateManager.glade @@ -33,7 +33,7 @@ 6 True False - 12 + 6 @@ -142,7 +142,7 @@ 1 0 0 - 12 + 0 0 @@ -152,6 +152,23 @@ False 6 + + + True + gtk-dialog-info + 3 + 0 + 0 + 0 + 0 + + + 0 + False + True + + + True @@ -209,7 +226,7 @@ True False - 4 + 6 @@ -246,17 +263,18 @@ True False - 0 + 12 + True False False GTK_JUSTIFY_LEFT False False - 0.5 + 1 0.5 0 0 @@ -265,18 +283,98 @@ False 0 + + 0 + True + True + + + + + + True + True + True + True + GTK_RELIEF_NORMAL + True + + + + + True + 0.5 + 0.5 + 0 + 0 + 0 + 0 + 0 + 0 + + + + True + False + 2 + + + + True + gtk-apply + 4 + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + _Install Updates + True + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + + + 0 False False - GTK_PACK_END 0 False - False + True @@ -617,6 +715,7 @@ True + Search for updates in the software channels True True GTK_RELIEF_NORMAL @@ -661,7 +760,7 @@ True - _Reload + _Query True False GTK_JUSTIFY_LEFT @@ -694,7 +793,7 @@ True True True - gtk-cancel + gtk-close True GTK_RELIEF_NORMAL True @@ -702,82 +801,6 @@ - - - - True - True - True - True - GTK_RELIEF_NORMAL - True - - - - - True - 0.5 - 0.5 - 0 - 0 - 0 - 0 - 0 - 0 - - - - True - False - 2 - - - - True - gtk-apply - 4 - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - True - _Install - True - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - - - 0 @@ -1303,7 +1326,7 @@ Need to get the changes from the central server True - <big><b>Reading package information</b></big> + <big><b>Loading software information</b></big> False True GTK_JUSTIFY_LEFT @@ -1327,8 +1350,7 @@ Need to get the changes from the central server - True - Reading information about the installed packages. Depending on the speed of your computer this may take a bit. + False False GTK_JUSTIFY_LEFT @@ -1379,4 +1401,128 @@ Need to get the changes from the central server + + 6 + + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_CENTER_ON_PARENT + False + False + False + True + True + True + GDK_WINDOW_TYPE_HINT_DIALOG + GDK_GRAVITY_NORTH_WEST + True + False + False + + + + True + False + 12 + + + + True + GTK_BUTTONBOX_END + + + + True + True + True + _Reload + True + GTK_RELIEF_NORMAL + True + -8 + + + + + + True + True + True + gtk-close + True + GTK_RELIEF_NORMAL + True + -7 + + + + + 0 + False + True + GTK_PACK_END + + + + + + 6 + True + False + 11 + + + + True + gtk-dialog-info + 6 + 0 + 0 + 0 + 0 + + + 0 + False + True + + + + + + True + True + <b><big>You need to manually query for updates</big></b> + +Your system does not search for updates automatically. You can configure this behavior in "System" -> "Administration" -> "Software Properties". + False + True + GTK_JUSTIFY_LEFT + True + True + 0 + 0 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + 0 + True + True + + + + + + -- cgit v1.2.3 From 686048536599316356a300a1f08e95a1983109c6 Mon Sep 17 00:00:00 2001 From: Sebastian Heinlein Date: Thu, 26 Jan 2006 18:43:10 +0100 Subject: * Set the progress bar from pulse to 100% if we exceed 99% --- DistUpgrade/DistUpgradeViewGtk.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'DistUpgrade') diff --git a/DistUpgrade/DistUpgradeViewGtk.py b/DistUpgrade/DistUpgradeViewGtk.py index 94090322..40597519 100644 --- a/DistUpgrade/DistUpgradeViewGtk.py +++ b/DistUpgrade/DistUpgradeViewGtk.py @@ -47,9 +47,10 @@ class GtkOpProgress(apt.progress.OpProgress): self.progressbar.pulse() def update(self, percent): - # self.progressbar.set_text(self.op) -# self.progressbar.set_fraction(percent/100.0) - self.progressbar.pulse() + if percent > 99: + self.progressbar.set_fraction(1) + else: + self.progressbar.pulse() while gtk.events_pending(): gtk.main_iteration() -- cgit v1.2.3 From 31da72b447877118bd911ba9b4610bf3173f3f50 Mon Sep 17 00:00:00 2001 From: Sebastian Heinlein Date: Thu, 26 Jan 2006 19:17:19 +0100 Subject: * Add a virtual step 5 "complete" and some hidden widgets to the main window. the effect: if the upgrade is complete all progress list points are checked --- DistUpgrade/DistUpgrade.glade | 47 ++++++++++++++++++++++++++++++++++++- DistUpgrade/DistUpgradeControler.py | 1 + DistUpgrade/DistUpgradeView.py | 3 ++- 3 files changed, 49 insertions(+), 2 deletions(-) (limited to 'DistUpgrade') diff --git a/DistUpgrade/DistUpgrade.glade b/DistUpgrade/DistUpgrade.glade index affc7019..573ea66f 100644 --- a/DistUpgrade/DistUpgrade.glade +++ b/DistUpgrade/DistUpgrade.glade @@ -95,7 +95,7 @@ True - 4 + 5 2 False 6 @@ -288,6 +288,51 @@ fill + + + + 18 + 18 + 0.5 + 0.5 + 0 + 0 + + + 0 + 1 + 4 + 5 + fill + + + + + + + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 1 + 2 + 4 + 5 + fill + + + 0 diff --git a/DistUpgrade/DistUpgradeControler.py b/DistUpgrade/DistUpgradeControler.py index ea2de522..6ab77103 100644 --- a/DistUpgrade/DistUpgradeControler.py +++ b/DistUpgrade/DistUpgradeControler.py @@ -317,6 +317,7 @@ class DistUpgradeControler(object): self.doPostUpgrade() # done, ask for reboot + self._view.setStep(5) self._view.updateStatus(_("System upgrade is complete.")) # FIXME should we look into /var/run/reboot-required here? if self._view.confirmRestart(): diff --git a/DistUpgrade/DistUpgradeView.py b/DistUpgrade/DistUpgradeView.py index abc5b340..4c9103ba 100644 --- a/DistUpgrade/DistUpgradeView.py +++ b/DistUpgrade/DistUpgradeView.py @@ -38,11 +38,12 @@ class DistUpgradeView(object): """ pass def setStep(self, step): - """ we have 4 steps current for a upgrade: + """ we have 5 steps current for a upgrade: 1. Analyzing the system 2. Updating repository information 3. Performing the upgrade 4. Post upgrade stuff + 5. Complete """ pass def confirmChanges(self, summary, changes, downloadSize): -- cgit v1.2.3