6 files changed, 166 insertions, 72 deletions

diff --git a/noncore/net/wellenreiter/gui/configbase.ui b/noncore/net/wellenreiter/gui/configbase.ui
index fa727f9..dda7ba0 100644
--- a/noncore/net/wellenreiter/gui/configbase.ui
+++ b/noncore/net/wellenreiter/gui/configbase.ui
@@ -8,14 +8,14 @@
     </property>
     <property stdset="1">
         <name>geometry</name>
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>212</width>
-            <height>267</height>
+            <width>220</width>
+            <height>306</height>
         </rect>
     </property>
     <property stdset="1">
         <name>caption</name>
         <string>Form1</string>
     </property>
@@ -25,13 +25,13 @@
     <property>
         <name>layoutSpacing</name>
     </property>
     <vbox>
         <property stdset="1">
             <name>margin</name>
-            <number>4</number>
+            <number>3</number>
         </property>
         <property stdset="1">
             <name>spacing</name>
             <number>1</number>
         </property>
         <widget>
@@ -322,94 +322,139 @@
                         <enum>Horizontal</enum>
                     </property>
                 </widget>
             </hbox>
         </widget>
         <widget>
+            <class>QCheckBox</class>
+            <property stdset="1">
+                <name>name</name>
+                <cstring>groupNetworks</cstring>
+            </property>
+            <property stdset="1">
+                <name>enabled</name>
+                <bool>false</bool>
+            </property>
+            <property stdset="1">
+                <name>text</name>
+                <string>Group Detected Networks</string>
+            </property>
+        </widget>
+        <widget>
+            <class>QCheckBox</class>
+            <property stdset="1">
+                <name>name</name>
+                <cstring>enableActivity</cstring>
+            </property>
+            <property stdset="1">
+                <name>enabled</name>
+                <bool>false</bool>
+            </property>
+            <property stdset="1">
+                <name>text</name>
+                <string>Enable Activity Display</string>
+            </property>
+        </widget>
+        <widget>
             <class>QLayoutWidget</class>
             <property stdset="1">
                 <name>name</name>
                 <cstring>Layout5</cstring>
             </property>
-            <property>
-                <name>layoutSpacing</name>
-            </property>
-            <vbox>
+            <grid>
                 <property stdset="1">
                     <name>margin</name>
                     <number>0</number>
                 </property>
                 <property stdset="1">
                     <name>spacing</name>
-                    <number>-1</number>
+                    <number>6</number>
                 </property>
-                <widget>
-                    <class>QCheckBox</class>
+                <widget row="0"  column="1" >
+                    <class>QLabel</class>
                     <property stdset="1">
                         <name>name</name>
-                        <cstring>groupNetworks</cstring>
-                    </property>
-                    <property stdset="1">
-                        <name>enabled</name>
-                        <bool>false</bool>
+                        <cstring>TextLabel1</cstring>
                     </property>
                     <property stdset="1">
                         <name>text</name>
-                        <string>Group Detected Networks</string>
+                        <string>sound on new net</string>
                     </property>
                 </widget>
-                <widget>
-                    <class>QCheckBox</class>
+                <widget row="1"  column="0" >
+                    <class>QComboBox</class>
+                    <item>
+                        <property>
+                            <name>text</name>
+                            <string>Ignore</string>
+                        </property>
+                    </item>
+                    <item>
+                        <property>
+                            <name>text</name>
+                            <string>Touch</string>
+                        </property>
+                    </item>
+                    <item>
+                        <property>
+                            <name>text</name>
+                            <string>Key</string>
+                        </property>
+                    </item>
+                    <item>
+                        <property>
+                            <name>text</name>
+                            <string>Alarm</string>
+                        </property>
+                    </item>
                     <property stdset="1">
                         <name>name</name>
-                        <cstring>enableActivity</cstring>
-                    </property>
-                    <property stdset="1">
-                        <name>enabled</name>
-                        <bool>false</bool>
-                    </property>
-                    <property stdset="1">
-                        <name>text</name>
-                        <string>Enable Activity Display</string>
+                        <cstring>beaconSound</cstring>
                     </property>
                 </widget>
-                <widget>
-                    <class>QCheckBox</class>
+                <widget row="0"  column="0" >
+                    <class>QComboBox</class>
+                    <item>
+                        <property>
+                            <name>text</name>
+                            <string>Ignore</string>
+                        </property>
+                    </item>
+                    <item>
+                        <property>
+                            <name>text</name>
+                            <string>Touch</string>
+                        </property>
+                    </item>
+                    <item>
+                        <property>
+                            <name>text</name>
+                            <string>Key</string>
+                        </property>
+                    </item>
+                    <item>
+                        <property>
+                            <name>text</name>
+                            <string>Alarm</string>
+                        </property>
+                    </item>
                     <property stdset="1">
                         <name>name</name>
