- initial attempt to autodetect driver

- add possibility to play sounds when receiving beacon and/or found a new network

1 files changed, 23 insertions, 1 deletions

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
@@ -15,4 +15,5 @@
 
 #include "scanlist.h"
+#include "configwindow.h"
 
 #include <assert.h>
@@ -21,4 +22,9 @@
 #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 )
@@ -143,5 +149,4 @@ void MScanListView::addNewItem( QString type, QString essid, QString macaddr, bo
     {
         s.sprintf( "(i) new network: '%s'", (const char*) essid );
-
         network = new MScanListItem( this, "networks", essid, QString::null, 0, 0, 0 );
     }
@@ -193,4 +198,6 @@ MScanListItem::MScanListItem( QListView* parent, QString type, QString essid, QS
 {
     qDebug( "creating scanlist item" );
+    if ( WellenreiterConfigWindow::instance() && type == "networks" )
+        playSound( WellenreiterConfigWindow::instance()->soundOnNetwork() );
     decorateItem( type, essid, macaddr, wep, channel, signal );
 }
@@ -272,4 +279,5 @@ void MScanListItem::decorateItem( QString type, QString essid, QString macaddr,
 }
 
+
 void MScanListItem::setManufacturer( const QString& manufacturer )
 {
@@ -277,4 +285,16 @@ void MScanListItem::setManufacturer( const QString& 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()
 {
@@ -285,4 +305,6 @@ void MScanListItem::receivedBeacon()
     setText( col_sig, QString::number( _beacons ) );
     setText( col_lastseen, QTime::currentTime().toString() );
+    if ( WellenreiterConfigWindow::instance() )
+        playSound( WellenreiterConfigWindow::instance()->soundOnBeacon() );
 }