author | mickeyl <mickeyl> | 2005-05-10 17:27:42 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2005-05-10 17:27:42 (UTC) |
commit | 7ef3deff5f0023f0e73ad805b13cbd2b12bc1395 (patch) (side-by-side diff) | |
tree | 17e209a557b79fd47a82301dae8982a3d16a4cdf /noncore/net/wellenreiter | |
parent | e31f22952f47aeb54b206349f1e469704a6a6e8f (diff) | |
download | opie-7ef3deff5f0023f0e73ad805b13cbd2b12bc1395.zip opie-7ef3deff5f0023f0e73ad805b13cbd2b12bc1395.tar.gz opie-7ef3deff5f0023f0e73ad805b13cbd2b12bc1395.tar.bz2 |
Remove joining networks from Wellenreiter. It never really fit into the
philosophy of this application and with OpieStumbler there is an application
that does it better (active scan).
-rw-r--r-- | noncore/net/wellenreiter/gui/gui.pro | 2 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/scanlist.cpp | 11 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/scanlist.h | 1 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/wellenreiter.cpp | 39 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/wellenreiter.h | 2 | ||||
-rw-r--r-- | noncore/net/wellenreiter/wellenreiter.pro | 2 |
6 files changed, 4 insertions, 53 deletions
diff --git a/noncore/net/wellenreiter/gui/gui.pro b/noncore/net/wellenreiter/gui/gui.pro index faedd1b..544c2af 100644 --- a/noncore/net/wellenreiter/gui/gui.pro +++ b/noncore/net/wellenreiter/gui/gui.pro @@ -34,5 +34,5 @@ DEPENDPATH += $(OPIEDIR)/include INTERFACES = configbase.ui TARGET = wellenreiter -VERSION = 1.0.5 +VERSION = 1.0.6 DEFINES += WELLENREITER_VERSION='"$$VERSION (GPL) Opie"' diff --git a/noncore/net/wellenreiter/gui/scanlist.cpp b/noncore/net/wellenreiter/gui/scanlist.cpp index f24e09f..587faad 100644 --- a/noncore/net/wellenreiter/gui/scanlist.cpp +++ b/noncore/net/wellenreiter/gui/scanlist.cpp @@ -403,14 +403,7 @@ void MScanListView::contextMenuRequested( QListViewItem* item, const QPoint&, in << itm->type << ") in column: '" << col << "'" << oendl; - if ( itm->type == "adhoc" || itm->type == "managed" ) - { - QString entry = QString( "&Join %1 Net '%2'..." ).arg( itm->type ).arg( itm->essid() ); + /* do something meaningful */ - 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() ); - } + return; } diff --git a/noncore/net/wellenreiter/gui/scanlist.h b/noncore/net/wellenreiter/gui/scanlist.h index 8b3814a..eec51af 100644 --- a/noncore/net/wellenreiter/gui/scanlist.h +++ b/noncore/net/wellenreiter/gui/scanlist.h @@ -56,5 +56,4 @@ class MScanListView: public Opie::Ui::OListView signals: void rightButtonClicked(QListViewItem*,const QPoint&,int); - void joinNetwork( const QString&, const QString&, int, const QString& ); protected: diff --git a/noncore/net/wellenreiter/gui/wellenreiter.cpp b/noncore/net/wellenreiter/gui/wellenreiter.cpp index 8cabf0d..c4e6f02 100644 --- a/noncore/net/wellenreiter/gui/wellenreiter.cpp +++ b/noncore/net/wellenreiter/gui/wellenreiter.cpp @@ -83,6 +83,4 @@ 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(); pcap->setAutoDelete( false ); @@ -729,41 +727,4 @@ void Wellenreiter::doAction( const QString& action, const QString& protocol, OPa } -void Wellenreiter::joinNetwork(const QString& type, const QString& essid, int channel, const QString& macaddr) -{ - #ifdef QWS - if ( !iface ) - { - QMessageBox::warning( this, tr( "Can't do that!" ), tr( "No wireless\ninterface available." ) ); - return; - } - - if ( sniffing ) - { - QMessageBox::warning( this, tr( "Can't do that!" ), tr( "Stop sniffing before\njoining a net." ) ); - return; - } - - odebug << "joinNetwork() with Interface " << iface->name() - << ": " << type << ", " << essid - << ", " << channel << ", " << macaddr << oendl; - - QCopEnvelope msg( "QPE/Application/networksettings", "wlan(QString,QString,QString)" ); - int count = 3; - odebug << "sending " << count << " messages" << oendl; - msg << QString("count") << QString::number(count); - odebug << "msg >" << iface->name() << "< Mode >" << type.latin1() << "<" << oendl; - msg << QString(iface->name()) << QString("Mode") << type; - odebug << "msg >" << iface->name() << "< essid >" << essid.latin1() << "<" << oendl; - msg << QString(iface->name()) << QString("ESSID") << essid; - odebug << "msg >" << iface->name() << "< channel >" << channel << "<" << oendl; - msg << QString(iface->name()) << QString("Channel") << channel; -// odebug << "msg >" << iface->name() << "< mac >" << macaddr << "<" << oendl; -// msg << QString(iface->name()) << QString("MacAddr") << macaddr; - #else - QMessageBox::warning( this, tr( "Can't do that!" ), tr( "Function only available on Embedded build" ) ); - #endif - -} - void Wellenreiter::updateStatistics() { diff --git a/noncore/net/wellenreiter/gui/wellenreiter.h b/noncore/net/wellenreiter/gui/wellenreiter.h index 5ac389e..1c9633d 100644 --- a/noncore/net/wellenreiter/gui/wellenreiter.h +++ b/noncore/net/wellenreiter/gui/wellenreiter.h @@ -72,6 +72,4 @@ class Wellenreiter : public WellenreiterBase { void stopClicked(); - void joinNetwork(const QString&,const QString&,int,const QString&); - signals: void startedSniffing(); diff --git a/noncore/net/wellenreiter/wellenreiter.pro b/noncore/net/wellenreiter/wellenreiter.pro index e995db9..673868f 100644 --- a/noncore/net/wellenreiter/wellenreiter.pro +++ b/noncore/net/wellenreiter/wellenreiter.pro @@ -1,4 +1,4 @@ TEMPLATE = subdirs -VERSION = 1.0.3-cvs +VERSION = 1.0.5-cvs !contains( platform, x11 ) { |