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

Fixed bug in handling state changes

Browse Source
This commit is contained in:
Marta Marczykowska-Górecka 2018-12-07 18:07:45 +01:00
parent c0eb8b55ab
commit 24adad8094
No known key found for this signature in database
GPG Key ID: 9A752C30B26FD04B
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
qubesmanager/template_manager.py
View File

@ -171,7 +171,8 @@ class TemplateManagerWindow(
def clear_selection(self): def clear_selection(self):
for row in self.rows_in_table.values(): for row in self.rows_in_table.values():
row.checkbox.setChecked(False) if row.checkbox:
row.checkbox.setChecked(False)
def change_all_changed(self): def change_all_changed(self):
if self.change_all_combobox.currentIndex() == 0: if self.change_all_combobox.currentIndex() == 0:
@ -179,7 +180,7 @@ class TemplateManagerWindow(
selected_template = self.change_all_combobox.currentText() selected_template = self.change_all_combobox.currentText()
for row in self.rows_in_table.values(): for row in self.rows_in_table.values():
if row.checkbox.isChecked(): if row.checkbox and row.checkbox.isChecked():
row.new_item.setCurrentIndex( row.new_item.setCurrentIndex(
row.new_item.findText(selected_template)) row.new_item.findText(selected_template))
@ -218,8 +219,10 @@ class TemplateManagerWindow(
def reset(self): def reset(self):
for row in self.rows_in_table.values(): for row in self.rows_in_table.values():
row.new_item.reset_choice() if row.new_item:
row.checkbox.setChecked(False) row.new_item.reset_choice()
if row.checkbox:
row.checkbox.setChecked(False)
def cancel(self): def cancel(self):
self.close() self.close()
@ -227,7 +230,7 @@ class TemplateManagerWindow(
def apply(self): def apply(self):
errors = {} errors = {}
for vm, row in self.rows_in_table.items(): for vm, row in self.rows_in_table.items():
if row.new_item.changed: if row.new_item and row.new_item.changed:
try: try:
setattr(self.qubes_app.domains[vm], setattr(self.qubes_app.domains[vm],
'template', row.new_item.currentText()) 'template', row.new_item.currentText())
@ -375,12 +378,14 @@ class VMRow:
if new_template: if new_template:
self.table_widget.removeCellWidget( self.table_widget.removeCellWidget(
row, column_names.index('New template')) row, column_names.index('New template'))
self.new_item = None
checkbox = self.table_widget.cellWidget( checkbox = self.table_widget.cellWidget(
row, column_names.index('State')) row, column_names.index('State'))
if checkbox: if checkbox:
self.table_widget.removeCellWidget( self.table_widget.removeCellWidget(
row, column_names.index('State')) row, column_names.index('State'))
self.checkbox = None
# Bases on the original code by: # Bases on the original code by:
# Copyright (c) 2002-2007 Pascal Varet <p.varet@gmail.com> # Copyright (c) 2002-2007 Pascal Varet <p.varet@gmail.com>