-                        <cstring>beepOnFound</cstring>
+                        <cstring>netSound</cstring>
                     </property>
+                </widget>
+                <widget row="1"  column="1" >
+                    <class>QLabel</class>
                     <property stdset="1">
-                        <name>enabled</name>
-                        <bool>false</bool>
+                        <name>name</name>
+                        <cstring>TextLabel1_3</cstring>
                     </property>
                     <property stdset="1">
                         <name>text</name>
-                        <string>Beep on new network</string>
+                        <string>sound on beacon</string>
                     </property>
                 </widget>
-            </vbox>
+            </grid>
         </widget>
-        <spacer>
-            <property>
-                <name>name</name>
-                <cstring>Spacer2</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>
     </vbox>
 </widget>
 </UI>
diff --git a/noncore/net/wellenreiter/gui/configwindow.cpp b/noncore/net/wellenreiter/gui/configwindow.cpp
index 6dd862f..e287b47 100644
--- a/noncore/net/wellenreiter/gui/configwindow.cpp
+++ b/noncore/net/wellenreiter/gui/configwindow.cpp
@@ -14,21 +14,25 @@
 **********************************************************************/
 
 /* LOCAL */
 #include "configwindow.h"
 
 /* QT */
-#include <qmap.h>
 #include <qcombobox.h>
+#include <qfile.h>
+#include <qlayout.h>
+#include <qmap.h>
 #include <qpushbutton.h>
 #include <qspinbox.h>
-#include <qlayout.h>
+#include <qtextstream.h>
 
 /* OPIE */
 #include <opie2/onetwork.h>
 
