# HG changeset patch
# User Oliver Maurhart <oliver.maurhart@ait.ac.at>
# Date 1396435942 -7200
# Node ID 52c1face04d3fcb3ccc47f377128aaa320b88303
# Parent  e072452916fe6ca42841d33f1b0424fdea37c966
log tab on configue dialog

diff -r e072452916fe -r 52c1face04d3 OpenSecurity/bin/ui/ConfigureDialog.ui
--- a/OpenSecurity/bin/ui/ConfigureDialog.ui	Wed Apr 02 12:32:53 2014 +0200
+++ b/OpenSecurity/bin/ui/ConfigureDialog.ui	Wed Apr 02 12:52:22 2014 +0200
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>595</width>
-    <height>421</height>
+    <width>400</width>
+    <height>455</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -20,7 +20,7 @@
   <property name="sizeGripEnabled">
    <bool>true</bool>
   </property>
-  <layout class="QVBoxLayout" name="lyMain" stretch="0,0,0,0,0,0,0,1,0">
+  <layout class="QVBoxLayout" name="verticalLayout_3">
    <item>
     <layout class="QHBoxLayout" name="lyHeading">
      <property name="spacing">
@@ -80,152 +80,183 @@
     </layout>
    </item>
    <item>
-    <widget class="QLabel" name="lblTemplate">
-     <property name="text">
-      <string>Initial Template:</string>
+    <widget class="QTabWidget" name="tabConfig">
+     <property name="currentIndex">
+      <number>0</number>
      </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QTreeWidget" name="tvTemplate">
