diff options
Diffstat (limited to 'AptUrl/gtk/GtkUI.py')
| -rw-r--r-- | AptUrl/gtk/GtkUI.py | 51 |
1 files changed, 25 insertions, 26 deletions
diff --git a/AptUrl/gtk/GtkUI.py b/AptUrl/gtk/GtkUI.py index dcc905f..9174a32 100644 --- a/AptUrl/gtk/GtkUI.py +++ b/AptUrl/gtk/GtkUI.py @@ -1,30 +1,27 @@ +from .aptdaemon import APT +from AptUrl.Helpers import _ +from AptUrl import Helpers +from AptUrl.UI import AbstractUI +import tempfile +import subprocess +import apt_pkg +import sys +import os +from gi.repository import GObject +from gi.repository import Gdk +from gi.repository import Gtk import gi gi.require_version('Gtk', '3.0') -gi.require_version('XApp', '1.0') -from gi.repository import Gtk -from gi.repository import Gdk -from gi.repository import GObject -from gi.repository import XApp -GObject.threads_init() -import os -import sys -import apt_pkg -import subprocess -import tempfile - -from AptUrl.UI import AbstractUI -from AptUrl import Helpers -from AptUrl.Helpers import _ +GObject.threads_init() -import mintcommon.aptdaemon APTURL_UI_FILE = os.environ.get( # Set this envar to use a test .ui file. 'APTURL_UI_FILE', # System file to use if the envar is not set. '/usr/share/apturl/apturl-gtk.ui' - ) +) class GtkUI(AbstractUI): @@ -51,7 +48,7 @@ class GtkUI(AbstractUI): buttons=buttons) d.set_title("") d.set_markup("<big><b>%s</b></big>\n\n%s" % (summary, msg)) - XApp.set_window_icon_name(d, "package-x-generic") + d.set_icon_name("package-x-generic") d.set_keep_above(True) d.realize() d.get_window().set_functions(Gdk.WMFunction.MOVE) @@ -96,7 +93,7 @@ class GtkUI(AbstractUI): desc = "%s\n\n%s" % (summary, Helpers.format_description(description)) tbuf.set_text(desc) description_text_view.set_buffer(tbuf) - XApp.set_window_icon_name(dia, "package-x-generic") + dia.set_icon_name("package-x-generic") # check if another package manager is already running # FIXME: just checking for the existance of the file is @@ -104,14 +101,14 @@ class GtkUI(AbstractUI): # be locked via apt_pkg.get_lock() # - but that needs to run as root # - a dbus helper might be the best answer here - #args = (update_button_status, dia_xml.get_object("yes_button"), + # args = (update_button_status, dia_xml.get_object("yes_button"), # dia_xml.get_object("infolabel")) - #args[0](*args[1:]) - #timer_id = GObject.timeout_add(750, *args ) + # args[0](*args[1:]) + # timer_id = GObject.timeout_add(750, *args ) # show the dialog res = dia.run() - #GObject.source_remove(timer_id) + # GObject.source_remove(timer_id) if res != Gtk.ResponseType.YES: dia.hide() return False @@ -130,11 +127,12 @@ class GtkUI(AbstractUI): self.install_packages(packages) def install_packages(self, package_names): - self.apt = mintcommon.aptdaemon.APT(None) + self.apt = APT(None) self.package_names = package_names self.busy = True if self.require_update: - self.apt.set_finished_callback(self.on_update_before_install_finished) + self.apt.set_finished_callback( + self.on_update_before_install_finished) self.apt.update_cache() else: self.on_update_before_install_finished() @@ -153,6 +151,7 @@ class GtkUI(AbstractUI): self.busy = False self.dia.exit() + if __name__ == "__main__": ui = GtkUI() - ui.error("foo","bar") + ui.error("foo", "bar") |