summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2003-06-15 12:45:31 (UTC)
committer mickeyl <mickeyl>2003-06-15 12:45:31 (UTC)
commit6b682070b6d83f3537dd9fa5aee715ab142a04e6 (patch) (side-by-side diff)
treeb152def34a4fe52ef6195af9c1c324b23a3d7981
parent7feda6ad0e05602d0a939f9867f296f62ae758cd (diff)
downloadopie-6b682070b6d83f3537dd9fa5aee715ab142a04e6.zip
opie-6b682070b6d83f3537dd9fa5aee715ab142a04e6.tar.gz
opie-6b682070b6d83f3537dd9fa5aee715ab142a04e6.tar.bz2
basic framework for context menu "join network" established
just need to send the proper qcop messages now
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/wellenreiter/gui/scanlist.cpp39
-rw-r--r--noncore/net/wellenreiter/gui/scanlist.h8
-rw-r--r--noncore/net/wellenreiter/gui/wellenreiter.cpp18
-rw-r--r--noncore/net/wellenreiter/gui/wellenreiter.h2
4 files changed, 66 insertions, 1 deletions
diff --git a/noncore/net/wellenreiter/gui/scanlist.cpp b/noncore/net/wellenreiter/gui/scanlist.cpp
index 809d0bd..085eec4 100644
--- a/noncore/net/wellenreiter/gui/scanlist.cpp
+++ b/noncore/net/wellenreiter/gui/scanlist.cpp
@@ -11,26 +11,28 @@
** 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 <qdatetime.h>
#include <qtextstream.h>
+#include <qpopupmenu.h>
#ifdef QWS
+#include <qpe/qpeapplication.h>
#include <opie/odevice.h>
using namespace Opie;
#endif
#ifdef QWS
#include <qpe/resource.h>
#else
#include "resource.h"
#endif
const int col_type = 0;
@@ -65,24 +67,32 @@ MScanListView::MScanListView( QWidget* parent, const char* name )
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 );
+
+ connect( this, SIGNAL( rightButtonClicked(QListViewItem*,const QPoint&,int) ),
+ this, SLOT( contextMenuRequested(QListViewItem*,const QPoint&,int) ) );
+
+ #ifdef QWS
+ QPEApplication::setStylusOperation( viewport(), QPEApplication::RightOnHold );
+ #endif
+
};
MScanListView::~MScanListView()
{
};
OListViewItem* MScanListView::childFactory()
{
return new MScanListItem( this );
}
@@ -308,24 +318,45 @@ void MScanListView::identify( const OMacAddress& macaddr, const QString& ip )
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.toString(), (const char*) ip ) );
}
+void MScanListView::contextMenuRequested( QListViewItem* item, const QPoint&, int col )
+{
+ if ( !item ) return;
+
+ MScanListItem* itm = static_cast<MScanListItem*>( item );
+
+ qDebug( "contextMenuRequested on item '%s' (%s) in column: '%d'",
+ (const char*) itm->text(0), (const char*) itm->type, col );
+
+ if ( itm->type == "adhoc" || itm->type == "managed" )
+ {
+ QString entry = QString().sprintf( "&Join %s Net '%s'...", (const char*) itm->type, (const char*) itm->essid() );
+
+ QPopupMenu m( this );
+ m.insertItem( entry, 37773, 0 );
+ int result = m.exec( QCursor::pos() );
+ if ( result == 37773 )
+ emit joinNetwork( itm->type, itm->essid(), itm->channel(), itm->macaddr() );
+ }
+}
+
//============================================================
// 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" );
@@ -336,24 +367,32 @@ MScanListItem::MScanListItem( QListView* parent, QString type, QString essid, QS
}
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 );
}
+const QString& MScanListItem::essid() const
+{
+ if ( type == "network" )
+ return _essid;
+ else
+ return ( (MScanListItem*) parent() )->essid();
+}
+
OListViewItem* MScanListItem::childFactory()
{
return new MScanListItem( this );
}
void MScanListItem::serializeTo( QDataStream& s ) const
{
#ifdef DEBUG
qDebug( "serializing MScanListItem" );
#endif
OListViewItem::serializeTo( s );
diff --git a/noncore/net/wellenreiter/gui/scanlist.h b/noncore/net/wellenreiter/gui/scanlist.h
index 253c166..5aba0d2 100644
--- a/noncore/net/wellenreiter/gui/scanlist.h
+++ b/noncore/net/wellenreiter/gui/scanlist.h
@@ -38,24 +38,30 @@ class MScanListView: public OListView
virtual void serializeTo( QDataStream& s ) const;
virtual void serializeFrom( QDataStream& s );
public slots:
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 OMacAddress&, const QString& ipaddr );
+ void contextMenuRequested( QListViewItem* item, const QPoint&, int );
+
+ signals:
+ void rightButtonClicked(QListViewItem*,const QPoint&,int);
+ void joinNetwork( const QString&, const QString&, int, const QString& );
+
protected:
void addIfNotExisting( MScanListItem* parent, const OMacAddress& addr, const QString& type = "station" );
};
//****************************** MScanListItem ****************************************************************
class MScanListItem: public OListViewItem
{
public:
MScanListItem::MScanListItem( QListView* parent,
QString type = "unknown",
@@ -73,25 +79,25 @@ class MScanListItem: public OListViewItem
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& essid() const;
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();
diff --git a/noncore/net/wellenreiter/gui/wellenreiter.cpp b/noncore/net/wellenreiter/gui/wellenreiter.cpp
index 2f26702..8a9e55d 100644
--- a/noncore/net/wellenreiter/gui/wellenreiter.cpp
+++ b/noncore/net/wellenreiter/gui/wellenreiter.cpp
@@ -19,24 +19,25 @@
#include "scanlist.h"
#include "logwindow.h"
#include "hexwindow.h"
#include "configwindow.h"
#include "statwindow.h"
#include "graphwindow.h"
#include "protolistview.h"
// Opie
#ifdef QWS
#include <opie/odevice.h>
+#include <qpe/qcopenvelope_qws.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
@@ -72,24 +73,26 @@ Wellenreiter::Wellenreiter( QWidget* parent )
//
// 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
netview->setColumnWidthMode( 1, QListView::Manual );
+ connect( netview, SIGNAL( joinNetwork(const QString&,const QString&,int,const QString&) ),
+ this, SLOT( joinNetwork(const QString&,const QString&,int,const QString&) ) );
pcap = new OPacketCapturer();
}
Wellenreiter::~Wellenreiter()
{
delete pcap;
}
void Wellenreiter::setConfigWindow( WellenreiterConfigWindow* cw )
{
@@ -479,12 +482,27 @@ void Wellenreiter::doAction( const QString& action, const QString& protocol, OPa
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 ) );
}
+void Wellenreiter::joinNetwork(const QString& type, const QString& essid, int channel, const QString& macaddr)
+{
+ qDebug( "joinNetwork() - %s, %s, %d, %s",
+ (const char*) type,
+ (const char*) essid,
+ channel,
+ (const char*) macaddr );
+
+ // TODO: Stop scanning here
+
+ QCopEnvelope msg( "QPE/Application/networksettings", "wlan(QString,QString,QString)" );
+ msg << "test" << "test" << "test";
+
+}
+
diff --git a/noncore/net/wellenreiter/gui/wellenreiter.h b/noncore/net/wellenreiter/gui/wellenreiter.h
index f23ca4d..e1062df 100644
--- a/noncore/net/wellenreiter/gui/wellenreiter.h
+++ b/noncore/net/wellenreiter/gui/wellenreiter.h
@@ -50,24 +50,26 @@ class Wellenreiter : public WellenreiterBase {
public:
bool sniffing;
protected:
virtual void timerEvent( QTimerEvent* );
public slots:
void channelHopped(int);
void receivePacket(OPacket*);
void startClicked();
void stopClicked();
+ void joinNetwork(const QString&,const QString&,int,const QString&);
+
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 );