-     <property name="maximumSize">
-      <size>
-       <width>16777215</width>
-       <height>64</height>
-      </size>
-     </property>
-     <property name="rootIsDecorated">
-      <bool>false</bool>
-     </property>
-     <property name="itemsExpandable">
-      <bool>false</bool>
-     </property>
-     <property name="allColumnsShowFocus">
-      <bool>true</bool>
-     </property>
-     <column>
-      <property name="text">
-       <string>Name</string>
-      </property>
-     </column>
-     <column>
-      <property name="text">
-       <string>Date</string>
-      </property>
-     </column>
-     <column>
-      <property name="text">
-       <string>Size</string>
-      </property>
-     </column>
-     <column>
-      <property name="text">
-       <string>Path</string>
-      </property>
-     </column>
-    </widget>
-   </item>
-   <item>
-    <layout class="QHBoxLayout" name="lyDownload">
-     <item>
-      <spacer name="spDownload">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item>
-      <widget class="QPushButton" name="btnDownload">
-       <property name="minimumSize">
-        <size>
-         <width>100</width>
-         <height>0</height>
-        </size>
-       </property>
-       <property name="text">
-        <string>&amp;Download</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="btnImport">
-       <property name="minimumSize">
-        <size>
-         <width>100</width>
-         <height>0</height>
-        </size>
-       </property>
-       <property name="text">
-        <string>&amp;Import</string>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-   <item>
-    <widget class="QLabel" name="lblMachines">
-     <property name="text">
-      <string>Machines:</string>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QTreeWidget" name="tvMachines">
-     <property name="maximumSize">
-      <size>
-       <width>16777215</width>
-       <height>128</height>
-      </size>
-     </property>
-     <property name="rootIsDecorated">
-      <bool>false</bool>
-     </property>
-     <property name="itemsExpandable">
-      <bool>false</bool>
-     </property>
-     <property name="allColumnsShowFocus">
-      <bool>true</bool>
-     </property>
-     <column>
-      <property name="text">
-       <string>Name</string>
-      </property>
-     </column>
-    </widget>
-   </item>
-   <item>
-    <widget class="QLabel" name="lblProgress">
-     <property name="text">
-      <string>Progress:</string>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QPlainTextEdit" name="edtProgress">
-     <property name="font">
-      <font>
-       <family>Monospace</family>
-       <pointsize>10</pointsize>
-      </font>
-     </property>
-     <property name="verticalScrollBarPolicy">
-      <enum>Qt::ScrollBarAlwaysOn</enum>
-     </property>
-     <property name="lineWrapMode">
-      <enum>QPlainTextEdit::NoWrap</enum>
-     </property>
-     <property name="readOnly">
-      <bool>true</bool>
-     </property>
-     <property name="plainText">
-      <string/>
-     </property>
+     <widget class="QWidget" name="tbConfig">
+      <attribute name="title">
+       <string>Configuration</string>
+      </attribute>
+      <layout class="QVBoxLayout" name="lyConfig">
+       <item>
+        <widget class="QLabel" name="lblTemplate">
+         <property name="text">
+          <string>Initial Template:</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QTreeWidget" name="tvTemplate">
+         <property name="maximumSize">
+          <size>
+           <width>16777215</width>
+           <height>64</height>
+          </size>
+         </property>
+         <property name="rootIsDecorated">
+          <bool>false</bool>
+         </property>
+         <property name="itemsExpandable">
+          <bool>false</bool>
+         </property>
+         <property name="allColumnsShowFocus">
+          <bool>true</bool>
+         </property>
+         <column>
+          <property name="text">
+           <string>Name</string>
+          </property>
+         </column>
+         <column>
+          <property name="text">
+           <string>Date</string>
+          </property>
+         </column>
+         <column>
+          <property name="text">
+           <string>Size</string>
+          </property>
+         </column>
+         <column>
+          <property name="text">
+           <string>Path</string>
+          </property>
+         </column>
+        </widget>
+       </item>
+       <item>
+        <layout class="QHBoxLayout" name="lyDownload">
+         <item>
+          <spacer name="spDownload">
+           <property name="orientation">
+            <enum>Qt::Horizontal</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>40</width>
+             <height>20</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+         <item>
+          <widget class="QPushButton" name="btnDownload">
+           <property name="minimumSize">
+            <size>
+             <width>100</width>
+             <height>0</height>
+            </size>
+           </property>
+           <property name="text">
+            <string>&amp;Download</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QPushButton" name="btnImport">
+           <property name="minimumSize">
+            <size>
+             <width>100</width>
+             <height>0</height>
+            </size>
+           </property>
+           <property name="text">
+            <string>&amp;Import</string>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
+       <item>
+        <widget class="QLabel" name="lblMachines">
+         <property name="text">
+          <string>Machines:</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QTreeWidget" name="tvMachines">
+         <property name="maximumSize">
+          <size>
+           <width>16777215</width>
+           <height>128</height>
+          </size>
+         </property>
+         <property name="rootIsDecorated">
+          <bool>false</bool>
+         </property>
+         <property name="itemsExpandable">
+          <bool>false</bool>
+         </property>
+         <property name="allColumnsShowFocus">
+          <bool>true</bool>
+         </property>
+         <column>
+          <property name="text">
+           <string>Name</string>
+          </property>
+         </column>
+        </widget>
+       </item>
+       <item>
+        <widget class="QLabel" name="lblProgress">
+         <property name="text">
+          <string>Progress:</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QPlainTextEdit" name="edtProgress">
+         <property name="font">
+          <font>
+           <family>Monospace</family>
+           <pointsize>10</pointsize>
+          </font>
+         </property>
+         <property name="verticalScrollBarPolicy">
+          <enum>Qt::ScrollBarAlwaysOn</enum>
+         </property>
+         <property name="lineWrapMode">
+          <enum>QPlainTextEdit::NoWrap</enum>
+         </property>
+         <property name="readOnly">
+          <bool>true</bool>
+         </property>
+         <property name="plainText">
+          <string/>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </widget>
+     <widget class="QWidget" name="tbLog">
+      <attribute name="title">
+       <string>Log</string>
+      </attribute>
+      <layout class="QVBoxLayout" name="lyLog">
+       <item>
+        <widget class="QPlainTextEdit" name="edtLog">
+         <property name="lineWrapMode">
+          <enum>QPlainTextEdit::NoWrap</enum>
+         </property>
+         <property name="readOnly">
+          <bool>true</bool>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </widget>
     </widget>
    </item>
    <item>
@@ -288,6 +319,8 @@
     </layout>
    </item>
   </layout>
+  <zorder>tabConfig</zorder>
+  <zorder>btnAbout</zorder>
  </widget>
  <tabstops>
   <tabstop>edtStatus</tabstop>
diff -r e072452916fe -r 52c1face04d3 OpenSecurity/bin/ui/ui_ConfigureDialog.py
--- a/OpenSecurity/bin/ui/ui_ConfigureDialog.py	Wed Apr 02 12:32:53 2014 +0200
+++ b/OpenSecurity/bin/ui/ui_ConfigureDialog.py	Wed Apr 02 12:52:22 2014 +0200
@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'ConfigureDialog.ui'
 #
