summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2003-05-05 22:27:02 (UTC)
committer mickeyl <mickeyl>2003-05-05 22:27:02 (UTC)
commit58a78cbe1bc5ded219ba23432041f20e03404403 (patch) (side-by-side diff)
treee06706f3cbd0303cdcd52ab4a94650b2059ed07c
parent3f8c29b3cbbb32864694fe9c95b43d1cb777360e (diff)
downloadopie-58a78cbe1bc5ded219ba23432041f20e03404403.zip
opie-58a78cbe1bc5ded219ba23432041f20e03404403.tar.gz
opie-58a78cbe1bc5ded219ba23432041f20e03404403.tar.bz2
major overhaul of the configuration window - showing what will come soon...
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/net/wellenreiter/gui/configbase.ui747
-rw-r--r--noncore/net/wellenreiter/gui/configbasenew.ui814
-rw-r--r--noncore/net/wellenreiter/gui/configwindow.cpp146
-rw-r--r--noncore/net/wellenreiter/gui/configwindow.h59
-rw-r--r--noncore/net/wellenreiter/gui/graphwindow.cpp12
-rw-r--r--noncore/net/wellenreiter/gui/gui.pro8
-rw-r--r--noncore/net/wellenreiter/gui/mainwindow.cpp3
-rw-r--r--noncore/net/wellenreiter/gui/protolistview.cpp95
-rw-r--r--noncore/net/wellenreiter/gui/protolistview.h44
-rw-r--r--noncore/net/wellenreiter/gui/wellenreiter.cpp4
10 files changed, 676 insertions, 1256 deletions
diff --git a/noncore/net/wellenreiter/gui/configbase.ui b/noncore/net/wellenreiter/gui/configbase.ui
index a8b55bb..d85956e 100644
--- a/noncore/net/wellenreiter/gui/configbase.ui
+++ b/noncore/net/wellenreiter/gui/configbase.ui
@@ -11,13 +11,13 @@
<rect>
<x>0</x>
<y>0</y>
- <width>232</width>
- <height>342</height>
+ <width>209</width>
+ <height>287</height>
</rect>
</property>
<property stdset="1">
<name>caption</name>
- <string>Form1</string>
+ <string>Wellenreiter II COnfiguration Dialog</string>
</property>
<property>
<name>layoutMargin</name>
@@ -28,134 +28,100 @@
<grid>
<property stdset="1">
<name>margin</name>
- <number>6</number>
+ <number>2</number>
</property>
<property stdset="1">
<name>spacing</name>
- <number>5</number>
+ <number>3</number>
</property>
- <widget row="0" column="0" rowspan="1" colspan="3" >
- <class>QLayoutWidget</class>
+ <widget row="0" column="0" >
+ <class>QTabWidget</class>
<property stdset="1">
<name>name</name>
- <cstring>Layout5</cstring>
+ <cstring>tab</cstring>
+ </property>
+ <property>
+ <name>layoutMargin</name>
</property>
<property>
<name>layoutSpacing</name>
</property>
- <hbox>
+ <widget>
+ <class>QWidget</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>tab</cstring>
+ </property>
+ <attribute>
+ <name>title</name>
+ <string>Interface</string>
+ </attribute>
+ <grid>
<property stdset="1">
<name>margin</name>
- <number>0</number>
+ <number>5</number>
</property>
<property stdset="1">
<name>spacing</name>
- <number>2</number>
+ <number>3</number>
</property>
- <widget>
+ <widget row="0" column="0" >
<class>QLabel</class>
<property stdset="1">
<name>name</name>
- <cstring>TextLabel3_2</cstring>
+ <cstring>TextLabel1_2</cstring>
</property>
<property stdset="1">
- <name>sizePolicy</name>
- <sizepolicy>
- <hsizetype>4</hsizetype>
- <vsizetype>1</vsizetype>
- </sizepolicy>
+ <name>enabled</name>
+ <bool>true</bool>
</property>
<property stdset="1">
<name>text</name>
- <string>Sniffer</string>
- </property>
- </widget>
- <widget>
- <class>Line</class>
- <property stdset="1">
- <name>name</name>
- <cstring>Line9</cstring>
- </property>
- <property stdset="1">
- <name>orientation</name>
- <enum>Horizontal</enum>
+ <string>Name:</string>
</property>
</widget>
- </hbox>
- </widget>
- <widget row="1" column="0" rowspan="1" colspan="2" >
- <class>QComboBox</class>
+ <widget row="1" column="0" >
+ <class>QLabel</class>
<property stdset="1">
<name>name</name>
- <cstring>interfaceName</cstring>
+ <cstring>TextLabel2_3</cstring>
</property>
<property stdset="1">
<name>enabled</name>
<bool>true</bool>
</property>
- <property>
- <name>whatsThis</name>
- <string>Choose the interface used for sniffing.</string>
- </property>
- </widget>
- <widget row="2" column="0" rowspan="1" colspan="2" >
- <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>
- <item>
- <property>
- <name>text</name>
- <string>wlan-ng</string>
- </property>
- </item>
- <item>
- <property>
+ <property stdset="1">
<name>text</name>
- <string>hostap</string>
+ <string>Driver:</string>
</property>
- </item>
- <item>
- <property>
- <name>text</name>
- <string>orinoco</string>
+ </widget>
+ <widget row="4" column="0" rowspan="1" colspan="2" >
+ <class>QCheckBox</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>hopChannels</cstring>
</property>
- </item>
- <item>
- <property>
+ <property stdset="1">
<name>text</name>
- <string>&lt;manual&gt;</string>
+ <string>Hop Channels</string>
</property>
- </item>
- <item>
- <property>
- <name>text</name>
- <string>&lt;file&gt;</string>
+ <property stdset="1">
+ <name>checked</name>
+ <bool>true</bool>
</property>
- </item>
+ </widget>
+ <widget row="2" column="0" rowspan="1" colspan="4" >
+ <class>QCheckBox</class>
<property stdset="1">
<name>name</name>
- <cstring>deviceType</cstring>
+ <cstring>prismHeader</cstring>
</property>
<property stdset="1">
- <name>enabled</name>
- <bool>true</bool>
- </property>
- <property>
- <name>whatsThis</name>
- <string>Choose the type of driver used for sniffing.</string>
+ <name>text</name>
+ <string>Use additional PRISM header</string>
</property>
</widget>
- <widget row="3" column="0" rowspan="1" colspan="2" >
+ <widget row="4" column="3" >
<class>QSpinBox</class>
<property stdset="1">
<name>name</name>
@@ -181,214 +147,394 @@
<name>lineStep</name>
<number>100</number>
</property>
+ <property stdset="1">
+ <name>value</name>
+ <number>1000</number>
+ </property>
<property>
<name>whatsThis</name>
<string>Choose the channel hop interval.</string>
</property>
</widget>
- <widget row="3" column="2" >
- <class>QLabel</class>
+ <widget row="5" column="0" rowspan="1" colspan="4" >
+ <class>QGroupBox</class>
<property stdset="1">
<name>name</name>
- <cstring>TextLabel3_3</cstring>
+ <cstring>GroupBox1</cstring>
</property>
<property stdset="1">
- <name>enabled</name>
- <bool>true</bool>
+ <name>title</name>
+ <string>Scan on channel</string>
+ </property>
+ <property>
+ <name>layoutMargin</name>
+ </property>
+ <property>
+ <name>layoutSpacing</name>
+ </property>
+ <grid>
+ <property stdset="1">
+ <name>margin</name>
+ <number>4</number>
+ </property>
+ <property stdset="1">
+ <name>spacing</name>
+ <number>2</number>
+ </property>
+ <widget row="1" column="1" >
+ <class>QCheckBox</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>channel6</cstring>
</property>
<property stdset="1">
<name>text</name>
- <string>Hop Interval</string>
+ <string>6</string>
</property>
</widget>
- <widget row="2" column="2" >
- <class>QLabel</class>
+ <widget row="1" column="3" >
+ <class>QCheckBox</class>
<property stdset="1">
<name>name</name>
- <cstring>TextLabel2_3</cstring>
+ <cstring>channel8</cstring>
</property>
<property stdset="1">
- <name>enabled</name>
- <bool>true</bool>
+ <name>text</name>
+ <string>8</string>
+ </property>
+ </widget>
+ <widget row="0" column="2" >
+ <class>QCheckBox</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>channel2</cstring>
</property>
<property stdset="1">
<name>text</name>
- <string>Device Type</string>
+ <string>2</string>
</property>
</widget>
- <widget row="1" column="2" >
- <class>QLabel</class>
+ <widget row="1" column="4" >
+ <class>QCheckBox</class>
<property stdset="1">
<name>name</name>
- <cstring>TextLabel1_2</cstring>
+ <cstring>channel9</cstring>
</property>
<property stdset="1">
- <name>enabled</name>
- <bool>true</bool>
+ <name>text</name>
+ <string>9</string>
+ </property>
+ </widget>
+ <widget row="0" column="1" >
+ <class>QCheckBox</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>channel1</cstring>
</property>
<property stdset="1">
<name>text</name>
- <string>Interface Name</string>
+ <string>1</string>
</property>
</widget>
- <widget row="5" column="0" >
- <class>QLabel</class>
+ <widget row="0" column="0" >
+ <class>QCheckBox</class>
<property stdset="1">
<name>name</name>
- <cstring>TextLabel1_5</cstring>
+ <cstring>channelAll</cstring>
</property>
<property stdset="1">
<name>text</name>
- <string>Fake MAC:</string>
+ <string>All</string>
</property>
</widget>
- <widget row="5" column="1" rowspan="1" colspan="2" >
- <class>QLineEdit</class>
+ <widget row="2" column="1" >
+ <class>QCheckBox</class>
<property stdset="1">
<name>name</name>
- <cstring>MAC</cstring>
+ <cstring>channel11</cstring>
</property>
<property stdset="1">
- <name>enabled</name>
- <bool>false</bool>
+ <name>text</name>
+ <string>11</string>
+ </property>
+ </widget>
+ <widget row="2" column="0" >
+ <class>QCheckBox</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>channel10</cstring>
</property>
<property stdset="1">
<name>text</name>
- <string>44:44:44:44:44:44</string>
+ <string>10</string>
</property>
</widget>
- <widget row="4" column="0" rowspan="1" colspan="3" >
+ <widget row="1" column="2" >
<class>QCheckBox</class>
<property stdset="1">
<name>name</name>
- <cstring>activeScanning</cstring>
+ <cstring>channel7</cstring>
</property>
<property stdset="1">
- <name>enabled</name>
- <bool>false</bool>
+ <name>text</name>
+ <string>7</string>
+ </property>
+ </widget>
+ <widget row="0" column="3" >
+ <class>QCheckBox</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>channel3</cstring>
</property>
<property stdset="1">
<name>text</name>
- <string>Active Scanning (caution!)</string>
+ <string>3</string>
</property>
</widget>
- <widget row="10" column="0" rowspan="1" colspan="3" >
- <class>QLayoutWidget</class>
+ <widget row="1" column="0" >
+ <class>QCheckBox</class>
<property stdset="1">
<name>name</name>
- <cstring>Layout5</cstring>
+ <cstring>channel5</cstring>
</property>
- <grid>
<property stdset="1">
- <name>margin</name>
- <number>0</number>
+ <name>text</name>
+ <string>5</string>
</property>
+ </widget>
+ <widget row="0" column="4" >
+ <class>QCheckBox</class>
<property stdset="1">
- <name>spacing</name>
- <number>6</number>
+ <name>name</name>
+ <cstring>channel4</cstring>
</property>
- <widget row="0" column="1" >
- <class>QLabel</class>
+ <property stdset="1">
+ <name>text</name>
+ <string>4</string>
+ </property>
+ </widget>
+ <widget row="2" column="2" >
+ <class>QCheckBox</class>
<property stdset="1">
<name>name</name>
- <cstring>TextLabel1</cstring>
+ <cstring>channel12</cstring>
</property>
<property stdset="1">
<name>text</name>
- <string>sound on new net</string>
+ <string>12</string>
</property>
</widget>
- <widget row="1" column="0" >
+ <widget row="2" column="3" >
+ <class>QCheckBox</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>channel13</cstring>
+ </property>
+ <property stdset="1">
+ <name>text</name>
+ <string>13</string>
+ </property>
+ </widget>
+ <widget row="2" column="4" >
+ <class>QCheckBox</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>channel14</cstring>
+ </property>
+ <property stdset="1">
+ <name>text</name>
+ <string>14</string>
+ </property>
+ </widget>
+ </grid>
+ </widget>
+ <widget row="0" column="1" rowspan="1" colspan="3" >
<class>QComboBox</class>
- <item>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>interfaceName</cstring>
+ </property>
+ <property stdset="1">
+ <name>enabled</name>
+ <bool>true</bool>
+ </property>
<property>
- <name>text</name>
- <string>Ignore</string>
+ <name>whatsThis</name>
+ <string>Choose the interface used for sniffing.</string>
</property>
- </item>
+ </widget>
+ <widget row="1" column="1" rowspan="1" colspan="3" >
+ <class>QComboBox</class>
<item>
<property>
<name>text</name>
- <string>Touch</string>
+ <string>&lt;select&gt;</string>
</property>
</item>
<item>
<property>
<name>text</name>
- <string>Key</string>
+ <string>cisco</string>
</property>
</item>
<item>
<property>
<name>text</name>
- <string>Alarm</string>
+ <string>wlan-ng</string>
</property>
</item>
- <property stdset="1">
- <name>name</name>
- <cstring>beaconSound</cstring>
- </property>
- </widget>
- <widget row="0" column="0" >
- <class>QComboBox</class>
<item>
<property>
<name>text</name>
- <string>Ignore</string>
+ <string>hostap</string>
</property>
</item>
<item>
<property>
<name>text</name>
- <string>Touch</string>
+ <string>orinoco</string>
</property>
</item>
<item>
<property>
<name>text</name>
- <string>Key</string>
+ <string>&lt;manual&gt;</string>
</property>
</item>
<item>
<property>
<name>text</name>
- <string>Alarm</string>
+ <string>&lt;file&gt;</string>
</property>
</item>
<property stdset="1">
<name>name</name>
- <cstring>netSound</cstring>
+ <cstring>deviceType</cstring>
+ </property>
+ <property stdset="1">
+ <name>enabled</name>
+ <bool>true</bool>
+ </property>
+ <property>
+ <name>whatsThis</name>
+ <string>Choose the type of driver used for sniffing.</string>
</property>
</widget>
- <widget row="1" column="1" >
+ <widget row="4" column="2" >
<class>QLabel</class>
<property stdset="1">
<name>name</name>
- <cstring>TextLabel1_3</cstring>
+ <cstring>TextLabel1</cstring>
</property>
<property stdset="1">
<name>text</name>
- <string>sound on beacon</string>
+ <string>every</string>
</property>
</widget>
+ <spacer row="3" column="0" >
+ <property>
+ <name>name</name>
+ <cstring>Spacer4</cstring>
+ </property>
+ <property stdset="1">
+ <name>orientation</name>
+ <enum>Vertical</enum>
+ </property>
+ <property stdset="1">
+ <name>sizeType</name>
+ <enum>Expanding</enum>
+ </property>
+ <property>
+ <name>sizeHint</name>
+ <size>
+ <width>20</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
</grid>
</widget>
- <widget row="8" column="0" rowspan="1" colspan="3" >
- <class>QLayoutWidget</class>
+ <widget>
+ <class>QWidget</class>
<property stdset="1">
<name>name</name>
- <cstring>Layout7</cstring>
+ <cstring>tab</cstring>
</property>
- <hbox>
+ <attribute>
+ <name>title</name>
+ <string>Capture</string>
+ </attribute>
+ <grid>
<property stdset="1">
<name>margin</name>
- <number>0</number>
+ <number>5</number>
</property>
<property stdset="1">
<name>spacing</name>
- <number>6</number>
+ <number>3</number>
</property>
- <widget>
+ <widget row="2" column="0" rowspan="1" colspan="3" >
+ <class>ProtocolListView</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>capturePackets</cstring>
+ </property>
+ <property stdset="1">
+ <name>sizePolicy</name>
+ <sizepolicy>
+ <hsizetype>7</hsizetype>
+ <vsizetype>7</vsizetype>
+ </sizepolicy>
+ </property>
+ </widget>
+ <widget row="1" column="0" rowspan="1" colspan="3" >
+ <class>QLineEdit</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>captureFileName</cstring>
+ </property>
+ <property stdset="1">
+ <name>enabled</name>
+ <bool>false</bool>
+ </property>
+ </widget>
+ <widget row="0" column="2" >
+ <class>QToolButton</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>getCaptureFileName</cstring>
+ </property>
+ <property stdset="1">
+ <name>enabled</name>
+ <bool>false</bool>
+ </property>
+ <property stdset="1">
+ <name>text</name>
+ <string>Browse</string>
+ </property>
+ </widget>
+ <spacer row="0" column="1" >
+ <property>
+ <name>name</name>
+ <cstring>Spacer2</cstring>
+ </property>
+ <property stdset="1">
+ <name>orientation</name>
+ <enum>Horizontal</enum>
+ </property>
+ <property stdset="1">
+ <name>sizeType</name>
+ <enum>Expanding</enum>
+ </property>
+ <property>
+ <name>sizeHint</name>
+ <size>
+ <width>20</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ <widget row="0" column="0" >
<class>QCheckBox</class>
<property stdset="1">
<name>name</name>
@@ -400,154 +546,307 @@
</property>
<property stdset="1">
<name>text</name>
- <string>Write Capture File</string>
+ <string>Write Capture Files To</string>
</property>
</widget>
+ </grid>
+ </widget>
<widget>
- <class>QToolButton</class>
+ <class>QWidget</class>
<property stdset="1">
<name>name</name>
- <cstring>getCaptureFileName</cstring>
+ <cstring>tab</cstring>
</property>
+ <attribute>
+ <name>title</name>
+ <string>Parse</string>
+ </attribute>
+ <grid>
<property stdset="1">
- <name>enabled</name>
- <bool>false</bool>
+ <name>margin</name>
+ <number>5</number>
</property>
<property stdset="1">
- <name>text</name>
- <string>...</string>
+ <name>spacing</name>
+ <number>3</number>
+ </property>
+ <widget row="0" column="0" >
+ <class>ProtocolListView</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>parsePackets</cstring>
+ </property>
+ <property stdset="1">
+ <name>sizePolicy</name>
+ <sizepolicy>
+ <hsizetype>7</hsizetype>
+ <vsizetype>7</vsizetype>
+ </sizepolicy>
</property>
</widget>
- </hbox>
+ </grid>
</widget>
- <widget row="7" column="0" rowspan="1" colspan="3" >
- <class>QLayoutWidget</class>
+ <widget>
+ <class>QWidget</class>
<property stdset="1">
<name>name</name>
- <cstring>Layout6</cstring>
+ <cstring>tab</cstring>
</property>
- <property>
- <name>layoutSpacing</name>
+ <attribute>
+ <name>title</name>
+ <string>Intrusion</string>
+ </attribute>
+ <grid>
+ <property stdset="1">
+ <name>margin</name>
+ <number>11</number>
</property>
- <hbox>
+ <property stdset="1">
+ <name>spacing</name>
+ <number>6</number>
+ </property>
+ <widget row="1" column="0" >
+ <class>QGroupBox</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>GroupBox3</cstring>
+ </property>
+ <property stdset="1">
+ <name>enabled</name>
+ <bool>false</bool>
+ </property>
+ <property stdset="1">
+ <name>title</name>
+ <string>Link Level</string>
+ </property>
+ <grid>
<property stdset="1">
<name>margin</name>
- <number>0</number>
+ <number>11</number>
</property>
<property stdset="1">
<name>spacing</name>
- <number>2</number>
+ <number>6</number>
</property>
- <widget>
+ <widget row="0" column="0" >
<class>QLabel</class>
<property stdset="1">
<name>name</name>
- <cstring>TextLabel3_2_2</cstring>
+ <cstring>TextLabel1_5</cstring>
+ </property>
+ <property stdset="1">
+ <name>text</name>
+ <string>Fake Mac:</string>
+ </property>
+ </widget>
+ <widget row="1" column="0" rowspan="1" colspan="2" >
+ <class>QCheckBox</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>sendProbeRequests</cstring>
+ </property>
+ <property stdset="1">
+ <name>text</name>
+ <string>Send proble requests</string>
+ </property>
+ </widget>
+ <widget row="0" column="1" >
+ <class>QComboBox</class>
+ <item>
+ <property>
+ <name>text</name>
+ <string>&lt;automatic&gt;</string>
+ </property>
+ </item>
+ <item>
+ <property>
+ <name>text</name>
+ <string>44:44:44:44:44:44</string>
+ </property>
+ </item>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>fakeMac</cstring>
</property>
<property stdset="1">
<name>sizePolicy</name>
<sizepolicy>
- <hsizetype>4</hsizetype>
- <vsizetype>1</vsizetype>
+ <hsizetype>7</hsizetype>
+ <vsizetype>0</vsizetype>
</sizepolicy>
</property>
<property stdset="1">
- <name>text</name>
- <string>GUI</string>
+ <name>editable</name>
+ <bool>true</bool>
+ </property>
+ <property stdset="1">
+ <name>currentItem</name>
+ <number>1</number>
+ </property>
+ <property stdset="1">
+ <name>autoCompletion</name>
+ <bool>true</bool>
</property>
</widget>
- <widget>
- <class>Line</class>
+ <widget row="2" column="0" rowspan="1" colspan="2" >
+ <class>QCheckBox</class>
<property stdset="1">
<name>name</name>
- <cstring>Line9_2</cstring>
+ <cstring>tryToAuthenticate</cstring>
</property>
<property stdset="1">
- <name>orientation</name>
- <enum>Horizontal</enum>
+ <name>text</name>
+ <string>Try to authenticate</string>
</property>
</widget>
- </hbox>
+ </grid>
</widget>
- <spacer row="6" column="2" >
- <property>
+ <widget row="0" column="0" >
+ <class>QCheckBox</class>
+ <property stdset="1">
<name>name</name>
- <cstring>Spacer1</cstring>
+ <cstring>enableActiveScanning</cstring>
</property>
<property stdset="1">
- <name>orientation</name>
- <enum>Vertical</enum>
+ <name>enabled</name>
+ <bool>false</bool>
</property>
<property stdset="1">
- <name>sizeType</name>
- <enum>Expanding</enum>
- </property>
- <property>
- <name>sizeHint</name>
- <size>
- <width>20</width>
- <height>20</height>
- </size>
+ <name>text</name>
+ <string>Enable active scanning</string>
</property>
- </spacer>
- <widget row="9" column="0" rowspan="1" colspan="3" >
- <class>QLayoutWidget</class>
+ </widget>
+ <widget row="2" column="0" >
+ <class>QGroupBox</class>
<property stdset="1">
<name>name</name>
- <cstring>Layout7</cstring>
+ <cstring>GroupBox4</cstring>
+ </property>
+ <property stdset="1">
+ <name>enabled</name>
+ <bool>false</bool>
+ </property>
+ <property stdset="1">
+ <name>title</name>
+ <string>IP Level</string>
</property>
- <hbox>
+ <grid>
<property stdset="1">
<name>margin</name>
- <number>0</number>
+ <number>11</number>
</property>
<property stdset="1">
<name>spacing</name>
<number>6</number>
</property>
- <widget>
+ <widget row="1" column="0" rowspan="1" colspan="2" >
+ <class>QCheckBox</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>CheckBox24</cstring>
+ </property>
+ <property stdset="1">
+ <name>text</name>
+ <string>Request DHCP Address</string>
+ </property>
+ </widget>
+ <widget row="0" column="0" >
<class>QLabel</class>
<property stdset="1">
<name>name</name>
- <cstring>TextLabel1_4</cstring>
+ <cstring>TextLabel1_5_2</cstring>
</property>
<property stdset="1">
<name>text</name>
- <string>CaptureFile:</string>
+ <string>Fake IP:</string>
</property>
</widget>
- <widget>
- <class>QLineEdit</class>
+ <widget row="0" column="1" >
+ <class>QComboBox</class>
+ <item>
+ <property>
+ <name>text</name>
+ <string>192.168.125.1</string>
+ </property>
+ </item>
+ <item>
+ <property>
+ <name>text</name>
+ <string>&lt;automatic&gt;</string>
+ </property>
+ </item>
<property stdset="1">
<name>name</name>
- <cstring>captureFileName</cstring>
+ <cstring>fakeIP</cstring>
</property>
<property stdset="1">
- <name>enabled</name>
- <bool>false</bool>
+ <name>sizePolicy</name>
+ <sizepolicy>
+ <hsizetype>7</hsizetype>
+ <vsizetype>0</vsizetype>
+ </sizepolicy>
+ </property>
+ <property stdset="1">
+ <name>editable</name>
+ <bool>true</bool>
+ </property>
+ <property stdset="1">
+ <name>currentItem</name>
+ <number>0</number>
</property>
</widget>
- </hbox>
+ </grid>
</widget>
</grid>
</widget>
+ </widget>
+ </grid>
+</widget>
+<customwidgets>
+ <customwidget>
+ <class>ProtocolListView</class>
+ <header location="local">protolistview.h</header>
+ <sizehint>
+ <width>100</width>
+ <height>100</height>
+ </sizehint>
+ <container>0</container>
+ <sizepolicy>
+ <hordata>3</hordata>
+ <verdata>3</verdata>
+ </sizepolicy>
+ <pixmap>image0</pixmap>
+ </customwidget>
+</customwidgets>
+<images>
+ <image>
+ <name>image0</name>
+ <data format="XPM.GZ" length="646">789c6dd2c10ac2300c00d07bbf2234b7229d1be245fc04c5a3201e4615f430059d0711ff5ddb2e6bb236ec90eed134cb5a19d8ef36602af5ecdbfeeac05dda0798d3abebde87e3faa374d3807fa0d633a52d38d8de6f679fe33fc776e196f53cd010188256a3600a292882096246517815ca99884606e18044a3a40d91824820924265a7923a2e8bcd05f33db1173e002913175f2a6be6d3294871a2d95fa00e8a94ee017b69d339d90df1e77c57ea072ede6758</data>
+ </image>
+</images>
<connections>
<connection>
- <sender>writeCaptureFile</sender>
+ <sender>hopChannels</sender>
+ <signal>toggled(bool)</signal>
+ <receiver>hopInterval</receiver>
+ <slot>setEnabled(bool)</slot>
+ </connection>
+ <connection>
+ <sender>hopChannels</sender>
<signal>toggled(bool)</signal>
- <receiver>getCaptureFileName</receiver>
+ <receiver>TextLabel1</receiver>
<slot>setEnabled(bool)</slot>
</connection>
<connection>
- <sender>activeScanning</sender>
+ <sender>enableActiveScanning</sender>
<signal>toggled(bool)</signal>
- <receiver>MAC</receiver>
+ <receiver>GroupBox3</receiver>
<slot>setEnabled(bool)</slot>
</connection>
<connection>
- <sender>writeCaptureFile</sender>
+ <sender>enableActiveScanning</sender>
<signal>toggled(bool)</signal>
- <receiver>captureFileName</receiver>
+ <receiver>GroupBox4</receiver>
<slot>setEnabled(bool)</slot>
</connection>
</connections>
diff --git a/noncore/net/wellenreiter/gui/configbasenew.ui b/noncore/net/wellenreiter/gui/configbasenew.ui
deleted file mode 100644
index 1307f00..0000000
--- a/noncore/net/wellenreiter/gui/configbasenew.ui
+++ b/dev/null
@@ -1,814 +0,0 @@
-<!DOCTYPE UI><UI>
-<class>Form1</class>
-<widget>
- <class>QDialog</class>
- <property stdset="1">
- <name>name</name>
- <cstring>Form1</cstring>
- </property>
- <property stdset="1">
- <name>geometry</name>
- <rect>
- <x>0</x>
- <y>0</y>
- <width>280</width>
- <height>382</height>
- </rect>
- </property>
- <property stdset="1">
- <name>caption</name>
- <string>Form1</string>
- </property>
- <property>
- <name>layoutMargin</name>
- </property>
- <property>
- <name>layoutSpacing</name>
- </property>
- <grid>
- <property stdset="1">
- <name>margin</name>
- <number>5</number>
- </property>
- <property stdset="1">
- <name>spacing</name>
- <number>3</number>
- </property>
- <widget row="0" column="0" >
- <class>QTabWidget</class>
- <property stdset="1">
- <name>name</name>
- <cstring>interface</cstring>
- </property>
- <property>
- <name>layoutMargin</name>
- </property>
- <property>
- <name>layoutSpacing</name>
- </property>
- <widget>
- <class>QWidget</class>
- <property stdset="1">
- <name>name</name>
- <cstring>tab</cstring>
- </property>
- <attribute>
- <name>title</name>
- <string>Interface</string>
- </attribute>
- <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>QLabel</class>
- <property stdset="1">
- <name>name</name>
- <cstring>TextLabel1_2</cstring>
- </property>
- <property stdset="1">
- <name>enabled</name>
- <bool>true</bool>
- </property>
- <property stdset="1">
- <name>text</name>
- <string>Name:</string>
- </property>
- </widget>
- <widget row="0" column="1" rowspan="1" colspan="2" >
- <class>QComboBox</class>
- <property stdset="1">
- <name>name</name>
- <cstring>name</cstring>
- </property>
- <property stdset="1">
- <name>enabled</name>
- <bool>true</bool>
- </property>
- <property>
- <name>whatsThis</name>
- <string>Choose the interface used for sniffing.</string>
- </property>
- </widget>
- <widget row="1" column="0" >
- <class>QLabel</class>
- <property stdset="1">
- <name>name</name>
- <cstring>TextLabel2_3</cstring>
- </property>
- <property stdset="1">
- <name>enabled</name>
- <bool>true</bool>
- </property>
- <property stdset="1">
- <name>text</name>
- <string>Driver:</string>
- </property>
- </widget>
- <widget row="1" column="1" rowspan="1" colspan="2" >
- <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>
- <item>
- <property>
- <name>text</name>
- <string>wlan-ng</string>
- </property>
- </item>
- <item>
- <property>
- <name>text</name>
- <string>hostap</string>
- </property>
- </item>
- <item>
- <property>
- <name>text</name>
- <string>orinoco</string>
- </property>
- </item>
- <item>
- <property>
- <name>text</name>
- <string>&lt;manual&gt;</string>
- </property>
- </item>
- <item>
- <property>
- <name>text</name>
- <string>&lt;file&gt;</string>
- </property>
- </item>
- <property stdset="1">
- <name>name</name>
- <cstring>driver</cstring>
- </property>
- <property stdset="1">
- <name>enabled</name>
- <bool>true</bool>
- </property>
- <property>
- <name>whatsThis</name>
- <string>Choose the type of driver used for sniffing.</string>
- </property>
- </widget>
- <widget row="4" column="0" >
- <class>QCheckBox</class>
- <property stdset="1">
- <name>name</name>
- <cstring>CheckBox18</cstring>
- </property>
- <property stdset="1">
- <name>text</name>
- <string>Hop Channels</string>
- </property>
- <property stdset="1">
- <name>checked</name>
- <bool>true</bool>
- </property>
- </widget>
- <widget row="4" column="1" >
- <class>QLabel</class>
- <property stdset="1">
- <name>name</name>
- <cstring>TextLabel1</cstring>
- </property>
- <property stdset="1">
- <name>text</name>
- <string>every</string>
- </property>
- </widget>
- <widget row="4" column="2" >
- <class>QSpinBox</class>
- <property stdset="1">
- <name>name</name>
- <cstring>hopInterval</cstring>
- </property>
- <property stdset="1">
- <name>enabled</name>
- <bool>true</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>
- <property stdset="1">
- <name>value</name>
- <number>1000</number>
- </property>
- <property>
- <name>whatsThis</name>
- <string>Choose the channel hop interval.</string>
- </property>
- </widget>
- <widget row="5" column="0" rowspan="1" colspan="3" >
- <class>QGroupBox</class>
- <property stdset="1">
- <name>name</name>
- <cstring>GroupBox1</cstring>
- </property>
- <property stdset="1">
- <name>title</name>
- <string>Scan on channel</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="1" column="1" >
- <class>QCheckBox</class>
- <property stdset="1">
- <name>name</name>
- <cstring>channel6</cstring>
- </property>
- <property stdset="1">
- <name>text</name>
- <string>6</string>
- </property>
- </widget>
- <widget row="1" column="3" >
- <class>QCheckBox</class>
- <property stdset="1">
- <name>name</name>
- <cstring>channel8</cstring>
- </property>
- <property stdset="1">
- <name>text</name>
- <string>8</string>
- </property>
- </widget>
- <widget row="0" column="2" >
- <class>QCheckBox</class>
- <property stdset="1">
- <name>name</name>
- <cstring>channel2</cstring>
- </property>
- <property stdset="1">
- <name>text</name>
- <string>2</string>
- </property>
- </widget>
- <widget row="1" column="4" >
- <class>QCheckBox</class>
- <property stdset="1">
- <name>name</name>
- <cstring>channel9</cstring>
- </property>
- <property stdset="1">
- <name>text</name>
- <string>9</string>
- </property>
- </widget>
- <widget row="0" column="1" >
- <class>QCheckBox</class>
- <property stdset="1">
- <name>name</name>
- <cstring>channel1</cstring>
- </property>
- <property stdset="1">
- <name>text</name>
- <string>1</string>
- </property>
- </widget>
- <widget row="0" column="0" >
- <class>QCheckBox</class>
- <property stdset="1">
- <name>name</name>
- <cstring>channelAll</cstring>
- </property>
- <property stdset="1">
- <name>text</name>
- <string>All</string>
- </property>
- </widget>
- <widget row="2" column="1" >
- <class>QCheckBox</class>
- <property stdset="1">
- <name>name</name>
- <cstring>channel11</cstring>
- </property>
- <property stdset="1">
- <name>text</name>
- <string>11</string>
- </property>
- </widget>
- <widget row="2" column="0" >
- <class>QCheckBox</class>
- <property stdset="1">
- <name>name</name>
- <cstring>channel10</cstring>
- </property>
- <property stdset="1">
- <name>text</name>
- <string>10</string>
- </property>
- </widget>
- <widget row="1" column="2" >
- <class>QCheckBox</class>
- <property stdset="1">
- <name>name</name>
- <cstring>channel7</cstring>
- </property>
- <property stdset="1">
- <name>text</name>
- <string>7</string>
- </property>
- </widget>
- <widget row="0" column="3" >
- <class>QCheckBox</class>
- <property stdset="1">
- <name>name</name>
- <cstring>channel3</cstring>
- </property>
- <property stdset="1">
- <name>text</name>
- <string>3</string>
- </property>
- </widget>
- <widget row="1" column="0" >
- <class>QCheckBox</class>
- <property stdset="1">
- <name>name</name>
- <cstring>channel5</cstring>
- </property>
- <property stdset="1">
- <name>text</name>
- <string>5</string>
- </property>
- </widget>
- <widget row="0" column="4" >
- <class>QCheckBox</class>
- <property stdset="1">
- <name>name</name>
- <cstring>channel4</cstring>
- </property>
- <property stdset="1">
- <name>text</name>
- <string>4</string>
- </property>
- </widget>
- <widget row="2" column="2" >
- <class>QCheckBox</class>
- <property stdset="1">
- <name>name</name>
- <cstring>channel12</cstring>
- </property>
- <property stdset="1">
- <name>text</name>
- <string>12</string>
- </property>
- </widget>
- <widget row="2" column="3" >
- <class>QCheckBox</class>
- <property stdset="1">
- <name>name</name>
- <cstring>channel13</cstring>
- </property>
- <property stdset="1">
- <name>text</name>
- <string>13</string>
- </property>
- </widget>
- <widget row="2" column="4" >
- <class>QCheckBox</class>
- <property stdset="1">
- <name>name</name>
- <cstring>channel14</cstring>
- </property>
- <property stdset="1">
- <name>text</name>
- <string>14</string>
- </property>
- </widget>
- </grid>
- </widget>
- <spacer row="3" column="0" >
- <property>
- <name>name</name>
- <cstring>Spacer4</cstring>
- </property>
- <property stdset="1">
- <name>orientation</name>
- <enum>Vertical</enum>
- </property>
- <property stdset="1">
- <name>sizeType</name>
- <enum>Expanding</enum>
- </property>
- <property>
- <name>sizeHint</name>
- <size>
- <width>20</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- <widget row="2" column="0" rowspan="1" colspan="3" >
- <class>QCheckBox</class>
- <property stdset="1">
- <name>name</name>
- <cstring>usePrismHeader</cstring>
- </property>
- <property stdset="1">
- <name>text</name>
- <string>Use additional PRISM header</string>
- </property>
- </widget>
- </grid>
- </widget>
- <widget>
- <class>QWidget</class>
- <property stdset="1">
- <name>name</name>
- <cstring>tab</cstring>
- </property>
- <attribute>
- <name>title</name>
- <string>Capture</string>
- </attribute>
- <grid>
- <property stdset="1">
- <name>margin</name>
- <number>5</number>
- </property>
- <property stdset="1">
- <name>spacing</name>
- <number>3</number>
- </property>
- <widget row="2" column="0" rowspan="1" colspan="2" >
- <class>ProtocolListView</class>
- <property stdset="1">
- <name>name</name>
- <cstring>MyCustomWidget1</cstring>
- </property>
- <property stdset="1">
- <name>sizePolicy</name>
- <sizepolicy>
- <hsizetype>7</hsizetype>
- <vsizetype>7</vsizetype>
- </sizepolicy>
- </property>
- </widget>
- <widget row="0" column="0" >
- <class>QCheckBox</class>
- <property stdset="1">
- <name>name</name>
- <cstring>writeCaptureFile</cstring>
- </property>
- <property stdset="1">
- <name>enabled</name>
- <bool>true</bool>
- </property>
- <property stdset="1">
- <name>text</name>
- <string>Write Capture Files To</string>
- </property>
- </widget>
- <widget row="0" column="1" >
- <class>QToolButton</class>
- <property stdset="1">
- <name>name</name>
- <cstring>getCaptureFileName</cstring>
- </property>
- <property stdset="1">
- <name>enabled</name>
- <bool>false</bool>
- </property>
- <property stdset="1">
- <name>text</name>
- <string>...</string>
- </property>
- </widget>
- <widget row="1" column="0" rowspan="1" colspan="2" >
- <class>QLineEdit</class>
- <property stdset="1">
- <name>name</name>
- <cstring>captureFileName</cstring>
- </property>
- <property stdset="1">
- <name>enabled</name>
- <bool>false</bool>
- </property>
- </widget>
- </grid>
- </widget>
- <widget>
- <class>QWidget</class>
- <property stdset="1">
- <name>name</name>
- <cstring>tab</cstring>
- </property>
- <attribute>
- <name>title</name>
- <string>Parse</string>
- </attribute>
- <grid>
- <property stdset="1">
- <name>margin</name>
- <number>5</number>
- </property>
- <property stdset="1">
- <name>spacing</name>
- <number>3</number>
- </property>
- <widget row="0" column="0" >
- <class>ProtocolListView</class>
- <property stdset="1">
- <name>name</name>
- <cstring>parsePackets</cstring>
- </property>
- <property stdset="1">
- <name>sizePolicy</name>
- <sizepolicy>
- <hsizetype>7</hsizetype>
- <vsizetype>7</vsizetype>
- </sizepolicy>
- </property>
- </widget>
- </grid>
- </widget>
- <widget>
- <class>QWidget</class>
- <property stdset="1">
- <name>name</name>
- <cstring>tab</cstring>
- </property>
- <attribute>
- <name>title</name>
- <string>Intrusion</string>
- </attribute>
- <grid>
- <property stdset="1">
- <name>margin</name>
- <number>11</number>
- </property>
- <property stdset="1">
- <name>spacing</name>
- <number>6</number>
- </property>
- <widget row="1" column="0" >
- <class>QGroupBox</class>
- <property stdset="1">
- <name>name</name>
- <cstring>GroupBox3</cstring>
- </property>
- <property stdset="1">
- <name>enabled</name>
- <bool>false</bool>
- </property>
- <property stdset="1">
- <name>title</name>
- <string>Link Level</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>QLabel</class>
- <property stdset="1">
- <name>name</name>
- <cstring>TextLabel1_5</cstring>
- </property>
- <property stdset="1">
- <name>text</name>
- <string>Fake Mac:</string>
- </property>
- </widget>
- <widget row="1" column="0" rowspan="1" colspan="2" >
- <class>QCheckBox</class>
- <property stdset="1">
- <name>name</name>
- <cstring>sendProbeRequests</cstring>
- </property>
- <property stdset="1">
- <name>text</name>
- <string>Send proble requests</string>
- </property>
- </widget>
- <widget row="0" column="1" >
- <class>QComboBox</class>
- <item>
- <property>
- <name>text</name>
- <string>44:44:44:44:44:44</string>
- </property>
- </item>
- <item>
- <property>
- <name>text</name>
- <string>&lt;automatic&gt;</string>
- </property>
- </item>
- <property stdset="1">
- <name>name</name>
- <cstring>fakeMac</cstring>
- </property>
- <property stdset="1">
- <name>sizePolicy</name>
- <sizepolicy>
- <hsizetype>7</hsizetype>
- <vsizetype>0</vsizetype>
- </sizepolicy>
- </property>
- <property stdset="1">
- <name>editable</name>
- <bool>true</bool>
- </property>
- <property stdset="1">
- <name>autoCompletion</name>
- <bool>true</bool>
- </property>
- </widget>
- <widget row="2" column="0" rowspan="1" colspan="2" >
- <class>QCheckBox</class>
- <property stdset="1">
- <name>name</name>
- <cstring>tryToAuthenticate</cstring>
- </property>
- <property stdset="1">
- <name>text</name>
- <string>Try to authenticate</string>
- </property>
- </widget>
- </grid>
- </widget>
- <widget row="0" column="0" >
- <class>QCheckBox</class>
- <property stdset="1">
- <name>name</name>
- <cstring>enableActiveScanning</cstring>
- </property>
- <property stdset="1">
- <name>enabled</name>
- <bool>false</bool>
- </property>
- <property stdset="1">
- <name>text</name>
- <string>Enable active scanning</string>
- </property>
- </widget>
- <widget row="2" column="0" >
- <class>QGroupBox</class>
- <property stdset="1">
- <name>name</name>
- <cstring>GroupBox4</cstring>
- </property>
- <property stdset="1">
- <name>enabled</name>
- <bool>false</bool>
- </property>
- <property stdset="1">
- <name>title</name>
- <string>IP Level</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="1" column="0" rowspan="1" colspan="2" >
- <class>QCheckBox</class>
- <property stdset="1">
- <name>name</name>
- <cstring>CheckBox24</cstring>
- </property>
- <property stdset="1">
- <name>text</name>
- <string>Request DHCP Address</string>
- </property>
- </widget>
- <widget row="0" column="0" >
- <class>QLabel</class>
- <property stdset="1">
- <name>name</name>
- <cstring>TextLabel1_5_2</cstring>
- </property>
- <property stdset="1">
- <name>text</name>
- <string>Fake IP:</string>
- </property>
- </widget>
- <widget row="0" column="1" >
- <class>QComboBox</class>
- <item>
- <property>
- <name>text</name>
- <string>192.168.125.1</string>
- </property>
- </item>
- <item>
- <property>
- <name>text</name>
- <string>&lt;automatic&gt;</string>
- </property>
- </item>
- <property stdset="1">
- <name>name</name>
- <cstring>ComboBox10</cstring>
- </property>
- <property stdset="1">
- <name>sizePolicy</name>
- <sizepolicy>
- <hsizetype>7</hsizetype>
- <vsizetype>0</vsizetype>
- </sizepolicy>
- </property>
- </widget>
- </grid>
- </widget>
- </grid>
- </widget>
- </widget>
- </grid>
-</widget>
-<customwidgets>
- <customwidget>
- <class>ProtocolListView</class>
- <header location="local">protolistview.h</header>
- <sizehint>
- <width>100</width>
- <height>100</height>
- </sizehint>
- <container>0</container>
- <sizepolicy>
- <hordata>3</hordata>
- <verdata>3</verdata>
- </sizepolicy>
- <pixmap>image0</pixmap>
- </customwidget>
-</customwidgets>
-<images>
- <image>
- <name>image0</name>
- <data format="XPM.GZ" length="646">789c6dd2c10ac2300c00d07bbf2234b7229d1be245fc04c5a3201e4615f430059d0711ff5ddb2e6bb236ec90eed134cb5a19d8ef36602af5ecdbfeeac05dda0798d3abebde87e3faa374d3807fa0d633a52d38d8de6f679fe33fc776e196f53cd010188256a3600a292882096246517815ca99884606e18044a3a40d91824820924265a7923a2e8bcd05f33db1173e002913175f2a6be6d3294871a2d95fa00e8a94ee017b69d339d90df1e77c57ea072ede6758</data>
- </image>
-</images>
-<connections>
- <connection>
- <sender>CheckBox18</sender>
- <signal>toggled(bool)</signal>
- <receiver>hopInterval</receiver>
- <slot>setEnabled(bool)</slot>
- </connection>
- <connection>
- <sender>CheckBox18</sender>
- <signal>toggled(bool)</signal>
- <receiver>TextLabel1</receiver>
- <slot>setEnabled(bool)</slot>
- </connection>
- <connection>
- <sender>enableActiveScanning</sender>
- <signal>toggled(bool)</signal>
- <receiver>GroupBox3</receiver>
- <slot>setEnabled(bool)</slot>
- </connection>
- <connection>
- <sender>enableActiveScanning</sender>
- <signal>toggled(bool)</signal>
- <receiver>GroupBox4</receiver>
- <slot>setEnabled(bool)</slot>
- </connection>
-</connections>
-</UI>
diff --git a/noncore/net/wellenreiter/gui/configwindow.cpp b/noncore/net/wellenreiter/gui/configwindow.cpp
deleted file mode 100644
index 92715b4..0000000
--- a/noncore/net/wellenreiter/gui/configwindow.cpp
+++ b/dev/null
@@ -1,146 +0,0 @@
-/**********************************************************************
-** Copyright (C) 2002 Michael 'Mickey' Lauer. All rights reserved.
-**
-** This file is part of Opie Environment.
-**
-** This file may be distributed and/or modified under the terms of the
-** GNU General Public License version 2 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-**********************************************************************/
-
-/* LOCAL */
-#include "configwindow.h"
-#include "mainwindow.h"
-
-/* QT */
-#include <qapplication.h>
-#include <qcombobox.h>
-#include <qfile.h>
-#include <qlineedit.h>
-#include <qlayout.h>
-#include <qmap.h>
-#include <qpushbutton.h>
-#include <qtoolbutton.h>
-#include <qspinbox.h>
-#include <qtextstream.h>
-
-/* OPIE */
-#include <opie2/onetwork.h>
-
-WellenreiterConfigWindow* WellenreiterConfigWindow::_instance = 0;
-
-WellenreiterConfigWindow::WellenreiterConfigWindow( QWidget * parent, const char * name, WFlags f )
- :WellenreiterConfigBase( parent, name, true, f )
-{
- _devicetype[ "cisco" ] = DEVTYPE_CISCO;
- _devicetype[ "wlan-ng" ] = DEVTYPE_WLAN_NG;
- _devicetype[ "hostap" ] = DEVTYPE_HOSTAP;
- _devicetype[ "orinoco" ] = DEVTYPE_ORINOCO;
- _devicetype[ "<manual>" ] = DEVTYPE_MANUAL;
- _devicetype[ "<file>" ] = DEVTYPE_FILE;
-
- // gather possible interface names from ONetwork
- ONetwork* net = ONetwork::instance();
- ONetwork::InterfaceIterator it = net->iterator();
- while ( it.current() )
- {
- if ( it.current()->isWireless() )
- interfaceName->insertItem( it.current()->name() );
- ++it;
- }
-
- // try to guess device type
- QFile m( "/proc/modules" );
- if ( m.open( IO_ReadOnly ) )
- {
- int devicetype(0);
- QString line;
- QTextStream modules( &m );
- while( !modules.atEnd() && !devicetype )
- {
- modules >> line;
- if ( line.contains( "cisco" ) ) devicetype = DEVTYPE_CISCO;
- else if ( line.contains( "hostap" ) ) devicetype = DEVTYPE_HOSTAP;
- else if ( line.contains( "prism" ) ) devicetype = DEVTYPE_WLAN_NG;
- else if ( line.contains( "orinoco" ) ) devicetype = DEVTYPE_ORINOCO;
- }
- if ( devicetype )
- {
- deviceType->setCurrentItem( devicetype );
- _guess = devicetype;
- qDebug( "Wellenreiter: guessed device type to be #%d", devicetype );
- }
- }
-
- #ifdef Q_WS_X11 // We're on X11: adding an Ok-Button for the Dialog here
- QPushButton* okButton = new QPushButton( "ok", this );
- okButton->show();
- Layout5_2->addWidget( okButton, 0, 3 ); //FIXME: rename this in configbase.ui
- connect( okButton, SIGNAL( clicked() ), this, SLOT( accept() ) );
- #endif
-
- WellenreiterConfigWindow::_instance = this;
-
- connect( deviceType, SIGNAL( activated(int) ), this, SLOT( changedDeviceType(int) ) );
- connect( getCaptureFileName, SIGNAL( clicked() ), this, SLOT( getCaptureFileNameClicked() ) );
-};
-
-
-int WellenreiterConfigWindow::daemonDeviceType()
-{
- QString name = deviceType->currentText();
- if ( _devicetype.contains( name ) )
- {
- return _devicetype[name];
- }
- else
- {
- return 0;
- }
-};
-
-
-int WellenreiterConfigWindow::daemonHopInterval()
-{
- return hopInterval->cleanText().toInt();
-}
-
-
-void WellenreiterConfigWindow::changedDeviceType(int t)
-{
- if ( t != DEVTYPE_FILE ) return;
- QString name = ( (WellenreiterMainWindow*) qApp->mainWidget() )->getFileName(false);
- if ( !name.isEmpty() && QFile::exists( name ) )
- {
- interfaceName->insertItem( name );
- interfaceName->setCurrentItem( interfaceName->count()-1 );
- }
- else
- {
- deviceType->setCurrentItem( _guess );
- }
-
-}
-
-
-void WellenreiterConfigWindow::getCaptureFileNameClicked()
-{
- QString name = ( (WellenreiterMainWindow*) qApp->mainWidget() )->getFileName(true);
- qDebug( "name = %s", (const char*) name );
- if ( !name.isEmpty() )
- {
- captureFileName->setText( name );
- }
-}
-
-
-bool WellenreiterConfigWindow::usePrismHeader()
-{
- return true;
- //return interface->usePrismHeader();
-}
diff --git a/noncore/net/wellenreiter/gui/configwindow.h b/noncore/net/wellenreiter/gui/configwindow.h
deleted file mode 100644
index 11ae5b8..0000000
--- a/noncore/net/wellenreiter/gui/configwindow.h
+++ b/dev/null
@@ -1,59 +0,0 @@
-/**********************************************************************
-** Copyright (C) 2002 Michael 'Mickey' Lauer. All rights reserved.
-**
-** This file is part of Opie Environment.
-**
-** This file may be distributed and/or modified under the terms of the
-** GNU General Public License version 2 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-**********************************************************************/
-
-#ifndef WELLENREITERCONFIGWINDOW_H
-#define WELLENREITERCONFIGWINDOW_H
-
-#include "configbase.h"
-#include <qmap.h>
-#include <qcombobox.h>
-#include <qstring.h>
-
-const int DEVTYPE_SELECT = 0;
-const int DEVTYPE_CISCO = 1;
-const int DEVTYPE_WLAN_NG = 2;
-const int DEVTYPE_HOSTAP = 3;
-const int DEVTYPE_ORINOCO = 4;
-const int DEVTYPE_MANUAL = 5;
-const int DEVTYPE_FILE = 6;
-
-class WellenreiterConfigWindow;
-
-class WellenreiterConfigWindow : public WellenreiterConfigBase
-{
- Q_OBJECT
-
- public:
- WellenreiterConfigWindow( QWidget * parent = 0, const char * name = "WellenreiterConfigWindow", WFlags f = 0 );
- int daemonDeviceType();
- int daemonHopInterval();
- const QString soundOnNetwork() const { return netSound->currentText(); };
- const QString soundOnBeacon() const { return beaconSound->currentText(); };
- static WellenreiterConfigWindow* instance() { return _instance; };
-
- bool usePrismHeader();
-
- public slots:
- void changedDeviceType(int);
- void getCaptureFileNameClicked();
-
- protected:
- QMap<QString, int> _devicetype;
- static WellenreiterConfigWindow* _instance;
- int _guess;
-
-};
-
-#endif
diff --git a/noncore/net/wellenreiter/gui/graphwindow.cpp b/noncore/net/wellenreiter/gui/graphwindow.cpp
index c620fe2..7e1f378 100644
--- a/noncore/net/wellenreiter/gui/graphwindow.cpp
+++ b/noncore/net/wellenreiter/gui/graphwindow.cpp
@@ -47,13 +47,13 @@ void MFrequencySpectrum::drawLine( QPainter* p, int x, int y, int width, const Q
void MFrequencySpectrum::drawBar( QPainter* p, int x, int y, int width, int height, int maxheight )
{
-/* int h1 = 133; int h2 = 0;
+ int h1 = 133; int h2 = 0;
int s1 = 200; int s2 = 255;
- int v1 = 140; int v2 = 255; */
+ int v1 = 140; int v2 = 255;
- int h1 = 196; int h2 = 194;
+ /*int h1 = 196; int h2 = 194;
int s1 = 85; int s2 = 15;
- int v1 = 95; int v2 = 237;
+ int v1 = 95; int v2 = 237;*/
QColor c( 120, 60, 200 );
for ( int i = 0; i < height; ++i )
@@ -125,7 +125,7 @@ MGraphWindow::MGraphWindow( QWidget* parent, const char* name, WFlags f )
{
spectrum = new MFrequencySpectrum( 14, this );
legende = new Legende( 14, this );
- startTimer( 50 );
+ startTimer( 50 ); //FIXME: tweak
//testGraph();
@@ -146,7 +146,7 @@ void MGraphWindow::timerEvent( QTimerEvent* e )
{
for ( int i = 0; i < 14; i++ )
{
- spectrum->decrease( i, 4 );
+ spectrum->decrease( i, 1 ); //TODO: make this customizable?
}
spectrum->repaint();
}
diff --git a/noncore/net/wellenreiter/gui/gui.pro b/noncore/net/wellenreiter/gui/gui.pro
index a11698f..2c4c6c3 100644
--- a/noncore/net/wellenreiter/gui/gui.pro
+++ b/noncore/net/wellenreiter/gui/gui.pro
@@ -13,7 +13,8 @@ HEADERS = wellenreiterbase.h \
statwindow.h \
configwindow.h \
manufacturers.h \
- graphwindow.h
+ graphwindow.h \
+ protolistview.h
SOURCES = main.cpp \
mainwindow.cpp \
@@ -25,11 +26,12 @@ SOURCES = main.cpp \
statwindow.cpp \
configwindow.cpp \
manufacturers.cpp \
- graphwindow.cpp
+ graphwindow.cpp \
+ protolistview.cpp
INCLUDEPATH += $(OPIEDIR)/include
DEPENDPATH += $(OPIEDIR)/include
-INTERFACES = configbase.ui #configbasenew.ui
+INTERFACES = configbase.ui
TARGET = wellenreiter
!contains( platform, x11 ) {
diff --git a/noncore/net/wellenreiter/gui/mainwindow.cpp b/noncore/net/wellenreiter/gui/mainwindow.cpp
index 773d825..39f5978 100644
--- a/noncore/net/wellenreiter/gui/mainwindow.cpp
+++ b/noncore/net/wellenreiter/gui/mainwindow.cpp
@@ -181,8 +181,7 @@ void WellenreiterMainWindow::showConfigure()
void WellenreiterMainWindow::updateToolButtonState()
{
const QString& interface = cw->interfaceName->currentText();
- const int cardtype = cw->daemonDeviceType();
- const int interval = cw->daemonHopInterval();
+ const int cardtype = cw->driverType();
if ( ( interface != "<select>" ) && ( cardtype != 0 ) )
{
diff --git a/noncore/net/wellenreiter/gui/protolistview.cpp b/noncore/net/wellenreiter/gui/protolistview.cpp
index e69de29..8b86072 100644
--- a/noncore/net/wellenreiter/gui/protolistview.cpp
+++ b/noncore/net/wellenreiter/gui/protolistview.cpp
@@ -0,0 +1,95 @@
+/**********************************************************************
+** Copyright (C) 2002 Michael 'Mickey' Lauer. All rights reserved.
+**
+** This file is part of Opie Environment.
+**
+** This file may be distributed and/or modified under the terms of the
+** GNU General Public License version 2 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.
+**
+** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+**
+**********************************************************************/
+
+/* LOCAL */
+#include "protolistview.h"
+
+#include <qcheckbox.h>
+#include <qcombobox.h>
+#include <qhbox.h>
+#include <qvbox.h>
+#include <qpalette.h>
+#include <qcolor.h>
+#include <qlabel.h>
+#include <qframe.h>
+
+ProtocolListView::ProtocolListView( QWidget* parent, const char* name, WFlags f )
+ :QScrollView( parent, name, f )
+{
+ actions = ( QString( "parsePackets" ) == QString( name ) );
+
+ setMargins( 3, 3, 0, 0 );
+ viewport()->setBackgroundColor( QCheckBox(0).palette().color( QPalette::Active, QColorGroup::Background ) );
+
+ vbox = new QVBox( viewport() );
+ vbox->setSpacing( 1 );
+ addChild( vbox );
+
+ QHBox* hbox = new QHBox( vbox );
+ hbox->setSpacing( 40 );
+ new QLabel( tr( "Protocol Family" ), hbox );
+ if ( actions ) new QLabel( tr( "Perform Action" ), hbox );
+ QFrame* frame = new QFrame( vbox );
+ frame->setFrameStyle( QFrame::HLine + QFrame::Sunken );
+
+ //TODO: hardcoded for now...a protocol database would be nice!?
+
+ //addProtocol( "Ethernet" );
+ addProtocol( "Prism" );
+ //addProtocol( "802.11" );
+ addProtocol( "802.11 Management" );
+ addProtocol( "802.11 SSID" );
+ addProtocol( "802.11 Rates" );
+ addProtocol( "802.11 CF" );
+ addProtocol( "802.11 FH" );
+ addProtocol( "802.11 DS" );
+ addProtocol( "802.11 Tim" );
+ addProtocol( "802.11 IBSS" );
+ addProtocol( "802.11 Challenge" );
+ addProtocol( "802.11 Data" );
+ addProtocol( "802.11 LLC" );
+ addProtocol( "802.11 Data" );
+ addProtocol( "IP" );
+ addProtocol( "ARP" );
+ addProtocol( "UDP" );
+ addProtocol( "TCP" );
+}
+
+
+ProtocolListView::~ProtocolListView()
+{
+}
+
+
+void ProtocolListView::addProtocol( const QString& name )
+{
+ QHBox* hbox = new QHBox( vbox );
+ new QCheckBox( name, hbox, (const char*) name );
+
+ if ( actions )
+ {
+ QComboBox* combo = new QComboBox( hbox, (const char*) name );
+ #ifdef QWS
+ combo->setFixedWidth( 75 );
+ #endif
+ combo->insertItem( "Ignore" );
+ combo->insertItem( "TouchSound" );
+ combo->insertItem( "AlarmSound" );
+ combo->insertItem( "KeySound" );
+ combo->insertItem( "LedOn" );
+ combo->insertItem( "LedOff" );
+ }
+}
+
diff --git a/noncore/net/wellenreiter/gui/protolistview.h b/noncore/net/wellenreiter/gui/protolistview.h
index e69de29..42aec7d 100644
--- a/noncore/net/wellenreiter/gui/protolistview.h
+++ b/noncore/net/wellenreiter/gui/protolistview.h
@@ -0,0 +1,44 @@
+/**********************************************************************
+** Copyright (C) 2002 Michael 'Mickey' Lauer. All rights reserved.
+**
+** This file is part of Opie Environment.
+**
+** This file may be distributed and/or modified under the terms of the
+** GNU General Public License version 2 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.
+**
+** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+**
+**********************************************************************/
+
+#ifndef PROTOLISTVIEW_H
+#define PROTOLISTVIEW_H
+
+#include <qscrollview.h>
+#include <qdict.h>
+//#include <qcheckbox.h>
+//#include <qcombobox.h>
+class QCheckBox;
+class QComboBox;
+
+class QVBox;
+
+class ProtocolListView : public QScrollView
+{
+ public:
+ ProtocolListView( QWidget* parent = 0, const char* name = 0, WFlags f = 0 );
+ virtual ~ProtocolListView();
+
+ protected:
+ virtual void addProtocol( const QString& name );
+
+ private:
+ QVBox* vbox;
+ bool actions;
+};
+
+
+
+#endif // PROTOLISTVIEW_H
diff --git a/noncore/net/wellenreiter/gui/wellenreiter.cpp b/noncore/net/wellenreiter/gui/wellenreiter.cpp
index 705aab6..2f3d093 100644
--- a/noncore/net/wellenreiter/gui/wellenreiter.cpp
+++ b/noncore/net/wellenreiter/gui/wellenreiter.cpp
@@ -314,8 +314,8 @@ void Wellenreiter::startClicked()
// get configuration from config window
const QString& interface = configwindow->interfaceName->currentText();
- const int cardtype = configwindow->daemonDeviceType();
- const int interval = configwindow->daemonHopInterval();
+ const int cardtype = configwindow->driverType();
+ const int interval = configwindow->hoppingInterval();
if ( ( interface == "" ) || ( cardtype == 0 ) )
{