diff options
Diffstat (limited to 'UpdateManager')
| -rw-r--r-- | UpdateManager/GtkProgress.py | 11 | ||||
| -rw-r--r-- | UpdateManager/UpdateManager.py | 24 |
2 files changed, 26 insertions, 9 deletions
diff --git a/UpdateManager/GtkProgress.py b/UpdateManager/GtkProgress.py index 704946c7..d11ca3e9 100644 --- a/UpdateManager/GtkProgress.py +++ b/UpdateManager/GtkProgress.py @@ -27,14 +27,17 @@ import apt_pkg from gettext import gettext as _ class GtkOpProgress(apt.OpProgress): - def __init__(self, window, progressbar, status, parent): + def __init__(self, host_window, progressbar, status, parent): self._parent = parent - self._window = window + self._window = host_window self._status = status self._progressbar = progressbar + # Do not show the close button + self._window.realize() + host_window.window.set_functions(gtk.gdk.FUNC_MOVE) #self._progressbar.set_pulse_step(0.01) #self._progressbar.pulse() - window.set_transient_for(parent) + self._window.set_transient_for(parent) def update(self, percent): #print percent #print self.Op @@ -66,6 +69,8 @@ class GtkFetchProgress(apt.progress.FetchProgress): self.progress = parent.progressbar_fetch self.window_fetch = parent.window_fetch self.window_fetch.set_transient_for(parent.window_main) + self.window_fetch.realize() + self.window_fetch.window.set_functions(gtk.gdk.FUNC_MOVE) # set summary if self.summary != "": self.summary.set_markup("<big><b>%s</b></big> \n\n%s" % diff --git a/UpdateManager/UpdateManager.py b/UpdateManager/UpdateManager.py index 3724de94..b87fb498 100644 --- a/UpdateManager/UpdateManager.py +++ b/UpdateManager/UpdateManager.py @@ -213,7 +213,13 @@ class UpdateList: class UpdateManager(SimpleGladeApp): def __init__(self, datadir): - + icons = gtk.icon_theme_get_default() + try: + logo=icons.load_icon("update-manager", 48, 0) + gtk.window_set_default_icon_list(logo) + except: + pass + self.datadir = datadir SimpleGladeApp.__init__(self, datadir+"glade/UpdateManager.glade", None, domain="update-manager") @@ -232,7 +238,7 @@ class UpdateManager(SimpleGladeApp): self.expander_details.connect("notify::expanded", self.activate_details) # useful exit stuff - self.window_main.connect("delete_event", lambda w, ev: self.exit()) + self.window_main.connect("delete_event", self.close) self.button_cancel.connect("clicked", lambda w: self.exit()) # the treeview (move into it's own code!) @@ -285,6 +291,13 @@ class UpdateManager(SimpleGladeApp): self.restore_state() + def close(self, widget, data=None): + if self.window_main.get_property("sensitive") is False: + return True + else: + self.exit() + + def set_changes_buffer(self, changes_buffer, text, name, srcpkg): changes_buffer.set_text("") lines = text.split("\n") @@ -549,6 +562,8 @@ class UpdateManager(SimpleGladeApp): win = gtk.Window() win.set_property("type-hint", gtk.gdk.WINDOW_TYPE_HINT_DIALOG) win.set_title("") + win.realize() + win.window.set_functions(gtk.gdk.FUNC_MOVE) win.set_border_width(6) win.set_transient_for(self.window_main) win.set_position(gtk.WIN_POS_CENTER_ON_PARENT) @@ -556,9 +571,6 @@ class UpdateManager(SimpleGladeApp): win.set_property("skip-pager-hint", True) win.resize(400,200) win.set_resizable(False) - # prevent the window from closing with the delete button (there is - # a cancel button in the window) - win.connect("delete_event", lambda e,w: True); # create the socket socket = gtk.Socket() @@ -578,7 +590,7 @@ class UpdateManager(SimpleGladeApp): while gtk.events_pending(): gtk.main_iteration() self.fillstore() - self.window_main.set_sensitive(True) + self.window_main.set_sensitive(True) def toggled(self, renderer, path_string): """ a toggle button in the listview was toggled """ |