Diffstat (limited to 'noncore/net/wellenreiter/gui') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/net/wellenreiter/gui/scanlist.cpp | 39 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/scanlist.h | 8 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/wellenreiter.cpp | 18 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/wellenreiter.h | 2 |
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 @@ -21,6 +21,8 @@ #include <qdatetime.h> #include <qtextstream.h> +#include <qpopupmenu.h> #ifdef QWS +#include <qpe/qpeapplication.h> #include <opie/odevice.h> using namespace Opie; @@ -75,4 +77,12 @@ MScanListView::MScanListView( QWidget* parent, const char* name ) 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 + }; @@ -318,4 +328,25 @@ void MScanListView::identify( const OMacAddress& macaddr, const QString& 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 @@ -346,4 +377,12 @@ MScanListItem::MScanListItem( QListViewItem* parent, QString type, QString essid } +const QString& MScanListItem::essid() const +{ + if ( type == "network" ) + return _essid; + else + return ( (MScanListItem*) parent() )->essid(); +} + OListViewItem* MScanListItem::childFactory() { 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 @@ -48,4 +48,10 @@ class MScanListView: public OListView 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" ); @@ -83,5 +89,5 @@ class MScanListItem: public OListViewItem public: //const QString& type() { return _type; }; - const QString& essid() { return _essid; }; + const QString& essid() const; const QString& macaddr() { return _macaddr; }; bool wep() { return _wep; }; 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 @@ -29,4 +29,5 @@ #ifdef QWS #include <opie/odevice.h> +#include <qpe/qcopenvelope_qws.h> using namespace Opie; #endif @@ -82,4 +83,6 @@ Wellenreiter::Wellenreiter( QWidget* parent ) 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(); } @@ -489,2 +492,17 @@ void Wellenreiter::doAction( const QString& action, const QString& protocol, OPa } +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 @@ -60,4 +60,6 @@ class Wellenreiter : public WellenreiterBase { void stopClicked(); + void joinNetwork(const QString&,const QString&,int,const QString&); + signals: void startedSniffing(); |