- use OManufacturerDB instead of ManufacturerDB

- misc fixes

10 files changed, 199 insertions, 820 deletions

diff --git a/noncore/net/wellenreiter/gui/configbase.ui b/noncore/net/wellenreiter/gui/configbase.ui
index 590ca92..554fc29 100644
--- a/noncore/net/wellenreiter/gui/configbase.ui
+++ b/noncore/net/wellenreiter/gui/configbase.ui
@@ -1,898 +1,1037 @@
 <!DOCTYPE UI><UI>
 <class>WellenreiterConfigBase</class>
 <widget>
     <class>QDialog</class>
     <property stdset="1">
         <name>name</name>
         <cstring>WellenreiterConfigBase</cstring>
     </property>
     <property stdset="1">
         <name>geometry</name>
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>261</width>
-            <height>280</height>
+            <width>230</width>
+            <height>287</height>
         </rect>
     </property>
     <property stdset="1">
         <name>caption</name>
         <string>Wellenreiter II COnfiguration Dialog</string>
     </property>
     <property>
         <name>layoutMargin</name>
     </property>
     <property>
         <name>layoutSpacing</name>
     </property>
     <grid>
         <property stdset="1">
             <name>margin</name>
             <number>2</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>tab</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>5</number>
                     </property>
                     <property stdset="1">
                         <name>spacing</name>
                         <number>3</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="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="2"  column="0"  rowspan="1"  colspan="4" >
                         <class>QCheckBox</class>
                         <property stdset="1">
                             <name>name</name>
                             <cstring>prismHeader</cstring>
                         </property>
                         <property stdset="1">
                             <name>text</name>
                             <string>Use additional PRISM header</string>
                         </property>
                     </widget>
                     <widget row="6"  column="0"  rowspan="1"  colspan="4" >
                         <class>QGroupBox</class>
                         <property stdset="1">
                             <name>name</name>
                             <cstring>GroupBox1</cstring>
                         </property>
                         <property stdset="1">
                             <name>enabled</name>
                             <bool>false</bool>
                         </property>
                         <property stdset="1">
                             <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>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>
                     <widget row="0"  column="1"  rowspan="1"  colspan="3" >
                         <class>QComboBox</class>
                         <property stdset="1">
                             <name>name</name>
                             <cstring>interfaceName</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="1"  rowspan="1"  colspan="3" >
                         <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>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>
                     <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="4"  column="2" >
                         <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="0"  rowspan="1"  colspan="2" >
                         <class>QCheckBox</class>
                         <property stdset="1">
                             <name>name</name>
                             <cstring>hopChannels</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="3" >
                         <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="4" >
                         <class>QCheckBox</class>
                         <property stdset="1">
                             <name>name</name>
                             <cstring>adaptiveHopping</cstring>
                         </property>
                         <property stdset="1">
                             <name>enabled</name>
                             <bool>false</bool>
                         </property>
                         <property stdset="1">
                             <name>text</name>
                             <string>Use Adaptive(TM) Hop Scheme</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="3" >
                         <class>ProtocolListView</class>
                         <property stdset="1">
                             <name>name</name>
                             <cstring>capturePackets</cstring>
                         </property>
                         <property stdset="1">
                             <name>enabled</name>
                             <bool>false</bool>
                         </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>
                         <property stdset="1">
                             <name>text</name>
                             <string>/tmp/capture</string>
                         </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>
                             <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>
                 </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>UI</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="3"  column="0" >
+                        <class>QGroupBox</class>
+                        <property stdset="1">
+                            <name>name</name>
+                            <cstring>GroupBox4_2</cstring>
+                        </property>
+                        <property stdset="1">
+                            <name>title</name>
+                            <string>Action On Detecting</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" >
+                                <class>QLabel</class>
+                                <property stdset="1">
+                                    <name>name</name>
+                                    <cstring>TextLabel2</cstring>
+                                </property>
+                                <property stdset="1">
+                                    <name>text</name>
+                                    <string>New Wireless Station</string>
+                                </property>
+                            </widget>
+                            <widget row="0"  column="0" >
+                                <class>QLabel</class>
+                                <property stdset="1">
+                                    <name>name</name>
+                                    <cstring>TextLabel1_3</cstring>
+                                </property>
+                                <property stdset="1">
+                                    <name>text</name>
+                                    <string>New Network</string>
+                                </property>
+                            </widget>
+                            <widget row="0"  column="1" >
+                                <class>QComboBox</class>
+                                <property stdset="1">
+                                    <name>name</name>
+                                    <cstring>newNetwork</cstring>
+                                </property>
+                            </widget>
+                            <widget row="1"  column="1" >
+                                <class>QComboBox</class>
+                                <property stdset="1">
+                                    <name>name</name>
+                                    <cstring>newWirelessStation</cstring>
+                                </property>
+                            </widget>
+                            <widget row="2"  column="1" >
+                                <class>QComboBox</class>
+                                <property stdset="1">
+                                    <name>name</name>
+                                    <cstring>newStation</cstring>
+                                </property>
+                            </widget>
+                            <widget row="2"  column="0" >
+                                <class>QLabel</class>
+                                <property stdset="1">
+                                    <name>name</name>
+                                    <cstring>TextLabel3</cstring>
+                                </property>
+                                <property stdset="1">
+                                    <name>text</name>
+                                    <string>New Station</string>
+                                </property>
+                            </widget>
+                        </grid>
+                    </widget>
+                    <spacer row="2"  column="0" >
+                        <property>
+                            <name>name</name>
+                            <cstring>Spacer3</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="0"  column="0" >
+                        <class>QCheckBox</class>
+                        <property stdset="1">
+                            <name>name</name>
+                            <cstring>lookupVendor</cstring>
+                        </property>
+                        <property stdset="1">
+                            <name>text</name>
+                            <string>Lookup MAC vendor names</string>
+                        </property>
+                    </widget>
+                    <widget row="1"  column="0" >
+                        <class>QCheckBox</class>
+                        <property stdset="1">
+                            <name>name</name>
+                            <cstring>openTree</cstring>
+                        </property>
+                        <property stdset="1">
+                            <name>text</name>
+                            <string>Open Tree On New Station</string>
+                        </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>&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>7</hsizetype>
                                         <vsizetype>0</vsizetype>
                                     </sizepolicy>
                                 </property>
                                 <property stdset="1">
                                     <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 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>fakeIP</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>currentItem</name>
                                     <number>0</number>
                                 </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>hopChannels</sender>
         <signal>toggled(bool)</signal>
         <receiver>hopInterval</receiver>
         <slot>setEnabled(bool)</slot>
     </connection>
     <connection>
         <sender>hopChannels</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>
     <connection>
         <sender>writeCaptureFile</sender>
         <signal>toggled(bool)</signal>
         <receiver>getCaptureFileName</receiver>
         <slot>setEnabled(bool)</slot>
     </connection>
     <connection>
         <sender>writeCaptureFile</sender>
         <signal>toggled(bool)</signal>
         <receiver>captureFileName</receiver>
         <slot>setEnabled(bool)</slot>
     </connection>
     <connection>
         <sender>writeCaptureFile</sender>
         <signal>toggled(bool)</signal>
         <receiver>capturePackets</receiver>
         <slot>setEnabled(bool)</slot>
     </connection>
 </connections>
 </UI>
diff --git a/noncore/net/wellenreiter/gui/gui.pro b/noncore/net/wellenreiter/gui/gui.pro
index 2c4c6c3..ee239a3 100644
--- a/noncore/net/wellenreiter/gui/gui.pro
+++ b/noncore/net/wellenreiter/gui/gui.pro
@@ -1,67 +1,65 @@
 MOC_DIR         = ./tmp
 OBJECTS_DIR     = ./tmp
 DESTDIR         = $(OPIEDIR)/bin
 TEMPLATE        = app
 CONFIG          = qt warn_on debug
 
 HEADERS         = wellenreiterbase.h \
                   mainwindow.h \
                   wellenreiter.h \
                   scanlist.h \
                   logwindow.h \
                   hexwindow.h \
                   statwindow.h \
                   configwindow.h \
-                  manufacturers.h \
                   graphwindow.h \
                   protolistview.h
 
 SOURCES         = main.cpp \
                   mainwindow.cpp \
                   wellenreiterbase.cpp \
                   wellenreiter.cpp \
                   scanlist.cpp \
                   logwindow.cpp \
                   hexwindow.cpp \
                   statwindow.cpp \
                   configwindow.cpp \
-                  manufacturers.cpp \
                   graphwindow.cpp \
                   protolistview.cpp
 
 INCLUDEPATH     += $(OPIEDIR)/include
 DEPENDPATH      += $(OPIEDIR)/include
 INTERFACES      = configbase.ui
 TARGET          = wellenreiter
 
 !contains( platform, x11 ) {
   message( qws )
   include ( $(OPIEDIR)/include.pro )
   LIBS += -lqpe -lopie -lopiecore2 -lopieui2 -lopienet2 -lstdc++
 }
 
 contains( platform, x11 ) {
   LIBS += -L$(OPIEDIR)/output/lib -Wl,-rpath,$(OPIEDIR)/output/lib -Wl,-rpath,/usr/local/lib -lwellenreiter
   SOURCES += resource.cpp
   HEADERS += resource.h
   DESTDIR = $(OPIEDIR)/output/bin
 }
 
 TRANSLATIONS  = ../../../../i18n/de/wellenreiter.ts \
                 ../../../../i18n/nl/wellenreiter.ts \
                 ../../../../i18n/da/wellenreiter.ts \
                 ../../../../i18n/xx/wellenreiter.ts \
                 ../../../../i18n/en/wellenreiter.ts \
                 ../../../../i18n/es/wellenreiter.ts \
                 ../../../../i18n/fr/wellenreiter.ts \
                 ../../../../i18n/hu/wellenreiter.ts \
                 ../../../../i18n/ja/wellenreiter.ts \
                 ../../../../i18n/ko/wellenreiter.ts \
                 ../../../../i18n/no/wellenreiter.ts \
                 ../../../../i18n/pl/wellenreiter.ts \
                 ../../../../i18n/pt/wellenreiter.ts \
                 ../../../../i18n/pt_BR/wellenreiter.ts \
                 ../../../../i18n/sl/wellenreiter.ts \
                 ../../../../i18n/zh_CN/wellenreiter.ts \
                 ../../../../i18n/zh_TW/wellenreiter.ts
 
