summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/net/wellenreiter/gui/configbase.ui242
-rw-r--r--noncore/net/wellenreiter/gui/gui.pro4
-rw-r--r--noncore/net/wellenreiter/gui/wellenreiterbase.cpp5
-rw-r--r--noncore/net/wellenreiter/gui/wellenreiterbase.h2
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,19 +1,19 @@
<!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>
@@ -28,75 +28,68 @@
<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>
@@ -143,18 +136,26 @@
<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>
@@ -191,89 +192,158 @@
<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>
@@ -284,8 +354,12 @@
<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>
@@ -295,8 +369,12 @@
<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>
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,10 +1,10 @@
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
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
@@ -29,8 +29,9 @@
#include <qpixmap.h>
#include "logwindow.h"
#include "hexwindow.h"
+#include "configwindow.h"
#include <qpe/resource.h>
@@ -89,10 +90,10 @@ WellenreiterBase::WellenreiterBase( QWidget* parent, const char* name, WFlags f
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" );
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
@@ -27,8 +27,9 @@ class QListViewItem;
class QPushButton;
class OTabWidget;
class MLogWindow;
class MHexWindow;
+class WellenreiterConfigWindow;
class WellenreiterBase : public QWidget
{
Q_OBJECT
@@ -41,8 +42,9 @@ public:
QWidget* ap;
QListView* netview;
MLogWindow* logwindow;
MHexWindow* hexwindow;
+ WellenreiterConfigWindow* configwindow;
QWidget* about;
QLabel* PixmapLabel1_3_2;
QLabel* TextLabel1_4_2;
QPushButton* button;