|
|
|
@ -18,7 +18,7 @@
|
|
|
|
|
import os
|
|
|
|
|
|
|
|
|
|
from os import path
|
|
|
|
|
from PySide import QtCore, QtGui
|
|
|
|
|
from PyQt5 import QtCore, QtGui, QtWidgets
|
|
|
|
|
import time
|
|
|
|
|
from calculate.core.client.cert_info import user_can_run_update
|
|
|
|
|
from calculate.lib.datavars import DataVars
|
|
|
|
@ -63,7 +63,7 @@ def check_livecd_and_autocheck():
|
|
|
|
|
dv.close()
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
class SysTray(QtGui.QSystemTrayIcon):
|
|
|
|
|
class SysTray(QtWidgets.QSystemTrayIcon):
|
|
|
|
|
ICON = "/usr/share/pixmaps/calculate-console-update.svg"
|
|
|
|
|
ICON_NO_UPDATE = "/usr/share/pixmaps/calculate-console-update-no.svg"
|
|
|
|
|
|
|
|
|
@ -141,14 +141,14 @@ class DBusChecker(dbus.service.Object):
|
|
|
|
|
|
|
|
|
|
@dbus.service.method(DBUS_NAME_UPDATER, in_signature='', out_signature='')
|
|
|
|
|
def quit(self):
|
|
|
|
|
QtGui.qApp.quit()
|
|
|
|
|
QtWidgets.qApp.quit()
|
|
|
|
|
|
|
|
|
|
@dbus.service.method(DBUS_NAME_UPDATER, in_signature='', out_signature='')
|
|
|
|
|
def check(self):
|
|
|
|
|
self.parent.step()
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
class CheckThread(QtGui.QMainWindow, UpdateInfo):
|
|
|
|
|
class CheckThread(QtWidgets.QMainWindow, UpdateInfo):
|
|
|
|
|
interval = 5 * MINUTE
|
|
|
|
|
|
|
|
|
|
def __init__(self, bus):
|
|
|
|
@ -230,10 +230,10 @@ if __name__ == '__main__':
|
|
|
|
|
_("No need to run a live cd or disable autoupdates") + "\n")
|
|
|
|
|
sys.exit(1)
|
|
|
|
|
|
|
|
|
|
app = QtGui.QApplication(sys.argv)
|
|
|
|
|
app = QtWidgets.QApplication(sys.argv)
|
|
|
|
|
|
|
|
|
|
for i in [0.5, 1, 2, 5]:
|
|
|
|
|
if QtGui.QSystemTrayIcon.isSystemTrayAvailable():
|
|
|
|
|
if QtWidgets.QSystemTrayIcon.isSystemTrayAvailable():
|
|
|
|
|
break
|
|
|
|
|
time.sleep(i)
|
|
|
|
|
|
|
|
|
@ -251,8 +251,8 @@ if __name__ == '__main__':
|
|
|
|
|
sys.exit(1)
|
|
|
|
|
except Exception as e:
|
|
|
|
|
pass
|
|
|
|
|
QtGui.QApplication.setQuitOnLastWindowClosed(False)
|
|
|
|
|
QtGui.QApplication.setApplicationName(_("Calculate Update Checker"))
|
|
|
|
|
QtWidgets.QApplication.setQuitOnLastWindowClosed(False)
|
|
|
|
|
QtWidgets.QApplication.setApplicationName(_("Calculate Update Checker"))
|
|
|
|
|
# Export the service
|
|
|
|
|
name = dbus.service.BusName(DBUS_NAME_UPDATER, bus)
|
|
|
|
|
# Export the object
|
|
|
|
|