diff --git a/noncore/net/wellenreiter/gui/mainwindow.cpp b/noncore/net/wellenreiter/gui/mainwindow.cpp
index 3e36f5b..27ecae3 100644
--- a/noncore/net/wellenreiter/gui/mainwindow.cpp
+++ b/noncore/net/wellenreiter/gui/mainwindow.cpp
@@ -1,366 +1,366 @@
 /**********************************************************************
 ** 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.
 **
 **********************************************************************/
 
 #include "configwindow.h"
 #include "logwindow.h"
 #include "hexwindow.h"
 #include "mainwindow.h"
 #include "wellenreiter.h"
 #include "scanlist.h"
 
 #include <qcombobox.h>
 #include <qdatastream.h>
 #include <qfile.h>
 #include <qfileinfo.h>
 #include <qiconset.h>
 #include <qmenubar.h>
 #include <qmessagebox.h>
 #include <qpopupmenu.h>
 #include <qstatusbar.h>
 #include <qtextstream.h>
 #include <qtoolbutton.h>
 
 #ifdef QWS
 #include <qpe/resource.h>
 #include <opie/ofiledialog.h>
 #else
 #include "resource.h"
 #include <qapplication.h>
 #include <qfiledialog.h>
 #endif
 
 WellenreiterMainWindow::WellenreiterMainWindow( QWidget * parent, const char * name, WFlags f )
            :QMainWindow( parent, name, f )
 {
     cw = new WellenreiterConfigWindow( this );
     mw = new Wellenreiter( this );
     mw->setConfigWindow( cw );
     setCentralWidget( mw );
 
     // setup application icon
 
     #ifndef QWS
     setIcon( Resource::loadPixmap( "wellenreiter/appicon-trans" ) );
     setIconText( "Wellenreiter/X11" );
     #endif
 
     // setup icon sets
 
     infoIconSet = new QIconSet( Resource::loadPixmap( "wellenreiter/InfoIcon" ) );
     settingsIconSet = new QIconSet( Resource::loadPixmap( "wellenreiter/SettingsIcon" ) );
     startIconSet = new QIconSet( Resource::loadPixmap( "wellenreiter/SearchIcon" ) );
     stopIconSet = new QIconSet( Resource::loadPixmap( "wellenreiter/CancelIcon" ) );
 
     // setup tool buttons
 
     startButton = new QToolButton( 0 );
     #ifdef QWS
     startButton->setAutoRaise( true );
     #endif
     startButton->setIconSet( *startIconSet );
     startButton->setEnabled( false );
     connect( startButton, SIGNAL( clicked() ), mw, SLOT( startClicked() ) );
 
     stopButton = new QToolButton( 0 );
     #ifdef QWS
     stopButton->setAutoRaise( true );
     #endif
     stopButton->setIconSet( *stopIconSet );
     stopButton->setEnabled( false );
     connect( stopButton, SIGNAL( clicked() ), mw, SLOT( stopClicked() ) );
 
     QToolButton* c = new QToolButton( 0 );
     #ifdef QWS
     c->setAutoRaise( true );
     #endif
     c->setIconSet( *infoIconSet );
     c->setEnabled( false );
 
     QToolButton* d = new QToolButton( 0 );
     #ifdef QWS
     d->setAutoRaise( true );
     #endif
     d->setIconSet( *settingsIconSet );
     connect( d, SIGNAL( clicked() ), this, SLOT( showConfigure() ) );
 
     // setup menu bar
 
     int id;
 
     QMenuBar* mb = menuBar();
 
     QPopupMenu* fileSave = new QPopupMenu( mb );
     fileSave->insertItem( tr( "&Session..." ), this, SLOT( fileSaveSession() ) );
     fileSave->insertItem( tr( "&Text Log..." ), this, SLOT( fileSaveLog() ) );
     fileSave->insertItem( tr( "&Hex Log..." ), this, SLOT( fileSaveHex() ) );
 
     QPopupMenu* fileLoad = new QPopupMenu( mb );
     fileLoad->insertItem( tr( "&Session..." ), this, SLOT( fileLoadSession() ) );
     //fileLoad->insertItem( "&Log", this, SLOT( fileLoadLog() ) );
 
     QPopupMenu* file = new QPopupMenu( mb );
     file->insertItem( tr( "&New" ), this, SLOT( fileNew() ) );
     id = file->insertItem( tr( "&Load" ), fileLoad );
     file->insertItem( tr( "&Save" ), fileSave );
     file->insertSeparator();
     file->insertItem( tr( "&Exit" ), qApp, SLOT( quit() ) );
 
     QPopupMenu* view = new QPopupMenu( mb );
     view->insertItem( tr( "&Configure..." ) );
 
     QPopupMenu* sniffer = new QPopupMenu( mb );
     sniffer->insertItem( tr( "&Configure..." ), this, SLOT( showConfigure() ) );
     sniffer->insertSeparator();
     startID = sniffer->insertItem( tr( "&Start" ), mw, SLOT( startClicked() ) );
     sniffer->setItemEnabled( startID, false );
     stopID = sniffer->insertItem( tr( "Sto&p" ), mw, SLOT( stopClicked() ) );
     sniffer->setItemEnabled( stopID, false );
 
     QPopupMenu* demo = new QPopupMenu( mb );
     demo->insertItem( tr( "&Add something" ), this, SLOT( demoAddStations() ) );
 
     id = mb->insertItem( tr( "&File" ), file );
     //id = mb->insertItem( tr( "&View" ), view );
     //mb->setItemEnabled( id, false );
     id = mb->insertItem( tr( "&Sniffer" ), sniffer );
 
     id = mb->insertItem( tr( "&Demo" ), demo );
     mb->setItemEnabled( id, true );
 
     #ifdef QWS
     mb->insertItem( startButton );
     mb->insertItem( stopButton );
     mb->insertItem( c );
     mb->insertItem( d );
     #else // Qt3 changed the insertion order. It's now totally random :(
     mb->insertItem( d );
     mb->insertItem( c );
     mb->insertItem( stopButton );
     mb->insertItem( startButton );
     #endif
 
     updateToolButtonState();
 
     // setup status bar (for now only on X11)
 
     #ifndef QWS
     statusBar()->message( tr( "Ready." ) );
     #endif
 
     connect( mw, SIGNAL( startedSniffing() ), this, SLOT( changedSniffingState() ) );
     connect( mw, SIGNAL( stoppedSniffing() ), this, SLOT( changedSniffingState() ) );
 };
 
 
 
 void WellenreiterMainWindow::showConfigure()
 {
     qDebug( "show configure..." );
     cw->setCaption( tr( "Configure" ) );
     #ifdef QWS
     cw->showMaximized();
     #endif
     int result = cw->exec();
 
     if ( result ) updateToolButtonState();
 }
 
 
 
 void WellenreiterMainWindow::updateToolButtonState()
 {
     const QString& interface = cw->interfaceName->currentText();
     const int cardtype = cw->driverType();
 
     if ( ( interface != "<select>" ) && ( cardtype != 0 ) )
     {
         startButton->setEnabled( true );
         menuBar()->setItemEnabled( startID, true );
     }
     else
     {
         startButton->setEnabled( false );
         menuBar()->setItemEnabled( startID, false );
     }
 }
 
 
 void WellenreiterMainWindow::changedSniffingState()
 {
     startButton->setEnabled( !mw->sniffing );
     menuBar()->setItemEnabled( startID, !mw->sniffing );
     stopButton->setEnabled( mw->sniffing );
     menuBar()->setItemEnabled( stopID, mw->sniffing );
 }
 
 
 WellenreiterMainWindow::~WellenreiterMainWindow()
 {
     delete infoIconSet;
     delete settingsIconSet;
     delete startIconSet;
     delete stopIconSet;
 };
 
 void WellenreiterMainWindow::demoAddStations()
 {
-    mw = 0;
+    //mw = 0; // test SIGSGV handling
 
-    mw->netView()->addNewItem( "managed", "Vanille", "00:00:20:EF:A6:43", true, 6, 80 );
-    mw->netView()->addNewItem( "managed", "Vanille", "00:30:6D:EF:A6:23", true, 11, 10 );
-    mw->netView()->addNewItem( "adhoc", "ELAN", "00:A0:F8:E7:16:22", false, 3, 10 );
-    mw->netView()->addNewItem( "adhoc", "ELAN", "00:AA:01:E7:56:62", false, 3, 15 );
-    mw->netView()->addNewItem( "adhoc", "ELAN", "00:B0:8E:E7:56:E2", false, 3, 20 );
+    mw->netView()->addNewItem( "managed", "Vanille", OMacAddress::fromString("00:00:20:EF:A6:43"), true, 6, 80 );
+    mw->netView()->addNewItem( "managed", "Vanille", OMacAddress::fromString("00:30:6D:EF:A6:23"), true, 11, 10 );
+    mw->netView()->addNewItem( "adhoc", "ELAN", OMacAddress::fromString("00:A0:F8:E7:16:22"), false, 3, 10 );
+    mw->netView()->addNewItem( "adhoc", "ELAN", OMacAddress::fromString("00:AA:01:E7:56:62"), false, 3, 15 );
+    mw->netView()->addNewItem( "adhoc", "ELAN", OMacAddress::fromString("00:B0:8E:E7:56:E2"), false, 3, 20 );
 }
 
 
 QString WellenreiterMainWindow::getFileName( bool save )
 {
     QMap<QString, QStringList> map;
     map.insert( tr("All"), QStringList() );
     QStringList text;
     text << "text/*";
     map.insert( tr("Text"), text );
     text << "*";
     map.insert( tr("All"), text );
 
     QString str;
     if ( save )
     {
         #ifdef QWS
         str = OFileDialog::getSaveFileName( 2, "/", QString::null, map );
         #else
         str = QFileDialog::getSaveFileName();
         #endif
         if ( str.isEmpty() /*|| QFileInfo(str).isDir()*/ )
             return "";
     }
     else
     {
         #ifdef QWS
         str = OFileDialog::getOpenFileName( 2, "/", QString::null, map );
         #else
         str = QFileDialog::getOpenFileName();
         #endif
         if ( str.isEmpty() || !QFile(str).exists() || QFileInfo(str).isDir() )
             return "";
     }
     return str;
 }
 
 
 void WellenreiterMainWindow::fileSaveLog()
 {
     QString fname = getFileName( true );
     if ( !fname.isEmpty() )
     {
         QFile f( fname );
         if ( f.open(IO_WriteOnly) )
         {
             QTextStream t( &f );
             t << mw->logWindow()->getLog();
             f.close();
             qDebug( "Saved log to file '%s'", (const char*) fname );
         }
         else
         {
             qDebug( "Problem saving log to file '%s'", (const char*) fname );
         }
     }
 }
 
 void WellenreiterMainWindow::fileSaveSession()
 {
     QString fname = getFileName( true );
     if ( !fname.isEmpty() )
     {
 
         QFile f( fname );
         if ( f.open(IO_WriteOnly) )
         {
             QDataStream t( &f );
             t << *mw->netView();
             f.close();
             qDebug( "Saved session to file '%s'", (const char*) fname );
         }
         else
         {
             qDebug( "Problem saving session to file '%s'", (const char*) fname );
         }
     }
 }
 
 void WellenreiterMainWindow::fileSaveHex()
 {
     QString fname = getFileName( true );
     if ( !fname.isEmpty() )
     {
         QFile f( fname );
         if ( f.open(IO_WriteOnly) )
         {
             QTextStream t( &f );
             t << mw->hexWindow()->getLog();
             f.close();
             qDebug( "Saved hex log to file '%s'", (const char*) fname );
         }
         else
         {
             qDebug( "Problem saving hex log to file '%s'", (const char*) fname );
         }
     }
 }
 
 void WellenreiterMainWindow::fileLoadSession()
 {
     QString fname = getFileName( false );
     if ( !fname.isEmpty() )
     {
         QFile f( fname );
         if ( f.open(IO_ReadOnly) )
         {
             QDataStream t( &f );
             t >> *mw->netView();
             f.close();
             qDebug( "Loaded session from file '%s'", (const char*) fname );
         }
         else
         {
             qDebug( "Problem loading session from file '%s'", (const char*) fname );
         }
     }
 }
 
 void WellenreiterMainWindow::fileNew()
 {
     mw->netView()->clear();
     mw->logWindow()->clear();
     mw->hexWindow()->clear();
 }
 
 void WellenreiterMainWindow::closeEvent( QCloseEvent* e )
 {
     if ( mw->isDaemonRunning() )
     {
         QMessageBox::warning( this, "Wellenreiter/Opie",
                               tr( "Sniffing in progress!\nPlease stop sniffing before closing." ) );
         e->ignore();
     }
     else
     {
         QMainWindow::closeEvent( e );
     }
 }
 
 
diff --git a/noncore/net/wellenreiter/gui/manufacturers.cpp b/noncore/net/wellenreiter/gui/manufacturers.cpp
deleted file mode 100644
index f9f8967..0000000
--- a/noncore/net/wellenreiter/gui/manufacturers.cpp
+++ b/dev/null
@@ -1,60 +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.
-**
-**********************************************************************/
-
-#include "manufacturers.h"
-
-// Qt
-#include <qstring.h>
-#include <qfile.h>
-#include <qtextstream.h>
-
-ManufacturerDB::ManufacturerDB( const QString& filename )
-{
-    QFile file( filename );
-    bool hasFile = file.open( IO_ReadOnly );
-    if (!hasFile)
-    {
-        qDebug( "ManufacturerDB: D'oh! Manufacturer list '%s' not found!", (const char*) filename );
-    }
-    else
-    {
-        qDebug( "ManufacturerDB: reading manufacturer list from '%s'...", (const char*) filename );
-        QTextStream s( &file );
-        QString addr;
-        QString manu;
-
-        while (!s.atEnd())
-        {
-            s >> addr;
-            s.skipWhiteSpace();
-            manu = s.readLine();
-            #ifdef DEBUG
-            //qDebug( "ManufacturerDB: read pair %s, %s", (const char*) addr, (const char*) manu );
-            #endif
-            manufacturers.insert( addr, manu );
-
-        }
-    }
-
-}
-
-ManufacturerDB::~ManufacturerDB()
-{
-}
-
-const QString& ManufacturerDB::lookup( const QString& macaddr ) const
-{
-    return manufacturers[macaddr.upper().left(8)];
-}
diff --git a/noncore/net/wellenreiter/gui/manufacturers.h b/noncore/net/wellenreiter/gui/manufacturers.h
deleted file mode 100644
index 75728b1..0000000
--- a/noncore/net/wellenreiter/gui/manufacturers.h
+++ b/dev/null
@@ -1,36 +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 MANUFACTURERS_H
-#define MANUFACTURERS_H
-
-#include <qmap.h>
-
-class ManufacturerDB
-{
-  public:
-  
-    ManufacturerDB( const QString& filename );
-    virtual ~ManufacturerDB();
-    const QString& lookup( const QString& macaddr ) const;
-    
-  private:
-  
-    QMap<QString, QString> manufacturers;
-
-};
-
-#endif
-
diff --git a/noncore/net/wellenreiter/gui/scanlist.cpp b/noncore/net/wellenreiter/gui/scanlist.cpp
index d5665b4..809d0bd 100644
--- a/noncore/net/wellenreiter/gui/scanlist.cpp
+++ b/noncore/net/wellenreiter/gui/scanlist.cpp
@@ -1,456 +1,455 @@
 /**********************************************************************
 ** 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.
 **
 **********************************************************************/
 
 #include "scanlist.h"
 #include "configwindow.h"
 #include "logwindow.h"
 
 #include <assert.h>
-#include "manufacturers.h"
 #include <qdatetime.h>
 #include <qtextstream.h>
 
 #ifdef QWS
 #include <opie/odevice.h>
 using namespace Opie;
 #endif
 
 
 #ifdef QWS
 #include <qpe/resource.h>
 #else
 #include "resource.h"
 #endif
 
 const int col_type = 0;
 const int col_essid = 0;
 const int col_sig = 1;
 const int col_ap = 2;
 const int col_channel = 3;
 const int col_wep = 4;
 const int col_traffic = 5;
 const int col_ip = 6;
 const int col_manuf = 7;
 const int col_firstseen = 8;
 const int col_lastseen = 9;
 
 MScanListView::MScanListView( QWidget* parent, const char* name )
-              :OListView( parent, name ), _manufacturerdb( 0 )
+              :OListView( parent, name )
 {
 
     setFrameShape( QListView::StyledPanel );
     setFrameShadow( QListView::Sunken );
 
     addColumn( tr( "Net/Station" ) );
     setColumnAlignment( col_essid, AlignLeft || AlignVCenter );
     addColumn( tr( "#" ) );
     setColumnAlignment( col_sig, AlignCenter );
     addColumn( tr( "MAC" ) );
     setColumnAlignment( col_ap, AlignCenter );
     addColumn( tr( "Chn" ) );
     setColumnAlignment( col_channel, AlignCenter );
     addColumn( tr( "W" ) );
     setColumnAlignment( col_wep, AlignCenter );
     addColumn( tr( "T" ) );
     setColumnAlignment( col_traffic, AlignCenter );
     addColumn( tr( "IP" ) );
     setColumnAlignment( col_ip, AlignCenter );
     addColumn( tr( "Manufacturer" ) );
     setColumnAlignment( col_manuf, AlignCenter );
     addColumn( tr( "First Seen" ) );
     setColumnAlignment( col_firstseen, AlignCenter );
     addColumn( tr( "Last Seen" ) );
     setColumnAlignment( col_lastseen, AlignCenter );
     setRootIsDecorated( true );
     setAllColumnsShowFocus( true );
 };
 
+
 MScanListView::~MScanListView()
 {
 };
 
+
 OListViewItem* MScanListView::childFactory()
 {
     return new MScanListItem( this );
 }
 
+
 void MScanListView::serializeTo( QDataStream& s) const
 {
     qDebug( "serializing MScanListView" );
     OListView::serializeTo( s );
 }
 
+
 void MScanListView::serializeFrom( QDataStream& s)
 {
     qDebug( "serializing MScanListView" );
     OListView::serializeFrom( s );
 }
 
-void MScanListView::setManufacturerDB( ManufacturerDB* manufacturerdb )
-{
-    _manufacturerdb = manufacturerdb;
-}
 
-void MScanListView::addNewItem( QString type, QString essid, QString macaddr, bool wep, int channel, int signal )
+void MScanListView::addNewItem( const QString& type, const QString& essid, const OMacAddress& mac, bool wep, int channel, int signal )
 {
-    // FIXME: scanlistitem needs a proper encapsulation and not such a damn dealing with text(...)
+    QString macaddr = mac.toString(true);
 
     #ifdef DEBUG
     qDebug( "MScanList::addNewItem( %s / %s / %s [%d]", (const char*) type,
             (const char*) essid, (const char*) macaddr, channel );
     #endif
 
     // search, if we already have seen this net
 
     QString s;
     MScanListItem* network;
     MScanListItem* item = static_cast<MScanListItem*> ( firstChild() );
 
     while ( item && ( item->text( col_essid ) != essid ) )
     {
         #ifdef DEBUG
         qDebug( "itemtext: %s", (const char*) item->text( col_essid ) );
         #endif
         item = static_cast<MScanListItem*> ( item->nextSibling() );
     }
     if ( item )
     {
         // we have already seen this net, check all childs if MAC exists
 
         network = item;
 
         item = static_cast<MScanListItem*> ( item->firstChild() );
         assert( item ); // this shouldn't fail
 
         while ( item && ( item->text( col_ap ) != macaddr ) )
         {
             #ifdef DEBUG
             qDebug( "subitemtext: %s", (const char*) item->text( col_ap ) );
             #endif
             item = static_cast<MScanListItem*> ( item->nextSibling() );
         }
 
         if ( item )
         {
             // we have already seen this item, it's a dupe
             #ifdef DEBUG
             qDebug( "%s is a dupe - ignoring...", (const char*) macaddr );
             #endif
             item->receivedBeacon();
             return;
         }
     }
     else
     {
         s.sprintf( "(i) New network: ESSID '%s'", (const char*) essid );
         MLogWindow::logwindow()->log( s );
         network = new MScanListItem( this, "network", essid, QString::null, 0, 0, 0 );
     }
 
 
     // insert new station as child from network
     // no essid to reduce clutter, maybe later we have a nick or stationname to display!?
 
     #ifdef DEBUG
     qDebug( "inserting new station %s", (const char*) macaddr );
     #endif
 
     MScanListItem* station = new MScanListItem( network, type, "", macaddr, wep, channel, signal );
-    if ( _manufacturerdb )
-        station->setManufacturer( _manufacturerdb->lookup( macaddr ) );
+    station->setManufacturer( mac.manufacturer() );
 
     if ( type == "managed" )
     {
         s.sprintf( "(i) New Access Point in '%s' [%d]", (const char*) essid, channel );
     }
     else
     {
         s.sprintf( "(i) New AdHoc station in '%s' [%d]", (const char*) essid, channel );
     }
     MLogWindow::logwindow()->log( s );
 
 }
 
 
