Skip to content
Draft
Changes from all commits
Commits
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
15 changes: 8 additions & 7 deletions qubesmanager/qube_manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -99,11 +99,12 @@ def __init__(self):
"Running" : QIcon(":/running"),
"Paused" : QIcon(":/paused"),
"Suspended" : QIcon(":/paused"),
"Transient" : QIcon(":/transient"),
"Starting" : QIcon(":/transient"),
"Halting" : QIcon(":/transient"),
"Dying" : QIcon(":/transient"),
"Halted" : QIcon(":/blank"),
"Blocked" : QIcon(":/ban"),
"NA" : QIcon(":/transient"),
}
self.preloadIcon = QIcon(":/preloaded")
self.preloadTooltip = (
Expand Down Expand Up @@ -170,7 +171,7 @@ def paint(self, qp, option, index):

# draw the main state icon, assuming all items have one
qp.drawPixmap(iconRect,
self.stateIcons[index.data()['power']].pixmap(iconSize))
self.stateIcons.get(index.data()['power'], 'NA').pixmap(iconSize))

left = delta = margin + iconRect.width()
if index.data()['outdated']:
Expand Down Expand Up @@ -549,9 +550,9 @@ def data(self, index, role):
state = vm.state.get('power', '')
try:
ordered_state = str(
["Running", "Transient", "Halting", "Paused",
"Suspended", "Dying", "Crashed",
"Halted", "NA"].index(state))
["Running", "Starting", "Paused", "Suspended",
"Dying", "Halting", "Crashed", "Halted",
"NA"].index(state))
except ValueError:
ordered_state = state
updated = vm.state.get('outdated', '')
Expand Down Expand Up @@ -1395,7 +1396,7 @@ def table_selection_changed(self):
# TODO: add boot from device to menu and add windows tools there
# Update available actions:
if vm.state['power'] in \
['Running', 'Transient', 'Halting', 'Dying']:
['Running', 'Starting', 'Halting', 'Dying']:
self.action_resumevm.setEnabled(False)
self.action_removevm.setEnabled(False)
self.template_menu.setEnabled(False)
Expand All @@ -1405,7 +1406,7 @@ def table_selection_changed(self):
self.action_restartvm.setEnabled(False)
self.action_open_console.setEnabled(False)
self.template_menu.setEnabled(False)
elif vm.state['power'] == 'Suspend':
elif vm.state['power'] == 'Suspended':
self.action_removevm.setEnabled(False)
self.action_pausevm.setEnabled(False)
self.action_open_console.setEnabled(False)
Expand Down