+WellenreiterConfigWindow* WellenreiterConfigWindow::_instance = 0;
+
 WellenreiterConfigWindow::WellenreiterConfigWindow( QWidget * parent, const char * name, WFlags f )
            :WellenreiterConfigBase( parent, name, true, f )
 {
     _devicetype[ "cisco" ] = 1;
     _devicetype[ "wlan-ng" ] = 2;
     _devicetype[ "hostap" ] = 3;
@@ -42,18 +46,42 @@ WellenreiterConfigWindow::WellenreiterConfigWindow( QWidget * parent, const char
     {
         if ( it.current()->isWireless() )
             interfaceName->insertItem( it.current()->name() );
         ++it;
     }
 
+    // try to guess device type
+    QFile m( "/proc/modules" );
+    if ( m.open( IO_ReadOnly ) )
+    {
+        int devicetype(0);
+        QString line;
+        QTextStream modules( &m );
+        while( !modules.atEnd() && !devicetype )
+        {
+            modules >> line;
+            if ( line.contains( "cisco" ) ) devicetype = 1;
+            else if ( line.contains( "wlan" ) ) devicetype = 2;
+            else if ( line.contains( "hostap" ) ) devicetype = 3;
+            else if ( line.contains( "orinoco" ) ) devicetype = 4;
+        }
+        if ( devicetype )
+        {
+            deviceType->setCurrentItem( devicetype );
+            qDebug( "Wellenreiter: guessed device type to be %d", devicetype );
+        }
+    }
+
     #ifdef Q_WS_X11 // We're on X11: adding an Ok-Button for the Dialog here
     QPushButton* okButton = new QPushButton( "ok", this );
     okButton->show();
     Layout5_2->addWidget( okButton ); //FIXME: rename this in configbase.ui
     connect( okButton, SIGNAL( clicked() ), this, SLOT( accept() ) );
     #endif
+
+    WellenreiterConfigWindow::_instance = this;
 };
 
 int WellenreiterConfigWindow::daemonDeviceType()
 {
     QString name = deviceType->currentText();
     if ( _devicetype.contains( name ) )
diff --git a/noncore/net/wellenreiter/gui/configwindow.h b/noncore/net/wellenreiter/gui/configwindow.h
index c627901..5fd0327 100644
--- a/noncore/net/wellenreiter/gui/configwindow.h
+++ b/noncore/net/wellenreiter/gui/configwindow.h
@@ -15,22 +15,30 @@
 
 #ifndef WELLENREITERCONFIGWINDOW_H
 #define WELLENREITERCONFIGWINDOW_H
 
 #include "configbase.h"
 #include <qmap.h>
+#include <qcombobox.h>
+#include <qstring.h>
+
+class WellenreiterConfigWindow;
 
 class WellenreiterConfigWindow : public WellenreiterConfigBase
 {
 
   public:
     WellenreiterConfigWindow( QWidget * parent = 0, const char * name = "WellenreiterConfigWindow", WFlags f = 0 );
     int daemonDeviceType();
     int daemonHopInterval();
+    const QString soundOnNetwork() const { return netSound->currentText(); };
+    const QString soundOnBeacon() const { return beaconSound->currentText(); };
+    static WellenreiterConfigWindow* instance() { return _instance; };
 
   protected:
     QMap<QString, int> _devicetype;
+    static WellenreiterConfigWindow* _instance;
 
 };
 
 #endif
 
diff --git a/noncore/net/wellenreiter/gui/scanlist.cpp b/noncore/net/wellenreiter/gui/scanlist.cpp
index be1245e..a006a3c 100644
--- a/noncore/net/wellenreiter/gui/scanlist.cpp
+++ b/noncore/net/wellenreiter/gui/scanlist.cpp
@@ -11,18 +11,24 @@
 ** 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 <assert.h>
 #include "manufacturers.h"
 #include <qdatetime.h>
 #include <qtextstream.h>
 
+#ifdef QWS
+#include <opie/odevice.h>
+using namespace Opie;
+#endif
+
 MScanListView::MScanListView( QWidget* parent, const char* name )
               :OListView( parent, name ), _manufacturerdb( 0 )
 {
 
     setFrameShape( QListView::StyledPanel );
     setFrameShadow( QListView::Sunken );
@@ -139,13 +145,12 @@ void MScanListView::addNewItem( QString type, QString essid, QString macaddr, bo
             return;
         }
     }
     else
     {
         s.sprintf( "(i) new network: '%s'", (const char*) essid );
-
         network = new MScanListItem( this, "networks", essid, QString::null, 0, 0, 0 );
     }
 
 
     // insert new station as child from network
 
@@ -189,12 +194,14 @@ MScanListItem::MScanListItem( QListView* parent, QString type, QString essid, QS
                               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( 0 )
 {
     qDebug( "creating scanlist item" );
+    if ( WellenreiterConfigWindow::instance() && type == "networks" )
+        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 )
@@ -268,21 +275,36 @@ void MScanListItem::decorateItem( QString type, QString essid, QString macaddr,
     _macaddr = macaddr;
     _channel = channel;
     _beacons = 0;
     _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() );
 }
 
diff --git a/noncore/net/wellenreiter/gui/scanlist.h b/noncore/net/wellenreiter/gui/scanlist.h
index da9369f..01db172 100644
--- a/noncore/net/wellenreiter/gui/scanlist.h
+++ b/noncore/net/wellenreiter/gui/scanlist.h
@@ -88,12 +88,15 @@ class MScanListItem: public OListViewItem
     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;
diff --git a/noncore/net/wellenreiter/gui/wellenreiter.cpp b/noncore/net/wellenreiter/gui/wellenreiter.cpp
index 41ffdcc..d1dd73a 100644
--- a/noncore/net/wellenreiter/gui/wellenreiter.cpp
+++ b/noncore/net/wellenreiter/gui/wellenreiter.cpp
@@ -107,15 +107,12 @@ void Wellenreiter::setConfigWindow( WellenreiterConfigWindow* cw )
 {
     configwindow = cw;
 }
 
 void Wellenreiter::receivePacket(OPacket* p)
 {
-    logwindow->log( "(d) Received data from daemon" );
-    //TODO
-
     // check if we received a beacon frame
     // static_cast is justified here
     OWaveLanManagementPacket* beacon = static_cast<OWaveLanManagementPacket*>( p->child( "802.11 Management" ) );
     if ( !beacon ) return;
     QString type;
 
@@ -160,25 +157,16 @@ void Wellenreiter::startStopClicked()
 
         // switch off monitor mode
         iface->setMonitorMode( false );
         // switch off promisc flag
         iface->setPromiscuousMode( false );
 
-        //TODO: Display "please wait..." (use owait?)
-
-        /*
-
-        QString cmdline;
-        cmdline.sprintf( "ifdown %s; sleep 1; ifup %s", (const char*) interface, (const char*) interface, (const char*) interface );
-        system( cmdline ); //FIXME: Use OProcess
-
-        */
+        system( "cardctl reset; sleep 1; dhclient; udhcpc" ); //FIXME: Use OProcess
 
         // message the user
-
-        //QMessageBox::information( this, "Wellenreiter II", "Your wireless card\nshould now be usable again." );
+        QMessageBox::information( this, "Wellenreiter II", "Your wireless card\nshould now be usable again." );
     }
 
     else
     {
         // get configuration from config window