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

Create "global" objects in main(), not VmManagerWindow

Browse Source 
To have them outside of VmManagerWindow instance - possibly passed
through to other objects.
This commit is contained in:
Marek Marczykowski-Górecki 2014-03-31 18:36:00 +02:00
parent 9669c9f069
commit aec32da2f1
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
qubesmanager/main.py
View File

@ -274,7 +274,7 @@ class VmManagerWindow(Ui_VmManagerWindow, QMainWindow):
"Last backup": 16, "Last backup": 16,
} }
def __init__(self, parent=None): def __init__(self, qvm_collection, blk_manager, parent=None):
super(VmManagerWindow, self).__init__() super(VmManagerWindow, self).__init__()
self.setupUi(self) self.setupUi(self)
self.toolbar = self.toolBar self.toolbar = self.toolBar
@ -282,9 +282,9 @@ class VmManagerWindow(Ui_VmManagerWindow, QMainWindow):
self.manager_settings = QSettings() self.manager_settings = QSettings()
self.qubes_watch = qubesutils.QubesWatch() self.qubes_watch = qubesutils.QubesWatch()
self.qvm_collection = QubesVmCollection() self.qvm_collection = qvm_collection
self.meminfo_changed = {} self.meminfo_changed = {}
self.blk_manager = QubesBlockDevicesManager(self.qvm_collection) self.blk_manager = blk_manager
self.blk_manager.tray_message_func = trayIcon.showMessage self.blk_manager.tray_message_func = trayIcon.showMessage
self.qubes_watch.setup_block_watch(self.blk_manager.block_devs_event) self.qubes_watch.setup_block_watch(self.blk_manager.block_devs_event)
self.qubes_watch.setup_meminfo_watch(self.meminfo_update_event) self.qubes_watch.setup_meminfo_watch(self.meminfo_update_event)
@ -1751,11 +1751,18 @@ def main():
global session_bus global session_bus
session_bus = QDBusConnection.sessionBus() session_bus = QDBusConnection.sessionBus()
qvm_collection = QubesVmCollection()
qvm_collection.lock_db_for_reading()
qvm_collection.load()
qvm_collection.unlock_db()
blk_manager = QubesBlockDevicesManager(qvm_collection)
global trayIcon global trayIcon
trayIcon = QubesTrayIcon(QIcon(":/qubes.png")) trayIcon = QubesTrayIcon(QIcon(":/qubes.png"))
global manager_window global manager_window
manager_window = VmManagerWindow() manager_window = VmManagerWindow(qvm_collection, blk_manager)
global wm global wm
wm = WatchManager() wm = WatchManager()