1.1 --- a/OpenSecurity/bin/ui/ui_ConfigureDialog.py Thu Jun 12 12:44:19 2014 +0200
1.2 +++ b/OpenSecurity/bin/ui/ui_ConfigureDialog.py Wed Jun 25 12:31:10 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: Thu Jun 12 12:44:02 2014
1.8 +# Created: Wed Jun 25 12:30:45 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,7 +26,7 @@
1.13 class Ui_ConfigureDialog(object):
1.14 def setupUi(self, ConfigureDialog):
1.15 ConfigureDialog.setObjectName(_fromUtf8("ConfigureDialog"))
1.16 - ConfigureDialog.resize(658, 482)
1.17 + ConfigureDialog.resize(722, 521)
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 @@ -92,16 +92,6 @@
1.22 self.btnImport.setObjectName(_fromUtf8("btnImport"))
1.23 self.lyDownload.addWidget(self.btnImport)
1.24 self.lyTabConfig.addLayout(self.lyDownload)
1.25 - self.lblMachines = QtGui.QLabel(self.tabConfiguration)
1.26 - self.lblMachines.setObjectName(_fromUtf8("lblMachines"))
1.27 - self.lyTabConfig.addWidget(self.lblMachines)
1.28 - self.tvMachines = QtGui.QTreeWidget(self.tabConfiguration)
1.29 - self.tvMachines.setMaximumSize(QtCore.QSize(16777215, 128))
1.30 - self.tvMachines.setRootIsDecorated(False)
1.31 - self.tvMachines.setItemsExpandable(False)
1.32 - self.tvMachines.setAllColumnsShowFocus(True)
1.33 - self.tvMachines.setObjectName(_fromUtf8("tvMachines"))
1.34 - self.lyTabConfig.addWidget(self.tvMachines)
1.35 self.lblProgress = QtGui.QLabel(self.tabConfiguration)
1.36 self.lblProgress.setObjectName(_fromUtf8("lblProgress"))
1.37 self.lyTabConfig.addWidget(self.lblProgress)
1.38 @@ -116,11 +106,29 @@
1.39 self.edtProgress.setPlainText(_fromUtf8(""))
1.40 self.edtProgress.setObjectName(_fromUtf8("edtProgress"))
1.41 self.lyTabConfig.addWidget(self.edtProgress)
1.42 - self.tabWidget.addTab(self.tabConfiguration, _fromUtf8(""))
1.43 + icon1 = QtGui.QIcon()
1.44 + icon1.addPixmap(QtGui.QPixmap(_fromUtf8(":/opensecurity/gfx/preferences-system.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
1.45 + self.tabWidget.addTab(self.tabConfiguration, icon1, _fromUtf8(""))
1.46 + self.tabMachines = QtGui.QWidget()
1.47 + self.tabMachines.setObjectName(_fromUtf8("tabMachines"))
1.48 + self.verticalLayout_2 = QtGui.QVBoxLayout(self.tabMachines)
1.49 + self.verticalLayout_2.setObjectName(_fromUtf8("verticalLayout_2"))
1.50 + self.tvMachines = QtGui.QTreeWidget(self.tabMachines)
1.51 + self.tvMachines.setRootIsDecorated(True)
1.52 + self.tvMachines.setUniformRowHeights(True)
1.53 + self.tvMachines.setItemsExpandable(True)
1.54 + self.tvMachines.setAnimated(True)
1.55 + self.tvMachines.setAllColumnsShowFocus(True)
1.56 + self.tvMachines.setColumnCount(3)
1.57 + self.tvMachines.setObjectName(_fromUtf8("tvMachines"))
1.58 + self.verticalLayout_2.addWidget(self.tvMachines)
1.59 + icon2 = QtGui.QIcon()
1.60 + icon2.addPixmap(QtGui.QPixmap(_fromUtf8(":/opensecurity/gfx/cpu.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
1.61 + self.tabWidget.addTab(self.tabMachines, icon2, _fromUtf8(""))
1.62 self.tabLog = QtGui.QWidget()
1.63 self.tabLog.setObjectName(_fromUtf8("tabLog"))
1.64 - self.lyTabLog = QtGui.QVBoxLayout(self.tabLog)
1.65 - self.lyTabLog.setObjectName(_fromUtf8("lyTabLog"))
1.66 + self.verticalLayout = QtGui.QVBoxLayout(self.tabLog)
1.67 + self.verticalLayout.setObjectName(_fromUtf8("verticalLayout"))
1.68 self.edtLog = QtGui.QPlainTextEdit(self.tabLog)
1.69 font = QtGui.QFont()
1.70 font.setFamily(_fromUtf8("Monospace"))
1.71 @@ -130,13 +138,24 @@
1.72 self.edtLog.setLineWrapMode(QtGui.QPlainTextEdit.NoWrap)
1.73 self.edtLog.setReadOnly(True)
1.74 self.edtLog.setObjectName(_fromUtf8("edtLog"))
1.75 - self.lyTabLog.addWidget(self.edtLog)
1.76 - self.tabWidget.addTab(self.tabLog, _fromUtf8(""))
1.77 + self.verticalLayout.addWidget(self.edtLog)
1.78 + self.lyLog = QtGui.QHBoxLayout()
1.79 + self.lyLog.setObjectName(_fromUtf8("lyLog"))
1.80 + spacerItem1 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
1.81 + self.lyLog.addItem(spacerItem1)
1.82 + self.btnExplorer = QtGui.QPushButton(self.tabLog)
1.83 + self.btnExplorer.setMinimumSize(QtCore.QSize(100, 0))
1.84 + self.btnExplorer.setObjectName(_fromUtf8("btnExplorer"))
1.85 + self.lyLog.addWidget(self.btnExplorer)
1.86 + self.verticalLayout.addLayout(self.lyLog)
1.87 + icon3 = QtGui.QIcon()
1.88 + icon3.addPixmap(QtGui.QPixmap(_fromUtf8(":/opensecurity/gfx/text-x-log.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
1.89 + self.tabWidget.addTab(self.tabLog, icon3, _fromUtf8(""))
1.90 self.lyMain.addWidget(self.tabWidget)
1.91 self.lyButton = QtGui.QHBoxLayout()
1.92 self.lyButton.setObjectName(_fromUtf8("lyButton"))
1.93 - spacerItem1 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
1.94 - self.lyButton.addItem(spacerItem1)
1.95 + spacerItem2 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
1.96 + self.lyButton.addItem(spacerItem2)
1.97 self.btnRefresh = QtGui.QPushButton(ConfigureDialog)
1.98 self.btnRefresh.setMinimumSize(QtCore.QSize(100, 0))
1.99 self.btnRefresh.setObjectName(_fromUtf8("btnRefresh"))
1.100 @@ -154,17 +173,14 @@
1.101 self.lblVersion.setBuddy(self.edtVersion)
1.102 self.lblStatus.setBuddy(self.edtStatus)
1.103 self.lblTemplate.setBuddy(self.tvTemplate)
1.104 - self.lblMachines.setBuddy(self.tvMachines)
1.105 self.lblProgress.setBuddy(self.edtProgress)
1.106
1.107 self.retranslateUi(ConfigureDialog)
1.108 self.tabWidget.setCurrentIndex(0)
1.109 QtCore.QMetaObject.connectSlotsByName(ConfigureDialog)
1.110 ConfigureDialog.setTabOrder(self.edtStatus, self.edtVersion)
1.111 - ConfigureDialog.setTabOrder(self.edtVersion, self.btnDownload)
1.112 - ConfigureDialog.setTabOrder(self.btnDownload, self.btnImport)
1.113 - ConfigureDialog.setTabOrder(self.btnImport, self.btnRefresh)
1.114 - ConfigureDialog.setTabOrder(self.btnRefresh, self.btnAbout)
1.115 + ConfigureDialog.setTabOrder(self.edtVersion, self.btnImport)
1.116 + ConfigureDialog.setTabOrder(self.btnImport, self.btnAbout)
1.117 ConfigureDialog.setTabOrder(self.btnAbout, self.btnClose)
1.118
1.119 def retranslateUi(self, ConfigureDialog):
1.120 @@ -178,10 +194,14 @@
1.121 self.tvTemplate.headerItem().setText(3, _translate("ConfigureDialog", "Path", None))
1.122 self.btnDownload.setText(_translate("ConfigureDialog", "&Download", None))
1.123 self.btnImport.setText(_translate("ConfigureDialog", "&Import", None))
1.124 - self.lblMachines.setText(_translate("ConfigureDialog", "Machines:", None))
1.125 - self.tvMachines.headerItem().setText(0, _translate("ConfigureDialog", "Name", None))
1.126 self.lblProgress.setText(_translate("ConfigureDialog", "Progress:", None))
1.127 self.tabWidget.setTabText(self.tabWidget.indexOf(self.tabConfiguration), _translate("ConfigureDialog", "Configuration", None))
1.128 + self.tvMachines.setSortingEnabled(True)
1.129 + self.tvMachines.headerItem().setText(0, _translate("ConfigureDialog", "Name", None))
1.130 + self.tvMachines.headerItem().setText(1, _translate("ConfigureDialog", "Key", None))
1.131 + self.tvMachines.headerItem().setText(2, _translate("ConfigureDialog", "Value", None))
1.132 + self.tabWidget.setTabText(self.tabWidget.indexOf(self.tabMachines), _translate("ConfigureDialog", "Machines", None))
1.133 + self.btnExplorer.setText(_translate("ConfigureDialog", "&Explorer", None))
1.134 self.tabWidget.setTabText(self.tabWidget.indexOf(self.tabLog), _translate("ConfigureDialog", "Service Log", None))
1.135 self.btnRefresh.setText(_translate("ConfigureDialog", "&Refresh", None))
1.136 self.btnAbout.setText(_translate("ConfigureDialog", "&About", None))