Config Tab is shaping up.

4 files changed, 167 insertions, 86 deletions

diff --git a/noncore/net/wellenreiter/gui/configbase.ui b/noncore/net/wellenreiter/gui/configbase.ui
index 8f38252..57ffd2a 100644
--- a/noncore/net/wellenreiter/gui/configbase.ui
+++ b/noncore/net/wellenreiter/gui/configbase.ui
@@ -1,114 +1,107 @@
 <!DOCTYPE UI><UI>
-<class>Form1</class>
+<class>WellenreiterConfigBase</class>
 <widget>
     <class>QWidget</class>
     <property stdset="1">
         <name>name</name>
-        <cstring>Form1</cstring>
+        <cstring>WellenreiterConfigBase</cstring>
     </property>
     <property stdset="1">
         <name>geometry</name>
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>226</width>
-            <height>300</height>
+            <width>240</width>
+            <height>276</height>
         </rect>
     </property>
     <property stdset="1">
         <name>caption</name>
         <string>Form1</string>
     </property>
     <vbox>
         <property stdset="1">
             <name>margin</name>
             <number>11</number>
         </property>
         <property stdset="1">
             <name>spacing</name>
             <number>6</number>
         </property>
         <widget>
-            <class>QGroupBox</class>
-            <property stdset="1">
-                <name>name</name>
-                <cstring>GroupBox1</cstring>
-            </property>
-            <property stdset="1">
-                <name>title</name>
-                <string>Sniffer Options</string>
-            </property>
-            <grid>
-                <property stdset="1">
-                    <name>margin</name>
-                    <number>11</number>
-                </property>
-                <property stdset="1">
-                    <name>spacing</name>
-                    <number>6</number>
-                </property>
-                <widget row="0"  column="0" >
                     <class>QLayoutWidget</class>
                     <property stdset="1">
                         <name>name</name>
-                        <cstring>Layout1</cstring>
+                <cstring>Layout5</cstring>
                     </property>
-                    <grid>
+            <hbox>
                         <property stdset="1">
                             <name>margin</name>
                             <number>0</number>
                         </property>
                         <property stdset="1">
                             <name>spacing</name>
                             <number>6</number>
                         </property>
-                        <widget row="2"  column="0" >
-                            <class>QSpinBox</class>
+                <widget>
+                    <class>QLabel</class>
                             <property stdset="1">
                                 <name>name</name>
-                                <cstring>hopInterval</cstring>
+                        <cstring>TextLabel3_2</cstring>
                             </property>
                             <property stdset="1">
-                                <name>suffix</name>
-                                <string> ms</string>
+                        <name>sizePolicy</name>
+                        <sizepolicy>
+                            <hsizetype>4</hsizetype>
+                            <vsizetype>1</vsizetype>
+                        </sizepolicy>
                             </property>
                             <property stdset="1">
-                                <name>maxValue</name>
-                                <number>2000</number>
+                        <name>text</name>
+                        <string>Sniffer</string>
                             </property>
+                </widget>
+                <widget>
+                    <class>Line</class>
                             <property stdset="1">
-                                <name>minValue</name>
-                                <number>100</number>
+                        <name>name</name>
+                        <cstring>Line9</cstring>
                             </property>
                             <property stdset="1">
-                                <name>lineStep</name>
-                                <number>100</number>
+                        <name>orientation</name>
+                        <enum>Horizontal</enum>
                             </property>
                         </widget>
-                        <widget row="2"  column="1" >
-                            <class>QLabel</class>
+            </hbox>
+        </widget>
+        <widget>
+            <class>QLayoutWidget</class>
                             <property stdset="1">
                                 <name>name</name>
-                                <cstring>TextLabel3</cstring>
+                <cstring>Layout7</cstring>
+            </property>
+            <grid>
+                <property stdset="1">
+                    <name>margin</name>
+                    <number>0</number>
                             </property>
                             <property stdset="1">
-                                <name>text</name>
-                                <string>Hop Interval</string>
+                    <name>spacing</name>
+                    <number>6</number>
                             </property>
-                        </widget>
                         <widget row="0"  column="0" >
                             <class>QComboBox</class>
                             <item>
                                 <property>
                                     <name>text</name>
                                     <string>&lt;select&gt;</string>
                                 </property>
                             </item>
                             <item>
                                 <property>
                                     <name>text</name>
                                     <string>eth0</string>
                                 </property>
                             </item>
                             <item>
                                 <property>
@@ -131,42 +124,50 @@
                             <item>
                                 <property>
                                     <name>text</name>
                                     <string>wifi0</string>
                                 </property>
                             </item>
                             <item>
                                 <property>
                                     <name>text</name>
                                     <string>wifi1</string>
                                 </property>
                             </item>
                             <property stdset="1">
                                 <name>name</name>
                                 <cstring>interfaceName</cstring>
                             </property>
