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

Merge branch 'master' of git.qubes-os.org:/var/lib/qubes/git/marmarek/qubes-manager

Browse Source
This commit is contained in:
Joanna Rutkowska 2012-03-07 11:08:27 +01:00
commit 0cc5399a5b
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
qubesmanager/main.py
View File

@ -191,8 +191,8 @@ class VmNetvmItem (QTableWidgetItem):
if vm.is_netvm() and not vm.is_proxyvm(): if vm.is_netvm() and not vm.is_proxyvm():
self.setText("n/a") self.setText("n/a")
elif vm.netvm_vm is not None: elif vm.netvm is not None:
self.setText(vm.netvm_vm.name) self.setText(vm.netvm.name)
else: else:
self.setText("---") self.setText("---")

6
qubesmanager/settings.py
View File

@ -151,7 +151,7 @@ class VMSettingsWindow(Ui_SettingsDialog, QDialog):
def current_tab_changed(self, idx): def current_tab_changed(self, idx):
if idx == self.tabs_indices["firewall"]: if idx == self.tabs_indices["firewall"]:
if self.vm.netvm_vm is not None and not self.vm.netvm_vm.is_proxyvm(): if self.vm.netvm is not None and not self.vm.netvm.is_proxyvm():
QMessageBox.warning (None, "VM configuration problem!", "The '{0}' AppVM is not network connected to a FirewallVM!<p>".format(self.vm.name) +\ QMessageBox.warning (None, "VM configuration problem!", "The '{0}' AppVM is not network connected to a FirewallVM!<p>".format(self.vm.name) +\
"You may edit the '{0}' VM firewall rules, but these will not take any effect until you connect it to a working Firewall VM.".format(self.vm.name)) "You may edit the '{0}' VM firewall rules, but these will not take any effect until you connect it to a working Firewall VM.".format(self.vm.name))
@ -196,9 +196,9 @@ class VMSettingsWindow(Ui_SettingsDialog, QDialog):
self.netvm_idx = 0 self.netvm_idx = 0
for (i, vm) in enumerate(netvm_list): for (i, vm) in enumerate(netvm_list):
text = vm.name text = vm.name
if vm is self.qvm_collection.get_default_netvm_vm(): if vm is self.qvm_collection.get_default_netvm():
text += " (default)" text += " (default)"
if vm.qid == self.vm.netvm_vm.qid: if vm.qid == self.vm.netvm.qid:
self.netvm_idx = i self.netvm_idx = i
text += " (current)" text += " (current)"
self.netVM.insertItem(i, text) self.netVM.insertItem(i, text)