From e63813d51970aa7b9eb34059c33ae9ba240bd327 Mon Sep 17 00:00:00 2001 From: Agnieszka Kostrzewa Date: Mon, 12 Mar 2012 12:53:07 +0100 Subject: [PATCH] Follow API change: template_vm -> template --- qubesmanager/appmenu_select.py | 4 ++-- qubesmanager/main.py | 6 +++--- qubesmanager/settings.py | 10 +++++----- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/qubesmanager/appmenu_select.py b/qubesmanager/appmenu_select.py index 40ece49..3c769ec 100755 --- a/qubesmanager/appmenu_select.py +++ b/qubesmanager/appmenu_select.py @@ -60,8 +60,8 @@ class AppmenuSelectManager: self.app_list = apps_multiselect # this is a multiselect wiget self.vm = vm - if self.vm.template_vm: - self.source_vm = self.vm.template_vm + if self.vm.template: + self.source_vm = self.vm.template else: self.source_vm = self.vm diff --git a/qubesmanager/main.py b/qubesmanager/main.py index 5534669..d4ab965 100755 --- a/qubesmanager/main.py +++ b/qubesmanager/main.py @@ -146,15 +146,15 @@ class VmTemplateItem (QTableWidgetItem): def __init__(self, vm): super(VmTemplateItem, self).__init__() - if vm.template_vm is not None: - self.setText(vm.template_vm.name) + if vm.template is not None: + self.setText(vm.template.name) else: font = QFont() font.setStyle(QFont.StyleItalic) self.setFont(font) self.setTextColor(QColor("gray")) - if vm.is_appvm(): # and vm.template_vm is None + if vm.is_appvm(): # and vm.template is None self.setText("StandaloneVM") elif vm.is_template(): self.setText("TemplateVM") diff --git a/qubesmanager/settings.py b/qubesmanager/settings.py index 0599be8..38e1242 100644 --- a/qubesmanager/settings.py +++ b/qubesmanager/settings.py @@ -64,8 +64,8 @@ class VMSettingsWindow(Ui_SettingsDialog, QDialog): self.app = app self.qvm_collection = qvm_collection self.vm = vm - if self.vm.template_vm: - self.source_vm = self.vm.template_vm + if self.vm.template: + self.source_vm = self.vm.template else: self.source_vm = self.vm @@ -179,14 +179,14 @@ class VMSettingsWindow(Ui_SettingsDialog, QDialog): self.vmlabel.setItemIcon (i, QIcon(label.icon_path)) self.vmlabel.setCurrentIndex(self.label_idx) - if not self.vm.is_template() and self.vm.template_vm is not None: + if not self.vm.is_template() and self.vm.template is not None: template_vm_list = [vm for vm in self.qvm_collection.values() if not vm.internal and vm.is_template()] self.template_idx = 0 for (i, vm) in enumerate(template_vm_list): text = vm.name if vm is self.qvm_collection.get_default_template_vm(): text += " (default)" - if vm.qid == self.vm.template_vm.qid: + if vm.qid == self.vm.template.qid: self.template_idx = i text += " (current)" self.template_name.insertItem(i, text) @@ -287,7 +287,7 @@ class VMSettingsWindow(Ui_SettingsDialog, QDialog): assert template_vm.is_template() self.qvm_collection.lock_db_for_writing() - self.vm.template_vm = template_vm + self.vm.template = template_vm self.qvm_collection.save() self.qvm_collection.unlock_db()