+                    <property stdset="1">
+                        <name>enabled</name>
+                        <bool>false</bool>
+                    </property>
                         </widget>
-                        <widget row="0"  column="1" >
-                            <class>QLabel</class>
+                <widget row="4"  column="0"  rowspan="1"  colspan="2" >
+                    <class>QCheckBox</class>
                             <property stdset="1">
                                 <name>name</name>
-                                <cstring>TextLabel1</cstring>
+                        <cstring>activeScanning</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>enabled</name>
+                        <bool>false</bool>
                             </property>
                             <property stdset="1">
                                 <name>text</name>
-                                <string>Interface Name</string>
+                        <string>Active Scanning (caution!)</string>
                             </property>
                         </widget>
                         <widget row="1"  column="0" >
                             <class>QComboBox</class>
                             <item>
                                 <property>
                                     <name>text</name>
                                     <string>&lt;select&gt;</string>
                                 </property>
                             </item>
                             <item>
                                 <property>
                                     <name>text</name>
                                     <string>cisco</string>
                                 </property>
                             </item>
@@ -179,129 +180,206 @@
                             <item>
                                 <property>
                                     <name>text</name>
                                     <string>prism</string>
                                 </property>
                             </item>
                             <item>
                                 <property>
                                     <name>text</name>
                                     <string>&lt;manual&gt;</string>
                                 </property>
                             </item>
                             <property stdset="1">
                                 <name>name</name>
                                 <cstring>deviceType</cstring>
                             </property>
+                    <property stdset="1">
+                        <name>enabled</name>
+                        <bool>false</bool>
+                    </property>
+                </widget>
+                <widget row="3"  column="0"  rowspan="1"  colspan="2" >
+                    <class>QCheckBox</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>additionalInfo</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>enabled</name>
+                        <bool>false</bool>
+                    </property>
+                    <property stdset="1">
+                        <name>text</name>
+                        <string>Gather Additional Info</string>
+                    </property>
+                </widget>
+                <widget row="2"  column="0" >
+                    <class>QSpinBox</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>hopInterval</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>enabled</name>
+                        <bool>false</bool>
+                    </property>
+                    <property stdset="1">
+                        <name>suffix</name>
+                        <string> ms</string>
+                    </property>
+                    <property stdset="1">
+                        <name>maxValue</name>
+                        <number>2000</number>
+                    </property>
+                    <property stdset="1">
+                        <name>minValue</name>
+                        <number>100</number>
+                    </property>
+                    <property stdset="1">
+                        <name>lineStep</name>
+                        <number>100</number>
+                    </property>
+                </widget>
+                <widget row="2"  column="1" >
+                    <class>QLabel</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>TextLabel3_3</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>enabled</name>
+                        <bool>false</bool>
+                    </property>
+                    <property stdset="1">
+                        <name>text</name>
+                        <string>Hop Interval</string>
+                    </property>
                         </widget>
                         <widget row="1"  column="1" >
                             <class>QLabel</class>
                             <property stdset="1">
                                 <name>name</name>
-                                <cstring>TextLabel2</cstring>
+                        <cstring>TextLabel2_3</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>enabled</name>
+                        <bool>false</bool>
                             </property>
                             <property stdset="1">
                                 <name>text</name>
                                 <string>Device Type</string>
                             </property>
                         </widget>
-                    </grid>
+                <widget row="0"  column="1" >
+                    <class>QLabel</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>TextLabel1_2</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>enabled</name>
+                        <bool>false</bool>
+                    </property>
+                    <property stdset="1">
+                        <name>text</name>
+                        <string>Interface Name</string>
+                    </property>
                 </widget>
             </grid>
         </widget>
         <widget>
-            <class>QGroupBox</class>
+            <class>QLayoutWidget</class>
             <property stdset="1">
                 <name>name</name>
-                <cstring>GroupBox8</cstring>
+                <cstring>Layout6</cstring>
             </property>
+            <hbox>
             <property stdset="1">
-                <name>title</name>
-                <string>Advanced Options</string>
+                    <name>margin</name>
+                    <number>0</number>
+                </property>
+                <property stdset="1">
+                    <name>spacing</name>
+                    <number>6</number>
             </property>
             <widget>
-                <class>QCheckBox</class>
+                    <class>QLabel</class>
                 <property stdset="1">
                     <name>name</name>
-                    <cstring>additionalInfo</cstring>
+                        <cstring>TextLabel3_2_2</cstring>
                 </property>
                 <property stdset="1">
