Skip to content

Arka plan bildirimleri ve ilerleme takibi #46

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
umutKaracelebi wants to merge 1 commit into from
Closed

Arka plan bildirimleri ve ilerleme takibi #46

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 55 additions & 5 deletions src/MainWindow.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
gi.require_version("Notify", "0.7")
gi.require_version("GdkPixbuf", "2.0")
gi.require_version("Vte", "2.91")
from gi.repository import GLib, Gtk, GObject, Notify, GdkPixbuf, Gdk, Vte, Pango
from gi.repository import GLib, Gtk, GObject, Notify, GdkPixbuf, Gdk, Vte, Pango, Gio

from Package import Package
from Server import Server
Expand Down Expand Up @@ -66,8 +66,15 @@ def __init__(self, application):

self.error = False
self.dpkglockerror = False

self.MainWindow = self.GtkBuilder.get_object("MainWindow")
if self.MainWindow:
self.MainWindow.connect("delete-event", self.on_delete_event)

Comment on lines +69 to +73
self.dpkgconferror = False
self.dpkglockerror_message = ""
self.bg_notified = False
self.last_notified_percent = -1
self.error_message = ""

self.searching = False
Expand Down Expand Up @@ -580,6 +587,39 @@ def getMac(self):
break
return mac

def on_delete_event(self, widget, event):
if self.inprogress:
self.MainWindow.hide()
self.bg_notified = True

try:
bus = Gio.bus_get_sync(Gio.BusType.SESSION, None)
bus.call_sync(
'org.freedesktop.Notifications',
'/org/freedesktop/Notifications',
'org.freedesktop.Notifications',
'Notify',
GLib.Variant('(susssasa{sv}i)', (
'Pardus Software Center',
0,
'pardus-software',
_('Pardus Software Center'),
_('İşlemler arka planda devam ediyor ({} uygulama)...').format(len(self.queue)) if len(self.queue) > 1 else _('İşlem arka planda devam ediyor...'),
Comment on lines +591 to +607
[],
{'desktop-entry': GLib.Variant('s', 'tr.org.pardus.software')},
5000
)),
None,
Gio.DBusCallFlags.NONE,
-1,
None
)
except Exception as e:
self.Logger.exception('Notification error: {}'.format(e))

return True
return False

def get_user_locale(self):
lang = os.getenv("LANG")
if lang:
Expand Down Expand Up @@ -4855,6 +4895,9 @@ def on_action_process_stdout(self, source, condition):

return True

def update_progress_notification(self, text, percent):
pass

Comment on lines +4899 to +4900
def on_action_process_stderr(self, source, condition):
if condition == GLib.IO_HUP:
return False
Expand All @@ -4866,18 +4909,23 @@ def on_action_process_stderr(self, source, condition):
if "dlstatus" in line:
percent = line.split(":")[2].split(".")[0]
self.ui_queue_flowbox.get_children()[0].get_children()[0].get_children()[0].get_children()[0].get_children()[0].get_children()[3].set_fraction(int(percent) / 100)
self.ui_queue_flowbox.get_children()[0].get_children()[0].get_children()[0].get_children()[0].get_children()[0].get_children()[3].set_text("{} : {} %".format(_("Downloading"), percent))
text = "{} : {} %".format(_("Downloading"), percent)
self.ui_queue_flowbox.get_children()[0].get_children()[0].get_children()[0].get_children()[0].get_children()[0].get_children()[3].set_text(text)
self.update_progress_notification(text, percent)
self.ui_queue_flowbox.get_children()[0].get_children()[0].get_children()[0].get_children()[0].get_children()[0].get_children()[4].set_sensitive(True)
Comment on lines 4909 to 4915
elif "pmstatus" in line:
percent = line.split(":")[2].split(".")[0]
self.ui_queue_flowbox.get_children()[0].get_children()[0].get_children()[0].get_children()[0].get_children()[0].get_children()[3].set_fraction(int(percent) / 100)
text = ""
if self.isinstalled:
if self.isupgrade:
self.ui_queue_flowbox.get_children()[0].get_children()[0].get_children()[0].get_children()[0].get_children()[0].get_children()[3].set_text("{} : {} %".format(_("Upgrading"), percent))
text = "{} : {} %".format(_("Upgrading"), percent)
else:
self.ui_queue_flowbox.get_children()[0].get_children()[0].get_children()[0].get_children()[0].get_children()[0].get_children()[3].set_text("{} : {} %".format(_("Removing"), percent))
text = "{} : {} %".format(_("Removing"), percent)
else:
self.ui_queue_flowbox.get_children()[0].get_children()[0].get_children()[0].get_children()[0].get_children()[0].get_children()[3].set_text("{} : {} %".format(_("Installing"), percent))
text = "{} : {} %".format(_("Installing"), percent)
self.ui_queue_flowbox.get_children()[0].get_children()[0].get_children()[0].get_children()[0].get_children()[0].get_children()[3].set_text(text)
self.update_progress_notification(text, percent)
self.ui_queue_flowbox.get_children()[0].get_children()[0].get_children()[0].get_children()[0].get_children()[0].get_children()[4].set_sensitive(False)
elif re.match(r"^[A-Za-zÇĞİÖŞÜçğıöşü]+:", line.strip()) and ".deb" in line:
self.Logger.warning("connection error")
Expand Down Expand Up @@ -4937,6 +4985,8 @@ def on_action_process_exit(self, pid, status):
self.inprogress_app_name = ""
self.inprogress_command = ""
self.inprogress_desktop = ""
self.bg_notified = False
self.last_notified_percent = -1

self.Logger.info(f"queue: {self.queue}")

Expand Down
Loading