Qubes/manager
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed incorrect QApplication start that led to missing icons

Browse Source 
Using QIcon object before initializing QApplication leads to
missing theme icons.

fixes QubesOS/qubes-issues#5354
This commit is contained in:
Marta Marczykowska-Górecka 2019-10-06 21:51:04 +02:00
parent 12481fd561
commit 0c10723205
No known key found for this signature in database
GPG Key ID: 9A752C30B26FD04B
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
qubesmanager/backup.py
View File

@ -25,7 +25,7 @@ from qubesadmin import exc
from qubesadmin import utils as admin_utils from qubesadmin import utils as admin_utils
from qubes.storage.file import get_disk_usage from qubes.storage.file import get_disk_usage
from PyQt5 import QtCore, QtWidgets, QtGui # pylint: disable=import-error from PyQt5 import QtCore, QtWidgets # pylint: disable=import-error
from . import ui_backupdlg # pylint: disable=no-name-in-module from . import ui_backupdlg # pylint: disable=no-name-in-module
from . import multiselectwidget from . import multiselectwidget
@ -386,7 +386,7 @@ class BackupVMsWindow(ui_backupdlg.Ui_Backup, QtWidgets.QWizard):
def main(): def main():
utils.run_asynchronous("Qubes Backup VMs", utils.run_asynchronous("Qubes Backup VMs",
QtGui.QIcon.fromTheme("qubes-manager"), "qubes-manager",
BackupVMsWindow) BackupVMsWindow)

2
qubesmanager/qube_manager.py
View File

@ -1301,7 +1301,7 @@ class VmManagerWindow(ui_qubemanager.Ui_VmManagerWindow, QtWidgets.QMainWindow):
def main(): def main():
manager_utils.run_asynchronous( manager_utils.run_asynchronous(
"Qube Manager", "Qube Manager",
QtGui.QIcon.fromTheme("qubes-manager"), "qubes-manager",
VmManagerWindow) VmManagerWindow)

2
qubesmanager/template_manager.py
View File

@ -379,7 +379,7 @@ class VMRow:
def main(): def main():
utils.run_asynchronous("Template Manager", utils.run_asynchronous("Template Manager",
QtGui.QIcon.fromTheme("qubes-manager"), "qubes-manager",
TemplateManagerWindow) TemplateManagerWindow)

4
qubesmanager/utils.py
View File

@ -262,12 +262,12 @@ def handle_exception(exc_type, exc_value, exc_traceback):
msg_box.exec_() msg_box.exec_()
def run_asynchronous(app_name, icon, window_class): def run_asynchronous(app_name, icon_name, window_class):
qt_app = QtWidgets.QApplication(sys.argv) qt_app = QtWidgets.QApplication(sys.argv)
qt_app.setOrganizationName("The Qubes Project") qt_app.setOrganizationName("The Qubes Project")
qt_app.setOrganizationDomain("http://qubes-os.org") qt_app.setOrganizationDomain("http://qubes-os.org")
qt_app.setApplicationName(app_name) qt_app.setApplicationName(app_name)
qt_app.setWindowIcon(icon) qt_app.setWindowIcon(QIcon.fromTheme(icon_name))
qt_app.lastWindowClosed.connect(loop_shutdown) qt_app.lastWindowClosed.connect(loop_shutdown)
qubes_app = qubesadmin.Qubes() qubes_app = qubesadmin.Qubes()