-                    <name>geometry</name>
-                    <rect>
-                        <x>11</x>
-                        <y>19</y>
-                        <width>147</width>
-                        <height>19</height>
-                    </rect>
+                        <name>sizePolicy</name>
+                        <sizepolicy>
+                            <hsizetype>4</hsizetype>
+                            <vsizetype>1</vsizetype>
+                        </sizepolicy>
                 </property>
                 <property stdset="1">
                     <name>text</name>
-                    <string>Gather Additional Info</string>
+                        <string>GUI</string>
                 </property>
             </widget>
             <widget>
-                <class>QCheckBox</class>
+                    <class>Line</class>
                 <property stdset="1">
                     <name>name</name>
-                    <cstring>activeScanning</cstring>
-                </property>
-                <property stdset="1">
-                    <name>geometry</name>
-                    <rect>
-                        <x>11</x>
-                        <y>44</y>
-                        <width>175</width>
-                        <height>19</height>
-                    </rect>
+                        <cstring>Line9_2</cstring>
                 </property>
                 <property stdset="1">
-                    <name>text</name>
-                    <string>Active Scanning (caution!)</string>
+                        <name>orientation</name>
+                        <enum>Horizontal</enum>
                 </property>
             </widget>
+            </hbox>
         </widget>
         <widget>
-            <class>QGroupBox</class>
+            <class>QLayoutWidget</class>
             <property stdset="1">
                 <name>name</name>
-                <cstring>GroupBox3</cstring>
-            </property>
-            <property stdset="1">
-                <name>title</name>
-                <string>GUI Options</string>
+                <cstring>Layout8</cstring>
             </property>
             <vbox>
                 <property stdset="1">
                     <name>margin</name>
-                    <number>11</number>
+                    <number>0</number>
                 </property>
                 <property stdset="1">
                     <name>spacing</name>
                     <number>6</number>
                 </property>
                 <widget>
                     <class>QCheckBox</class>
                     <property stdset="1">
                         <name>name</name>
                         <cstring>groupNetworks</cstring>
                     </property>
                     <property stdset="1">
+                        <name>enabled</name>
+                        <bool>false</bool>
+                    </property>
+                    <property stdset="1">
                         <name>text</name>
                         <string>Group Detected Networks</string>
                     </property>
                 </widget>
                 <widget>
                     <class>QCheckBox</class>
                     <property stdset="1">
                         <name>name</name>
                         <cstring>enableActivity</cstring>
                     </property>
                     <property stdset="1">
+                        <name>enabled</name>
+                        <bool>false</bool>
+                    </property>
+                    <property stdset="1">
                         <name>text</name>
                         <string>Enable Activity Display</string>
                     </property>
                 </widget>
             </vbox>
         </widget>
     </vbox>
 </widget>
 </UI>
diff --git a/noncore/net/wellenreiter/gui/gui.pro b/noncore/net/wellenreiter/gui/gui.pro
index a047433..b271ee3 100644
--- a/noncore/net/wellenreiter/gui/gui.pro
+++ b/noncore/net/wellenreiter/gui/gui.pro
@@ -1,11 +1,11 @@
 DESTDIR         = $(OPIEDIR)/bin
 TEMPLATE        = app
 CONFIG          = qt warn_on debug
 #CONFIG         = qt warn_on release
-HEADERS         = wellenreiterbase.h wellenreiter.h scanlistitem.h scanlist.h logwindow.h hexwindow.h
-SOURCES         = main.cpp wellenreiterbase.cpp wellenreiter.cpp scanlistitem.cpp scanlist.cpp logwindow.cpp hexwindow.cpp
+HEADERS         = wellenreiterbase.h wellenreiter.h scanlistitem.h scanlist.h logwindow.h hexwindow.h configwindow.h
+SOURCES         = main.cpp wellenreiterbase.cpp wellenreiter.cpp scanlistitem.cpp scanlist.cpp logwindow.cpp hexwindow.cpp configwindow.cpp
 INCLUDEPATH     += $(OPIEDIR)/include ../daemon
 DEPENDPATH      += $(OPIEDIR)/include ../daemon
 LIBS            += -lqpe -lopie -lwellenreiter
 INTERFACES      = configbase.ui
 TARGET          = wellenreiter
diff --git a/noncore/net/wellenreiter/gui/wellenreiterbase.cpp b/noncore/net/wellenreiter/gui/wellenreiterbase.cpp
index b1845b9..aa94c81 100644
--- a/noncore/net/wellenreiter/gui/wellenreiterbase.cpp
+++ b/noncore/net/wellenreiter/gui/wellenreiterbase.cpp
@@ -17,32 +17,33 @@
 
 #include <qheader.h>
 #include <qlabel.h>
 #include <qlistview.h>
 #include <qmultilineedit.h>
 #include <qpushbutton.h>
 #include <opie/otabwidget.h>
 #include <qlayout.h>
 #include <qvariant.h>
 #include <qtooltip.h>
 #include <qwhatsthis.h>
 #include <qimage.h>
 #include <qpixmap.h>
 
 #include "logwindow.h"
 #include "hexwindow.h"