-void MScanListView::addIfNotExisting( MScanListItem* network, QString addr, const QString& type )
+void MScanListView::addIfNotExisting( MScanListItem* network, const OMacAddress& addr, const QString& type )
 {
     MScanListItem* subitem = static_cast<MScanListItem*>( network->firstChild() );
 
-    while ( subitem && ( subitem->text( col_ap ) != addr ) )
+    while ( subitem && ( subitem->text( col_ap ) != addr.toString(true) ) )
     {
         #ifdef DEBUG
         qDebug( "subitemtext: %s", (const char*) subitem->text( col_ap ) );
         #endif
         subitem = static_cast<MScanListItem*> ( subitem->nextSibling() );
     }
 
     if ( subitem )
     {
         // we have already seen this item, it's a dupe
         #ifdef DEBUG
-        qDebug( "%s is a dupe - ignoring...", (const char*) addr );
+        qDebug( "%s is a dupe - ignoring...", (const char*) addr.toString(true) );
         #endif
         subitem->receivedBeacon(); //FIXME: sent data bit
         return;
     }
 
     // Hey, it seems to be a new item :-D
-    MScanListItem* station = new MScanListItem( network, type, /* network->text( col_essid ) */ "", addr, false, -1, -1 );
-    if ( _manufacturerdb )
-    station->setManufacturer( _manufacturerdb->lookup( addr ) );
+    MScanListItem* station = new MScanListItem( network, type, /* network->text( col_essid ) */ "", addr.toString(true), false, -1, -1 );
+    station->setManufacturer( addr.manufacturer() );
 
     QString s;
     if ( type == "station" )
     {
         s.sprintf( "(i) New Station in '%s' [xx]", (const char*) network->text( col_essid ) );
     }
     else
     {
         s.sprintf( "(i) New Wireless Station in '%s' [xx]", (const char*) network->text( col_essid ) );
     }
     MLogWindow::logwindow()->log( s );
 }
 
 
-void MScanListView::WDStraffic( QString from, QString to, QString viaFrom, QString viaTo )
+void MScanListView::WDStraffic( const OMacAddress& from, const OMacAddress& to, const OMacAddress& viaFrom, const OMacAddress& viaTo )
 {
     QString s;
     MScanListItem* network;
 
     QListViewItemIterator it( this );
     while ( it.current() &&
-            it.current()->text( col_ap ) != viaFrom &&
-            it.current()->text( col_ap ) != viaTo ) ++it;
+            it.current()->text( col_ap ) != viaFrom.toString(true) &&
+            it.current()->text( col_ap ) != viaTo.toString(true) ) ++it;
 
     MScanListItem* item = static_cast<MScanListItem*>( it.current() );
 
     if ( item ) // Either viaFrom or viaTo AP has shown up yet, so just add our two new stations
     {
         addIfNotExisting( static_cast<MScanListItem*>(item->parent()), from );
         addIfNotExisting( static_cast<MScanListItem*>(item->parent()), to );
     }
     else
     {
         qDebug( "D'Oh! Stations without AP... ignoring for now... will handle this in 1.1 version :-D" );
         MLogWindow::logwindow()->log( "WARNING: Unhandled WSD traffic!" );
     }
 }
 
 
-void MScanListView::toDStraffic( QString from, QString to, QString via )
+void MScanListView::toDStraffic( const OMacAddress& from, const OMacAddress& to, const OMacAddress& via )
 {
     QString s;
     MScanListItem* network;
 
     QListViewItemIterator it( this );
-    while ( it.current() && it.current()->text( col_ap ) != via ) ++it;
+    while ( it.current() && it.current()->text( col_ap ) != via.toString(true) ) ++it;
 
     MScanListItem* item = static_cast<MScanListItem*>( it.current() );
 
     if ( item ) // AP has shown up yet, so just add our new "from" - station
     {
         addIfNotExisting( static_cast<MScanListItem*>(item->parent()), from, "adhoc" );
     }
     else
     {
         qDebug( "D'Oh! Station without AP... ignoring for now... will handle this in 1.1 :-D" );
         MLogWindow::logwindow()->log( "WARNING: Unhandled toDS traffic!" );
 
     }
 }
 
 
-void MScanListView::fromDStraffic( QString from, QString to, QString via )
+void MScanListView::fromDStraffic( const OMacAddress& from, const OMacAddress& to, const OMacAddress& via )
 {
     QString s;
     MScanListItem* network;
 
     QListViewItemIterator it( this );
-    while ( it.current() && it.current()->text( col_ap ) != via ) ++it;
+    while ( it.current() && it.current()->text( col_ap ) != via.toString(true) ) ++it;
 
     MScanListItem* item = static_cast<MScanListItem*>( it.current() );
 
     if ( item ) // AP has shown up yet, so just add our new "from" - station
     {
         addIfNotExisting( static_cast<MScanListItem*>(item->parent()), from, "station" );
     }
     else
     {
         qDebug( "D'Oh! Station without AP... ignoring for now... will handle this in 1.1 :-D" );
         MLogWindow::logwindow()->log( "WARNING: Unhandled fromDS traffic!" );
     }
 }
 
 
-void MScanListView::IBSStraffic( QString from, QString to, QString via )
+void MScanListView::IBSStraffic( const OMacAddress& from, const OMacAddress& to, const OMacAddress& via )
 {
     qWarning( "D'oh! Not yet implemented..." );
     MLogWindow::logwindow()->log( "WARNING: Unhandled IBSS traffic!" );
 }
 
 
-void MScanListView::identify( const QString& macaddr, const QString& ip )
+void MScanListView::identify( const OMacAddress& macaddr, const QString& ip )
 {
-    qDebug( "identify %s = %s", (const char*) macaddr, (const char*) ip );
+    qDebug( "identify %s = %s", (const char*) macaddr.toString(), (const char*) ip );
 
     QListViewItemIterator it( this );
     for ( ; it.current(); ++it )
     {
-        if ( it.current()->text( col_ap ) == macaddr )
+        if ( it.current()->text( col_ap ) == macaddr.toString(true) )
         {
             it.current()->setText( col_ip, ip );
             return;
         }
     }
     qDebug( "D'oh! Received identification, but item not yet in list... ==> Handle this!" );
     MLogWindow::logwindow()->log( QString().sprintf( "WARNING: Unhandled identification %s = %s!",
-                                                     (const char*) macaddr, (const char*) ip ) );
+                                                     (const char*) macaddr.toString(), (const char*) ip ) );
 }
 
 
 //============================================================
 // MScanListItem
 //============================================================
 
 MScanListItem::MScanListItem( QListView* parent, QString type, QString essid, QString macaddr,
                               bool wep, int channel, int signal )
                :OListViewItem( parent, essid, QString::null, macaddr, QString::null, QString::null ),
                 _type( type ), _essid( essid ), _macaddr( macaddr ), _wep( wep ),
                 _channel( channel ), _signal( signal ), _beacons( 1 )
 {
     #ifdef DEBUG
     qDebug( "creating scanlist item" );
     #endif
     if ( WellenreiterConfigWindow::instance() && type == "network" )
         playSound( WellenreiterConfigWindow::instance()->soundOnNetwork() );
     decorateItem( type, essid, macaddr, wep, channel, signal );
 }
 
 MScanListItem::MScanListItem( QListViewItem* parent, QString type, QString essid, QString macaddr,
                               bool wep, int channel, int signal )
                :OListViewItem( parent, essid, QString::null, macaddr, QString::null, QString::null )
 {
     #ifdef DEBUG
     qDebug( "creating scanlist item" );
     #endif
     decorateItem( type, essid, macaddr, wep, channel, signal );
 }
 
 OListViewItem* MScanListItem::childFactory()
 {
     return new MScanListItem( this );
 }
 
 void MScanListItem::serializeTo( QDataStream& s ) const
 {
     #ifdef DEBUG
     qDebug( "serializing MScanListItem" );
     #endif
     OListViewItem::serializeTo( s );
 
     s << _type;
     s << (Q_UINT8) ( _wep ? 'y' : 'n' );
 }
 
 void MScanListItem::serializeFrom( QDataStream& s )
 {
     #ifdef DEBUG
     qDebug( "serializing MScanListItem" );
     #endif
     OListViewItem::serializeFrom( s );
 
     char wep;
     s >> _type;
     s >> (Q_UINT8) wep;
     _wep = (wep == 'y');
 
     QString name;
     name.sprintf( "wellenreiter/%s", (const char*) _type );
     setPixmap( col_type, Resource::loadPixmap( name ) );
     if ( _wep )
         setPixmap( col_wep, Resource::loadPixmap( "wellenreiter/cracked" ) ); //FIXME: rename the pixmap!
     listView()->triggerUpdate();
 }
 
 void MScanListItem::decorateItem( QString type, QString essid, QString macaddr, bool wep, int channel, int signal )
 {
     #ifdef DEBUG
     qDebug( "decorating scanlist item %s / %s / %s [%d]",
         (const char*) type,
         (const char*) essid,
         (const char*) macaddr,
         channel );
     #endif
 
     // set icon for managed or adhoc mode
     QString name;
     name.sprintf( "wellenreiter/%s", (const char*) type );
     setPixmap( col_type, Resource::loadPixmap( name ) );
 
     // set icon for wep (wireless encryption protocol)
     if ( wep )
         setPixmap( col_wep, Resource::loadPixmap( "wellenreiter/cracked" ) ); //FIXME: rename the pixmap!
 
     // set channel and signal text
 
     if ( signal != -1 )
         setText( col_sig, QString::number( signal ) );
     if ( channel != -1 )
         setText( col_channel, QString::number( channel ) );
 
     setText( col_firstseen, QTime::currentTime().toString() );
     //setText( col_lastseen, QTime::currentTime().toString() );
 
     listView()->triggerUpdate();
 
     this->type = type;
     _type = type;
     _essid = essid;
     _macaddr = macaddr;
     _channel = channel;
     _beacons = 1;
     _signal = 0;
 }
 
 
 void MScanListItem::setManufacturer( const QString& manufacturer )
 {
     setText( col_manuf, manufacturer );
 }
 
 
 void MScanListItem::playSound( const QString& sound ) const
 {
     #ifdef QWS
     if ( sound == "Ignore" ) return;
     else if ( sound == "Touch" ) ODevice::inst()->touchSound();
     else if ( sound == "Key" ) ODevice::inst()->keySound();
     else if ( sound == "Alarm" ) ODevice::inst()->alarmSound();
     #endif
 }
 
 
 void MScanListItem::receivedBeacon()
 {
     _beacons++;
     #ifdef DEBUG
     qDebug( "MScanListItem %s: received beacon #%d", (const char*) _macaddr, _beacons );
     #endif
     setText( col_sig, QString::number( _beacons ) );
     setText( col_lastseen, QTime::currentTime().toString() );
-    if ( WellenreiterConfigWindow::instance() )
-        playSound( WellenreiterConfigWindow::instance()->soundOnBeacon() );
+
+    MScanListItem* p = (MScanListItem*) parent();
+    if ( p ) p->receivedBeacon();
+
 }
 
diff --git a/noncore/net/wellenreiter/gui/scanlist.h b/noncore/net/wellenreiter/gui/scanlist.h
index 4cb9216..253c166 100644
--- a/noncore/net/wellenreiter/gui/scanlist.h
+++ b/noncore/net/wellenreiter/gui/scanlist.h
@@ -1,135 +1,131 @@
 /**********************************************************************
 ** 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 SCANLIST_H
 #define SCANLIST_H
 
+/* OPIE */
 #include <opie2/olistview.h>
+#include <opie2/onetutils.h>
 
+/* QT */
 #include <qtextstream.h>
 
 class QString;
-class ManufacturerDB;
-
 class MScanListItem;
 
 class MScanListView: public OListView
 {
   Q_OBJECT
 
   public:
     MScanListView( QWidget* parent = 0, const char* name = 0 );
     virtual ~MScanListView();
 
-    void setManufacturerDB( ManufacturerDB* manufacturerdb );
-
     virtual OListViewItem* childFactory();
     virtual void serializeTo( QDataStream& s ) const;
     virtual void serializeFrom( QDataStream& s );
 
   public slots:
-    void addNewItem( QString type, QString essid, QString macaddr, bool wep, int channel, int signal );
-    void fromDStraffic( QString from, QString to, QString via ); // NYI
-    void toDStraffic( QString from, QString to, QString via );
-    void WDStraffic( QString from, QString to, QString viaFrom, QString viaTo );
-    void IBSStraffic( QString from, QString to, QString via ); // NYI
+    void addNewItem( const QString& type, const QString& essid, const OMacAddress& macaddr, bool wep, int channel, int signal );
+    void fromDStraffic( const OMacAddress& from, const OMacAddress& to, const OMacAddress& via );
+    void toDStraffic( const OMacAddress& from, const OMacAddress& to, const OMacAddress& via );
+    void WDStraffic( const OMacAddress& from, const OMacAddress& to, const OMacAddress& viaFrom, const OMacAddress& viaTo );
+    void IBSStraffic( const OMacAddress& from, const OMacAddress& to, const OMacAddress& via );
 
-    void identify( const QString& macaddr, const QString& ipaddr );
+    void identify( const OMacAddress&, const QString& ipaddr );
 
   protected:
-    void addIfNotExisting( MScanListItem* parent, QString addr, const QString& type = "station" );
-
-  private:
-    ManufacturerDB* _manufacturerdb;
+    void addIfNotExisting( MScanListItem* parent, const OMacAddress& addr, const QString& type = "station" );
 
 };
 
 //****************************** MScanListItem ****************************************************************
 
 class MScanListItem: public OListViewItem
 {
   public:
     MScanListItem::MScanListItem( QListView* parent,
                                   QString type = "unknown",
                                   QString essid = "unknown",
                                   QString macaddr = "unknown",
                                   bool wep = false,
                                   int channel = 0,
                                   int signal = 0 );
 
     MScanListItem::MScanListItem( QListViewItem* parent,
                                   QString type = "unknown",
                                   QString essid = "unknown",
                                   QString macaddr = "unknown",
                                   bool wep = false,
                                   int channel = 0,
                                   int signal = 0 );
 
 
   protected:
     virtual void decorateItem( QString type, QString essid, QString macaddr, bool wep, int channel, int signal );
 
   public:
     QString type;
 
   public:
     //const QString& type() { return _type; };
     const QString& essid() { return _essid; };
     const QString& macaddr() { return _macaddr; };
     bool wep() { return _wep; };
     int channel() { return _channel; };
     int signal() { return _signal; };
     int beacons() { return _beacons; };
 
     void setSignal( int signal ) { /* TODO */ };
     void receivedBeacon();
 
     void setManufacturer( const QString& manufacturer );
 
     virtual OListViewItem* childFactory();
     virtual void serializeTo( QDataStream& s ) const;
     virtual void serializeFrom( QDataStream& s );
 
   protected:
     void playSound( const QString& ) const;
 
   private:
     QString _type;
     QString _essid;
     QString _macaddr;
     bool _wep;
     int _channel;
     int _signal;
     int _beacons;
 
 };
 
 //****************************** MScanListViewFactory ****************************************************************
 
 /*
 
 class MScanListViewFactory : public OListViewFactory
 {
 public:
     virtual QListView* listViewFactory();
     virtual QListViewItem* listViewItemFactory( QListView* lv );
     virtual QListViewItem* listViewItemFactory( QListViewItem* lvi );
     virtual void setColumnText( int depth, QListViewItem* lvi, int column, const QString& text );
     virtual void setCustomData( int depth, QListViewItem* lvi, const QString& text );
 }
 */
 
 #endif
 
