kicked log tab again ... no use :(
1.1 --- a/OpenSecurity/bin/ui/ConfigureDialog.ui Wed Apr 02 12:54:35 2014 +0200
1.2 +++ b/OpenSecurity/bin/ui/ConfigureDialog.ui Wed Apr 02 13:22:04 2014 +0200
1.3 @@ -6,8 +6,8 @@
1.4 <rect>
1.5 <x>0</x>
1.6 <y>0</y>
1.7 - <width>400</width>
1.8 - <height>455</height>
1.9 + <width>474</width>
1.10 + <height>416</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="verticalLayout_3">
1.19 + <layout class="QVBoxLayout" name="lyMain">
1.20 <item>
1.21 <layout class="QHBoxLayout" name="lyHeading">
1.22 <property name="spacing">
1.23 @@ -56,6 +56,9 @@
1.24 <property name="text">
1.25 <string>Version:</string>
1.26 </property>
1.27 + <property name="buddy">
1.28 + <cstring>edtVersion</cstring>
1.29 + </property>
1.30 </widget>
1.31 </item>
1.32 <item row="1" column="1">
1.33 @@ -70,196 +73,176 @@
1.34 <property name="text">
1.35 <string>Service status:</string>
1.36 </property>
1.37 + <property name="buddy">
1.38 + <cstring>edtStatus</cstring>
1.39 + </property>
1.40 </widget>
1.41 </item>
1.42 <item row="2" column="0" colspan="2">
1.43 - <widget class="QWidget" name="wdStatus" native="true"/>
1.44 + <widget class="QWidget" name="wdStatus" native="true">
1.45 + <zorder>tabConfig</zorder>
1.46 + </widget>
1.47 </item>
1.48 </layout>
1.49 </item>
1.50 </layout>
1.51 </item>
1.52 <item>
1.53 - <widget class="QTabWidget" name="tabConfig">
1.54 - <property name="currentIndex">
1.55 - <number>0</number>
1.56 + <widget class="QLabel" name="lblTemplate">
1.57 + <property name="text">
1.58 + <string>Initial Template:</string>
1.59 </property>
1.60 - <widget class="QWidget" name="tbConfig">
1.61 - <attribute name="title">
1.62 - <string>Configuration</string>
1.63 - </attribute>
1.64 - <layout class="QVBoxLayout" name="lyConfig">
1.65 - <item>
1.66 - <widget class="QLabel" name="lblTemplate">
1.67 - <property name="text">
1.68 - <string>Initial Template:</string>
1.69 - </property>
1.70 - </widget>
1.71 - </item>
1.72 - <item>
1.73 - <widget class="QTreeWidget" name="tvTemplate">
1.74 - <property name="maximumSize">
1.75 - <size>
1.76 - <width>16777215</width>
1.77 - <height>64</height>
1.78 - </size>
1.79 - </property>
1.80 - <property name="rootIsDecorated">
1.81 - <bool>false</bool>
1.82 - </property>
1.83 - <property name="itemsExpandable">
1.84 - <bool>false</bool>
1.85 - </property>
1.86 - <property name="allColumnsShowFocus">
1.87 - <bool>true</bool>
1.88 - </property>
1.89 - <column>
1.90 - <property name="text">
1.91 - <string>Name</string>
1.92 - </property>
1.93 - </column>
1.94 - <column>
1.95 - <property name="text">
1.96 - <string>Date</string>
1.97 - </property>
1.98 - </column>
1.99 - <column>
1.100 - <property name="text">
1.101 - <string>Size</string>
1.102 - </property>
1.103 - </column>
1.104 - <column>
1.105 - <property name="text">
1.106 - <string>Path</string>
1.107 - </property>
1.108 - </column>
1.109 - </widget>
1.110 - </item>
1.111 - <item>
1.112 - <layout class="QHBoxLayout" name="lyDownload">
1.113 - <item>
1.114 - <spacer name="spDownload">
1.115 - <property name="orientation">
1.116 - <enum>Qt::Horizontal</enum>
1.117 - </property>
1.118 - <property name="sizeHint" stdset="0">
1.119 - <size>
1.120 - <width>40</width>
1.121 - <height>20</height>
1.122 - </size>
1.123 - </property>
1.124 - </spacer>
1.125 - </item>
1.126 - <item>
1.127 - <widget class="QPushButton" name="btnDownload">
1.128 - <property name="minimumSize">
1.129 - <size>
1.130 - <width>100</width>
1.131 - <height>0</height>
1.132 - </size>
1.133 - </property>
1.134 - <property name="text">
1.135 - <string>&Download</string>
1.136 - </property>
1.137 - </widget>
1.138 - </item>
1.139 - <item>
1.140 - <widget class="QPushButton" name="btnImport">
1.141 - <property name="minimumSize">
1.142 - <size>
1.143 - <width>100</width>
1.144 - <height>0</height>
1.145 - </size>
1.146 - </property>
1.147 - <property name="text">
1.148 - <string>&Import</string>
1.149 - </property>
1.150 - </widget>
1.151 - </item>
1.152 - </layout>
1.153 - </item>
1.154 - <item>
1.155 - <widget class="QLabel" name="lblMachines">
1.156 - <property name="text">
1.157 - <string>Machines:</string>
1.158 - </property>
1.159 - </widget>
1.160 - </item>
1.161 - <item>
1.162 - <widget class="QTreeWidget" name="tvMachines">
1.163 - <property name="maximumSize">
1.164 - <size>
1.165 - <width>16777215</width>
1.166 - <height>128</height>
1.167 - </size>
1.168 - </property>
1.169 - <property name="rootIsDecorated">
1.170 - <bool>false</bool>
1.171 - </property>
1.172 - <property name="itemsExpandable">
1.173 - <bool>false</bool>
1.174 - </property>
1.175 - <property name="allColumnsShowFocus">
1.176 - <bool>true</bool>
1.177 - </property>
1.178 - <column>
1.179 - <property name="text">
1.180 - <string>Name</string>
1.181 - </property>
1.182 - </column>
1.183 - </widget>
1.184 - </item>
1.185 - <item>
1.186 - <widget class="QLabel" name="lblProgress">
1.187 - <property name="text">
1.188 - <string>Progress:</string>
1.189 - </property>
1.190 - </widget>
1.191 - </item>
1.192 - <item>
1.193 - <widget class="QPlainTextEdit" name="edtProgress">
1.194 - <property name="font">
1.195 - <font>
1.196 - <family>Monospace</family>
1.197 - <pointsize>10</pointsize>
1.198 - </font>
1.199 - </property>
1.200 - <property name="verticalScrollBarPolicy">
1.201 - <enum>Qt::ScrollBarAlwaysOn</enum>
1.202 - </property>
1.203 - <property name="lineWrapMode">
1.204 - <enum>QPlainTextEdit::NoWrap</enum>
1.205 - </property>
1.206 - <property name="readOnly">
1.207 - <bool>true</bool>
1.208 - </property>
1.209 - <property name="plainText">
1.210 - <string/>
1.211 - </property>
1.212 - </widget>
1.213 - </item>
1.214 - </layout>
1.215 - </widget>
1.216 - <widget class="QWidget" name="tbLog">
1.217 - <attribute name="title">
1.218 - <string>Log</string>
1.219 - </attribute>
1.220 - <layout class="QVBoxLayout" name="lyLog">
1.221 - <item>
1.222 - <widget class="QPlainTextEdit" name="edtLog">
1.223 - <property name="verticalScrollBarPolicy">
1.224 - <enum>Qt::ScrollBarAlwaysOn</enum>
1.225 - </property>
1.226 - <property name="lineWrapMode">
1.227 - <enum>QPlainTextEdit::NoWrap</enum>
1.228 - </property>
1.229 - <property name="readOnly">
1.230 - <bool>true</bool>
1.231 - </property>
1.232 - </widget>
1.233 - </item>
1.234 - </layout>
1.235 - </widget>
1.236 + <property name="buddy">
1.237 + <cstring>tvTemplate</cstring>
1.238 + </property>
1.239 + </widget>
1.240 + </item>
1.241 + <item>
1.242 + <widget class="QTreeWidget" name="tvTemplate">
1.243 + <property name="maximumSize">
1.244 + <size>
1.245 + <width>16777215</width>
1.246 + <height>64</height>
1.247 + </size>
1.248 + </property>
1.249 + <property name="rootIsDecorated">
1.250 + <bool>false</bool>
1.251 + </property>
1.252 + <property name="itemsExpandable">
1.253 + <bool>false</bool>
1.254 + </property>
1.255 + <property name="allColumnsShowFocus">
1.256 + <bool>true</bool>
1.257 + </property>
1.258 + <column>
1.259 + <property name="text">
1.260 + <string>Name</string>
1.261 + </property>
1.262 + </column>
1.263 + <column>
1.264 + <property name="text">
1.265 + <string>Date</string>
1.266 + </property>
1.267 + </column>
1.268 + <column>
1.269 + <property name="text">
1.270 + <string>Size</string>
1.271 + </property>
1.272 + </column>
1.273 + <column>
1.274 + <property name="text">
1.275 + <string>Path</string>
1.276 + </property>
1.277 + </column>
1.278 + </widget>
1.279 + </item>
1.280 + <item>
1.281 + <layout class="QHBoxLayout" name="lyDownload">
1.282 + <item>
1.283 + <spacer name="spDownload">
1.284 + <property name="orientation">
1.285 + <enum>Qt::Horizontal</enum>
1.286 + </property>
1.287 + <property name="sizeHint" stdset="0">
1.288 + <size>
1.289 + <width>40</width>
1.290 + <height>20</height>
1.291 + </size>
1.292 + </property>
1.293 + </spacer>
1.294 + </item>
1.295 + <item>
1.296 + <widget class="QPushButton" name="btnDownload">
1.297 + <property name="minimumSize">
1.298 + <size>
1.299 + <width>100</width>
1.300 + <height>0</height>
1.301 + </size>
1.302 + </property>
1.303 + <property name="text">
1.304 + <string>&Download</string>
1.305 + </property>
1.306 + </widget>
1.307 + </item>
1.308 + <item>
1.309 + <widget class="QPushButton" name="btnImport">
1.310 + <property name="minimumSize">
1.311 + <size>
1.312 + <width>100</width>
1.313 + <height>0</height>
1.314 + </size>
1.315 + </property>
1.316 + <property name="text">
1.317 + <string>&Import</string>
1.318 + </property>
1.319 + </widget>
1.320 + </item>
1.321 + </layout>
1.322 + </item>
1.323 + <item>
1.324 + <widget class="QLabel" name="lblMachines">
1.325 + <property name="text">
1.326 + <string>Machines:</string>
1.327 + </property>
1.328 + <property name="buddy">
1.329 + <cstring>tvMachines</cstring>
1.330 + </property>
1.331 + </widget>
1.332 + </item>
1.333 + <item>
1.334 + <widget class="QTreeWidget" name="tvMachines">
1.335 + <property name="maximumSize">
1.336 + <size>
1.337 + <width>16777215</width>
1.338 + <height>128</height>
1.339 + </size>
1.340 + </property>
1.341 + <property name="rootIsDecorated">
1.342 + <bool>false</bool>
1.343 + </property>
1.344 + <property name="itemsExpandable">
1.345 + <bool>false</bool>
1.346 + </property>
1.347 + <property name="allColumnsShowFocus">
1.348 + <bool>true</bool>
1.349 + </property>
1.350 + <column>
1.351 + <property name="text">
1.352 + <string>Name</string>
1.353 + </property>
1.354 + </column>
1.355 + </widget>
1.356 + </item>
1.357 + <item>
1.358 + <widget class="QLabel" name="lblProgress">
1.359 + <property name="text">
1.360 + <string>Progress:</string>
1.361 + </property>
1.362 + <property name="buddy">
1.363 + <cstring>edtProgress</cstring>
1.364 + </property>
1.365 + </widget>
1.366 + </item>
1.367 + <item>
1.368 + <widget class="QPlainTextEdit" name="edtProgress">
1.369 + <property name="font">
1.370 + <font>
1.371 + <family>Monospace</family>
1.372 + <pointsize>10</pointsize>
1.373 + </font>
1.374 + </property>
1.375 + <property name="verticalScrollBarPolicy">
1.376 + <enum>Qt::ScrollBarAlwaysOn</enum>
1.377 + </property>
1.378 + <property name="lineWrapMode">
1.379 + <enum>QPlainTextEdit::NoWrap</enum>
1.380 + </property>
1.381 + <property name="readOnly">
1.382 + <bool>true</bool>
1.383 + </property>
1.384 + <property name="plainText">
1.385 + <string/>
1.386 + </property>
1.387 </widget>
1.388 </item>
1.389 <item>
1.390 @@ -322,8 +305,14 @@
1.391 </layout>
1.392 </item>
1.393 </layout>
1.394 - <zorder>tabConfig</zorder>
1.395 <zorder>btnAbout</zorder>
1.396 + <zorder>lblTemplate</zorder>
1.397 + <zorder>tvTemplate</zorder>
1.398 + <zorder>tvMachines</zorder>
1.399 + <zorder>lblProgress</zorder>
1.400 + <zorder>edtProgress</zorder>
1.401 + <zorder>lblMachines</zorder>
1.402 + <zorder></zorder>
1.403 </widget>
1.404 <tabstops>
1.405 <tabstop>edtStatus</tabstop>
2.1 --- a/OpenSecurity/bin/ui/ui_ConfigureDialog.py Wed Apr 02 12:54:35 2014 +0200
2.2 +++ b/OpenSecurity/bin/ui/ui_ConfigureDialog.py Wed Apr 02 13:22:04 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 12:54:20 2014
2.8 +# Created: Wed Apr 2 13:21:51 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(400, 455)
2.17 + ConfigureDialog.resize(474, 416)
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.verticalLayout_3 = QtGui.QVBoxLayout(ConfigureDialog)
2.23 - self.verticalLayout_3.setObjectName(_fromUtf8("verticalLayout_3"))
2.24 + self.lyMain = QtGui.QVBoxLayout(ConfigureDialog)
2.25 + self.lyMain.setObjectName(_fromUtf8("lyMain"))
2.26 self.lyHeading = QtGui.QHBoxLayout()
2.27 self.lyHeading.setSpacing(8)
2.28 self.lyHeading.setContentsMargins(8, -1, -1, 8)
2.29 @@ -62,50 +62,44 @@
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.verticalLayout_3.addLayout(self.lyHeading)
2.34 - self.tabConfig = QtGui.QTabWidget(ConfigureDialog)
2.35 - self.tabConfig.setObjectName(_fromUtf8("tabConfig"))
2.36 - self.tbConfig = QtGui.QWidget()
2.37 - self.tbConfig.setObjectName(_fromUtf8("tbConfig"))
2.38 - self.lyConfig = QtGui.QVBoxLayout(self.tbConfig)
2.39 - self.lyConfig.setObjectName(_fromUtf8("lyConfig"))
2.40 - self.lblTemplate = QtGui.QLabel(self.tbConfig)
2.41 + self.lyMain.addLayout(self.lyHeading)
2.42 + self.lblTemplate = QtGui.QLabel(ConfigureDialog)
2.43 self.lblTemplate.setObjectName(_fromUtf8("lblTemplate"))
2.44 - self.lyConfig.addWidget(self.lblTemplate)
2.45 - self.tvTemplate = QtGui.QTreeWidget(self.tbConfig)
2.46 + self.lyMain.addWidget(self.lblTemplate)
2.47 + self.tvTemplate = QtGui.QTreeWidget(ConfigureDialog)
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.lyConfig.addWidget(self.tvTemplate)
2.54 + self.lyMain.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(self.tbConfig)
2.60 + self.btnDownload = QtGui.QPushButton(ConfigureDialog)
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(self.tbConfig)
2.65 + self.btnImport = QtGui.QPushButton(ConfigureDialog)
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.lyConfig.addLayout(self.lyDownload)
2.70 - self.lblMachines = QtGui.QLabel(self.tbConfig)
2.71 + self.lyMain.addLayout(self.lyDownload)
2.72 + self.lblMachines = QtGui.QLabel(ConfigureDialog)
2.73 self.lblMachines.setObjectName(_fromUtf8("lblMachines"))
2.74 - self.lyConfig.addWidget(self.lblMachines)
2.75 - self.tvMachines = QtGui.QTreeWidget(self.tbConfig)
2.76 + self.lyMain.addWidget(self.lblMachines)
2.77 + self.tvMachines = QtGui.QTreeWidget(ConfigureDialog)
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.lyConfig.addWidget(self.tvMachines)
2.84 - self.lblProgress = QtGui.QLabel(self.tbConfig)
2.85 + self.lyMain.addWidget(self.tvMachines)
2.86 + self.lblProgress = QtGui.QLabel(ConfigureDialog)
2.87 self.lblProgress.setObjectName(_fromUtf8("lblProgress"))
2.88 - self.lyConfig.addWidget(self.lblProgress)
2.89 - self.edtProgress = QtGui.QPlainTextEdit(self.tbConfig)
2.90 + self.lyMain.addWidget(self.lblProgress)
2.91 + self.edtProgress = QtGui.QPlainTextEdit(ConfigureDialog)
2.92 font = QtGui.QFont()
2.93 font.setFamily(_fromUtf8("Monospace"))
2.94 font.setPointSize(10)
2.95 @@ -115,20 +109,7 @@
2.96 self.edtProgress.setReadOnly(True)
2.97 self.edtProgress.setPlainText(_fromUtf8(""))
2.98 self.edtProgress.setObjectName(_fromUtf8("edtProgress"))
2.99 - self.lyConfig.addWidget(self.edtProgress)
2.100 - self.tabConfig.addTab(self.tbConfig, _fromUtf8(""))
2.101 - self.tbLog = QtGui.QWidget()
2.102 - self.tbLog.setObjectName(_fromUtf8("tbLog"))
2.103 - self.lyLog = QtGui.QVBoxLayout(self.tbLog)
2.104 - self.lyLog.setObjectName(_fromUtf8("lyLog"))
2.105 - self.edtLog = QtGui.QPlainTextEdit(self.tbLog)
2.106 - self.edtLog.setVerticalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOn)
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.lyMain.addWidget(self.edtProgress)
2.114 self.lyButton = QtGui.QHBoxLayout()
2.115 self.lyButton.setObjectName(_fromUtf8("lyButton"))
2.116 spacerItem1 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
2.117 @@ -146,10 +127,14 @@
2.118 self.btnClose.setDefault(True)
2.119 self.btnClose.setObjectName(_fromUtf8("btnClose"))
2.120 self.lyButton.addWidget(self.btnClose)
2.121 - self.verticalLayout_3.addLayout(self.lyButton)
2.122 + self.lyMain.addLayout(self.lyButton)
2.123 + self.lblVersion.setBuddy(self.edtVersion)
2.124 + self.lblStatus.setBuddy(self.edtStatus)
2.125 + self.lblTemplate.setBuddy(self.tvTemplate)
2.126 + self.lblMachines.setBuddy(self.tvMachines)
2.127 + self.lblProgress.setBuddy(self.edtProgress)
2.128
2.129 self.retranslateUi(ConfigureDialog)
2.130 - self.tabConfig.setCurrentIndex(0)
2.131 QtCore.QMetaObject.connectSlotsByName(ConfigureDialog)
2.132 ConfigureDialog.setTabOrder(self.edtStatus, self.edtVersion)
2.133 ConfigureDialog.setTabOrder(self.edtVersion, self.tvTemplate)
2.134 @@ -175,8 +160,6 @@
2.135 self.lblMachines.setText(_translate("ConfigureDialog", "Machines:", None))
2.136 self.tvMachines.headerItem().setText(0, _translate("ConfigureDialog", "Name", None))
2.137 self.lblProgress.setText(_translate("ConfigureDialog", "Progress:", None))
2.138 - self.tabConfig.setTabText(self.tabConfig.indexOf(self.tbConfig), _translate("ConfigureDialog", "Configuration", None))
2.139 - self.tabConfig.setTabText(self.tabConfig.indexOf(self.tbLog), _translate("ConfigureDialog", "Log", None))
2.140 self.btnRefresh.setText(_translate("ConfigureDialog", "&Refresh", None))
2.141 self.btnAbout.setText(_translate("ConfigureDialog", "&About", None))
2.142 self.btnClose.setText(_translate("ConfigureDialog", "&Close", None))