+#include "configwindow.h"
 
 #include <qpe/resource.h>
 
 
 /* 
  *  Constructs a WellenreiterBase which is a child of 'parent', with the 
  *  name 'name' and widget flags set to 'f' 
  */
 WellenreiterBase::WellenreiterBase( QWidget* parent,  const char* name, WFlags fl )
     : QWidget( parent, name, fl )
 {
     if ( !name )
         setName( "WellenreiterBase" );
     resize( 191, 294 ); 
     setCaption( tr( "Wellenreiter" ) );
     WellenreiterBaseLayout = new QVBoxLayout( this ); 
@@ -77,34 +78,34 @@ WellenreiterBase::WellenreiterBase( QWidget* parent,  const char* name, WFlags f
     netview->setRootIsDecorated( TRUE );
     apLayout->addWidget( netview );
     TabWidget->addTab( ap, "wellenreiter/networks", tr( "Networks" ) );
 
     //--------- LOG TAB --------------
     
     logwindow = new MLogWindow( TabWidget, "Log" );
     TabWidget->addTab( logwindow, "wellenreiter/log", tr( "Log" ) );
 
     //--------- HEX TAB --------------
     
     hexwindow = new MHexWindow( TabWidget, "Hex" );
     TabWidget->addTab( hexwindow, "wellenreiter/hex", tr( "Hex" ) );
 
     //--------- CONFIG TAB --------------
     
-    QPushButton* dummy = new QPushButton( "under construction", TabWidget );
-    TabWidget->addTab( dummy, "wellenreiter/config", tr( "Config" ) );
+    configwindow = new WellenreiterConfigWindow( TabWidget, "Config" );
+    TabWidget->addTab( configwindow, "wellenreiter/config", tr( "Config" ) );
     
     //--------- ABOUT TAB --------------
     
     about = new QWidget( TabWidget, "about" );
     aboutLayout = new QGridLayout( about ); 
     aboutLayout->setSpacing( 6 );
     aboutLayout->setMargin( 11 );
 
     PixmapLabel1_3_2 = new QLabel( about, "PixmapLabel1_3_2" );
     PixmapLabel1_3_2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, PixmapLabel1_3_2->sizePolicy().hasHeightForWidth() ) );
     PixmapLabel1_3_2->setFrameShape( QLabel::Panel );
     PixmapLabel1_3_2->setFrameShadow( QLabel::Sunken );
     PixmapLabel1_3_2->setLineWidth( 2 );
     PixmapLabel1_3_2->setMargin( 0 );
     PixmapLabel1_3_2->setMidLineWidth( 0 );
     PixmapLabel1_3_2->setPixmap(  Resource::loadPixmap( "wellenreiter/logo" ) );
diff --git a/noncore/net/wellenreiter/gui/wellenreiterbase.h b/noncore/net/wellenreiter/gui/wellenreiterbase.h
index b7bd820..4e5ca94 100644
--- a/noncore/net/wellenreiter/gui/wellenreiterbase.h
+++ b/noncore/net/wellenreiter/gui/wellenreiterbase.h
@@ -15,43 +15,45 @@
 
 #ifndef WELLENREITERBASE_H
 #define WELLENREITERBASE_H
 
 #include <qvariant.h>
 #include <qwidget.h>
 class QVBoxLayout; 
 class QHBoxLayout; 
 class QGridLayout; 
 class QLabel;
 class QListView;
 class QListViewItem;
 class QPushButton;
 class OTabWidget;
 class MLogWindow;
 class MHexWindow;
+class WellenreiterConfigWindow;
 
 class WellenreiterBase : public QWidget
 { 
     Q_OBJECT
 
 public:
     WellenreiterBase( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
     ~WellenreiterBase();
 
     OTabWidget* TabWidget;
     QWidget* ap;
     QListView* netview;
     MLogWindow* logwindow;
     MHexWindow* hexwindow;  
+    WellenreiterConfigWindow* configwindow;
     QWidget* about;
     QLabel* PixmapLabel1_3_2;
     QLabel* TextLabel1_4_2;
     QPushButton* button;
 
 protected:
     QVBoxLayout* WellenreiterBaseLayout;
     QVBoxLayout* apLayout;
     QGridLayout* aboutLayout;
     bool event( QEvent* );
 };
 
 #endif // WELLENREITERBASE_H