1.1 --- a/OpenSecurity/bin/ui/ui_ConfigureDialog.py Wed Apr 02 12:54:35 2014 +0200
1.2 +++ b/OpenSecurity/bin/ui/ui_ConfigureDialog.py Wed Apr 02 13:22:04 2014 +0200
1.3 @@ -2,7 +2,7 @@
1.4
1.5 # Form implementation generated from reading ui file 'ConfigureDialog.ui'
1.6 #
1.7 -# Created: Wed Apr 2 12:54:20 2014
1.8 +# Created: Wed Apr 2 13:21:51 2014
1.9 # by: PyQt4 UI code generator 4.10.3
1.10 #
1.11 # WARNING! All changes made in this file will be lost!
1.12 @@ -26,13 +26,13 @@
1.13 class Ui_ConfigureDialog(object):
1.14 def setupUi(self, ConfigureDialog):
1.15 ConfigureDialog.setObjectName(_fromUtf8("ConfigureDialog"))
1.16 - ConfigureDialog.resize(400, 455)
1.17 + ConfigureDialog.resize(474, 416)
1.18 icon = QtGui.QIcon()
1.19 icon.addPixmap(QtGui.QPixmap(_fromUtf8(":/opensecurity/gfx/opensecurity_icon_64.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
1.20 ConfigureDialog.setWindowIcon(icon)
1.21 ConfigureDialog.setSizeGripEnabled(True)
1.22 - self.verticalLayout_3 = QtGui.QVBoxLayout(ConfigureDialog)
1.23 - self.verticalLayout_3.setObjectName(_fromUtf8("verticalLayout_3"))
1.24 + self.lyMain = QtGui.QVBoxLayout(ConfigureDialog)
1.25 + self.lyMain.setObjectName(_fromUtf8("lyMain"))
1.26 self.lyHeading = QtGui.QHBoxLayout()
1.27 self.lyHeading.setSpacing(8)
1.28 self.lyHeading.setContentsMargins(8, -1, -1, 8)
1.29 @@ -62,50 +62,44 @@
1.30 self.wdStatus.setObjectName(_fromUtf8("wdStatus"))
1.31 self.lyStatus.addWidget(self.wdStatus, 2, 0, 1, 2)
1.32 self.lyHeading.addLayout(self.lyStatus)
1.33 - self.verticalLayout_3.addLayout(self.lyHeading)
1.34 - self.tabConfig = QtGui.QTabWidget(ConfigureDialog)
1.35 - self.tabConfig.setObjectName(_fromUtf8("tabConfig"))
1.36 - self.tbConfig = QtGui.QWidget()
1.37 - self.tbConfig.setObjectName(_fromUtf8("tbConfig"))
1.38 - self.lyConfig = QtGui.QVBoxLayout(self.tbConfig)
1.39 - self.lyConfig.setObjectName(_fromUtf8("lyConfig"))
1.40 - self.lblTemplate = QtGui.QLabel(self.tbConfig)
1.41 + self.lyMain.addLayout(self.lyHeading)
1.42 + self.lblTemplate = QtGui.QLabel(ConfigureDialog)
1.43 self.lblTemplate.setObjectName(_fromUtf8("lblTemplate"))
1.44 - self.lyConfig.addWidget(self.lblTemplate)
1.45 - self.tvTemplate = QtGui.QTreeWidget(self.tbConfig)
1.46 + self.lyMain.addWidget(self.lblTemplate)
1.47 + self.tvTemplate = QtGui.QTreeWidget(ConfigureDialog)
1.48 self.tvTemplate.setMaximumSize(QtCore.QSize(16777215, 64))
1.49 self.tvTemplate.setRootIsDecorated(False)
1.50 self.tvTemplate.setItemsExpandable(False)
1.51 self.tvTemplate.setAllColumnsShowFocus(True)
1.52 self.tvTemplate.setObjectName(_fromUtf8("tvTemplate"))
1.53 - self.lyConfig.addWidget(self.tvTemplate)
1.54 + self.lyMain.addWidget(self.tvTemplate)
1.55 self.lyDownload = QtGui.QHBoxLayout()
1.56 self.lyDownload.setObjectName(_fromUtf8("lyDownload"))
1.57 spacerItem = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
1.58 self.lyDownload.addItem(spacerItem)
1.59 - self.btnDownload = QtGui.QPushButton(self.tbConfig)
1.60 + self.btnDownload = QtGui.QPushButton(ConfigureDialog)
1.61 self.btnDownload.setMinimumSize(QtCore.QSize(100, 0))
1.62 self.btnDownload.setObjectName(_fromUtf8("btnDownload"))
1.63 self.lyDownload.addWidget(self.btnDownload)
1.64 - self.btnImport = QtGui.QPushButton(self.tbConfig)
1.65 + self.btnImport = QtGui.QPushButton(ConfigureDialog)
1.66 self.btnImport.setMinimumSize(QtCore.QSize(100, 0))
1.67 self.btnImport.setObjectName(_fromUtf8("btnImport"))
1.68 self.lyDownload.addWidget(self.btnImport)
1.69 - self.lyConfig.addLayout(self.lyDownload)
1.70 - self.lblMachines = QtGui.QLabel(self.tbConfig)
1.71 + self.lyMain.addLayout(self.lyDownload)
1.72 + self.lblMachines = QtGui.QLabel(ConfigureDialog)
1.73 self.lblMachines.setObjectName(_fromUtf8("lblMachines"))
1.74 - self.lyConfig.addWidget(self.lblMachines)
1.75 - self.tvMachines = QtGui.QTreeWidget(self.tbConfig)
1.76 + self.lyMain.addWidget(self.lblMachines)
1.77 + self.tvMachines = QtGui.QTreeWidget(ConfigureDialog)
1.78 self.tvMachines.setMaximumSize(QtCore.QSize(16777215, 128))
1.79 self.tvMachines.setRootIsDecorated(False)
1.80 self.tvMachines.setItemsExpandable(False)
1.81 self.tvMachines.setAllColumnsShowFocus(True)
1.82 self.tvMachines.setObjectName(_fromUtf8("tvMachines"))
1.83 - self.lyConfig.addWidget(self.tvMachines)
1.84 - self.lblProgress = QtGui.QLabel(self.tbConfig)
1.85 + self.lyMain.addWidget(self.tvMachines)
1.86 + self.lblProgress = QtGui.QLabel(ConfigureDialog)
1.87 self.lblProgress.setObjectName(_fromUtf8("lblProgress"))
1.88 - self.lyConfig.addWidget(self.lblProgress)
1.89 - self.edtProgress = QtGui.QPlainTextEdit(self.tbConfig)
1.90 + self.lyMain.addWidget(self.lblProgress)
1.91 + self.edtProgress = QtGui.QPlainTextEdit(ConfigureDialog)
1.92 font = QtGui.QFont()
1.93 font.setFamily(_fromUtf8("Monospace"))
1.94 font.setPointSize(10)
1.95 @@ -115,20 +109,7 @@
1.96 self.edtProgress.setReadOnly(True)
1.97 self.edtProgress.setPlainText(_fromUtf8(""))
1.98 self.edtProgress.setObjectName(_fromUtf8("edtProgress"))
1.99 - self.lyConfig.addWidget(self.edtProgress)
1.100 - self.tabConfig.addTab(self.tbConfig, _fromUtf8(""))
1.101 - self.tbLog = QtGui.QWidget()
1.102 - self.tbLog.setObjectName(_fromUtf8("tbLog"))
1.103 - self.lyLog = QtGui.QVBoxLayout(self.tbLog)
1.104 - self.lyLog.setObjectName(_fromUtf8("lyLog"))
1.105 - self.edtLog = QtGui.QPlainTextEdit(self.tbLog)
1.106 - self.edtLog.setVerticalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOn)
1.107 - self.edtLog.setLineWrapMode(QtGui.QPlainTextEdit.NoWrap)
1.108 - self.edtLog.setReadOnly(True)
1.109 - self.edtLog.setObjectName(_fromUtf8("edtLog"))
1.110 - self.lyLog.addWidget(self.edtLog)
1.111 - self.tabConfig.addTab(self.tbLog, _fromUtf8(""))
1.112 - self.verticalLayout_3.addWidget(self.tabConfig)
1.113 + self.lyMain.addWidget(self.edtProgress)
1.114 self.lyButton = QtGui.QHBoxLayout()
1.115 self.lyButton.setObjectName(_fromUtf8("lyButton"))
1.116 spacerItem1 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
1.117 @@ -146,10 +127,14 @@
1.118 self.btnClose.setDefault(True)
1.119 self.btnClose.setObjectName(_fromUtf8("btnClose"))
1.120 self.lyButton.addWidget(self.btnClose)
1.121 - self.verticalLayout_3.addLayout(self.lyButton)
1.122 + self.lyMain.addLayout(self.lyButton)
1.123 + self.lblVersion.setBuddy(self.edtVersion)
1.124 + self.lblStatus.setBuddy(self.edtStatus)
1.125 + self.lblTemplate.setBuddy(self.tvTemplate)
1.126 + self.lblMachines.setBuddy(self.tvMachines)
1.127 + self.lblProgress.setBuddy(self.edtProgress)
1.128
1.129 self.retranslateUi(ConfigureDialog)
1.130 - self.tabConfig.setCurrentIndex(0)
1.131 QtCore.QMetaObject.connectSlotsByName(ConfigureDialog)
1.132 ConfigureDialog.setTabOrder(self.edtStatus, self.edtVersion)
1.133 ConfigureDialog.setTabOrder(self.edtVersion, self.tvTemplate)
1.134 @@ -175,8 +160,6 @@
1.135 self.lblMachines.setText(_translate("ConfigureDialog", "Machines:", None))
1.136 self.tvMachines.headerItem().setText(0, _translate("ConfigureDialog", "Name", None))
1.137 self.lblProgress.setText(_translate("ConfigureDialog", "Progress:", None))
1.138 - self.tabConfig.setTabText(self.tabConfig.indexOf(self.tbConfig), _translate("ConfigureDialog", "Configuration", None))
1.139 - self.tabConfig.setTabText(self.tabConfig.indexOf(self.tbLog), _translate("ConfigureDialog", "Log", None))
1.140 self.btnRefresh.setText(_translate("ConfigureDialog", "&Refresh", None))
1.141 self.btnAbout.setText(_translate("ConfigureDialog", "&About", None))
1.142 self.btnClose.setText(_translate("ConfigureDialog", "&Close", None))