summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/net/wellenreiter/gui/configbase.ui127
-rw-r--r--noncore/net/wellenreiter/gui/configwindow.cpp32
-rw-r--r--noncore/net/wellenreiter/gui/configwindow.h8
-rw-r--r--noncore/net/wellenreiter/gui/scanlist.cpp24
-rw-r--r--noncore/net/wellenreiter/gui/scanlist.h3
-rw-r--r--noncore/net/wellenreiter/gui/wellenreiter.cpp16
6 files changed, 152 insertions, 58 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
@@ -11,8 +11,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>212</width>
- <height>267</height>
+ <width>220</width>
+ <height>306</height>
</rect>
</property>
<property stdset="1">
@@ -28,7 +28,7 @@
<vbox>
<property stdset="1">
<name>margin</name>
- <number>4</number>
+ <number>3</number>
</property>
<property stdset="1">
<name>spacing</name>
@@ -325,24 +325,6 @@
</hbox>
</widget>
<widget>
- <class>QLayoutWidget</class>
- <property stdset="1">
- <name>name</name>
- <cstring>Layout5</cstring>
- </property>
- <property>
- <name>layoutSpacing</name>
- </property>
- <vbox>
- <property stdset="1">
- <name>margin</name>
- <number>0</number>
- </property>
- <property stdset="1">
- <name>spacing</name>
- <number>-1</number>
- </property>
- <widget>
<class>QCheckBox</class>
<property stdset="1">
<name>name</name>
@@ -373,43 +355,106 @@
</property>
</widget>
<widget>
- <class>QCheckBox</class>
+ <class>QLayoutWidget</class>
<property stdset="1">
<name>name</name>
- <cstring>beepOnFound</cstring>
+ <cstring>Layout5</cstring>
</property>
+ <grid>
<property stdset="1">
- <name>enabled</name>
- <bool>false</bool>
+ <name>margin</name>
+ <number>0</number>
+ </property>
+ <property stdset="1">
+ <name>spacing</name>
+ <number>6</number>
+ </property>
+ <widget row="0" column="1" >
+ <class>QLabel</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>TextLabel1</cstring>
</property>
<property stdset="1">
<name>text</name>
- <string>Beep on new network</string>
+ <string>sound on new net</string>
</property>
</widget>
- </vbox>
- </widget>
- <spacer>
+ <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>Spacer2</cstring>
+ <cstring>beaconSound</cstring>
+ </property>
+ </widget>
+ <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>orientation</name>
- <enum>Vertical</enum>
+ <name>name</name>
+ <cstring>netSound</cstring>
</property>
+ </widget>
+ <widget row="1" column="1" >
+ <class>QLabel</class>
<property stdset="1">
- <name>sizeType</name>
- <enum>Expanding</enum>
+ <name>name</name>
+ <cstring>TextLabel1_3</cstring>
</property>
- <property>
- <name>sizeHint</name>
- <size>
- <width>20</width>
- <height>20</height>
- </size>
+ <property stdset="1">
+ <name>text</name>
+ <string>sound on beacon</string>
</property>
- </spacer>
+ </widget>
+ </grid>
+ </widget>
</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
@@ -17,15 +17,19 @@
#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 )
{
@@ -45,12 +49,36 @@ WellenreiterConfigWindow::WellenreiterConfigWindow( QWidget * parent, const char
++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()
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
@@ -18,6 +18,10 @@
#include "configbase.h"
#include <qmap.h>
+#include <qcombobox.h>
+#include <qstring.h>
+
+class WellenreiterConfigWindow;
class WellenreiterConfigWindow : public WellenreiterConfigBase
{
@@ -26,9 +30,13 @@ class WellenreiterConfigWindow : public WellenreiterConfigBase
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;
};
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
@@ -14,12 +14,18 @@
**********************************************************************/
#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 )
{
@@ -142,7 +148,6 @@ void MScanListView::addNewItem( QString type, QString essid, QString macaddr, bo
else
{
s.sprintf( "(i) new network: '%s'", (const char*) essid );
-
network = new MScanListItem( this, "networks", essid, QString::null, 0, 0, 0 );
}
@@ -192,6 +197,8 @@ MScanListItem::MScanListItem( QListView* parent, QString type, QString essid, QS
_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 );
}
@@ -271,11 +278,24 @@ void MScanListItem::decorateItem( QString type, QString essid, QString macaddr,
_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++;
@@ -284,5 +304,7 @@ void MScanListItem::receivedBeacon()
#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
@@ -91,6 +91,9 @@ class MScanListItem: public OListViewItem
virtual void serializeTo( QDataStream& s ) const;
virtual void serializeFrom( QDataStream& s );
+ protected:
+ void playSound( const QString& ) const;
+
private:
QString _type;
QString _essid;
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
@@ -110,9 +110,6 @@ void Wellenreiter::setConfigWindow( WellenreiterConfigWindow* 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" ) );
@@ -163,19 +160,10 @@ void Wellenreiter::startStopClicked()
// 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