diff --git a/noncore/net/wellenreiter/gui/wellenreiter.cpp b/noncore/net/wellenreiter/gui/wellenreiter.cpp
index 4257be1..2f26702 100644
--- a/noncore/net/wellenreiter/gui/wellenreiter.cpp
+++ b/noncore/net/wellenreiter/gui/wellenreiter.cpp
@@ -1,540 +1,490 @@
 /**********************************************************************
 ** 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 "wellenreiter.h"
 #include "scanlist.h"
 #include "logwindow.h"
 #include "hexwindow.h"
 #include "configwindow.h"
 #include "statwindow.h"
 #include "graphwindow.h"
-#include "manufacturers.h"
 #include "protolistview.h"
 
 // Opie
 
 #ifdef QWS
 #include <opie/odevice.h>
 using namespace Opie;
 #endif
 
 #ifdef QWS
 #include <opie2/oapplication.h>
 #else
 #include <qapplication.h>
 #endif
 #include <opie2/onetwork.h>
 #include <opie2/opcap.h>
 
 // Qt
 
 #include <qcheckbox.h>
 #include <qcombobox.h>
 #include <qdatetime.h>
 #include <qpushbutton.h>
 #include <qlineedit.h>
 #include <qmessagebox.h>
 #include <qobjectlist.h>
 #include <qregexp.h>
 #include <qspinbox.h>
 #include <qtoolbutton.h>
 #include <qmainwindow.h>
 
 // Standard
 
 #include <assert.h>
 #include <errno.h>
 #include <unistd.h>
 #include <string.h>
 #include <sys/types.h>
 #include <stdlib.h>
 
 Wellenreiter::Wellenreiter( QWidget* parent )
     : WellenreiterBase( parent, 0, 0 ),
-      sniffing( false ), iface( 0 ), manufacturerdb( 0 ), configwindow( 0 )
+      sniffing( false ), iface( 0 ), configwindow( 0 )
 {
 
-    //
-    // construct manufacturer database
-    //
-
-    QString manufile;
-    #ifdef QWS
-    manufile.sprintf( "%s/share/wellenreiter/manufacturers.dat", (const char*) QPEApplication::qpeDir() );
-    #else
-    manufile.sprintf( "/usr/local/share/wellenreiter/manufacturers.dat" );
-    #endif
-    manufacturerdb = new ManufacturerDB( manufile );
-
     logwindow->log( "(i) Wellenreiter has been started." );
 
     //
     // detect operating system
     //
 
     #ifdef QWS
     QString sys;
     sys.sprintf( "(i) Running on '%s'.", (const char*) ODevice::inst()->systemString() );
     _system = ODevice::inst()->system();
     logwindow->log( sys );
     #endif
 
-    // setup GUI
     netview->setColumnWidthMode( 1, QListView::Manual );
-
-    if ( manufacturerdb )
-        netview->setManufacturerDB( manufacturerdb );
-
     pcap = new OPacketCapturer();
-
 }
 
 
 Wellenreiter::~Wellenreiter()
 {
-    // no need to delete child widgets, Qt does it all for us
-
-    delete manufacturerdb;
     delete pcap;
 }
 
 
 void Wellenreiter::setConfigWindow( WellenreiterConfigWindow* cw )
 {
     configwindow = cw;
 }
 
 
 void Wellenreiter::channelHopped(int c)
 {
     QString title = "Wellenreiter II -scan- [";
     QString left;
     if ( c > 1 ) left.fill( '.', c-1 );
     title.append( left );
     title.append( '|' );
     if ( c < iface->channels() )
     {
         QString right;
         right.fill( '.', iface->channels()-c );
         title.append( right );
     }
     title.append( "]" );
     //title.append( QString().sprintf( " %02d", c ) );
     assert( parent() );
     ( (QMainWindow*) parent() )->setCaption( title );
 }
 
 
 void Wellenreiter::handleNotification( OPacket* p )
 {
     QObjectList* l = p->queryList();
     QObjectListIt it( *l );
     QObject* o;
 
     while ( (o = it.current()) != 0 )
     {
         QString name = it.current()->name();
         if ( configwindow->parsePackets->isProtocolChecked( name ) )
         {
             QString action = configwindow->parsePackets->protocolAction( name );
             qDebug( "parsePacket-action for '%s' seems to be '%s'", (const char*) name, (const char*) action );
             doAction( action, name, p );
         }
         else
         {
             qDebug( "protocol '%s' not checked in parsePackets.", (const char*) name );
         }
     ++it;
     }
 }
 
 
 void Wellenreiter::handleBeacon( OPacket* p, OWaveLanManagementPacket* beacon )
 {
     QString type;
     if ( beacon->canIBSS() )
     {
         type = "adhoc";
     }
     else if ( beacon->canESS() )
     {
         type = "managed";
     }
     else
     {
         qWarning( "Wellenreiter::invalid frame [possibly noise] detected!" );
         return;
     }
 
     OWaveLanManagementSSID* ssid = static_cast<OWaveLanManagementSSID*>( p->child( "802.11 SSID" ) );
     QString essid = ssid ? ssid->ID() : QString("<unknown>");
     OWaveLanManagementDS* ds = static_cast<OWaveLanManagementDS*>( p->child( "802.11 DS" ) );
     int channel = ds ? ds->channel() : -1;
 
     OWaveLanPacket* header = static_cast<OWaveLanPacket*>( p->child( "802.11" ) );
-    netView()->addNewItem( type, essid, header->macAddress2().toString(), beacon->canPrivacy(), channel, 0 );
+    netView()->addNewItem( type, essid, header->macAddress2(), beacon->canPrivacy(), channel, 0 );
 
     // update graph window
     if ( ds )
     {
         OPrismHeaderPacket* prism = static_cast<OPrismHeaderPacket*>( p->child( "Prism" ) );
         if ( prism )
             graphwindow->traffic( ds->channel(), prism->signalStrength() );
         else
             graphwindow->traffic( ds->channel(), 95 );
     }
 }
 
 
 void Wellenreiter::handleData( OPacket* p, OWaveLanDataPacket* data )
 {
     OWaveLanPacket* wlan = (OWaveLanPacket*) p->child( "802.11" );
     if ( wlan->fromDS() && !wlan->toDS() )
     {
-        qDebug( "FromDS traffic: '%s' -> '%s' via '%s'",
-            (const char*) wlan->macAddress3().toString(true),
-            (const char*) wlan->macAddress1().toString(true),
-            (const char*) wlan->macAddress2().toString(true) );
-        netView()->fromDStraffic( wlan->macAddress3().toString(),
-                                wlan->macAddress1().toString(),
-                                wlan->macAddress2().toString() );
+        netView()->fromDStraffic( wlan->macAddress3(), wlan->macAddress1(), wlan->macAddress2() );
     }
-    else
-    if ( !wlan->fromDS() && wlan->toDS() )
+    else if ( !wlan->fromDS() && wlan->toDS() )
     {
-        qDebug( "ToDS traffic: '%s' -> '%s' via '%s'",
-            (const char*) wlan->macAddress2().toString(true),
-            (const char*) wlan->macAddress3().toString(true),
-            (const char*) wlan->macAddress1().toString(true) );
-        netView()->toDStraffic( wlan->macAddress2().toString(),
-                                wlan->macAddress3().toString(),
-                                wlan->macAddress1().toString() );
+        netView()->toDStraffic( wlan->macAddress2(), wlan->macAddress3(), wlan->macAddress1() );
     }
-    else
-    if ( wlan->fromDS() && wlan->toDS() )
+    else if ( wlan->fromDS() && wlan->toDS() )
     {
-        qDebug( "WDS(bridge) traffic: '%s' -> '%s' via '%s' and '%s'",
-            (const char*) wlan->macAddress4().toString(true),
-            (const char*) wlan->macAddress3().toString(true),
-            (const char*) wlan->macAddress1().toString(true),
-            (const char*) wlan->macAddress2().toString(true) );
-        netView()->WDStraffic( wlan->macAddress4().toString(),
-                            wlan->macAddress3().toString(),
-                            wlan->macAddress1().toString(),
-                            wlan->macAddress2().toString() );
+        netView()->WDStraffic( wlan->macAddress4(), wlan->macAddress3(), wlan->macAddress1(), wlan->macAddress2() );
     }
     else
     {
-        qDebug( "IBSS(AdHoc) traffic: '%s' -> '%s' (Cell: '%s')'",
-            (const char*) wlan->macAddress2().toString(true),
-            (const char*) wlan->macAddress1().toString(true),
-            (const char*) wlan->macAddress3().toString(true) );
-        netView()->IBSStraffic( wlan->macAddress2().toString(),
-                                wlan->macAddress1().toString(),
-                                wlan->macAddress3().toString() );
+        netView()->IBSStraffic( wlan->macAddress2(), wlan->macAddress1(), wlan->macAddress3() );
     }
 
     OARPPacket* arp = (OARPPacket*) p->child( "ARP" );
     if ( arp )
     {
         qDebug( "Received ARP traffic (type '%s'): ", (const char*) arp->type() );
         if ( arp->type() == "REQUEST" )
         {
-            netView()->identify( arp->senderMacAddress().toString(), arp->senderIPV4Address().toString() );
+            netView()->identify( arp->senderMacAddress(), arp->senderIPV4Address().toString() );
         }
         else if ( arp->type() == "REPLY" )
         {
-            netView()->identify( arp->senderMacAddress().toString(), arp->senderIPV4Address().toString() );
-            netView()->identify( arp->targetMacAddress().toString(), arp->targetIPV4Address().toString() );
+            netView()->identify( arp->senderMacAddress(), arp->senderIPV4Address().toString() );
+            netView()->identify( arp->targetMacAddress(), arp->targetIPV4Address().toString() );
         }
     }
 
     OIPPacket* ip = (OIPPacket*) p->child( "IP" );
     if ( ip )
     {
         qDebug( "Received IP packet." );
     }
 }
 
 
 QObject* Wellenreiter::childIfToParse( OPacket* p, const QString& protocol )
 {
     if ( configwindow->parsePackets->isProtocolChecked( protocol ) )
         if ( configwindow->parsePackets->protocolAction( protocol ) == "Discard!" )
             return 0;
 
     return p->child( protocol );
 }
 
 
 bool Wellenreiter::checkDumpPacket( OPacket* p )
 {
     // go through all child packets and see if one is inside the child hierarchy for p
     // if so, do what the user requested (protocolAction), e.g. pass or discard
     if ( !configwindow->writeCaptureFile->isOn() )
         return false;
 
     QObjectList* l = p->queryList();
     QObjectListIt it( *l );
     QObject* o;
 
     while ( (o = it.current()) != 0 )
     {
         QString name = it.current()->name();
         if ( configwindow->capturePackets->isProtocolChecked( name ) )
         {
             QString action = configwindow->capturePackets->protocolAction( name );
             qDebug( "capturePackets-action for '%s' seems to be '%s'", (const char*) name, (const char*) action );
             if ( action == "Discard" )
             {
                 logwindow->log( QString().sprintf( "(i) dump-discarding of '%s' packet requested.", (const char*) name ) );
                 return false;
             }
         }
         else
         {
             qDebug( "protocol '%s' not checked in capturePackets.", (const char*) name );
         }
     ++it;
     }
     return true;
 }
 
 
 void Wellenreiter::receivePacket( OPacket* p )
 {
     hexWindow()->log( p->dump( 8 ) );
 
     if ( checkDumpPacket( p ) )
     {
         pcap->dump( p );
     }
 
     // check if we received a beacon frame
     OWaveLanManagementPacket* beacon = static_cast<OWaveLanManagementPacket*>( childIfToParse( p, "802.11 Management" ) );
     if ( beacon && beacon->managementType() == "Beacon" )
     {
         handleBeacon( p, beacon );
         return;
     }
 
     //TODO: WEP check here
 
     // check for a data frame
     OWaveLanDataPacket* data = static_cast<OWaveLanDataPacket*>( childIfToParse( p, "802.11 Data" ) );
     if ( data )
     {
         handleData( p, data );
     }
 
     handleNotification( p );
 
 }
 
 
 void Wellenreiter::stopClicked()
 {
     if ( iface )
     {
         disconnect( SIGNAL( receivedPacket(OPacket*) ), this, SLOT( receivePacket(OPacket*) ) );
         disconnect( SIGNAL( hopped(int) ), this, SLOT( channelHopped(int) ) );
         iface->setChannelHopping(); // stop hopping channels
     }
     else
         killTimers();
 
     pcap->close();
     sniffing = false;
 
     if ( iface )
     {
         // switch off monitor mode
         iface->setMonitorMode( false );
         // switch off promisc flag
         iface->setPromiscuousMode( false );
 
         system( "cardctl reset; sleep 1" ); //FIXME: Use OProcess
     }
 
     logwindow->log( "(i) Stopped Scanning." );
     assert( parent() );
     ( (QMainWindow*) parent() )->setCaption( "Wellenreiter II" );
 
     // message the user
     QMessageBox::information( this, "Wellenreiter II",
                               tr( "Your wireless card\nshould now be usable again." ) );
 
     sniffing = false;
     emit( stoppedSniffing() );
 
     // print out statistics
     for( QMap<QString,int>::ConstIterator it = pcap->statistics().begin(); it != pcap->statistics().end(); ++it )
        statwindow->updateCounter( it.key(), it.data() );
 }
 
 
 void Wellenreiter::startClicked()
 {
     // get configuration from config window
 
     const QString& interface = configwindow->interfaceName->currentText();
     const int cardtype = configwindow->driverType();
     const int interval = configwindow->hoppingInterval();
 
     if ( ( interface == "" ) || ( cardtype == 0 ) )
     {
         QMessageBox::information( this, "Wellenreiter II",
                                   tr( "Your device is not\nproperly configured. Please reconfigure!" ) );
         return;
     }
 
     // configure device
     ONetwork* net = ONetwork::instance();
     iface = static_cast<OWirelessNetworkInterface*>(net->interface( interface ));
 
     // bring device UP
     iface->setUp( true );
     if ( !iface->isUp() )
     {
         QMessageBox::warning( this, "Wellenreiter II",
                             tr( "Can't bring interface '%1' up:\n" ).arg( iface->name() ) + strerror( errno ) );
         return;
     }
 
     // set monitor mode
     bool usePrism = configwindow->usePrismHeader();
 
     switch ( cardtype )
     {
         case DEVTYPE_CISCO: iface->setMonitoring( new OCiscoMonitoringInterface( iface, usePrism ) ); break;
         case DEVTYPE_WLAN_NG: iface->setMonitoring( new OWlanNGMonitoringInterface( iface, usePrism ) ); break;
         case DEVTYPE_HOSTAP: iface->setMonitoring( new OHostAPMonitoringInterface( iface, usePrism ) ); break;
         case DEVTYPE_ORINOCO: iface->setMonitoring( new OOrinocoMonitoringInterface( iface, usePrism ) ); break;
         case DEVTYPE_MANUAL: QMessageBox::information( this, "Wellenreiter II", tr( "Bring your device into\nmonitor mode now." ) ); break;
         case DEVTYPE_FILE: qDebug( "Wellenreiter: Capturing from file '%s'", (const char*) interface ); break;
         default: assert( 0 ); // shouldn't reach this
     }
 
     // switch device into monitor mode
     if ( cardtype < DEVTYPE_FILE )
     {
         if ( cardtype != DEVTYPE_MANUAL )
             iface->setMonitorMode( true );
         if ( !iface->monitorMode() )
         {
             QMessageBox::warning( this, "Wellenreiter II",
-                                  tr( "Can't set interface '%1' into monitor mode:\n" ).arg( iface->name() ) + strerror( errno ) );
+                                  tr( "Can't set interface '%1'\ninto monitor mode:\n" ).arg( iface->name() ) + strerror( errno ) );
             return;
         }
     }
 
     // open pcap and start sniffing
     if ( cardtype != DEVTYPE_FILE )
     {
         pcap->open( interface );
 
         if ( configwindow->writeCaptureFile->isOn() )
         {
             QString dumpname( configwindow->captureFileName->text() );
             dumpname.append( '-' );
             dumpname.append( QTime::currentTime().toString().replace( QRegExp( ":" ), "-" ) );
             dumpname.append( ".wellenreiter" );
             pcap->openDumpFile( dumpname );
         }
         else
         {
             pcap->open( interface );
         }
     }
     else
     {
         pcap->open( QFile( interface ) );
     }
 
     if ( !pcap->isOpen() )
     {
         QMessageBox::warning( this, "Wellenreiter II",
                               tr( "Can't open packet capturer for '%1':\n" ).arg( iface->name() ) + QString(strerror( errno ) ));
         return;
     }
 
     // set capturer to non-blocking mode
     pcap->setBlocking( false );
 
     // start channel hopper
     if ( cardtype != DEVTYPE_FILE )
         iface->setChannelHopping( 1000 ); //use interval from config window
 
     if ( cardtype != DEVTYPE_FILE )
     {
         // connect socket notifier and start channel hopper
         connect( pcap, SIGNAL( receivedPacket(OPacket*) ), this, SLOT( receivePacket(OPacket*) ) );
         connect( iface->channelHopper(), SIGNAL( hopped(int) ), this, SLOT( channelHopped(int) ) );
     }
     else
     {
         // start timer for reading packets
         startTimer( 100 );
     }
 
     logwindow->log( "(i) Started Scanning." );
     sniffing = true;
     emit( startedSniffing() );
     if ( cardtype != DEVTYPE_FILE ) channelHopped( 6 ); // set title
     else
     {
         assert( parent() );
         ( (QMainWindow*) parent() )->setCaption( tr( "Wellenreiter II - replaying capture file..." ) );
     }
 }
 
 
 void Wellenreiter::timerEvent( QTimerEvent* )
 {
     qDebug( "Wellenreiter::timerEvent()" );
     OPacket* p = pcap->next();
     if ( !p ) // no more packets available
     {
         stopClicked();
     }
     else
     {
         receivePacket( p );
         delete p;
     }
 }
 
 
 void Wellenreiter::doAction( const QString& action, const QString& protocol, OPacket* p )
 {
     if ( action == "TouchSound" )
         ODevice::inst()->touchSound();
     else if ( action == "AlarmSound" )
         ODevice::inst()->alarmSound();
     else if ( action == "KeySound" )
         ODevice::inst()->keySound();
     else if ( action == "LedOn" )
         ODevice::inst()->setLedState( Led_Mail, Led_On );
     else if ( action == "LedOff" )
         ODevice::inst()->setLedState( Led_Mail, Led_Off );
     else if ( action == "LogMessage" )
         logwindow->log( QString().sprintf( "Got packet with protocol '%s'", (const char*) protocol ) );
     else if ( action == "MessageBox" )
         QMessageBox::information ( this, "Notification!",
         QString().sprintf( "Got packet with protocol '%s'", (const char*) protocol ) );
 }
 
diff --git a/noncore/net/wellenreiter/gui/wellenreiter.h b/noncore/net/wellenreiter/gui/wellenreiter.h
index d776492..f23ca4d 100644
--- a/noncore/net/wellenreiter/gui/wellenreiter.h
+++ b/noncore/net/wellenreiter/gui/wellenreiter.h
@@ -1,91 +1,89 @@
 /**********************************************************************
 ** 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 WELLENREITER_H
 #define WELLENREITER_H
 
 #include "wellenreiterbase.h"
 
 #ifdef QWS
 #include <opie/odevice.h>
 using namespace Opie;
 #endif
 
 class QTimerEvent;
 class QPixmap;
 class OPacket;
 class OWaveLanManagementPacket;
 class OWaveLanDataPacket;
 class OPacketCapturer;
 class OWirelessNetworkInterface;
-class ManufacturerDB;
 class WellenreiterConfigWindow;
 class MLogWindow;
 class MHexWindow;
 
 class Wellenreiter : public WellenreiterBase {
     Q_OBJECT
 
   public:
     Wellenreiter( QWidget* parent = 0 );
     ~Wellenreiter();
 
     void setConfigWindow( WellenreiterConfigWindow* cw );
     MScanListView* netView() const { return netview; };
     MLogWindow* logWindow() const { return logwindow; };
     MHexWindow* hexWindow() const { return hexwindow; };
     bool isDaemonRunning() const { return sniffing; };
 
   public:
     bool sniffing;
 
   protected:
     virtual void timerEvent( QTimerEvent* );
 
   public slots:
     void channelHopped(int);
     void receivePacket(OPacket*);
     void startClicked();
     void stopClicked();
 
   signals:
     void startedSniffing();
     void stoppedSniffing();
 
   private:
     void handleBeacon( OPacket* p, OWaveLanManagementPacket* beacon );
     void handleData( OPacket* p, OWaveLanDataPacket* data );
     void handleNotification( OPacket* p );
     void doAction( const QString& action, const QString& protocol, OPacket* p );
     QObject* childIfToParse( OPacket* p, const QString& protocol );
     bool checkDumpPacket( OPacket* p );
-    
+
   private:
     #ifdef QWS
     OSystem _system;                // Opie Operating System identifier
     #endif
 
     OWirelessNetworkInterface* iface;
     OPacketCapturer* pcap;
-    ManufacturerDB* manufacturerdb;
     WellenreiterConfigWindow* configwindow;
 
     //void readConfig();
     //void writeConfig();
 };
 
 
 
 #endif
diff --git a/noncore/net/wellenreiter/gui/wellenreitertemplate.ui b/noncore/net/wellenreiter/gui/wellenreitertemplate.ui
deleted file mode 100644
index 63c14d1..0000000
--- a/noncore/net/wellenreiter/gui/wellenreitertemplate.ui
+++ b/dev/null
@@ -1,605 +0,0 @@
-<!DOCTYPE UI><UI>
-<class>WellenreiterTemplate</class>
-<widget>
-    <class>QWidget</class>
-    <property stdset="1">
-        <name>name</name>
-        <cstring>WellenreiterTemplate</cstring>
-    </property>
-    <property stdset="1">
-        <name>geometry</name>
-        <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>188</width>
-            <height>294</height>
-        </rect>
-    </property>
-    <property stdset="1">
-        <name>caption</name>
-        <string>Wellenreiter</string>
-    </property>
-    <property>
-        <name>layoutMargin</name>
-    </property>
-    <property>
-        <name>layoutSpacing</name>
-    </property>
-    <vbox>
-        <property stdset="1">
-            <name>margin</name>
-            <number>0</number>
-        </property>
-        <property stdset="1">
-            <name>spacing</name>
-            <number>2</number>
-        </property>
-        <widget>
-            <class>QTabWidget</class>
-            <property stdset="1">
-                <name>name</name>
-                <cstring>TabWidget</cstring>
-            </property>
-            <property>
-                <name>layoutMargin</name>
-            </property>
-            <property>
-                <name>layoutSpacing</name>
-            </property>
-            <widget>
-                <class>QWidget</class>
-                <property stdset="1">
-                    <name>name</name>
-                    <cstring>ap</cstring>
-                </property>
-                <attribute>
-                    <name>title</name>
-                    <string>Networks</string>
-                </attribute>
-                <vbox>
-                    <property stdset="1">
-                        <name>margin</name>
-                        <number>2</number>
-                    </property>
-                    <property stdset="1">
-                        <name>spacing</name>
-                        <number>2</number>
-                    </property>
-                    <widget>
-                        <class>QListView</class>
-                        <column>
-                            <property>
-                                <name>text</name>
-                                <string>SSID</string>
-                            </property>
-                            <property>
-                                <name>clickable</name>
-                                <bool>true</bool>
-                            </property>
-                            <property>
-                                <name>resizeable</name>
-                                <bool>true</bool>
-                            </property>
-                        </column>
-                        <column>
-                            <property>
-                                <name>text</name>
-                                <string>Sig</string>
-                            </property>
-                            <property>
-                                <name>clickable</name>
-                                <bool>true</bool>
-                            </property>
-                            <property>
-                                <name>resizeable</name>
-                                <bool>true</bool>
-                            </property>
-                        </column>
-                        <column>
-                            <property>
-                                <name>text</name>
-                                <string>AP</string>
-                            </property>
-                            <property>
-                                <name>clickable</name>
-                                <bool>true</bool>
-                            </property>
-                            <property>
-                                <name>resizeable</name>
-                                <bool>true</bool>
-                            </property>
-                        </column>
-                        <column>
-                            <property>
-                                <name>text</name>
-                                <string>Chn</string>
-                            </property>
-                            <property>
-                                <name>clickable</name>
-                                <bool>true</bool>
-                            </property>
-                            <property>
-                                <name>resizeable</name>
-                                <bool>true</bool>
-                            </property>
-                        </column>
-                        <column>
-                            <property>
-                                <name>text</name>
-                                <string>W</string>
-                            </property>
-                            <property>
-                                <name>clickable</name>
-                                <bool>true</bool>
-                            </property>
-                            <property>
-                                <name>resizeable</name>
-                                <bool>true</bool>
-                            </property>
-                        </column>
-                        <column>
-                            <property>
-                                <name>text</name>
-                                <string>T</string>
-                            </property>
-                            <property>
-                                <name>clickable</name>
-                                <bool>true</bool>
-                            </property>
-                            <property>
-                                <name>resizeable</name>
-                                <bool>true</bool>
-                            </property>
-                        </column>
-                        <property stdset="1">
-                            <name>name</name>
-                            <cstring>netview</cstring>
-                        </property>
-                        <property stdset="1">
-                            <name>frameShape</name>
-                            <enum>StyledPanel</enum>
-                        </property>
-                        <property stdset="1">
-                            <name>frameShadow</name>
-                            <enum>Sunken</enum>
-                        </property>
-                        <property stdset="1">
-                            <name>rootIsDecorated</name>
-                            <bool>true</bool>
-                        </property>
-                    </widget>
-                </vbox>
-            </widget>
-            <widget>
-                <class>QWidget</class>
-                <property stdset="1">
-                    <name>name</name>
-                    <cstring>Log</cstring>
-                </property>
-                <attribute>
-                    <name>title</name>
-                    <string>Log</string>
-                </attribute>
-                <vbox>
-                    <property stdset="1">
-                        <name>margin</name>
-                        <number>2</number>
-                    </property>
-                    <property stdset="1">
-                        <name>spacing</name>
-                        <number>2</number>
-                    </property>
-                    <widget>
-                        <class>QMultiLineEdit</class>
-                        <property stdset="1">
-                            <name>name</name>
-                            <cstring>Log</cstring>
-                        </property>
-                        <property stdset="1">
-                            <name>text</name>
-                            <string>11/18 18:15 - log started
-11/19 20:13 - new net : "ELAN"
-11/19 20:15 - new station : "pegasus"</string>
-                        </property>
-                    </widget>
-                </vbox>
-            </widget>
-            <widget>
-                <class>QWidget</class>
-                <property stdset="1">
-                    <name>name</name>
-                    <cstring>tab</cstring>
-                </property>
-                <attribute>
-                    <name>title</name>
-                    <string>Hex</string>
-                </attribute>
-                <grid>
-                    <property stdset="1">
-                        <name>margin</name>
-                        <number>2</number>
-                    </property>
-                    <property stdset="1">
-                        <name>spacing</name>
-                        <number>2</number>
-                    </property>
-                    <widget row="0"  column="0" >
-                        <class>QMultiLineEdit</class>
-                        <property stdset="1">
-                            <name>name</name>
-                            <cstring>Log_2</cstring>
-                        </property>
-                        <property stdset="1">
-                            <name>palette</name>
-                            <palette>
-                                <active>
-                                    <color>
-                                        <red>255</red>
-                                        <green>255</green>
-                                        <blue>255</blue>
-                                    </color>
-                                    <color>
-                                        <red>192</red>
-                                        <green>192</green>
-                                        <blue>192</blue>
-                                    </color>
-                                    <color>
-                                        <red>255</red>
-                                        <green>255</green>
-                                        <blue>255</blue>
-                                    </color>
-                                    <color>
-                                        <red>223</red>
-                                        <green>223</green>
-                                        <blue>223</blue>
-                                    </color>
-                                    <color>
-                                        <red>96</red>
-                                        <green>96</green>
-                                        <blue>96</blue>
-                                    </color>
-                                    <color>
-                                        <red>128</red>
-                                        <green>128</green>
-                                        <blue>128</blue>
-                                    </color>
-                                    <color>
-                                        <red>255</red>
-                                        <green>255</green>
-                                        <blue>255</blue>
-                                    </color>
-                                    <color>
-                                        <red>255</red>
-                                        <green>255</green>
-                                        <blue>255</blue>
-                                    </color>
-                                    <color>
-                                        <red>255</red>
-                                        <green>255</green>
-                                        <blue>255</blue>
-                                    </color>
-                                    <color>
-                                        <red>0</red>
-                                        <green>0</green>
-                                        <blue>0</blue>
-                                    </color>
-                                    <color>
-                                        <red>0</red>
-                                        <green>0</green>
-                                        <blue>0</blue>
-                                    </color>
-                                    <color>
-                                        <red>0</red>
-                                        <green>0</green>
-                                        <blue>0</blue>
-                                    </color>
-                                    <color>
-                                        <red>0</red>
-                                        <green>0</green>
-                                        <blue>128</blue>
-                                    </color>
-                                    <color>
-                                        <red>255</red>
-                                        <green>255</green>
-                                        <blue>255</blue>
-                                    </color>
-                                </active>
-                                <disabled>
-                                    <color>
-                                        <red>128</red>
-                                        <green>128</green>
-                                        <blue>128</blue>
-                                    </color>
-                                    <color>
-                                        <red>192</red>
-                                        <green>192</green>
-                                        <blue>192</blue>
-                                    </color>
-                                    <color>
-                                        <red>255</red>
-                                        <green>255</green>
-                                        <blue>255</blue>
-                                    </color>
-                                    <color>
-                                        <red>220</red>
-                                        <green>220</green>
-                                        <blue>220</blue>
-                                    </color>
-                                    <color>
-                                        <red>96</red>
-                                        <green>96</green>
-                                        <blue>96</blue>
-                                    </color>
-                                    <color>
-                                        <red>128</red>
-                                        <green>128</green>
-                                        <blue>128</blue>
-                                    </color>
-                                    <color>
-                                        <red>128</red>
-                                        <green>128</green>
-                                        <blue>128</blue>
-                                    </color>
-                                    <color>
-                                        <red>255</red>
-                                        <green>255</green>
-                                        <blue>255</blue>
-                                    </color>
-                                    <color>
-                                        <red>128</red>
-                                        <green>128</green>
-                                        <blue>128</blue>
-                                    </color>
-                                    <color>
-                                        <red>0</red>
-                                        <green>0</green>
-                                        <blue>0</blue>
-                                    </color>
-                                    <color>
-                                        <red>0</red>
-                                        <green>0</green>
-                                        <blue>0</blue>
-                                    </color>
-                                    <color>
-                                        <red>0</red>
-                                        <green>0</green>
-                                        <blue>0</blue>
-                                    </color>
-                                    <color>
-                                        <red>0</red>
-                                        <green>0</green>
-                                        <blue>128</blue>
-                                    </color>
-                                    <color>
-                                        <red>255</red>
-                                        <green>255</green>
-                                        <blue>255</blue>
-                                    </color>
-                                </disabled>
-                                <inactive>
-                                    <color>
-                                        <red>255</red>
-                                        <green>255</green>
-                                        <blue>255</blue>
-                                    </color>
-                                    <color>
-                                        <red>192</red>
-                                        <green>192</green>
-                                        <blue>192</blue>
-                                    </color>
-                                    <color>
-                                        <red>255</red>
-                                        <green>255</green>
-                                        <blue>255</blue>
-                                    </color>
-                                    <color>
-                                        <red>220</red>
-                                        <green>220</green>
-                                        <blue>220</blue>
-                                    </color>
-                                    <color>
-                                        <red>96</red>
-                                        <green>96</green>
-                                        <blue>96</blue>
-                                    </color>
-                                    <color>
-                                        <red>128</red>
-                                        <green>128</green>
-                                        <blue>128</blue>
-                                    </color>
-                                    <color>
-                                        <red>255</red>
-                                        <green>255</green>
-                                        <blue>255</blue>
-                                    </color>
-                                    <color>
-                                        <red>255</red>
-                                        <green>255</green>
-                                        <blue>255</blue>
-                                    </color>
-                                    <color>
-                                        <red>255</red>
-                                        <green>255</green>
-                                        <blue>255</blue>
-                                    </color>
-                                    <color>
-                                        <red>0</red>
-                                        <green>0</green>
-                                        <blue>0</blue>
-                                    </color>
-                                    <color>
-                                        <red>0</red>
-                                        <green>0</green>
-                                        <blue>0</blue>
-                                    </color>
-                                    <color>
-                                        <red>0</red>
-                                        <green>0</green>
-                                        <blue>0</blue>
-                                    </color>
-                                    <color>
-                                        <red>0</red>
-                                        <green>0</green>
-                                        <blue>128</blue>
-                                    </color>
-                                    <color>
-                                        <red>255</red>
-                                        <green>255</green>
-                                        <blue>255</blue>
-                                    </color>
-                                </inactive>
-                            </palette>
-                        </property>
-                        <property stdset="1">
-                            <name>font</name>
-                            <font>
-                                <family>adobe-courier</family>
-                                <pointsize>8</pointsize>
-                            </font>
-                        </property>
-                        <property stdset="1">
-                            <name>text</name>
-                            <string>00 0a 20 00 a8 00 e2 00 ...ESD..
-00 0a 20 00 a8 00 e2 00 .*&amp;23...
-00 0a 20 00 a8 00 e2 00 ........
-00 0a 20 00 a8 00 e2 00 ........
-00 0a 20 00 a8 00 e2 00 ........
-00 0a 20 00 a8 00 e2 00 ...BRA22</string>
-                        </property>
-                    </widget>
-                </grid>
-            </widget>
-            <widget>
-                <class>QWidget</class>
-                <property stdset="1">
-                    <name>name</name>
-                    <cstring>about</cstring>
-                </property>
-                <attribute>
-                    <name>title</name>
-                    <string>About</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>PixmapLabel1_3_2</cstring>
-                        </property>
-                        <property stdset="1">
-                            <name>sizePolicy</name>
-                            <sizepolicy>
-                                <hsizetype>0</hsizetype>
-                                <vsizetype>0</vsizetype>
-                            </sizepolicy>
-                        </property>
-                        <property stdset="1">
-                            <name>frameShape</name>
-                            <enum>Panel</enum>
-                        </property>
-                        <property stdset="1">
-                            <name>frameShadow</name>
-                            <enum>Sunken</enum>
-                        </property>
-                        <property stdset="1">
-                            <name>lineWidth</name>
-                            <number>2</number>
-                        </property>
-                        <property stdset="1">
-                            <name>margin</name>
-                            <number>0</number>
-                        </property>
-                        <property stdset="1">
-                            <name>midLineWidth</name>
-                            <number>0</number>
-                        </property>
-                        <property stdset="1">
-                            <name>pixmap</name>
-                            <pixmap>image0</pixmap>
-                        </property>
-                        <property stdset="1">
-                            <name>scaledContents</name>
-                            <bool>true</bool>
-                        </property>
-                        <property stdset="1">
-                            <name>alignment</name>
-                            <set>AlignCenter</set>
-                        </property>
-                        <property>
-                            <name>hAlign</name>
-                        </property>
-                    </widget>
-                    <widget row="1"  column="0" >
-                        <class>QLabel</class>
-                        <property stdset="1">
-                            <name>name</name>
-                            <cstring>TextLabel1_4_2</cstring>
-                        </property>
-                        <property stdset="1">
-                            <name>font</name>
-                            <font>
-                                <family>adobe-helvetica</family>
-                                <pointsize>10</pointsize>
-                            </font>
-                        </property>
-                        <property stdset="1">
-                            <name>text</name>
-                            <string>&lt;p align=center&gt;
-&lt;hr&gt;
-Max Moser&lt;br&gt;
-Martin J. Muench&lt;br&gt;
-Michael Lauer&lt;br&gt;&lt;hr&gt;
-&lt;b&gt;www.remote-exploit.org&lt;/b&gt;
-&lt;/p&gt;</string>
-                        </property>
-                        <property stdset="1">
-                            <name>alignment</name>
-                            <set>AlignCenter</set>
-                        </property>
-                        <property>
-                            <name>hAlign</name>
-                        </property>
-                    </widget>
-                </grid>
-            </widget>
-        </widget>
-        <widget>
-            <class>QPushButton</class>
-            <property stdset="1">
-                <name>name</name>
-                <cstring>button</cstring>
-            </property>
-            <property stdset="1">
-                <name>sizePolicy</name>
-                <sizepolicy>
-                    <hsizetype>1</hsizetype>
-                    <vsizetype>0</vsizetype>
-                </sizepolicy>
-            </property>
-            <property stdset="1">
-                <name>text</name>
-                <string>Start Scanning</string>
-            </property>
-        </widget>
-    </vbox>
-</widget>
-<images>
-    <image>
-        <name>image0</name>
-        <data format="XPM.GZ" length="46755">789ced9dd95323bbd2e0dfef5f71e2eaed8b097dd8d8c68e8979c080590d665f26e6414b95548b3198d54cccff3e2965a6306eba4ff7e985be117d2ab8cdcf52a9a454662a952a73fffbbffeba180dfffaaffffed7ddbdba2fcc5fc6abe95fff651fc6e3d9fffe3fffebfffeebdf8df6d25f8da5f65fbd66ebafe6bfffc7bffeedf6fe327f89a5f85fe483c4ddc843e2169617bb89b17c3f7297eff7e3c4b1dc57c474bf1b25c6fbb97e97b82636c8e5327303db6f056ea4fe56cfc4d49e2f89a9bebb460e57e0da11b7a8bdabc8a9ff4549ccfd9d2043fdd87e7542dca5f6abc4587e4f6c90cb6de4e612729d056ea6fe978698fa5f2ae47047ecdf26b1412e1c72b862b9206e21d70f917bdc7efd98189f7f8e0cf57bb1ff257117b928880db28ff3b1dc48bcc2bcdc88f77790979790c7f7c42de4ea2972ea4f6590a11c9fdf26ee527d9d3896570fc406d9477d6835b8bdb1435e362dec4f81dc5a42f603e21672759158458ef3d75249ff0f91b9bc98127791c70fc406b98cfd6d3793be4b642ef78ab91dedcdf791db4bc8b54a8cf56f88db585e5c4656c0d89f3be21eb2f3c496ca6f03779a69fe5bc86ddbc1e7af21771ac8f52e719bca1b91933c0a66b287f20e19eae3f37bc43de4fa82d822fb38bf2bcbcdd6ca72e45be22e72758edcb1c86e0779a5815c9f11b7896d649dfab79918ed4f2237cd8a8ef59790979790ab1e72c7a2fd9654bed2c3f2b2496ca9fe69e0ee72d2df7562f6877bc8cbad2e8eef9ab88b5c17c89d1ed6573d628b9caf2546fb94ccd83f7385bcd2c0faa64a1cebe737cce4dfcac4587ec64cfee33931da534edcc6faf68819eb973631daab6426fbbf481ccbf38cb847f66c13c7f2ba4b6c513e053dbfdb4079bb1b662cafc6c46daa8fe34ff33f36c8cba68bf7ef22833b8dacf0799ae55dfbc471bc6a849ce4bb9a18e55730a37cc580b84df36912637b8fcc547f2b31cab762267fbd9a38ca276b1393be889bc4b83e3c3063fb5a258ee57a9919dbcf5f12e37c0f99713e8a0366f48f65496c697d394e1cebeb0e33ce6f5627c6feaf33637bd96962f44f1ab9cbfab7ca4ced0d12a3ff5f6126ff3e4b1cdbb3a93efacb92fadb657fc9e56dd4077f49dc237d69115b627e9eedb5e2fcc4f5ab07cb01f2b820ee124f880d72364466fdc87613a37eac3253fc714a4cf39d9d27c6f9e4fb79beaf13c77273c94cf6cdf7937e0bc94cf79f25c6fe3498e9fe63e42ee9bb5a4b1cebcb4b66ac2fae12a37edc30e37c8a7662f40f4fcca46f67cc387ff93231d987de4e1cef37a7ccd8be7d65d43fc58cede7adc4511f7497199f677788c91eac67c6fbf53471bc3fbf67c6fb2b9718cb67ccb89ebab3c4b13ceb105bbcdfec24c672961fad9f35cf07eb23e95baf41eb6bc64cebab4b8cfa3e65a6fbe9f9bd36b28feb5fcff07a36467d31a0cf2696637dd35e421ea37ccc4a0fb93c2426fdca4e90595fec0b33ce67b69c18e5dd2066ffa899b1bedc4f1ceb8b0933e9d76162d4af2933ce57362226fb308f89b1bd3b666c4f6e24c6fe3d33a33e88f3c418ff79669acf7b62f28ff622313eef9819db535562d49f2d66b2870766d42741fdef91ff335d66aa3f66c6fa663931facb544ef1d63631c757e3c4517fec0a33aebfe53533ce7f4df3d3eb51f99499f483fb4bfeb56e33637911fd876aa5f5fc0979a5a7505f1bc416b99a21771bc8fe22716ccfec12d3fcea3e33ad2f1531ad672a63a678c626c6f5e708b947fecc6d26467fb3cd8cf3291f134779cb1e33f91b9918f71f87c4a4bfa2c34ceb679638d65757ccd89ef089b1bd1633ceb716c4a49f6a3f31f66f8519f5256f33e3fceb9298fc937960c6f6f38a19f547dd27c6fb7366d40fbb9c389617fc7cf26f19cd9722ff95f598e9fee3c418af6f30937f1b25467f75cb8cfa625789391eb867267d5e66267d2b13c7f20ae599fc65759638faaff13532eb63f5424cf7176bc8497f26c434dfa64e8cfe65444cfe466c30e37cca49629c8f548ef3633262f22fee8419efcff612a3be3c30a33e640789f1f9383f46917f912789519fbacca80f994c8cf395eec7f9b2f43c45faaa3433de6f979829fedf4f1cdbcb537d6c2f3f4c8cf3af9851fee52ab122fdbb60c6fb4d2731eac38019f5a1bc4f8cf39b1367e4af9e13e37cc7f55c27ffe60be46e4f63fd2b628b9cdd212bf217663f31c6b38619e5af4f12a3fc2b6692df5e621cef2331f90b3b64a6f9be4f8ced9d32937ddf24c6f9ac8915ad37cdc4d87ec68cf7cba3c4f17eb9cd8cf36b0e13a3ffe0fe64585f94cc64ff3933cddf2b47f9e73c3e9e9f3a31ea47aa8ff2b7f43cdd247f344d1cebdb2d666ccf6d248ee52e67c6f6f4317107cb6bbebf83e57e8758691b19e56753be652731eeff1ac81d8bf56b94a7ed3590c796b88d6c5ac83c3f4e25467b5f27ce900b2ecf70be4c2a47f9ab9a19e72b3f4a8cfba71764dd247dd9498cf3ed98f17eb9ca4cfee08099ec8dfaaf3b34ff3d667c9ebc60a6f93f4f8cf3bfc48cede951629caf8c99e6a39b38caaf5a26267fa03c33b6a74e13e3f3f699b13dd74f1cdbcb3689339a9f21b369c7fb49fea649fa40e3311d2cafa3fd4338cef92845cceb4f8dbcd2c6fa4593b8873c16c83de2fa94d852b946560de46a880cf247ffdb4e8cf1e10633e5bb66c464df769319cb85498cf3b9c48cf3a764e2284fb14e4cf66cee9849de5c9fec57b6900dd9abb4cc385f4624467bbe614679e723661c7ff6484cfae0ae98b1dc8c12a3beac122be402c76753beff2631daf32d31d97b8dfdb39c9f32286fcbf9a8aacb8cfba571496cf179ce21771bc87e9db86d511fb07fe02f287f799218f38ff7c494bf288f88297e2e511faca2f6c7341ed5a6f1ef206bf207b96326ff89f303fa4df6ba9518edeb9819e72bdb498cebed1531d9bb1f2546fdb866c6fbc57e62d4873133f9e7d41eceaf3c23e6f5bdc94cebf34b62b4df27661c7f7dc88cf2360362b26f3d4b8cfe608399e627f6cf26fb2eb689793dd84b8cfa3145e6fca63e45e67ca63a498ce7139699f2df1d66da8fb78939bf39498cfa77cd4cf9249318cfef3431e5abca7366d41f4fe3e17c619d23777b387e5d21b37eea2131f547ef27c6f1ef31d379db1a33e58f489e3dcaafb9d3c498df9d30d379de5a6294578f99f2b52fcce80f75414cf69a1d3153bee120318ef78e19e551f7136339cd27ef77ea3566d47747ed2bd2af728b98f4a7a2f67513593591d93e0a1a8f21ff9a0f98697f74963896eb4d665a1f7789299e521789d17e5339d9c70933ad47cb89d17f3c3293bd1c235b8a9f549918fddb1d33b6a79e13c7726d99b1bd7a337116eb93be5bf2d7629719eb7b9338d62fbbcc791ee7778958617981f69025ff3e21267bcdb13f593a5fb820267dce4f12a33e1f31933e3e1093feeacbc4981f3e67a6f38646626c6f8999ce73f8f97cfe71c74cf6fc9818db97cc749e2098517ff31d64ceefa9c3c4b8bfed3293fd6f25c6f3a46566ca0717c4940fd11bcc585e578931dfd161c6fd925b4d8cfbdf6762da2f173231ee9773668c8fcb3133eac378466c71be1d8da7d74036dbc4349fd624c6f5b4c94cfa3720e6f3c0a5c4e83f0a663affdb488cf3714b4cfe5ecc12e37c3a669acfa3c4d83e8d57d17a201c333def25313e2f9553beff9499f29b2366f487658f19d77f4bfaa2c83f0b6e9ffcb35589515fb69871fed53233fac3ec8299e245ae4ff1a42d99293e7864467f9593bdf27ea59a3263fd729018f76bb7cc787f719a18e3838c19fd5549fac5fb97bac78cf3efc93f68f22fc53db2a57824bf4c8cf18866a6f82131ea677e9038b6a749dfacc2faf23931fabb544eebc351e2787ff6c09c7562799b98fcb53c64267f3d4b8ce3a3fe644dbcbf8efdcd3a1cef163bc4fc7e4d0399fd8fb9414efe649818e3933b62d21f354e8cfa72cb8cfa692689d1df3c13933fd42b89f1fe3d663a5fd861a6f7493433fa0b7540cce7a1dc1ee5f7c56662ccbf3599d11fe9b5c4b8ff9e31533e762f31e653e87eceef972bcc647fa7c494af293c33ce475513f790f33e31bf7fc0ed592c2fa85cf179a54f8ce7811d663a2f7e2056f4fec133339de71c2746ff3e61a67c954d8cf6ec9829ffb79118cb7789339aaf2c716c5f6e31537e89db237bcf7c62dc9f507f7493ce0f6f99c9fe5f12a37fb861a6fdc13531d973bd9e18f7075c4efb879ccbc95e8b2133cdd72371863ca6e71bb22f43f3c5f6ae487fd85ec52533ad675366bc5f0f1247fbcd0d7246f1947c60c6fbe53031fa9b2766d2a7edc4b1dc92fc32f2576aca8cf55d2ac7fa15f527a3f1dbcbc4d8bf0be61ccbd17eb274de933153fcd026e6f3b82b668a1770bc19e7e3ed2333d9ef38319e273698299f764f4cfea5bc64a6f39be7c4983fbf65a6f7155e98b1bdaa9d18cf7f87cc946fe0fb397ed965a6fa7bcc644febcc747e326346fd2b3266da4f38627e1f8be541e735639687c5f9a871bed37aefa6cca81ff50133cea7df481ccbc715719be6ff9838a3f880dba77c6485fe08d653f2b78299ce4f0c33e59b0e12633e6285b843e779c7cc54ff2931e6175f98c95fd8c4b8dfc999e93cf28899f20b3d628e3fee9829dfbc4f4cf144a699299ee0f1913d576bccb4fea3ffcd0cd96bbdc14cf69e31d37c9d1093bd8da93f86ecab247d4df6bfc68cf369bbc464cf559118e3db6b666aef8919ed55d07c66146f889a19f5432c2746fff2c28cf76764bf19f92f2912c7fab2c18cf5fd73e2b87fcbe9febc49edcd12c7f222f6377f5dcf9bc8ec0fec9498ecdb9e27c67cfa3333bdcfb947ccef57cd12a33f7962a6f35cc14ceb7b454cf143e599e97dd2a7c4787e9698cee7ae1263ff5699299fbec28cfe405c20a7f3a42566ca773412e3f9e90b33bdaf3761c6f929e9f91cbf3bc18cfa93ad2546ff7ece4cfe623f31eaef2533ce5f7184ac15bdffd160a6f72b1433e51bd712e379e03a31ef0746ccb4bf48e5944fbe63267bee22733e337f64a6fce53e33f9db7566cacf9e3193ff3d498cf220fde37ca61933e3fda660267f40fac1f9c7ea3631da6f8798ecc75d2646f9ee30a37c15cd47b2b76662b4df6b66acef9e12477bb27de49ce203dd4a8cf6bacb4cfe619a18ed91e493933f91b7cc54bf9b38d61734dfb9422eb1fd3c9d976c24c6fdc88498dfe7ad1363f916317d3fa140f9e56caf8520a678bf6c23f3f9ad5b4a8cf6beca4ceff3b488f9bc758f99cecf53399d976866dadf1d24c6f58199cefbf29298cff364623c5ff5cca4ffa8afb96ed27ea366c6fbc53333ada7341e3e0f329699d6d36162f41787ccb47fbe61a6f8f99819e7af2279f0f951d14d8cebf30e33da9fbc67a6f3be83c4b8be96ccf8bc318f87f4a5ba242679881366f21f9a99ecfb9699d66b961feb3f8d97fd83ae13e3f956c14cf1c35d62cccfa6fad4bf6d628a47dc7962ccd7ee3153ff4c62f45fdc1ec9db0d98c91f5f32d3f31ac4e42fdd3a33e57f8bc478fea298297ffb9218fd559f99ce3b7bcce44f569969bd267d3019eab37d4a8cf63466a6e7737b341f629418e39936333e5f5489d13f5b66caff6e32933fdc481cfb67d03fe596ec430e98697f7acd4cfd2b99293e5c4a8cfd2b98c9be478931bfbdc34cfe7d3331e66f0e9969fd9c25c6f5e49419c723537f48dedc1ed9739931537f0f13c7fe28cb4cfb4f9118c773ce4ce73b5b89315e4ccfa3f5e12e31e6571bccd4df5962b42f9a6f4bfe415f24c6f75d587efc7ec50933c9374f8cfd5d66a6fdea656294af63a6fd37f79fe253719418d7af0762ca3fd893c428df0366925f2b71ec8fe5fe51bc2fb3c4b81e3e3153beee2c31e6ab59dea4bf22b547e719549fe3fd6a9799c6ff9018e76b8599e2f5fbc468bf6bccf43c9b18e541fac3fb055b30537cb19e18c777c34cf36f12a3fdd1fa95f60f6789b1bf7d66baff95d1bf91fd717c231e12e3fddbcc74ff66621c0fcd17c733d51633d55789313e21ffccf18b9c268ee592fc45cefdf58963f921c93bfc87fce7fadaeb8fbcbeedfa23af6fbbfec8ebdbae3ff2fab6eb8fbcbeedfa23af6fbb7e777949f1d13d787bfdeef20289a98feec1fcf5bbcb4bea8feec1dbebb7979792e6a3fb307ffdf6f2b21fdd83b7d76f2faf4ce61fdd87f9ebb7979793fea3fb307ffdf6f22a64f9d17d98bf7e7b79557fe289afbfa497b51c7f742fe6afdf495ef2fa9dcf26f2e693cf6e3fae8fbf93bc4012d305f6f24e2ed6f950ffff3bc94b3ebcf3d9a37cfae4b3e78febe3ef242f90c46c81a7f245ae2e7cd6ff480dfb48792d8e5baec9f54fea6cc8c1c227d38fdc537eac7ec9cd05760bace496dc5ef86ce7e3fafbf1fa35bf26ca5db927870b75f6e5c1db7be4481e7e548f3f5cbf16fdd5d1db15526eca6379b250e77481fbbfb2c71fedefe5d91b3a97170be597f26adecfc907b9241b73dc5c8c417eeef5c1fad597cb6fa4d192ed85f28e5c79f38992dd37ec1775f4e75ebf5a5e9fac896f3c3cac7dbdb7e5420a21d47c7da1e7db10bf389bf8ebf5eb6dbe54aecf5ba0b02213f97c5de1c41b098b42cce52b645f548b6beccfbd3ec21e453d37622dc6626e8d1493b7e31737e256cc79287127e64b1f16a38d9f7d7d807ef51724f2f8eab1e5543c89b9dd8ec8c54c3ccedd6bc48b988bf7455facbd69fba7e77e3e44bfde44f1e08f8ee668438837fe6920365fd74390e7d66ba9d8163b6277aeeedefb398eff7479c1a8e7a252b12f0e5e354e8cc45c342a8e40bf8ee7f8449c8a740222cec4f99b76fdcfcfc5fe2a79cde7acc4b5b81097737cf56a476249344473ae6c003ab49ca825e6e20dd1112b622eba100b6beb7faebc823ce6ad4c4995cef9e55429a55f6b2af3ba822a0bfa35a76f2a5339cb5658e5d47c9b857c9a8f5d7f4e16e357e9975ab01455cdfd5eabb122bf230fd544a58c2a58ee40dd2a9282a8d59d7abdeb41cdaf14d7ea49cdad14ea2745b1bfce7fbd8d4cd58b4a5185f46a55a55da05a53eb2c07b5a106e26aee2ea35e3d5d476dcd69e2f6fc3e401cfdac1cd92f94d754cd6562d4aeda4b7ab3ac866a9f6aedaa835709c94d3552878ad64f75ac4e14edb6c525c86eae7571a7d24e549dcbf3579ff79f22af4f763e53d0a9f958fe5c259faff6619f48baa2ae9493b4ee897db5a45234a104f836f25e608da3d79d806aaae5396aa99f9681fd99faa5da0bdc81583d59a1ba7cd523b5a2ba7c0e245aaac7b213676aa425c7585a68a56965101d6d344516f256677a7e17f513d7c99f6b8fa258909816a35466b5d3a407e248179a5604e974c51e5fd77aacaf5153a5d2137d93eebdd5c9d78b0788625f23923b7db7d88f1fb7c7fcd9fe4b2ff28d4a3b3efda0c6ec67c4b17ed4f12448aeab9e7ec6b82a581d7c4e6b5d88f5f54bfc7c05eaacb2c5ebbe5ec3cfe1f775bda11732fefa07eec87fb6bca47a9b0fd55b7afbb50cfc119d96e91db648598a19d711460df42eea8eded343ce558035ee6bca53c3e7fb9ab4561fea237dfcb6078b33f69bcbcbeb1d7df2ca6219e2758a1dc4548c25ad8b7a539f6a8a61f5993e579df8db05e8d7a58e7e4e2f814e35824ee9267c467946ddd26ddda16735f58aeebe7d3eac243f345ffde3e5b5f83ea0eceb9e91af6c847286bc8dd17accbb6f7d263b616f28378d5123d43563f51874308ed8647a68a2578775b26b1c7deae1f70265674a5389376f8b99da8c7f6ccee267e89759c81188a699cce74165cfdc70eca51ae8c32054b885582bc6505a9829e62c4032a05fe62ec6657b1041c415d1dceb534367e1e6516c19f47b1eeaaea9b9679bcc3c9bb9385fb77e4f79c5739e371190be322f7a2f954ecdaaa4b8c2f45517338062a88732e6bac40874662dc4f8661de22f83392ebd6b36cc0073166a64a20f375b66db50146c76cd9e99cb7b987d736046737dda94ebdfbf4efe2cffa5f6d5c3bccccca13932e48945572e81c5453b31276a2237508a62a0cf436e42f4401e71953067aa0bfa05d1ab39361726c6b7ca9a2bb314d64c79ab0e40b2319e354dd0b9b998deb4c2df479ee31571a17ec07b173fcfdf9baee9cde70bacb442d0ce4684ef0253e4291fad09719adcb4162c1264a2fa62605e82c7b719f8b741d833da5c75ad0bf6a83235b071266ca146b60c1ecbf4e0b3b94cbeadf5d0cebd3766afedc47ef25ed447cacbbef34e969edae97cae5eb4ed1d9f5fdb7b186bf44112bcbb7d0c397cfda04f4376506a7d09b156a8f5043e6b104e38cc3ed47ac6b5117e9b05ddb52ffad4aec2bf7dbba67a769df3fc76033e9f8bc1eca69676eb478cf247ead7ab7f7abdcca9dd1629db0cbbe747f1c4ebbbdd01ddd90feba7dd05bdeac74875a45ca82fa41e5b68cf0e41f7067a27e6c8ba765f4e21aa18a9257b1072ad7a0851c534445d5036e2bcbe3d14337bf4ba4a83aeeddbe34ffb26fed19bea3fd21ee5913d91cd379f787b2a1af68c496d821e9c631db106231f8775521ec1782fc23a0a71d7486fd94bf87c64af6403f6922373619760d40d75124e6aad36175a81dc5a7a05ea34834e81060e2cf92edbb26d53d90e7b02f0fa53bbf2b69fb66b7bfff42dcf1febbf329909b39019cc941e1bde19ab4cab5e66e29b269b99553d8cc4f4ae1e8711c80dd039582333f05b212f61870a64016be84696ab51e64c4fccc420f3b20f71d7282b32785656a94156e3da928dc3da995db3766513bd9f2df82dd5942fd93f7ea3f347fbfb6caa0eb337fb5de9455b9f665cfe2076544fc608337b84f570203745377b52ddec399b890af4eb5c5f05bdd297d94bb61af40b66c181555eaa538834c09f65fd1077c16fedb05f042d1d656be10c5c5da83bf87d3ddb20c964a05b83b7918dc9b241f61d51c58f5f1fc56ab625244413afb9620f3a36cc684fa836b4836822da8fecc23a063be56c472d65b04f3483a01fb22db7416776f556b607ff0eb3fdec00f691d766331b05fd1256acab8132d9a13c8bfab6157c9e9c9917f8fd288bbe4a4e33f06fd9e96b740fbd38cbceb38becf2dbc6f3e3e4a5202ecaae3efd3c5bca1a6075cdd7f700831f3353de4567d3e0713003adaf51f7c012e3fe315bb66db991b5b2b6b9902b02a209d0af4eb60292e8663dd0b9a196b9d46d31c845ae741bb46b92c37372037b869132e8c7c443769edb3c9bcb57cfecb9eae539ebdefcf52def5b7f9f7e4923d773f74e2eb59ffbbc10b33cf932d431d0bb28b3bcd263bd1bd7b61db0ab99ac33d039e1f25adec57fa31fcaafed733ec96ff2db7c9a4f7437bf53460ff3fb0c620b35c81ff247b0d2dbfc29f4237f861958cae3eec7e6f0fb207f1139f72b5fcdfbf95abe2edef92e92ba90d3af7f27ea7bed518215e51bd96abe90738218dee88e3e556bb6107b2831fb0cf1d520df0ca3c8b7402e52fa7cdb4c60f47bea340f92bbb54bead11ee5bbf938dfcb877233df075940f4908fc00f36459e1f021fe98dac069f75056be1aa69c80788bf825f5b873dc25e7e0c923e81364e318706bbaf477d9a9fe5e7f9c2bb65f9a57d12b076e4efd8c8cf92173d79496dc9b0037a930b90d3fc5e0fa1f70dd5c24f3205fbc151de940a628b06e800584f761b7c90ee59a9f7f316ac9aa5eccfe73842d41ece7bc2d935e62f300712b4226fe71d59e61059e85bb105dabe9977c3efea318f7b0bf0883db0e0b193e2cd9b8b20d707ddcf8e4216fbdb4e927e94bfcf1e9cd0cbe6c62d644ff2b6d3e60ad6adb82b0e7ecc82cf710674c52a88ec9d05bd81b50eee6db8ecf53e973be7bc2b5ce92a57bb315dd76e029f145072238e1cf91db0ee4e5eb8a9bb73b06b700f66d53d3ab0d27ce09e21466bbb9934f352712ff079cfadba7f9019fb71eb23ccb707e9ac29234edcdc1b256e0362ef81d9b63af8aee0c7606d1be5cf46b8e0f5076ed36db96df03571fe65dfedb85d90cb1e5cc3f8bf7b6e1f7e0ee067449f1cd0cfc41dbaa3b0f386bb37417ec7b03bbf058b8f790877a296c4c09dbab35759d96b770e7b87ca5db8cb5f13df87f75fbe94477257b6692af05b997ae0bd633ed21b71451cb925097146a6cc058ca461975cd35cb9653ee7712dd726097deeeab815d7753d0f4a09d2c3cfc65ec952ee82346eccb37af4da1be385847575e8ad279dcdae6ce136cd85eafadcbb10f3fd33adf876fd929be041afd5f6e7de1b85726376f43ef4cceb75f40f2287b8de805f19796fac34e25ccc20ae2af2b669c4fcc2932f7c1946ef2b5f83deecf9f13bd2029df2d7bc1f95a59ff81bb0d658e66f7df457f0f499bf433d33079efaa4d7fd43d0f1fcc63f66efec25dff4ff8bf9d87f628f2196ce5e2016bff24f76037ce73beff8e963f36caab06ad9f3b076fa673fd3cb2ef4fac2dcfb17bfaa0dee5464dff7c9ce2abf968ffcfadfe858e5e6d633b1ec37fcc047a9f94dd70d7a66ee3cacbe7edb83cff4bb7e2f6836fc4cfcd0effb83f7c7146cc68fd48a8235fb4bf1d83ff75f611efca13ff2c7e6c56dfa93c57da3347e96d5ee14acf0147c574b805e05dfe54f436ceecffc79d03b7f41fab1e963dc2d72901dfbad037fe5977cc337fdb26f91cf025fe6db8bbe47acfa0eb5b3e2bba1157d97ef2b6b1b217f16d65fdf032b9c7e1227fa90f5f727a263c3ff19471162ff2faf97dfebeff50b58675e487b047e5e16a250626f3ee7a5f342873d20fcdc14a6b01ad67b7b546421675fe4c1f2dc5ee10acfe79045c17a54944555d4c5187eae8b497153dc92c4c2f5ce9864bf98e22a51d0fe15221488f7dc437ef3762d0c1229ee8b87e2b178cacecd6af15ccc20d6f3f3eff5ff2c79510f36a3d45ef2b30276c845bf58d34b8ede8190b3623d7f09fbc0a05bc5865d86da5e1c816486d106e7f673c580d7c5621364b415a535819fedf8ef8edb2f76b1c6fba764ae5fa09fab8a98972cf6b3a3e2203fe578ae18158776581c15c7b07fe8162720a9538880a75f9fd7ff1a7915675f77b6622f215ed4058415107175735b9cdba97b914a75446e960d44aab62a20c6f607ae1765352c2ed5d1ebfd72d7951c41145720a12590d152fa77027ad6483af6997724a4289a10af05fd9c86bd62b12ca76a56b48a76d1811df825443221eb3dcacfdc6ab102d1cbdfec1dc54216f4ebf44b1ca96db12eb3a25b1c163dd08e10177f66cf05d1b92a2e4a09de1d7c17ec1907deab4cdee5b3522818819f962acaca2dea08f41e63aefd52934ed524b10959e6a4341c597cdecfc8a91fc4b5b47418252badc23e43df6643775a5aff0892329ffbbb29c12f9759d1325baaaf8ac5f5f26bed31c42baa23fb655ebad2974559c27e2f2babb22e1e6c4bece926e62b7814fe192cb4037ee105fc1aac89f95a61bd29c71037f13a77ed163279e53597959320adf206a555decee9d82dd5a9bfdcdf725ab8b83ad4e55d09fba8fcbe7cb0955b2d1f610c73dfd80d6b61f90cbbb366f1605ae54cdca9c34c952fe5aa8cefff8885e8e21fc45fd0829e89bcec67d7d97ab9a67a61eea26fea9bc772dd8475a90551461ef77da6dc2807f953091eaedc022bd99d8bcff7caedf98c813ba235ae55ee80947659a7a2e450c726254b7b94ff8dc4e079437ade751879b92ffb71ff0976511e80fe58d32b4776bb3c0c7121ec5dd7caa3f2b83c81fdebf4f37fb3e77bfc7dd8d7671b307787e56979569ee72103d53553d50dd17c7921a47b76b6bcb4cfe555888bcaa577a2a951d9e0bff1553693f78afaf5896e859f8aeffcfbfd0cec1762d45b2ea33f2f5b65db6dea95e23c9c3fc11e249c735665273b2d57f24301fa8f76f4a5eb07ad8f61cebad2e4c3bc037eaa079a7f1a742eec0f43fc033117ecabc1afdc78f6e807afff56127525e81fcaab12694d4489d1bfe56ea558cefa8b6ff4cacd4ae36ea9320eb45cec99476b429f4097c6e6caf72a5b6576591c85b709befe1d8b1f9d8f0ef3e38dec57b95daf9c5bb6957a0c3902d5ab7c05deb32afde01d2d1b97e0ffcafbe4bf6ec183cdaf8df8efb89854ac5f5ffc1e475597cbb1565985539487708e19aeeada1eb95976534d7c57fabf5b1b7f85bc5e2fdc374a55dd54b76ebb9ae62fba17564469aabbea3eee0f31e74032aa1eaa478c04dcb07a7aab5bb456d6c54df54cf5773ffb5c53cd48b35eaad5b0d655fdfca6ec55ae5a73218ff1cd39af9f2daf785ac63fd7e1bd2c5821603764b7c09336e3f75638169fb74c1861da09ed55ebe0db6fc90a6f836e551bc5d82fa7f2cf9c1fba3eec22e39ec175abf0764a5d6dfab03f0a6bdd0ff826eea7f28af9cc3c9c1acb6936aeb6f28178a8b68bc36aa7daadf6ca836a588caafd32d3eba6ac0eb2b11daac2eceb3d77a2eb72548db249b95e1d164755c847c1dc82dfd8ce46d5b1d5f933c4d5ced01b72d5b83a71af39aef92bec115bd529ad91c98f5567a946f5fe68aaf3e8e187d505ec567d8c1b0b732f9eb2893d2c477a2fbb73b07ec3a80e4ca9d7f5615e2a5bb4615c9730beab6aa96a142dbf2bf6ecb5f4c588f2b89b5f9257fc8ed783f45553de54cb6ad32ee946d5aada66a7ea542b7ebbb4a5cdcfaa6ed5ab65be560b5863e08235b1a7ba1059c4354775f529fa8b90e70a79a89097c09facad46721f63dd6cb356ef482b5dd553ad6b83eb646deb0c2519aefa9d730bbf819a55bb7229c455d5563609f13c3c7388fd004f8ffd8afdad7d5dc47ef7c0d0058ca5cc618df7c31a5c64d5ce2b58d357e58dda7dfb7dcdcfdb63b4a629ae1d9c338fb63f93533d839d4f0debe1be38aa6b3fcb0fab5b7b9c77ea717d5d4fea9b7c56dfda417691add7d33cabef6ce57b3e776b79914f94a9ef4166456cbb5f3dfa9577758c2e7f553fd48f313b81f92fd09feae5132bcc3dc5baf553fd7c785fcfec36ee2ddca959756b3eaf5fead5ba9fd5f59a1dc09e7156afdb71bd618f6da71ec8198cc3c27854b4da30c63e8dfb130bfe11fe8bbd67581bc37b3621d7906f877348e9eb4df0f8abb29f819fadb74ca31ef8fd72a3de2e73be17d6a91d572dc8e9e0f3122ceede7cd76db7de49be7058ef8677f5d571bd6796eb61bd5f1fd4a3fc541f0b6b60875e1f86f328ec1bbf4ffdad9efffbe4e578d45339d3df900f5fec6576591f55f79f97d19c9fabeae3fa04f6a05bd5b9ef80577fcdc38eeb9487785f37621e65c679e1f0dbb7bf0bfc3df27239f41277b4e039fc77fd1d20790bf37f569f7f51665f92e4b81afffddf0296106978fa06737d01d6fbcdef067c8fbcc2d3eb981bce218af2837fdaceeba56d31f4fdb853febb6b84bebd5eaa43edaa187e4d0e4bcfea8627bd733d888bbf39c2589497eb1777f928f805e74b6035f56bafadd63b357ceefb757c83ab86d8b18e7163ccc41c4a8a21ebe5f2aeb82b2e5d2b96410b75abb8ab5b61dd9abfea7631a83b9f6689cd53bde27a7ef0c6dadeae02a52b8bbb72095a0dd22a65197c9abcadbbced7ad7af775bf5c3f2ff4455571b5abc6615660afe4712f2477eba6f330b61b3c4f71797107b4e61724ba28afb087ab7ba83b611d92b0e28f258e682ca29770eebac6a79749bfea57fd0af306e3aca05623f890b18ada30893b47fe66811f6b8ae5e11a9bf7de9991069e9d43cc7f33b6e55df5e27cf552de8d2d7056420c37ce5dccb58edd9c74823dd7f0b46b94427d169f5df912faa268c71523e9b18f25b5ab82564805e20bb330812b8ead3e8da318b9e1db595e945735c6d839e84ec8839ba790a98cfd0fd14d592f832e5da1c77eab5fc534e897bb82e78afad25dc93ee64ee177280336d503d48fef288f69d70dfba29b72299c637fe99dacd06ef04df187d6c67229ca7f04ab65da2babeb020400ebe51d3ca713ac2f6425c755e80b7ec7addec15145bb813e8f6b7c77df75631f731c5bfc046ad667e3a0df859cdb7b7d628f4760d55ba85fe36bd2af49d0932049589d9ea0dda2182ce857f25f7e12a4e0606b0c3f37689d8ece274037f6c6f1fc1475abd2f5164a3e1f8dc5d7ae5572b3eee15a8a91e9fce5370bd036e87b599f408f1f438fe7fb12f48b4f43e6fd97bf81d6cea1de21c66f684be30c7464b778f3f6dfe7f42bae7d7e5ebf8a909d9a78e105f4a11764fe897ec1dcbbf06407dec5c1987cd2af3b9eb3d0c31af7cce372eeb9f5276764ef5f94370d57395ec82f88e5f054d4c11003c619beaecfe18e8afab2f32aaf12b4107d19ec7da6f1440fc606bdeeb225071d1d4fdf463f8bf20afa519f7ee2bfc228db6e549918c178f418eff9aff15d38830efe4824ef1fac86f5ab7ac4b643ff16f4e66ff44b6e16c3d7d336dfc9479fd609faf59ab10dd2a94ca8c731d7bc7e0579a1af229febf16f3d613f827e558f9f3e61515ef908fcc2182c2ef46ce20ec7f7ac5f305fe07f8a62fce00adcbf85a7937e9920afa0736a1af3749d60b5759c29f01fd4c718f184397b8cbee7fa5b225c580b5fa38cca39f34eb6505dfbcdea0dbbe0c5578aa91f94cd45fdf297718445dcfbf441af86950ebdc6bff911f46b716d7c4f5e50f3b83285f36dd8d795f15f31b6fc0d577fe36f8376b39440aad1a76b5b2ff1095776397e0a77baaa7a09be78fcec4af4331eac197b031e7e84ebf0df5fd09e9ddb2f8d6044b3cfe5437d1f82d6b959183f8ec91eb12fd96625d9e7095bbd8005b6d15f81ce17a12658257a9f617dfede5f4b792f5e0ddf73d52023fe5173725647e133da8ddf067dc2cfc37cb39d073d13bb50ef89ef79fd9c63f0a0bfb5fbb2cf12bbe31968ebdc6e1c7ce717bed5124ff717ffc2df425fe6cbb16cfe79d233cff7f5efe4f52b2e918735ae76e397f774a5dc774760fd63379f1f9bf8e2fbde6dfe11d7c7fd3d3e59a29581cef4fc86cb455e3f17215751d49fec877c09bbd3d9cffa9b12ff19f28a3aa6bf629f58d58dfa3790d4c7cb2b5c65f30b3989ba7aa8cf84fd1df48aaf8f96578c888ffc00a4761ddf4f1d81d79a407cfee476ea9d5ffbb72fbfe6fa7879e1a567e2a85ef61be3db7ac777a5523fe02ce7675cbf8bbcfe53ae3ff2fab6eb8fbcbeedfa23af6fbbfec8ebdbae3ff2fab6eb8fbcbeedfaf7fffb9ffffaff245f9a02</data>
-    </image>
-</images>
-<tabstops>
-    <tabstop>button</tabstop>
-    <tabstop>netview</tabstop>
-    <tabstop>TabWidget</tabstop>
-</tabstops>
-</UI>