1.1 --- a/OpenSecurity/bin/ui/ConfigureDialog.ui Wed Apr 02 12:32:53 2014 +0200
1.2 +++ b/OpenSecurity/bin/ui/ConfigureDialog.ui Wed Apr 02 12:52:22 2014 +0200
1.3 @@ -6,8 +6,8 @@
1.4 <rect>
1.5 <x>0</x>
1.6 <y>0</y>
1.7 - <width>595</width>
1.8 - <height>421</height>
1.9 + <width>400</width>
1.10 + <height>455</height>
1.11 </rect>
1.12 </property>
1.13 <property name="windowTitle">
1.14 @@ -20,7 +20,7 @@
1.15 <property name="sizeGripEnabled">
1.16 <bool>true</bool>
1.17 </property>
1.18 - <layout class="QVBoxLayout" name="lyMain" stretch="0,0,0,0,0,0,0,1,0">
1.19 + <layout class="QVBoxLayout" name="verticalLayout_3">
1.20 <item>
1.21 <layout class="QHBoxLayout" name="lyHeading">
1.22 <property name="spacing">
1.23 @@ -80,152 +80,183 @@
1.24 </layout>
1.25 </item>
1.26 <item>
1.27 - <widget class="QLabel" name="lblTemplate">
1.28 - <property name="text">
1.29 - <string>Initial Template:</string>
1.30 + <widget class="QTabWidget" name="tabConfig">
1.31 + <property name="currentIndex">
1.32 + <number>0</number>
1.33 </property>
1.34 - </widget>
1.35 - </item>
1.36 - <item>
1.37 - <widget class="QTreeWidget" name="tvTemplate">
1.38 - <property name="maximumSize">
1.39 - <size>
1.40 - <width>16777215</width>
1.41 - <height>64</height>
1.42 - </size>
1.43 - </property>
1.44 - <property name="rootIsDecorated">
1.45 - <bool>false</bool>
1.46 - </property>
1.47 - <property name="itemsExpandable">
1.48 - <bool>false</bool>
1.49 - </property>
1.50 - <property name="allColumnsShowFocus">
1.51 - <bool>true</bool>
1.52 - </property>
1.53 - <column>
1.54 - <property name="text">
1.55 - <string>Name</string>
1.56 - </property>
1.57 - </column>
1.58 - <column>
1.59 - <property name="text">
1.60 - <string>Date</string>
1.61 - </property>
1.62 - </column>
1.63 - <column>
1.64 - <property name="text">
1.65 - <string>Size</string>
1.66 - </property>
1.67 - </column>
1.68 - <column>
1.69 - <property name="text">
1.70 - <string>Path</string>
1.71 - </property>
1.72 - </column>
1.73 - </widget>
1.74 - </item>
1.75 - <item>
1.76 - <layout class="QHBoxLayout" name="lyDownload">
1.77 - <item>
1.78 - <spacer name="spDownload">
1.79 - <property name="orientation">
1.80 - <enum>Qt::Horizontal</enum>
1.81 - </property>
1.82 - <property name="sizeHint" stdset="0">
1.83 - <size>
1.84 - <width>40</width>
1.85 - <height>20</height>
1.86 - </size>
1.87 - </property>
1.88 - </spacer>
1.89 - </item>
1.90 - <item>
1.91 - <widget class="QPushButton" name="btnDownload">
1.92 - <property name="minimumSize">
1.93 - <size>
1.94 - <width>100</width>
1.95 - <height>0</height>
1.96 - </size>
1.97 - </property>
1.98 - <property name="text">
1.99 - <string>&Download</string>
1.100 - </property>
1.101 - </widget>
1.102 - </item>
1.103 - <item>
1.104 - <widget class="QPushButton" name="btnImport">
1.105 - <property name="minimumSize">
1.106 - <size>
1.107 - <width>100</width>
1.108 - <height>0</height>
1.109 - </size>
1.110 - </property>
1.111 - <property name="text">
1.112 - <string>&Import</string>
1.113 - </property>
1.114 - </widget>
1.115 - </item>
1.116 - </layout>
1.117 - </item>
1.118 - <item>
1.119 - <widget class="QLabel" name="lblMachines">
1.120 - <property name="text">
1.121 - <string>Machines:</string>
1.122 - </property>
1.123 - </widget>
1.124 - </item>
1.125 - <item>
1.126 - <widget class="QTreeWidget" name="tvMachines">
1.127 - <property name="maximumSize">
1.128 - <size>
1.129 - <width>16777215</width>
1.130 - <height>128</height>
1.131 - </size>
1.132 - </property>
1.133 - <property name="rootIsDecorated">
1.134 - <bool>false</bool>
1.135 - </property>
1.136 - <property name="itemsExpandable">
1.137 - <bool>false</bool>
1.138 - </property>
1.139 - <property name="allColumnsShowFocus">
1.140 - <bool>true</bool>
1.141 - </property>
1.142 - <column>
1.143 - <property name="text">
1.144 - <string>Name</string>
1.145 - </property>
1.146 - </column>
1.147 - </widget>
1.148 - </item>
1.149 - <item>
1.150 - <widget class="QLabel" name="lblProgress">
1.151 - <property name="text">
1.152 - <string>Progress:</string>
1.153 - </property>
1.154 - </widget>
1.155 - </item>
1.156 - <item>
1.157 - <widget class="QPlainTextEdit" name="edtProgress">
1.158 - <property name="font">
1.159 - <font>
1.160 - <family>Monospace</family>
1.161 - <pointsize>10</pointsize>
1.162 - </font>
1.163 - </property>
1.164 - <property name="verticalScrollBarPolicy">
1.165 - <enum>Qt::ScrollBarAlwaysOn</enum>
1.166 - </property>
1.167 - <property name="lineWrapMode">
1.168 - <enum>QPlainTextEdit::NoWrap</enum>
1.169 - </property>
1.170 - <property name="readOnly">
1.171 - <bool>true</bool>
1.172 - </property>
1.173 - <property name="plainText">
1.174 - <string/>
1.175 - </property>
1.176 + <widget class="QWidget" name="tbConfig">
1.177 + <attribute name="title">
1.178 + <string>Configuration</string>
1.179 + </attribute>
1.180 + <layout class="QVBoxLayout" name="lyConfig">
1.181 + <item>
1.182 + <widget class="QLabel" name="lblTemplate">
1.183 + <property name="text">
1.184 + <string>Initial Template:</string>
1.185 + </property>
1.186 + </widget>
1.187 + </item>
1.188 + <item>
1.189 + <widget class="QTreeWidget" name="tvTemplate">
1.190 + <property name="maximumSize">
1.191 + <size>
1.192 + <width>16777215</width>
1.193 + <height>64</height>
1.194 + </size>
1.195 + </property>
1.196 + <property name="rootIsDecorated">
1.197 + <bool>false</bool>
1.198 + </property>
1.199 + <property name="itemsExpandable">
1.200 + <bool>false</bool>
1.201 + </property>
1.202 + <property name="allColumnsShowFocus">
1.203 + <bool>true</bool>
1.204 + </property>
1.205 + <column>
1.206 + <property name="text">
1.207 + <string>Name</string>
1.208 + </property>
1.209 + </column>
1.210 + <column>
1.211 + <property name="text">
1.212 + <string>Date</string>
1.213 + </property>
1.214 + </column>
1.215 + <column>
1.216 + <property name="text">
1.217 + <string>Size</string>
1.218 + </property>
1.219 + </column>
1.220 + <column>
1.221 + <property name="text">
1.222 + <string>Path</string>
1.223 + </property>
1.224 + </column>
1.225 + </widget>
1.226 + </item>
1.227 + <item>
1.228 + <layout class="QHBoxLayout" name="lyDownload">
1.229 + <item>
1.230 + <spacer name="spDownload">
1.231 + <property name="orientation">
1.232 + <enum>Qt::Horizontal</enum>
1.233 + </property>
1.234 + <property name="sizeHint" stdset="0">
1.235 + <size>
1.236 + <width>40</width>
1.237 + <height>20</height>
1.238 + </size>
1.239 + </property>
1.240 + </spacer>
1.241 + </item>
1.242 + <item>
1.243 + <widget class="QPushButton" name="btnDownload">
1.244 + <property name="minimumSize">
1.245 + <size>
1.246 + <width>100</width>
1.247 + <height>0</height>
1.248 + </size>
1.249 + </property>
1.250 + <property name="text">
1.251 + <string>&Download</string>
1.252 + </property>
1.253 + </widget>
1.254 + </item>
1.255 + <item>
1.256 + <widget class="QPushButton" name="btnImport">
1.257 + <property name="minimumSize">
1.258 + <size>
1.259 + <width>100</width>
1.260 + <height>0</height>
1.261 + </size>
1.262 + </property>
1.263 + <property name="text">
1.264 + <string>&Import</string>
1.265 + </property>
1.266 + </widget>
1.267 + </item>
1.268 + </layout>
1.269 + </item>
1.270 + <item>
1.271 + <widget class="QLabel" name="lblMachines">
1.272 + <property name="text">
1.273 + <string>Machines:</string>
1.274 + </property>
1.275 + </widget>
1.276 + </item>
1.277 + <item>
1.278 + <widget class="QTreeWidget" name="tvMachines">
1.279 + <property name="maximumSize">
1.280 + <size>
1.281 + <width>16777215</width>
1.282 + <height>128</height>
1.283 + </size>
1.284 + </property>
1.285 + <property name="rootIsDecorated">
1.286 + <bool>false</bool>
1.287 + </property>
1.288 + <property name="itemsExpandable">
1.289 + <bool>false</bool>
1.290 + </property>
1.291 + <property name="allColumnsShowFocus">
1.292 + <bool>true</bool>
1.293 + </property>
1.294 + <column>
1.295 + <property name="text">
1.296 + <string>Name</string>
1.297 + </property>
1.298 + </column>
1.299 + </widget>
1.300 + </item>
1.301 + <item>
1.302 + <widget class="QLabel" name="lblProgress">
1.303 + <property name="text">
1.304 + <string>Progress:</string>
1.305 + </property>
1.306 + </widget>
1.307 + </item>
1.308 + <item>
1.309 + <widget class="QPlainTextEdit" name="edtProgress">
1.310 + <property name="font">
1.311 + <font>
1.312 + <family>Monospace</family>
1.313 + <pointsize>10</pointsize>
1.314 + </font>
1.315 + </property>
1.316 + <property name="verticalScrollBarPolicy">
1.317 + <enum>Qt::ScrollBarAlwaysOn</enum>
1.318 + </property>
1.319 + <property name="lineWrapMode">
1.320 + <enum>QPlainTextEdit::NoWrap</enum>
1.321 + </property>
1.322 + <property name="readOnly">
1.323 + <bool>true</bool>
1.324 + </property>
1.325 + <property name="plainText">
1.326 + <string/>
1.327 + </property>
1.328 + </widget>
1.329 + </item>
1.330 + </layout>
1.331 + </widget>
1.332 + <widget class="QWidget" name="tbLog">
1.333 + <attribute name="title">
1.334 + <string>Log</string>
1.335 + </attribute>
1.336 + <layout class="QVBoxLayout" name="lyLog">
1.337 + <item>
1.338 + <widget class="QPlainTextEdit" name="edtLog">
1.339 + <property name="lineWrapMode">
1.340 + <enum>QPlainTextEdit::NoWrap</enum>
1.341 + </property>
1.342 + <property name="readOnly">
1.343 + <bool>true</bool>
1.344 + </property>
1.345 + </widget>
1.346 + </item>
1.347 + </layout>
1.348 + </widget>
1.349 </widget>
1.350 </item>
1.351 <item>
1.352 @@ -288,6 +319,8 @@
1.353 </layout>
1.354 </item>
1.355 </layout>
1.356 + <zorder>tabConfig</zorder>
1.357 + <zorder>btnAbout</zorder>
1.358 </widget>
1.359 <tabstops>
1.360 <tabstop>edtStatus</tabstop>
2.1 --- a/OpenSecurity/bin/ui/ui_ConfigureDialog.py Wed Apr 02 12:32:53 2014 +0200
2.2 +++ b/OpenSecurity/bin/ui/ui_ConfigureDialog.py Wed Apr 02 12:52:22 2014 +0200
2.3 @@ -2,7 +2,7 @@
2.4
2.5 # Form implementation generated from reading ui file 'ConfigureDialog.ui'
2.6 #
2.7 -# Created: Wed Apr 2 10:27:01 2014
2.8 +# Created: Wed Apr 2 12:52:07 2014
2.9 # by: PyQt4 UI code generator 4.10.3
2.10 #
2.11 # WARNING! All changes made in this file will be lost!
2.12 @@ -26,13 +26,13 @@
2.13 class Ui_ConfigureDialog(object):
2.14 def setupUi(self, ConfigureDialog):
2.15 ConfigureDialog.setObjectName(_fromUtf8("ConfigureDialog"))
2.16 - ConfigureDialog.resize(595, 421)
2.17 + ConfigureDialog.resize(400, 455)
2.18 icon = QtGui.QIcon()
2.19 icon.addPixmap(QtGui.QPixmap(_fromUtf8(":/opensecurity/gfx/opensecurity_icon_64.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
2.20 ConfigureDialog.setWindowIcon(icon)
2.21 ConfigureDialog.setSizeGripEnabled(True)
2.22 - self.lyMain = QtGui.QVBoxLayout(ConfigureDialog)
2.23 - self.lyMain.setObjectName(_fromUtf8("lyMain"))
2.24 + self.verticalLayout_3 = QtGui.QVBoxLayout(ConfigureDialog)
2.25 + self.verticalLayout_3.setObjectName(_fromUtf8("verticalLayout_3"))
2.26 self.lyHeading = QtGui.QHBoxLayout()
2.27 self.lyHeading.setSpacing(8)
2.28 self.lyHeading.setContentsMargins(8, -1, -1, 8)
2.29 @@ -62,44 +62,50 @@
2.30 self.wdStatus.setObjectName(_fromUtf8("wdStatus"))
2.31 self.lyStatus.addWidget(self.wdStatus, 2, 0, 1, 2)
2.32 self.lyHeading.addLayout(self.lyStatus)
2.33 - self.lyMain.addLayout(self.lyHeading)
2.34 - self.lblTemplate = QtGui.QLabel(ConfigureDialog)
2.35 + self.verticalLayout_3.addLayout(self.lyHeading)
2.36 + self.tabConfig = QtGui.QTabWidget(ConfigureDialog)
2.37 + self.tabConfig.setObjectName(_fromUtf8("tabConfig"))
2.38 + self.tbConfig = QtGui.QWidget()
2.39 + self.tbConfig.setObjectName(_fromUtf8("tbConfig"))
2.40 + self.lyConfig = QtGui.QVBoxLayout(self.tbConfig)
2.41 + self.lyConfig.setObjectName(_fromUtf8("lyConfig"))
2.42 + self.lblTemplate = QtGui.QLabel(self.tbConfig)
2.43 self.lblTemplate.setObjectName(_fromUtf8("lblTemplate"))
2.44 - self.lyMain.addWidget(self.lblTemplate)
2.45 - self.tvTemplate = QtGui.QTreeWidget(ConfigureDialog)
2.46 + self.lyConfig.addWidget(self.lblTemplate)
2.47 + self.tvTemplate = QtGui.QTreeWidget(self.tbConfig)
2.48 self.tvTemplate.setMaximumSize(QtCore.QSize(16777215, 64))
2.49 self.tvTemplate.setRootIsDecorated(False)
2.50 self.tvTemplate.setItemsExpandable(False)
2.51 self.tvTemplate.setAllColumnsShowFocus(True)
2.52 self.tvTemplate.setObjectName(_fromUtf8("tvTemplate"))
2.53 - self.lyMain.addWidget(self.tvTemplate)
2.54 + self.lyConfig.addWidget(self.tvTemplate)
2.55 self.lyDownload = QtGui.QHBoxLayout()
2.56 self.lyDownload.setObjectName(_fromUtf8("lyDownload"))
2.57 spacerItem = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
2.58 self.lyDownload.addItem(spacerItem)
2.59 - self.btnDownload = QtGui.QPushButton(ConfigureDialog)
2.60 + self.btnDownload = QtGui.QPushButton(self.tbConfig)
2.61 self.btnDownload.setMinimumSize(QtCore.QSize(100, 0))
2.62 self.btnDownload.setObjectName(_fromUtf8("btnDownload"))
2.63 self.lyDownload.addWidget(self.btnDownload)
2.64 - self.btnImport = QtGui.QPushButton(ConfigureDialog)
2.65 + self.btnImport = QtGui.QPushButton(self.tbConfig)
2.66 self.btnImport.setMinimumSize(QtCore.QSize(100, 0))
2.67 self.btnImport.setObjectName(_fromUtf8("btnImport"))
2.68 self.lyDownload.addWidget(self.btnImport)
2.69 - self.lyMain.addLayout(self.lyDownload)
2.70 - self.lblMachines = QtGui.QLabel(ConfigureDialog)
2.71 + self.lyConfig.addLayout(self.lyDownload)
2.72 + self.lblMachines = QtGui.QLabel(self.tbConfig)
2.73 self.lblMachines.setObjectName(_fromUtf8("lblMachines"))
2.74 - self.lyMain.addWidget(self.lblMachines)
2.75 - self.tvMachines = QtGui.QTreeWidget(ConfigureDialog)
2.76 + self.lyConfig.addWidget(self.lblMachines)
2.77 + self.tvMachines = QtGui.QTreeWidget(self.tbConfig)
2.78 self.tvMachines.setMaximumSize(QtCore.QSize(16777215, 128))
2.79 self.tvMachines.setRootIsDecorated(False)
2.80 self.tvMachines.setItemsExpandable(False)
2.81 self.tvMachines.setAllColumnsShowFocus(True)
2.82 self.tvMachines.setObjectName(_fromUtf8("tvMachines"))
2.83 - self.lyMain.addWidget(self.tvMachines)
2.84 - self.lblProgress = QtGui.QLabel(ConfigureDialog)
2.85 + self.lyConfig.addWidget(self.tvMachines)
2.86 + self.lblProgress = QtGui.QLabel(self.tbConfig)
2.87 self.lblProgress.setObjectName(_fromUtf8("lblProgress"))
2.88 - self.lyMain.addWidget(self.lblProgress)
2.89 - self.edtProgress = QtGui.QPlainTextEdit(ConfigureDialog)
2.90 + self.lyConfig.addWidget(self.lblProgress)
2.91 + self.edtProgress = QtGui.QPlainTextEdit(self.tbConfig)
2.92 font = QtGui.QFont()
2.93 font.setFamily(_fromUtf8("Monospace"))
2.94 font.setPointSize(10)
2.95 @@ -109,7 +115,19 @@
2.96 self.edtProgress.setReadOnly(True)
2.97 self.edtProgress.setPlainText(_fromUtf8(""))
2.98 self.edtProgress.setObjectName(_fromUtf8("edtProgress"))
2.99 - self.lyMain.addWidget(self.edtProgress)
2.100 + self.lyConfig.addWidget(self.edtProgress)
2.101 + self.tabConfig.addTab(self.tbConfig, _fromUtf8(""))
2.102 + self.tbLog = QtGui.QWidget()
2.103 + self.tbLog.setObjectName(_fromUtf8("tbLog"))
2.104 + self.lyLog = QtGui.QVBoxLayout(self.tbLog)
2.105 + self.lyLog.setObjectName(_fromUtf8("lyLog"))
2.106 + self.edtLog = QtGui.QPlainTextEdit(self.tbLog)
2.107 + self.edtLog.setLineWrapMode(QtGui.QPlainTextEdit.NoWrap)
2.108 + self.edtLog.setReadOnly(True)
2.109 + self.edtLog.setObjectName(_fromUtf8("edtLog"))
2.110 + self.lyLog.addWidget(self.edtLog)
2.111 + self.tabConfig.addTab(self.tbLog, _fromUtf8(""))
2.112 + self.verticalLayout_3.addWidget(self.tabConfig)
2.113 self.lyButton = QtGui.QHBoxLayout()
2.114 self.lyButton.setObjectName(_fromUtf8("lyButton"))
2.115 spacerItem1 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
2.116 @@ -127,10 +145,10 @@
2.117 self.btnClose.setDefault(True)
2.118 self.btnClose.setObjectName(_fromUtf8("btnClose"))
2.119 self.lyButton.addWidget(self.btnClose)
2.120 - self.lyMain.addLayout(self.lyButton)
2.121 - self.lyMain.setStretch(7, 1)
2.122 + self.verticalLayout_3.addLayout(self.lyButton)
2.123
2.124 self.retranslateUi(ConfigureDialog)
2.125 + self.tabConfig.setCurrentIndex(0)
2.126 QtCore.QMetaObject.connectSlotsByName(ConfigureDialog)
2.127 ConfigureDialog.setTabOrder(self.edtStatus, self.edtVersion)
2.128 ConfigureDialog.setTabOrder(self.edtVersion, self.tvTemplate)
2.129 @@ -156,6 +174,8 @@
2.130 self.lblMachines.setText(_translate("ConfigureDialog", "Machines:", None))
2.131 self.tvMachines.headerItem().setText(0, _translate("ConfigureDialog", "Name", None))
2.132 self.lblProgress.setText(_translate("ConfigureDialog", "Progress:", None))
2.133 + self.tabConfig.setTabText(self.tabConfig.indexOf(self.tbConfig), _translate("ConfigureDialog", "Configuration", None))
2.134 + self.tabConfig.setTabText(self.tabConfig.indexOf(self.tbLog), _translate("ConfigureDialog", "Log", None))
2.135 self.btnRefresh.setText(_translate("ConfigureDialog", "&Refresh", None))
2.136 self.btnAbout.setText(_translate("ConfigureDialog", "&About", None))
2.137 self.btnClose.setText(_translate("ConfigureDialog", "&Close", None))