diff --git a/editfwrulesdlg.ui b/editfwrulesdlg.ui
index 2d05eb0..4df4368 100644
--- a/editfwrulesdlg.ui
+++ b/editfwrulesdlg.ui
@@ -7,48 +7,76 @@
0
0
500
- 280
+ 335
- Edit Firewall Rules
+ VM Firewall
+ -
+
+
+ Allow network access except...
+
+
+
+ -
+
+
+ Deny network access except...
+
+
+
-
QLayout::SetMaximumSize
-
-
-
- false
-
-
- false
-
-
- false
-
-
- true
-
-
- true
-
-
- 40
-
-
- false
-
-
- 40
-
-
- false
-
-
+
+
-
+
+
+ false
+
+
+ false
+
+
+ false
+
+
+ true
+
+
+ true
+
+
+ 40
+
+
+ false
+
+
+ 40
+
+
+ false
+
+
+
+ -
+
+
+ Allow DNS queries
+
+
+ true
+
+
+
+
-
@@ -103,10 +131,13 @@
+ policyAllowRadioButton
+ policyDenyRadioButton
+ dnsCheckBox
+ rulesTreeView
newRuleButton
editRuleButton
deleteRuleButton
- rulesTreeView
buttonBox
@@ -118,8 +149,8 @@
reject()
- 316
- 260
+ 320
+ 330
286
@@ -134,8 +165,8 @@
accept()
- 248
- 254
+ 252
+ 330
157
diff --git a/newfwruledlg.ui b/newfwruledlg.ui
index 8241f3f..1037421 100644
--- a/newfwruledlg.ui
+++ b/newfwruledlg.ui
@@ -9,12 +9,12 @@
0
0
- 311
- 202
+ 381
+ 121
- New Firewall Rule
+ New Address
true
@@ -22,9 +22,9 @@
- 30
- 160
- 271
+ 10
+ 80
+ 361
32
@@ -35,170 +35,59 @@
QDialogButtonBox::Cancel|QDialogButtonBox::Ok
-
+
10
- 10
+ 14
62
17
- Name
+ Address
-
+
- 10
- 40
- 291
- 121
-
-
-
-
-
-
-
-
- 10
- 10
- 62
- 17
-
-
-
- Address
-
-
-
-
-
- 190
- 10
- 62
- 17
-
-
-
- Netmask
-
-
-
-
-
- 200
- 80
- 71
- 23
-
-
-
-
- 0
- 0
-
-
-
- Allow
-
-
-
-
-
- 10
- 30
- 171
- 27
-
-
-
-
-
-
- 10
- 62
- 31
- 21
-
-
-
- Port
-
-
-
-
-
- 123
- 62
- 16
- 21
-
-
-
- -
-
-
-
-
-
- 190
- 30
- 84
- 27
-
-
-
-
-
-
- 50
- 60
- 71
- 27
-
-
-
- 65535
-
-
- 0
-
-
-
-
-
- 130
- 60
- 71
- 27
-
-
-
- 65535
-
-
-
-
-
-
- 60
- 4
- 241
+ 70
+ 10
+ 301
27
+
+
+
+ 10
+ 44
+ 61
+ 21
+
+
+
+ Service
+
+
+
+
+
+ 70
+ 40
+ 301
+ 27
+
+
+
+ true
+
+
- nameEdit
addressEdit
- netmaskComboBox
- portBeginSpinBox
- portEndSpinBox
- allowCheckBox
+ serviceComboBox
buttonBox
@@ -210,12 +99,12 @@
accept()
- 248
- 174
+ 370
+ 94
157
- 201
+ 120
@@ -226,12 +115,12 @@
reject()
- 300
- 180
+ 370
+ 100
286
- 201
+ 120
diff --git a/qubesmanager/ui_editfwrulesdlg.py b/qubesmanager/ui_editfwrulesdlg.py
index 0d179b4..153abcb 100644
--- a/qubesmanager/ui_editfwrulesdlg.py
+++ b/qubesmanager/ui_editfwrulesdlg.py
@@ -2,7 +2,7 @@
# Form implementation generated from reading ui file 'editfwrulesdlg.ui'
#
-# Created: Wed Feb 16 20:55:59 2011
+# Created: Thu Mar 3 17:36:19 2011
# by: PyQt4 UI code generator 4.7.3
#
# WARNING! All changes made in this file will be lost!
@@ -12,12 +12,20 @@ from PyQt4 import QtCore, QtGui
class Ui_EditFwRulesDlg(object):
def setupUi(self, EditFwRulesDlg):
EditFwRulesDlg.setObjectName("EditFwRulesDlg")
- EditFwRulesDlg.resize(500, 280)
+ EditFwRulesDlg.resize(500, 335)
self.verticalLayout_3 = QtGui.QVBoxLayout(EditFwRulesDlg)
self.verticalLayout_3.setObjectName("verticalLayout_3")
+ self.policyAllowRadioButton = QtGui.QRadioButton(EditFwRulesDlg)
+ self.policyAllowRadioButton.setObjectName("policyAllowRadioButton")
+ self.verticalLayout_3.addWidget(self.policyAllowRadioButton)
+ self.policyDenyRadioButton = QtGui.QRadioButton(EditFwRulesDlg)
+ self.policyDenyRadioButton.setObjectName("policyDenyRadioButton")
+ self.verticalLayout_3.addWidget(self.policyDenyRadioButton)
self.horizontalLayout = QtGui.QHBoxLayout()
self.horizontalLayout.setSizeConstraint(QtGui.QLayout.SetMaximumSize)
self.horizontalLayout.setObjectName("horizontalLayout")
+ self.verticalLayout_2 = QtGui.QVBoxLayout()
+ self.verticalLayout_2.setObjectName("verticalLayout_2")
self.rulesTreeView = QtGui.QTreeView(EditFwRulesDlg)
self.rulesTreeView.setRootIsDecorated(False)
self.rulesTreeView.setUniformRowHeights(False)
@@ -27,7 +35,12 @@ class Ui_EditFwRulesDlg(object):
self.rulesTreeView.setObjectName("rulesTreeView")
self.rulesTreeView.header().setDefaultSectionSize(40)
self.rulesTreeView.header().setStretchLastSection(False)
- self.horizontalLayout.addWidget(self.rulesTreeView)
+ self.verticalLayout_2.addWidget(self.rulesTreeView)
+ self.dnsCheckBox = QtGui.QCheckBox(EditFwRulesDlg)
+ self.dnsCheckBox.setChecked(True)
+ self.dnsCheckBox.setObjectName("dnsCheckBox")
+ self.verticalLayout_2.addWidget(self.dnsCheckBox)
+ self.horizontalLayout.addLayout(self.verticalLayout_2)
self.verticalLayout = QtGui.QVBoxLayout()
self.verticalLayout.setObjectName("verticalLayout")
self.newRuleButton = QtGui.QPushButton(EditFwRulesDlg)
@@ -53,13 +66,19 @@ class Ui_EditFwRulesDlg(object):
QtCore.QObject.connect(self.buttonBox, QtCore.SIGNAL("rejected()"), EditFwRulesDlg.reject)
QtCore.QObject.connect(self.buttonBox, QtCore.SIGNAL("accepted()"), EditFwRulesDlg.accept)
QtCore.QMetaObject.connectSlotsByName(EditFwRulesDlg)
+ EditFwRulesDlg.setTabOrder(self.policyAllowRadioButton, self.policyDenyRadioButton)
+ EditFwRulesDlg.setTabOrder(self.policyDenyRadioButton, self.dnsCheckBox)
+ EditFwRulesDlg.setTabOrder(self.dnsCheckBox, self.rulesTreeView)
+ EditFwRulesDlg.setTabOrder(self.rulesTreeView, self.newRuleButton)
EditFwRulesDlg.setTabOrder(self.newRuleButton, self.editRuleButton)
EditFwRulesDlg.setTabOrder(self.editRuleButton, self.deleteRuleButton)
- EditFwRulesDlg.setTabOrder(self.deleteRuleButton, self.rulesTreeView)
- EditFwRulesDlg.setTabOrder(self.rulesTreeView, self.buttonBox)
+ EditFwRulesDlg.setTabOrder(self.deleteRuleButton, self.buttonBox)
def retranslateUi(self, EditFwRulesDlg):
- EditFwRulesDlg.setWindowTitle(QtGui.QApplication.translate("EditFwRulesDlg", "Edit Firewall Rules", None, QtGui.QApplication.UnicodeUTF8))
+ EditFwRulesDlg.setWindowTitle(QtGui.QApplication.translate("EditFwRulesDlg", "VM Firewall", None, QtGui.QApplication.UnicodeUTF8))
+ self.policyAllowRadioButton.setText(QtGui.QApplication.translate("EditFwRulesDlg", "Allow network access except...", None, QtGui.QApplication.UnicodeUTF8))
+ self.policyDenyRadioButton.setText(QtGui.QApplication.translate("EditFwRulesDlg", "Deny network access except...", None, QtGui.QApplication.UnicodeUTF8))
+ self.dnsCheckBox.setText(QtGui.QApplication.translate("EditFwRulesDlg", "Allow DNS queries", None, QtGui.QApplication.UnicodeUTF8))
self.newRuleButton.setText(QtGui.QApplication.translate("EditFwRulesDlg", "&New", None, QtGui.QApplication.UnicodeUTF8))
self.editRuleButton.setText(QtGui.QApplication.translate("EditFwRulesDlg", "&Edit", None, QtGui.QApplication.UnicodeUTF8))
self.deleteRuleButton.setText(QtGui.QApplication.translate("EditFwRulesDlg", "&Delete", None, QtGui.QApplication.UnicodeUTF8))
diff --git a/qubesmanager/ui_newfwruledlg.py b/qubesmanager/ui_newfwruledlg.py
index 5081e55..e195026 100644
--- a/qubesmanager/ui_newfwruledlg.py
+++ b/qubesmanager/ui_newfwruledlg.py
@@ -2,7 +2,7 @@
# Form implementation generated from reading ui file 'newfwruledlg.ui'
#
-# Created: Wed Feb 16 20:55:59 2011
+# Created: Thu Mar 3 17:36:19 2011
# by: PyQt4 UI code generator 4.7.3
#
# WARNING! All changes made in this file will be lost!
@@ -13,76 +13,36 @@ class Ui_NewFwRuleDlg(object):
def setupUi(self, NewFwRuleDlg):
NewFwRuleDlg.setObjectName("NewFwRuleDlg")
NewFwRuleDlg.setWindowModality(QtCore.Qt.NonModal)
- NewFwRuleDlg.resize(311, 202)
+ NewFwRuleDlg.resize(381, 121)
NewFwRuleDlg.setModal(True)
self.buttonBox = QtGui.QDialogButtonBox(NewFwRuleDlg)
- self.buttonBox.setGeometry(QtCore.QRect(30, 160, 271, 32))
+ self.buttonBox.setGeometry(QtCore.QRect(10, 80, 361, 32))
self.buttonBox.setOrientation(QtCore.Qt.Horizontal)
self.buttonBox.setStandardButtons(QtGui.QDialogButtonBox.Cancel|QtGui.QDialogButtonBox.Ok)
self.buttonBox.setObjectName("buttonBox")
- self.label = QtGui.QLabel(NewFwRuleDlg)
- self.label.setGeometry(QtCore.QRect(10, 10, 62, 17))
- self.label.setObjectName("label")
- self.groupBox = QtGui.QGroupBox(NewFwRuleDlg)
- self.groupBox.setGeometry(QtCore.QRect(10, 40, 291, 121))
- self.groupBox.setTitle("")
- self.groupBox.setObjectName("groupBox")
- self.label_2 = QtGui.QLabel(self.groupBox)
- self.label_2.setGeometry(QtCore.QRect(10, 10, 62, 17))
+ self.label_2 = QtGui.QLabel(NewFwRuleDlg)
+ self.label_2.setGeometry(QtCore.QRect(10, 14, 62, 17))
self.label_2.setObjectName("label_2")
- self.label_3 = QtGui.QLabel(self.groupBox)
- self.label_3.setGeometry(QtCore.QRect(190, 10, 62, 17))
- self.label_3.setObjectName("label_3")
- self.allowCheckBox = QtGui.QCheckBox(self.groupBox)
- self.allowCheckBox.setGeometry(QtCore.QRect(200, 80, 71, 23))
- sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Fixed)
- sizePolicy.setHorizontalStretch(0)
- sizePolicy.setVerticalStretch(0)
- sizePolicy.setHeightForWidth(self.allowCheckBox.sizePolicy().hasHeightForWidth())
- self.allowCheckBox.setSizePolicy(sizePolicy)
- self.allowCheckBox.setObjectName("allowCheckBox")
- self.addressEdit = QtGui.QLineEdit(self.groupBox)
- self.addressEdit.setGeometry(QtCore.QRect(10, 30, 171, 27))
+ self.addressEdit = QtGui.QLineEdit(NewFwRuleDlg)
+ self.addressEdit.setGeometry(QtCore.QRect(70, 10, 301, 27))
self.addressEdit.setObjectName("addressEdit")
- self.label_4 = QtGui.QLabel(self.groupBox)
- self.label_4.setGeometry(QtCore.QRect(10, 62, 31, 21))
+ self.label_4 = QtGui.QLabel(NewFwRuleDlg)
+ self.label_4.setGeometry(QtCore.QRect(10, 44, 61, 21))
self.label_4.setObjectName("label_4")
- self.label_5 = QtGui.QLabel(self.groupBox)
- self.label_5.setGeometry(QtCore.QRect(123, 62, 16, 21))
- self.label_5.setObjectName("label_5")
- self.netmaskComboBox = QtGui.QComboBox(self.groupBox)
- self.netmaskComboBox.setGeometry(QtCore.QRect(190, 30, 84, 27))
- self.netmaskComboBox.setObjectName("netmaskComboBox")
- self.portBeginSpinBox = QtGui.QSpinBox(self.groupBox)
- self.portBeginSpinBox.setGeometry(QtCore.QRect(50, 60, 71, 27))
- self.portBeginSpinBox.setMaximum(65535)
- self.portBeginSpinBox.setProperty("value", 0)
- self.portBeginSpinBox.setObjectName("portBeginSpinBox")
- self.portEndSpinBox = QtGui.QSpinBox(self.groupBox)
- self.portEndSpinBox.setGeometry(QtCore.QRect(130, 60, 71, 27))
- self.portEndSpinBox.setMaximum(65535)
- self.portEndSpinBox.setObjectName("portEndSpinBox")
- self.nameEdit = QtGui.QLineEdit(NewFwRuleDlg)
- self.nameEdit.setGeometry(QtCore.QRect(60, 4, 241, 27))
- self.nameEdit.setObjectName("nameEdit")
+ self.serviceComboBox = QtGui.QComboBox(NewFwRuleDlg)
+ self.serviceComboBox.setGeometry(QtCore.QRect(70, 40, 301, 27))
+ self.serviceComboBox.setEditable(True)
+ self.serviceComboBox.setObjectName("serviceComboBox")
self.retranslateUi(NewFwRuleDlg)
QtCore.QObject.connect(self.buttonBox, QtCore.SIGNAL("accepted()"), NewFwRuleDlg.accept)
QtCore.QObject.connect(self.buttonBox, QtCore.SIGNAL("rejected()"), NewFwRuleDlg.reject)
QtCore.QMetaObject.connectSlotsByName(NewFwRuleDlg)
- NewFwRuleDlg.setTabOrder(self.nameEdit, self.addressEdit)
- NewFwRuleDlg.setTabOrder(self.addressEdit, self.netmaskComboBox)
- NewFwRuleDlg.setTabOrder(self.netmaskComboBox, self.portBeginSpinBox)
- NewFwRuleDlg.setTabOrder(self.portBeginSpinBox, self.portEndSpinBox)
- NewFwRuleDlg.setTabOrder(self.portEndSpinBox, self.allowCheckBox)
- NewFwRuleDlg.setTabOrder(self.allowCheckBox, self.buttonBox)
+ NewFwRuleDlg.setTabOrder(self.addressEdit, self.serviceComboBox)
+ NewFwRuleDlg.setTabOrder(self.serviceComboBox, self.buttonBox)
def retranslateUi(self, NewFwRuleDlg):
- NewFwRuleDlg.setWindowTitle(QtGui.QApplication.translate("NewFwRuleDlg", "New Firewall Rule", None, QtGui.QApplication.UnicodeUTF8))
- self.label.setText(QtGui.QApplication.translate("NewFwRuleDlg", "Name", None, QtGui.QApplication.UnicodeUTF8))
+ NewFwRuleDlg.setWindowTitle(QtGui.QApplication.translate("NewFwRuleDlg", "New Address", None, QtGui.QApplication.UnicodeUTF8))
self.label_2.setText(QtGui.QApplication.translate("NewFwRuleDlg", "Address", None, QtGui.QApplication.UnicodeUTF8))
- self.label_3.setText(QtGui.QApplication.translate("NewFwRuleDlg", "Netmask", None, QtGui.QApplication.UnicodeUTF8))
- self.allowCheckBox.setText(QtGui.QApplication.translate("NewFwRuleDlg", "Allow", None, QtGui.QApplication.UnicodeUTF8))
- self.label_4.setText(QtGui.QApplication.translate("NewFwRuleDlg", "Port", None, QtGui.QApplication.UnicodeUTF8))
- self.label_5.setText(QtGui.QApplication.translate("NewFwRuleDlg", "-", None, QtGui.QApplication.UnicodeUTF8))
+ self.label_4.setText(QtGui.QApplication.translate("NewFwRuleDlg", "Service", None, QtGui.QApplication.UnicodeUTF8))