Merge branch 'master' of git.qubes-os.org:/var/lib/qubes/git/aga/qubes-manager
This commit is contained in:
commit
0f5cbe84ca
@ -178,7 +178,7 @@ p, li { white-space: pre-wrap; }
|
|||||||
<item>
|
<item>
|
||||||
<widget class="QProgressBar" name="progress_bar">
|
<widget class="QProgressBar" name="progress_bar">
|
||||||
<property name="value">
|
<property name="value">
|
||||||
<number>24</number>
|
<number>0</number>
|
||||||
</property>
|
</property>
|
||||||
<property name="alignment">
|
<property name="alignment">
|
||||||
<set>Qt::AlignCenter</set>
|
<set>Qt::AlignCenter</set>
|
||||||
|
215
newfwruledlg.ui
215
newfwruledlg.ui
@ -10,7 +10,7 @@
|
|||||||
<x>0</x>
|
<x>0</x>
|
||||||
<y>0</y>
|
<y>0</y>
|
||||||
<width>381</width>
|
<width>381</width>
|
||||||
<height>121</height>
|
<height>193</height>
|
||||||
</rect>
|
</rect>
|
||||||
</property>
|
</property>
|
||||||
<property name="windowTitle">
|
<property name="windowTitle">
|
||||||
@ -19,15 +19,156 @@
|
|||||||
<property name="modal">
|
<property name="modal">
|
||||||
<bool>true</bool>
|
<bool>true</bool>
|
||||||
</property>
|
</property>
|
||||||
<widget class="QDialogButtonBox" name="buttonBox">
|
<layout class="QGridLayout" name="gridLayout">
|
||||||
<property name="geometry">
|
<item row="0" column="0">
|
||||||
<rect>
|
<layout class="QGridLayout" name="gridLayout_2">
|
||||||
<x>10</x>
|
<property name="leftMargin">
|
||||||
<y>80</y>
|
<number>0</number>
|
||||||
<width>361</width>
|
|
||||||
<height>32</height>
|
|
||||||
</rect>
|
|
||||||
</property>
|
</property>
|
||||||
|
<property name="rightMargin">
|
||||||
|
<number>0</number>
|
||||||
|
</property>
|
||||||
|
<property name="verticalSpacing">
|
||||||
|
<number>6</number>
|
||||||
|
</property>
|
||||||
|
<item row="2" column="0">
|
||||||
|
<widget class="QLabel" name="label">
|
||||||
|
<property name="text">
|
||||||
|
<string>Protocol</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="3" column="0">
|
||||||
|
<widget class="QLabel" name="label_3">
|
||||||
|
<property name="text">
|
||||||
|
<string>Port</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="1" column="0">
|
||||||
|
<widget class="QLabel" name="label_4">
|
||||||
|
<property name="text">
|
||||||
|
<string>Service</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="1" column="1" colspan="3">
|
||||||
|
<widget class="QComboBox" name="serviceComboBox">
|
||||||
|
<property name="editable">
|
||||||
|
<bool>true</bool>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="0" column="0">
|
||||||
|
<widget class="QLabel" name="label_2">
|
||||||
|
<property name="text">
|
||||||
|
<string>Address</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="0" column="1" colspan="3">
|
||||||
|
<widget class="QComboBox" name="addressComboBox">
|
||||||
|
<property name="editable">
|
||||||
|
<bool>true</bool>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="2" column="1">
|
||||||
|
<widget class="QRadioButton" name="tcp_radio">
|
||||||
|
<property name="sizePolicy">
|
||||||
|
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
|
||||||
|
<horstretch>0</horstretch>
|
||||||
|
<verstretch>0</verstretch>
|
||||||
|
</sizepolicy>
|
||||||
|
</property>
|
||||||
|
<property name="minimumSize">
|
||||||
|
<size>
|
||||||
|
<width>0</width>
|
||||||
|
<height>0</height>
|
||||||
|
</size>
|
||||||
|
</property>
|
||||||
|
<property name="text">
|
||||||
|
<string>TCP</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="2" column="2">
|
||||||
|
<widget class="QRadioButton" name="udp_radio">
|
||||||
|
<property name="sizePolicy">
|
||||||
|
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
|
||||||
|
<horstretch>0</horstretch>
|
||||||
|
<verstretch>0</verstretch>
|
||||||
|
</sizepolicy>
|
||||||
|
</property>
|
||||||
|
<property name="minimumSize">
|
||||||
|
<size>
|
||||||
|
<width>0</width>
|
||||||
|
<height>0</height>
|
||||||
|
</size>
|
||||||
|
</property>
|
||||||
|
<property name="text">
|
||||||
|
<string>UDP</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="2" column="3">
|
||||||
|
<widget class="QRadioButton" name="any_radio">
|
||||||
|
<property name="sizePolicy">
|
||||||
|
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
|
||||||
|
<horstretch>0</horstretch>
|
||||||
|
<verstretch>0</verstretch>
|
||||||
|
</sizepolicy>
|
||||||
|
</property>
|
||||||
|
<property name="minimumSize">
|
||||||
|
<size>
|
||||||
|
<width>71</width>
|
||||||
|
<height>0</height>
|
||||||
|
</size>
|
||||||
|
</property>
|
||||||
|
<property name="text">
|
||||||
|
<string> Any </string>
|
||||||
|
</property>
|
||||||
|
<property name="checked">
|
||||||
|
<bool>true</bool>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="3" column="1">
|
||||||
|
<widget class="QLineEdit" name="tcp_port_lineedit">
|
||||||
|
<property name="enabled">
|
||||||
|
<bool>false</bool>
|
||||||
|
</property>
|
||||||
|
<property name="sizePolicy">
|
||||||
|
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
|
||||||
|
<horstretch>0</horstretch>
|
||||||
|
<verstretch>0</verstretch>
|
||||||
|
</sizepolicy>
|
||||||
|
</property>
|
||||||
|
<property name="inputMethodHints">
|
||||||
|
<set>Qt::ImhDigitsOnly</set>
|
||||||
|
</property>
|
||||||
|
<property name="maxLength">
|
||||||
|
<number>5</number>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="3" column="2">
|
||||||
|
<widget class="QLineEdit" name="udp_port_lineedit">
|
||||||
|
<property name="enabled">
|
||||||
|
<bool>false</bool>
|
||||||
|
</property>
|
||||||
|
<property name="inputMethodHints">
|
||||||
|
<set>Qt::ImhDigitsOnly</set>
|
||||||
|
</property>
|
||||||
|
<property name="maxLength">
|
||||||
|
<number>5</number>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
</layout>
|
||||||
|
</item>
|
||||||
|
<item row="1" column="0">
|
||||||
|
<widget class="QDialogButtonBox" name="buttonBox">
|
||||||
<property name="orientation">
|
<property name="orientation">
|
||||||
<enum>Qt::Horizontal</enum>
|
<enum>Qt::Horizontal</enum>
|
||||||
</property>
|
</property>
|
||||||
@ -35,62 +176,10 @@
|
|||||||
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
|
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
<widget class="QLabel" name="label_2">
|
</item>
|
||||||
<property name="geometry">
|
</layout>
|
||||||
<rect>
|
|
||||||
<x>10</x>
|
|
||||||
<y>14</y>
|
|
||||||
<width>62</width>
|
|
||||||
<height>17</height>
|
|
||||||
</rect>
|
|
||||||
</property>
|
|
||||||
<property name="text">
|
|
||||||
<string>Address</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
<widget class="QLabel" name="label_4">
|
|
||||||
<property name="geometry">
|
|
||||||
<rect>
|
|
||||||
<x>10</x>
|
|
||||||
<y>44</y>
|
|
||||||
<width>61</width>
|
|
||||||
<height>21</height>
|
|
||||||
</rect>
|
|
||||||
</property>
|
|
||||||
<property name="text">
|
|
||||||
<string>Service</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
<widget class="QComboBox" name="serviceComboBox">
|
|
||||||
<property name="geometry">
|
|
||||||
<rect>
|
|
||||||
<x>70</x>
|
|
||||||
<y>40</y>
|
|
||||||
<width>301</width>
|
|
||||||
<height>27</height>
|
|
||||||
</rect>
|
|
||||||
</property>
|
|
||||||
<property name="editable">
|
|
||||||
<bool>true</bool>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
<widget class="QComboBox" name="addressComboBox">
|
|
||||||
<property name="geometry">
|
|
||||||
<rect>
|
|
||||||
<x>70</x>
|
|
||||||
<y>10</y>
|
|
||||||
<width>301</width>
|
|
||||||
<height>27</height>
|
|
||||||
</rect>
|
|
||||||
</property>
|
|
||||||
<property name="editable">
|
|
||||||
<bool>true</bool>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</widget>
|
</widget>
|
||||||
<tabstops>
|
<tabstops>
|
||||||
<tabstop>addressComboBox</tabstop>
|
|
||||||
<tabstop>serviceComboBox</tabstop>
|
|
||||||
<tabstop>buttonBox</tabstop>
|
<tabstop>buttonBox</tabstop>
|
||||||
</tabstops>
|
</tabstops>
|
||||||
<resources/>
|
<resources/>
|
||||||
|
@ -173,9 +173,17 @@ class BackupVMsWindow(Ui_Backup, QWizard):
|
|||||||
if not self.thread_monitor.success:
|
if not self.thread_monitor.success:
|
||||||
QMessageBox.warning (None, "Backup error!", "ERROR: {1}".format(self.vm.name, self.thread_monitor.error_msg))
|
QMessageBox.warning (None, "Backup error!", "ERROR: {1}".format(self.vm.name, self.thread_monitor.error_msg))
|
||||||
|
|
||||||
|
if self.dev_mount_path != None:
|
||||||
umount_device(self.dev_mount_path)
|
umount_device(self.dev_mount_path)
|
||||||
self.button(self.FinishButton).setEnabled(True)
|
self.button(self.FinishButton).setEnabled(True)
|
||||||
|
|
||||||
|
|
||||||
|
def reject(self):
|
||||||
|
if self.dev_mount_path != None:
|
||||||
|
umount_device(self.dev_mount_path)
|
||||||
|
self.done(0)
|
||||||
|
|
||||||
|
|
||||||
def has_selected_vms(self):
|
def has_selected_vms(self):
|
||||||
return self.select_vms_widget.selected_list.count() > 0
|
return self.select_vms_widget.selected_list.count() > 0
|
||||||
|
|
||||||
|
@ -81,8 +81,7 @@ def fill_devs_list(dialog):
|
|||||||
dialog.dev_combobox.setCurrentIndex(0) #current selected is null ""
|
dialog.dev_combobox.setCurrentIndex(0) #current selected is null ""
|
||||||
dialog.prev_dev_idx = 0
|
dialog.prev_dev_idx = 0
|
||||||
dialog.dir_line_edit.clear()
|
dialog.dir_line_edit.clear()
|
||||||
dialog.dir_line_edit.setEnabled(False)
|
enable_dir_line_edit(dialog, True)
|
||||||
dialog.select_path_button.setEnabled(False)
|
|
||||||
|
|
||||||
|
|
||||||
def enable_dir_line_edit(dialog, boolean):
|
def enable_dir_line_edit(dialog, boolean):
|
||||||
@ -100,12 +99,10 @@ def dev_combobox_activated(dialog, idx):
|
|||||||
|
|
||||||
if dialog.dev_mount_path != None:
|
if dialog.dev_mount_path != None:
|
||||||
dialog.dev_mount_path = umount_device(dialog.dev_mount_path)
|
dialog.dev_mount_path = umount_device(dialog.dev_mount_path)
|
||||||
if dialog_dev_mount_path != None:
|
if dialog.dev_mount_path != None:
|
||||||
dialog.dev_combobox.setCurrentIndex(dialog.prev_dev_idx)
|
dialog.dev_combobox.setCurrentIndex(dialog.prev_dev_idx)
|
||||||
return
|
return
|
||||||
|
|
||||||
enable_dir_line_edit(dialog, False)
|
|
||||||
|
|
||||||
if dialog.dev_combobox.currentText() != "None": #An existing device chosen
|
if dialog.dev_combobox.currentText() != "None": #An existing device chosen
|
||||||
dev_name = str(dialog.dev_combobox.itemData(idx).toString())
|
dev_name = str(dialog.dev_combobox.itemData(idx).toString())
|
||||||
|
|
||||||
@ -123,15 +120,12 @@ def dev_combobox_activated(dialog, idx):
|
|||||||
|
|
||||||
#check if device mounted
|
#check if device mounted
|
||||||
dialog.dev_mount_path = check_if_mounted(dev_path)
|
dialog.dev_mount_path = check_if_mounted(dev_path)
|
||||||
if dialog.dev_mount_path != None:
|
if dialog.dev_mount_path == None:
|
||||||
enable_dir_line_edit(dialog, True)
|
|
||||||
else:
|
|
||||||
dialog.dev_mount_path = mount_device(dev_path)
|
dialog.dev_mount_path = mount_device(dev_path)
|
||||||
if dialog.dev_mount_path != None:
|
if dialog.dev_mount_path == None:
|
||||||
enable_dir_line_edit(dialog, True)
|
|
||||||
else:
|
|
||||||
dialog.dev_combobox.setCurrentIndex(0) #if couldn't mount - set current device to "None"
|
dialog.dev_combobox.setCurrentIndex(0) #if couldn't mount - set current device to "None"
|
||||||
|
dialog.prev_dev_idx = 0
|
||||||
|
return
|
||||||
|
|
||||||
dialog.prev_dev_idx = idx
|
dialog.prev_dev_idx = idx
|
||||||
dialog.select_dir_page.emit(SIGNAL("completeChanged()"))
|
dialog.select_dir_page.emit(SIGNAL("completeChanged()"))
|
||||||
@ -141,7 +135,12 @@ def select_path_button_clicked(dialog):
|
|||||||
dialog.backup_dir = dialog.dir_line_edit.text()
|
dialog.backup_dir = dialog.dir_line_edit.text()
|
||||||
file_dialog = QFileDialog()
|
file_dialog = QFileDialog()
|
||||||
file_dialog.setReadOnly(True)
|
file_dialog.setReadOnly(True)
|
||||||
|
|
||||||
|
if dialog.dev_mount_path != None:
|
||||||
new_path = file_dialog.getExistingDirectory(dialog, "Select backup directory.", dialog.dev_mount_path)
|
new_path = file_dialog.getExistingDirectory(dialog, "Select backup directory.", dialog.dev_mount_path)
|
||||||
|
else:
|
||||||
|
new_path = file_dialog.getExistingDirectory(dialog, "Select backup directory.", "~")
|
||||||
|
|
||||||
if new_path:
|
if new_path:
|
||||||
dialog.dir_line_edit.setText(new_path)
|
dialog.dir_line_edit.setText(new_path)
|
||||||
dialog.backup_dir = new_path
|
dialog.backup_dir = new_path
|
||||||
|
@ -81,7 +81,7 @@ class NewFwRuleDlg (QDialog, ui_newfwruledlg.Ui_NewFwRuleDlg):
|
|||||||
self.set_ok_enabled(False)
|
self.set_ok_enabled(False)
|
||||||
self.addressComboBox.setValidator(QIPAddressValidator())
|
self.addressComboBox.setValidator(QIPAddressValidator())
|
||||||
self.addressComboBox.editTextChanged.connect(self.address_editing_finished)
|
self.addressComboBox.editTextChanged.connect(self.address_editing_finished)
|
||||||
self.serviceComboBox.setValidator(QRegExpValidator(QRegExp("[a-z][a-z0-9-]+|[0-9]+(-[0-9]+)?", Qt.CaseInsensitive), None))
|
self.serviceComboBox.setValidator(QRegExpValidator(QRegExp("\*|[a-z][a-z0-9-]+|[0-9]+(-[0-9]+)?", Qt.CaseInsensitive), None))
|
||||||
|
|
||||||
self.serviceComboBox.setInsertPolicy(QComboBox.InsertAtBottom)
|
self.serviceComboBox.setInsertPolicy(QComboBox.InsertAtBottom)
|
||||||
self.populate_combos()
|
self.populate_combos()
|
||||||
@ -115,6 +115,21 @@ class NewFwRuleDlg (QDialog, ui_newfwruledlg.Ui_NewFwRuleDlg):
|
|||||||
if ok_button is not None:
|
if ok_button is not None:
|
||||||
ok_button.setEnabled(on)
|
ok_button.setEnabled(on)
|
||||||
|
|
||||||
|
def on_tcp_radio_toggled(self, checked):
|
||||||
|
self.tcp_port_lineedit.setEnabled(checked)
|
||||||
|
self.udp_port_lineedit.setEnabled(not checked)
|
||||||
|
|
||||||
|
def on_udp_radio_toggled(self, checked):
|
||||||
|
self.tcp_port_lineedit.setEnabled(not checked)
|
||||||
|
self.udp_port_lineedit.setEnabled(checked)
|
||||||
|
|
||||||
|
def on_any_radio_toggled(self, checked):
|
||||||
|
self.tcp_port_lineedit.setEnabled(not checked)
|
||||||
|
self.udp_port_lineedit.setEnabled(not checked)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
class QubesFirewallRuleItem(object):
|
class QubesFirewallRuleItem(object):
|
||||||
def __init__(self, address = str(), netmask = 32, portBegin = 0, portEnd = None):
|
def __init__(self, address = str(), netmask = 32, portBegin = 0, portEnd = None):
|
||||||
self.__address = address
|
self.__address = address
|
||||||
@ -141,6 +156,8 @@ class QubesFirewallRuleItem(object):
|
|||||||
def hasChildren(self):
|
def hasChildren(self):
|
||||||
return False
|
return False
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
class QubesFirewallRulesModel(QAbstractItemModel):
|
class QubesFirewallRulesModel(QAbstractItemModel):
|
||||||
def __init__(self, parent=None):
|
def __init__(self, parent=None):
|
||||||
QAbstractItemModel.__init__(self, parent)
|
QAbstractItemModel.__init__(self, parent)
|
||||||
@ -168,6 +185,16 @@ class QubesFirewallRulesModel(QAbstractItemModel):
|
|||||||
self.__services.append( (service["name"], int(service["port"]), service["protocol"]) )
|
self.__services.append( (service["name"], int(service["port"]), service["protocol"]) )
|
||||||
f.close()
|
f.close()
|
||||||
|
|
||||||
|
def sort(self, idx, order):
|
||||||
|
from operator import attrgetter
|
||||||
|
|
||||||
|
rev = (order == Qt.AscendingOrder)
|
||||||
|
if idx==0:
|
||||||
|
self.children.sort(key=attrgetter('address'), reverse = rev)
|
||||||
|
if idx==1:
|
||||||
|
self.children.sort(key=lambda x: self.get_service_name(attrgetter('portBegin')) if attrgetter('portEnd') == None else attrgetter('portBegin'), reverse = rev)
|
||||||
|
|
||||||
|
|
||||||
def get_service_name(self, port):
|
def get_service_name(self, port):
|
||||||
for service in self.__services:
|
for service in self.__services:
|
||||||
if service[1] == port:
|
if service[1] == port:
|
||||||
|
@ -165,7 +165,7 @@ class VmTemplateItem (QTableWidgetItem):
|
|||||||
else:
|
else:
|
||||||
self.setText("---")
|
self.setText("---")
|
||||||
|
|
||||||
self.setTextAlignment(Qt.AlignHCenter)
|
self.setTextAlignment(Qt.AlignCenter)
|
||||||
|
|
||||||
|
|
||||||
class VmIconWidget (QWidget):
|
class VmIconWidget (QWidget):
|
||||||
@ -196,7 +196,7 @@ class VmNetvmItem (QTableWidgetItem):
|
|||||||
else:
|
else:
|
||||||
self.setText("---")
|
self.setText("---")
|
||||||
|
|
||||||
self.setTextAlignment(Qt.AlignHCenter)
|
self.setTextAlignment(Qt.AlignCenter)
|
||||||
|
|
||||||
|
|
||||||
class VmUsageBarWidget (QWidget):
|
class VmUsageBarWidget (QWidget):
|
||||||
@ -347,7 +347,7 @@ class VmUpdateInfoWidget(QWidget):
|
|||||||
layout.addWidget(self.label, alignment=Qt.AlignCenter)
|
layout.addWidget(self.label, alignment=Qt.AlignCenter)
|
||||||
else:
|
else:
|
||||||
self.icon = QLabel("")
|
self.icon = QLabel("")
|
||||||
layout.addWidget(self.icon, alignment=Qt.AlignHCenter)
|
layout.addWidget(self.icon, alignment=Qt.AlignCenter)
|
||||||
self.setLayout(layout)
|
self.setLayout(layout)
|
||||||
|
|
||||||
self.previous_outdated = False
|
self.previous_outdated = False
|
||||||
@ -541,6 +541,8 @@ class VmManagerWindow(Ui_VmManagerWindow, QMainWindow):
|
|||||||
self.context_menu.addAction(self.action_editfwrules)
|
self.context_menu.addAction(self.action_editfwrules)
|
||||||
self.context_menu.addAction(self.action_updatevm)
|
self.context_menu.addAction(self.action_updatevm)
|
||||||
|
|
||||||
|
self.table_selection_changed()
|
||||||
|
|
||||||
self.blk_menu = QMenu("Block devices")
|
self.blk_menu = QMenu("Block devices")
|
||||||
self.context_menu.addMenu(self.blk_menu)
|
self.context_menu.addMenu(self.blk_menu)
|
||||||
|
|
||||||
@ -704,7 +706,7 @@ class VmManagerWindow(Ui_VmManagerWindow, QMainWindow):
|
|||||||
|
|
||||||
vm_row.update(self.counter, blk_visible=blk_visible)
|
vm_row.update(self.counter, blk_visible=blk_visible)
|
||||||
|
|
||||||
#self.table_selection_changed()
|
self.table_selection_changed()
|
||||||
|
|
||||||
if not out_of_schedule:
|
if not out_of_schedule:
|
||||||
self.counter += 1
|
self.counter += 1
|
||||||
@ -850,7 +852,7 @@ class VmManagerWindow(Ui_VmManagerWindow, QMainWindow):
|
|||||||
def get_selected_vm(self):
|
def get_selected_vm(self):
|
||||||
#vm selection relies on the VmInfo widget's value used for sorting by VM name
|
#vm selection relies on the VmInfo widget's value used for sorting by VM name
|
||||||
row_index = self.table.currentRow()
|
row_index = self.table.currentRow()
|
||||||
if row_index != None:
|
if row_index != -1:
|
||||||
(vm_name, qid) = self.table.item(row_index, self.columns_indices["Name"]).value
|
(vm_name, qid) = self.table.item(row_index, self.columns_indices["Name"]).value
|
||||||
assert self.vms_in_table[qid] is not None
|
assert self.vms_in_table[qid] is not None
|
||||||
vm = self.vms_in_table[qid].vm
|
vm = self.vms_in_table[qid].vm
|
||||||
@ -914,10 +916,10 @@ class VmManagerWindow(Ui_VmManagerWindow, QMainWindow):
|
|||||||
self.qvm_collection.load()
|
self.qvm_collection.load()
|
||||||
|
|
||||||
#TODO: the following two conditions should really be checked by qvm_collection.pop() overload...
|
#TODO: the following two conditions should really be checked by qvm_collection.pop() overload...
|
||||||
if vm.is_template() and qvm_collection.default_template_qid == vm.qid:
|
if vm.is_template() and self.qvm_collection.default_template_qid == vm.qid:
|
||||||
qvm_collection.default_template_qid = None
|
self.qvm_collection.default_template_qid = None
|
||||||
if vm.is_netvm() and qvm_collection.default_netvm_qid == vm.qid:
|
if vm.is_netvm() and self.qvm_collection.default_netvm_qid == vm.qid:
|
||||||
qvm_collection.default_netvm_qid = None
|
self.qvm_collection.default_netvm_qid = None
|
||||||
|
|
||||||
vm.remove_from_disk()
|
vm.remove_from_disk()
|
||||||
self.qvm_collection.pop(vm.qid)
|
self.qvm_collection.pop(vm.qid)
|
||||||
|
@ -97,7 +97,6 @@ class RestoreVMsWindow(Ui_Restore, QWizard):
|
|||||||
def dev_combobox_activated(self, idx):
|
def dev_combobox_activated(self, idx):
|
||||||
dev_combobox_activated(self, idx)
|
dev_combobox_activated(self, idx)
|
||||||
|
|
||||||
|
|
||||||
@pyqtSlot(name='on_select_path_button_clicked')
|
@pyqtSlot(name='on_select_path_button_clicked')
|
||||||
def select_path_button_clicked(self):
|
def select_path_button_clicked(self):
|
||||||
select_path_button_clicked(self)
|
select_path_button_clicked(self)
|
||||||
@ -209,9 +208,15 @@ class RestoreVMsWindow(Ui_Restore, QWizard):
|
|||||||
#if not self.thread_monitor.success:
|
#if not self.thread_monitor.success:
|
||||||
#QMessageBox.warning (None, "Backup error!", "ERROR: {1}".format(self.vm.name, self.thread_monitor.error_msg))
|
#QMessageBox.warning (None, "Backup error!", "ERROR: {1}".format(self.vm.name, self.thread_monitor.error_msg))
|
||||||
|
|
||||||
|
if self.dev_mount_path != None:
|
||||||
umount_device(self.dev_mount_path)
|
umount_device(self.dev_mount_path)
|
||||||
self.button(self.FinishButton).setEnabled(True)
|
self.button(self.FinishButton).setEnabled(True)
|
||||||
|
|
||||||
|
def reject(self):
|
||||||
|
if self.dev_mount_path != None:
|
||||||
|
umount_device(self.dev_mount_path)
|
||||||
|
self.done(0)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
def has_selected_dir(self):
|
def has_selected_dir(self):
|
||||||
|
@ -139,14 +139,15 @@ class VMSettingsWindow(Ui_SettingsDialog, QDialog):
|
|||||||
self.done(0)
|
self.done(0)
|
||||||
|
|
||||||
def __save_changes__(self, thread_monitor):
|
def __save_changes__(self, thread_monitor):
|
||||||
|
|
||||||
|
self.fw_model.apply_rules()
|
||||||
|
self.AppListManager.save_appmenu_select_changes()
|
||||||
|
|
||||||
ret = self.__apply_basic_tab__()
|
ret = self.__apply_basic_tab__()
|
||||||
if len(ret) > 0 :
|
if len(ret) > 0 :
|
||||||
thread_monitor.set_error_msg('\n'.join(ret))
|
thread_monitor.set_error_msg('\n'.join(ret))
|
||||||
thread_monitor.set_finished()
|
thread_monitor.set_finished()
|
||||||
return
|
|
||||||
#self.fw_model.apply_rules()
|
|
||||||
self.AppListManager.save_appmenu_select_changes()
|
|
||||||
thread_monitor.set_finished()
|
|
||||||
|
|
||||||
def current_tab_changed(self, idx):
|
def current_tab_changed(self, idx):
|
||||||
if idx == self.tabs_indices["firewall"]:
|
if idx == self.tabs_indices["firewall"]:
|
||||||
@ -211,15 +212,13 @@ class VMSettingsWindow(Ui_SettingsDialog, QDialog):
|
|||||||
def __apply_basic_tab__(self):
|
def __apply_basic_tab__(self):
|
||||||
msg = []
|
msg = []
|
||||||
|
|
||||||
if self.vm.is_running():
|
|
||||||
msg.append("Can't change settings of a running VM.")
|
|
||||||
msg.append("telemele")
|
|
||||||
return msg
|
|
||||||
|
|
||||||
# vmname changed
|
# vmname changed
|
||||||
vmname = str(self.vmname.text())
|
vmname = str(self.vmname.text())
|
||||||
if self.vm.name != vmname:
|
if self.vm.name != vmname:
|
||||||
if self.qvm_collection.get_vm_by_name(vmname) is not None:
|
if self.vm.is_running():
|
||||||
|
msg.append("Can't change name of a running VM.")
|
||||||
|
|
||||||
|
elif self.qvm_collection.get_vm_by_name(vmname) is not None:
|
||||||
msg.append("A VM named <b>{0}</b> already exists in the system!".format(vmname))
|
msg.append("A VM named <b>{0}</b> already exists in the system!".format(vmname))
|
||||||
else:
|
else:
|
||||||
oldname = self.vm.name
|
oldname = self.vm.name
|
||||||
@ -236,6 +235,10 @@ class VMSettingsWindow(Ui_SettingsDialog, QDialog):
|
|||||||
|
|
||||||
#vm label changed
|
#vm label changed
|
||||||
if self.vmlabel.currentIndex() != self.label_idx:
|
if self.vmlabel.currentIndex() != self.label_idx:
|
||||||
|
if self.vm.is_running():
|
||||||
|
msg.append("Can't change label of a running VM.")
|
||||||
|
|
||||||
|
else:
|
||||||
label = self.label_list[self.vmlabel.currentIndex()]
|
label = self.label_list[self.vmlabel.currentIndex()]
|
||||||
self.qvm_collection.lock_db_for_writing()
|
self.qvm_collection.lock_db_for_writing()
|
||||||
self.vm.label = label
|
self.vm.label = label
|
||||||
|
@ -29,7 +29,7 @@
|
|||||||
<locale language="English" country="UnitedStates"/>
|
<locale language="English" country="UnitedStates"/>
|
||||||
</property>
|
</property>
|
||||||
<property name="currentIndex">
|
<property name="currentIndex">
|
||||||
<number>5</number>
|
<number>2</number>
|
||||||
</property>
|
</property>
|
||||||
<widget class="QWidget" name="basic_tab">
|
<widget class="QWidget" name="basic_tab">
|
||||||
<property name="locale">
|
<property name="locale">
|
||||||
@ -470,22 +470,48 @@
|
|||||||
<attribute name="title">
|
<attribute name="title">
|
||||||
<string>Firewall rules</string>
|
<string>Firewall rules</string>
|
||||||
</attribute>
|
</attribute>
|
||||||
<layout class="QVBoxLayout" name="verticalLayout_7">
|
<layout class="QGridLayout" name="gridLayout_8">
|
||||||
<item>
|
<item row="0" column="0">
|
||||||
<widget class="QRadioButton" name="policyAllowRadioButton">
|
<widget class="QRadioButton" name="policyAllowRadioButton">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Allow network access except...</string>
|
<string>Allow network access except...</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
<item row="0" column="1">
|
||||||
|
<widget class="QCheckBox" name="icmpCheckBox">
|
||||||
|
<property name="minimumSize">
|
||||||
|
<size>
|
||||||
|
<width>323</width>
|
||||||
|
<height>0</height>
|
||||||
|
</size>
|
||||||
|
</property>
|
||||||
|
<property name="text">
|
||||||
|
<string>Allow ICMP traffic</string>
|
||||||
|
</property>
|
||||||
|
<property name="checked">
|
||||||
|
<bool>true</bool>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="1" column="0">
|
||||||
<widget class="QRadioButton" name="policyDenyRadioButton">
|
<widget class="QRadioButton" name="policyDenyRadioButton">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Deny network access except...</string>
|
<string>Deny network access except...</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
<item row="1" column="1">
|
||||||
|
<widget class="QCheckBox" name="dnsCheckBox">
|
||||||
|
<property name="text">
|
||||||
|
<string>Allow DNS queries</string>
|
||||||
|
</property>
|
||||||
|
<property name="checked">
|
||||||
|
<bool>true</bool>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="2" column="0" colspan="2">
|
||||||
<layout class="QHBoxLayout" name="horizontalLayout_2">
|
<layout class="QHBoxLayout" name="horizontalLayout_2">
|
||||||
<property name="sizeConstraint">
|
<property name="sizeConstraint">
|
||||||
<enum>QLayout::SetMaximumSize</enum>
|
<enum>QLayout::SetMaximumSize</enum>
|
||||||
@ -503,6 +529,9 @@
|
|||||||
<property name="itemsExpandable">
|
<property name="itemsExpandable">
|
||||||
<bool>false</bool>
|
<bool>false</bool>
|
||||||
</property>
|
</property>
|
||||||
|
<property name="sortingEnabled">
|
||||||
|
<bool>true</bool>
|
||||||
|
</property>
|
||||||
<property name="allColumnsShowFocus">
|
<property name="allColumnsShowFocus">
|
||||||
<bool>true</bool>
|
<bool>true</bool>
|
||||||
</property>
|
</property>
|
||||||
@ -518,28 +547,7 @@
|
|||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
<item>
|
||||||
<layout class="QHBoxLayout" name="horizontalLayout_4">
|
<layout class="QHBoxLayout" name="horizontalLayout_4"/>
|
||||||
<item>
|
|
||||||
<widget class="QCheckBox" name="icmpCheckBox">
|
|
||||||
<property name="text">
|
|
||||||
<string>Allow ICMP traffic</string>
|
|
||||||
</property>
|
|
||||||
<property name="checked">
|
|
||||||
<bool>true</bool>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<widget class="QCheckBox" name="dnsCheckBox">
|
|
||||||
<property name="text">
|
|
||||||
<string>Allow DNS queries</string>
|
|
||||||
</property>
|
|
||||||
<property name="checked">
|
|
||||||
<bool>true</bool>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
</layout>
|
|
||||||
</item>
|
</item>
|
||||||
</layout>
|
</layout>
|
||||||
</item>
|
</item>
|
||||||
|
Loading…
Reference in New Issue
Block a user