-# Created: Wed Apr  2 10:27:01 2014
+# Created: Wed Apr  2 12:52:07 2014
 #      by: PyQt4 UI code generator 4.10.3
 #
 # WARNING! All changes made in this file will be lost!
@@ -26,13 +26,13 @@
 class Ui_ConfigureDialog(object):
     def setupUi(self, ConfigureDialog):
         ConfigureDialog.setObjectName(_fromUtf8("ConfigureDialog"))
-        ConfigureDialog.resize(595, 421)
+        ConfigureDialog.resize(400, 455)
         icon = QtGui.QIcon()
         icon.addPixmap(QtGui.QPixmap(_fromUtf8(":/opensecurity/gfx/opensecurity_icon_64.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
         ConfigureDialog.setWindowIcon(icon)
         ConfigureDialog.setSizeGripEnabled(True)
-        self.lyMain = QtGui.QVBoxLayout(ConfigureDialog)
-        self.lyMain.setObjectName(_fromUtf8("lyMain"))
+        self.verticalLayout_3 = QtGui.QVBoxLayout(ConfigureDialog)
+        self.verticalLayout_3.setObjectName(_fromUtf8("verticalLayout_3"))
         self.lyHeading = QtGui.QHBoxLayout()
         self.lyHeading.setSpacing(8)
         self.lyHeading.setContentsMargins(8, -1, -1, 8)
@@ -62,44 +62,50 @@
         self.wdStatus.setObjectName(_fromUtf8("wdStatus"))
         self.lyStatus.addWidget(self.wdStatus, 2, 0, 1, 2)
         self.lyHeading.addLayout(self.lyStatus)
-        self.lyMain.addLayout(self.lyHeading)
-        self.lblTemplate = QtGui.QLabel(ConfigureDialog)
+        self.verticalLayout_3.addLayout(self.lyHeading)
+        self.tabConfig = QtGui.QTabWidget(ConfigureDialog)
+        self.tabConfig.setObjectName(_fromUtf8("tabConfig"))
+        self.tbConfig = QtGui.QWidget()
+        self.tbConfig.setObjectName(_fromUtf8("tbConfig"))
+        self.lyConfig = QtGui.QVBoxLayout(self.tbConfig)
+        self.lyConfig.setObjectName(_fromUtf8("lyConfig"))
+        self.lblTemplate = QtGui.QLabel(self.tbConfig)
         self.lblTemplate.setObjectName(_fromUtf8("lblTemplate"))
-        self.lyMain.addWidget(self.lblTemplate)
-        self.tvTemplate = QtGui.QTreeWidget(ConfigureDialog)
+        self.lyConfig.addWidget(self.lblTemplate)
+        self.tvTemplate = QtGui.QTreeWidget(self.tbConfig)
         self.tvTemplate.setMaximumSize(QtCore.QSize(16777215, 64))
         self.tvTemplate.setRootIsDecorated(False)
         self.tvTemplate.setItemsExpandable(False)
         self.tvTemplate.setAllColumnsShowFocus(True)
         self.tvTemplate.setObjectName(_fromUtf8("tvTemplate"))
-        self.lyMain.addWidget(self.tvTemplate)
+        self.lyConfig.addWidget(self.tvTemplate)
         self.lyDownload = QtGui.QHBoxLayout()
         self.lyDownload.setObjectName(_fromUtf8("lyDownload"))
         spacerItem = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
         self.lyDownload.addItem(spacerItem)
-        self.btnDownload = QtGui.QPushButton(ConfigureDialog)
+        self.btnDownload = QtGui.QPushButton(self.tbConfig)
         self.btnDownload.setMinimumSize(QtCore.QSize(100, 0))
         self.btnDownload.setObjectName(_fromUtf8("btnDownload"))
         self.lyDownload.addWidget(self.btnDownload)
-        self.btnImport = QtGui.QPushButton(ConfigureDialog)
+        self.btnImport = QtGui.QPushButton(self.tbConfig)
         self.btnImport.setMinimumSize(QtCore.QSize(100, 0))
         self.btnImport.setObjectName(_fromUtf8("btnImport"))
         self.lyDownload.addWidget(self.btnImport)
-        self.lyMain.addLayout(self.lyDownload)
-        self.lblMachines = QtGui.QLabel(ConfigureDialog)
+        self.lyConfig.addLayout(self.lyDownload)
+        self.lblMachines = QtGui.QLabel(self.tbConfig)
         self.lblMachines.setObjectName(_fromUtf8("lblMachines"))
-        self.lyMain.addWidget(self.lblMachines)
-        self.tvMachines = QtGui.QTreeWidget(ConfigureDialog)
+        self.lyConfig.addWidget(self.lblMachines)
+        self.tvMachines = QtGui.QTreeWidget(self.tbConfig)
         self.tvMachines.setMaximumSize(QtCore.QSize(16777215, 128))
         self.tvMachines.setRootIsDecorated(False)
         self.tvMachines.setItemsExpandable(False)
         self.tvMachines.setAllColumnsShowFocus(True)
         self.tvMachines.setObjectName(_fromUtf8("tvMachines"))
-        self.lyMain.addWidget(self.tvMachines)
-        self.lblProgress = QtGui.QLabel(ConfigureDialog)
+        self.lyConfig.addWidget(self.tvMachines)
+        self.lblProgress = QtGui.QLabel(self.tbConfig)
         self.lblProgress.setObjectName(_fromUtf8("lblProgress"))
-        self.lyMain.addWidget(self.lblProgress)
-        self.edtProgress = QtGui.QPlainTextEdit(ConfigureDialog)
+        self.lyConfig.addWidget(self.lblProgress)
+        self.edtProgress = QtGui.QPlainTextEdit(self.tbConfig)
         font = QtGui.QFont()
         font.setFamily(_fromUtf8("Monospace"))
         font.setPointSize(10)
@@ -109,7 +115,19 @@
         self.edtProgress.setReadOnly(True)
         self.edtProgress.setPlainText(_fromUtf8(""))
         self.edtProgress.setObjectName(_fromUtf8("edtProgress"))
-        self.lyMain.addWidget(self.edtProgress)
+        self.lyConfig.addWidget(self.edtProgress)
+        self.tabConfig.addTab(self.tbConfig, _fromUtf8(""))
+        self.tbLog = QtGui.QWidget()
+        self.tbLog.setObjectName(_fromUtf8("tbLog"))
+        self.lyLog = QtGui.QVBoxLayout(self.tbLog)
+        self.lyLog.setObjectName(_fromUtf8("lyLog"))
+        self.edtLog = QtGui.QPlainTextEdit(self.tbLog)
+        self.edtLog.setLineWrapMode(QtGui.QPlainTextEdit.NoWrap)
+        self.edtLog.setReadOnly(True)
+        self.edtLog.setObjectName(_fromUtf8("edtLog"))
+        self.lyLog.addWidget(self.edtLog)
+        self.tabConfig.addTab(self.tbLog, _fromUtf8(""))
+        self.verticalLayout_3.addWidget(self.tabConfig)
         self.lyButton = QtGui.QHBoxLayout()
         self.lyButton.setObjectName(_fromUtf8("lyButton"))
         spacerItem1 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
@@ -127,10 +145,10 @@
         self.btnClose.setDefault(True)
         self.btnClose.setObjectName(_fromUtf8("btnClose"))
         self.lyButton.addWidget(self.btnClose)
-        self.lyMain.addLayout(self.lyButton)
-        self.lyMain.setStretch(7, 1)
+        self.verticalLayout_3.addLayout(self.lyButton)
 
         self.retranslateUi(ConfigureDialog)
+        self.tabConfig.setCurrentIndex(0)
         QtCore.QMetaObject.connectSlotsByName(ConfigureDialog)
         ConfigureDialog.setTabOrder(self.edtStatus, self.edtVersion)
         ConfigureDialog.setTabOrder(self.edtVersion, self.tvTemplate)
@@ -156,6 +174,8 @@
         self.lblMachines.setText(_translate("ConfigureDialog", "Machines:", None))
         self.tvMachines.headerItem().setText(0, _translate("ConfigureDialog", "Name", None))
         self.lblProgress.setText(_translate("ConfigureDialog", "Progress:", None))
+        self.tabConfig.setTabText(self.tabConfig.indexOf(self.tbConfig), _translate("ConfigureDialog", "Configuration", None))
+        self.tabConfig.setTabText(self.tabConfig.indexOf(self.tbLog), _translate("ConfigureDialog", "Log", None))
         self.btnRefresh.setText(_translate("ConfigureDialog", "&Refresh", None))
         self.btnAbout.setText(_translate("ConfigureDialog", "&About", None))
         self.btnClose.setText(_translate("ConfigureDialog", "&Close", None))