From f0f9cf3fa486a577770e3c0e89280c66ea331e73 Mon Sep 17 00:00:00 2001 From: tille Date: Thu, 12 Jun 2003 15:04:14 +0000 Subject: 1st version of qcop call in oder to let wellenreiter copy the APs it found... ... and more later. --- (limited to 'noncore') diff --git a/noncore/settings/networksettings/mainwindowimp.cpp b/noncore/settings/networksettings/mainwindowimp.cpp index 4119490..0ef1e68 100644 --- a/noncore/settings/networksettings/mainwindowimp.cpp +++ b/noncore/settings/networksettings/mainwindowimp.cpp @@ -11,6 +11,7 @@ #include #include #include +#include #include // in order to disable the profiles tab #include @@ -61,7 +62,7 @@ MainWindowImp::MainWindowImp(QWidget *parent, const char *name) : MainWindow(par connect(newProfile, SIGNAL(textChanged(const QString&)), this, SLOT(newProfileChanged(const QString&))); //FIXME: disable profiles for the moment: - tabWidget->setTabEnabled( tab, false ); +// tabWidget->setTabEnabled( tab, false ); // Load connections. // /usr/local/kde/lib/libinterfaces.la @@ -119,6 +120,7 @@ MainWindowImp::MainWindowImp(QWidget *parent, const char *name) : MainWindow(par } file.close(); } + makeChannel(); } /** @@ -193,7 +195,8 @@ void MainWindowImp::getAllInterfaces(){ } for (QStringList::Iterator it = ifaces.begin(); it != ifaces.end(); ++it) { - int flags = 0, family; + int flags = 0; +// int family; i = NULL; strcpy(ifr.ifr_name, (*it).latin1()); @@ -624,3 +627,40 @@ void MainWindowImp::changeProfile(){ // TODO change the profile in the modules } + +void MainWindowImp::makeChannel() +{ + channel = new QCopChannel( "QPE/Application/networksettings", this ); + connect( channel, SIGNAL(received(const QCString&, const QByteArray&)), + this, SLOT(receive(const QCString&, const QByteArray&)) ); +} + +void MainWindowImp::receive(const QCString &msg, const QByteArray &arg) +{ + bool found = false; + qDebug("MainWindowImp::receive QCop msg >"+msg+"<"); + + QString dest = msg.left(msg.find("(")); + QCString param = msg.right(msg.length() - msg.find("(") - 1); + param = param.left( param.length() - 1 ); + qDebug("dest >%s< param >"+param+"<",dest.latin1()); + +// if (param.contains("QString,QString,QString")) { +// QDataStream stream(arg,IO_ReadOnly); +// QString arg1, arg2, arg3; +// stream >> arg1 >> arg2 >> arg3 ; +// qDebug("args: >%s< >%s< >%s<",arg1.latin1(),arg2.latin1(),arg3.latin1()); +// } + + QMap::Iterator it; + for( it = libraries.begin(); it != libraries.end(); ++it ){ + qDebug("plugin >%s<", it.key()->type().latin1() ); + if(it.key()->type() == dest){ + it.key()->receive( param, arg ); + found = true; + } + } + + + if (!found) qDebug("Huh what do ya want"); +} diff --git a/noncore/settings/networksettings/mainwindowimp.h b/noncore/settings/networksettings/mainwindowimp.h index c045fe6..a553f75 100644 --- a/noncore/settings/networksettings/mainwindowimp.h +++ b/noncore/settings/networksettings/mainwindowimp.h @@ -1,67 +1,73 @@ -#ifndef MAINWINOWIMP_H -#define MAINWINOWIMP_H - -#include "mainwindow.h" -#include -#include - -class Module; -class Interface; -class QLibrary; -class KProcess; -#ifdef QWS -class QLibrary; -#else -class KLibrary; -class KLibLoader; -#define QLibrary KLibrary -#endif - - -class MainWindowImp : public MainWindow { - Q_OBJECT - -public: - MainWindowImp(QWidget *parent=0, const char *name=0); - ~MainWindowImp(); - -private slots: - void getAllInterfaces(); - - void addClicked(); - void removeClicked(); - void configureClicked(); - void informationClicked(); - - void addProfile(); - void removeProfile(); - void changeProfile(); - - void updateInterface(Interface *i); - void newProfileChanged(const QString& newText); - -private: - void loadModules(const QString &path); - - Module* loadPlugin(const QString &pluginFileName, - const QString &resolveString = "create_plugin"); - - // For our local list of names - QMap interfaceNames; - - QMap libraries; - QMap items; - QMap interfaceItems; - - QMap threads; - QStringList profiles; - - bool advancedUserMode; - QString scheme; -#ifndef QWS - KLibLoader *loader; -#endif -}; - -#endif // MAINWINOWIMP_H - +#ifndef MAINWINOWIMP_H +#define MAINWINOWIMP_H + +#include "mainwindow.h" +#include +#include + +class Module; +class Interface; +class QLibrary; +class KProcess; +class QCopChannel; +#ifdef QWS +class QLibrary; +#else +class KLibrary; +class KLibLoader; +#define QLibrary KLibrary +#endif + + +class MainWindowImp : public MainWindow { + Q_OBJECT + +public: + MainWindowImp(QWidget *parent=0, const char *name=0); + ~MainWindowImp(); + + QCopChannel *channel; + +private slots: + void getAllInterfaces(); + + void addClicked(); + void removeClicked(); + void configureClicked(); + void informationClicked(); + + void addProfile(); + void removeProfile(); + void changeProfile(); + + void updateInterface(Interface *i); + void newProfileChanged(const QString& newText); + + void receive (const QCString &, const QByteArray &); + +private: + void makeChannel(); + void loadModules(const QString &path); + + Module* loadPlugin(const QString &pluginFileName, + const QString &resolveString = "create_plugin"); + + // For our local list of names + QMap interfaceNames; + + QMap libraries; + QMap items; + QMap interfaceItems; + + QMap threads; + QStringList profiles; + + bool advancedUserMode; + QString scheme; +#ifndef QWS + KLibLoader *loader; +#endif +}; + +#endif // MAINWINOWIMP_H + diff --git a/noncore/settings/networksettings/module.h b/noncore/settings/networksettings/module.h index 46a3c77..db74394 100644 --- a/noncore/settings/networksettings/module.h +++ b/noncore/settings/networksettings/module.h @@ -17,11 +17,18 @@ class Module : QObject{ signals: void updateInterface(Interface *i); + public: Module(){}; /** + * The type of the plugin + * and the name of the dcop call + */ + virtual const QString type() = 0; + + /** * The current profile has been changed and the module should do any * neccesary changes also. * @param newProfile what the profile should be changed to. @@ -82,6 +89,11 @@ public: */ virtual bool remove(Interface* i) = 0; + /** + * get dcop calls + */ + virtual void receive(const QCString &msg, const QByteArray &arg) = 0; + }; #endif diff --git a/noncore/settings/networksettings/networksettings.pro b/noncore/settings/networksettings/networksettings.pro index 875c68e..cdd133a 100644 --- a/noncore/settings/networksettings/networksettings.pro +++ b/noncore/settings/networksettings/networksettings.pro @@ -1,7 +1,8 @@ DESTDIR = $(OPIEDIR)/bin TEMPLATE = app -#CONFIG = qt warn_on debug -CONFIG = qt warn_on release +# +CONFIG = qt warn_on debug +#CONFIG = qt warn_on release HEADERS = mainwindowimp.h addconnectionimp.h defaultmodule.h module.h SOURCES = main.cpp mainwindowimp.cpp addconnectionimp.cpp INCLUDEPATH += $(OPIEDIR)/include interfaces/ diff --git a/noncore/settings/networksettings/ppp/pppmodule.h b/noncore/settings/networksettings/ppp/pppmodule.h index 6464f87..de649e4 100644 --- a/noncore/settings/networksettings/ppp/pppmodule.h +++ b/noncore/settings/networksettings/ppp/pppmodule.h @@ -12,6 +12,7 @@ public: PPPModule(); ~PPPModule(); + virtual const QString type() {return "ppp";}; virtual void setProfile(const QString &newProfile); virtual bool isOwner(Interface *); virtual QWidget *configure(Interface *i); @@ -21,6 +22,7 @@ public: virtual Interface *addNewInterface(const QString &name); virtual bool remove(Interface* i); virtual QString getPixmapName(Interface* i); + virtual void receive(const QCString &msg, const QByteArray &arg) {}; private: QList list; diff --git a/noncore/settings/networksettings/wlan/wlanmodule.cpp b/noncore/settings/networksettings/wlan/wlanmodule.cpp index 3979e60..3c988d5 100644 --- a/noncore/settings/networksettings/wlan/wlanmodule.cpp +++ b/noncore/settings/networksettings/wlan/wlanmodule.cpp @@ -10,13 +10,13 @@ /** * Constructor, find all of the possible interfaces - */ + */ WLANModule::WLANModule() : Module() { } /** * Delete any interfaces that we own. - */ + */ WLANModule::~WLANModule(){ Interface *i; for ( i=list.first(); i != 0; i=list.next() ) @@ -25,7 +25,7 @@ WLANModule::~WLANModule(){ /** * Change the current profile - */ + */ void WLANModule::setProfile(const QString &newProfile){ profile = newProfile; } @@ -33,8 +33,8 @@ void WLANModule::setProfile(const QString &newProfile){ /** * get the icon name for this device. * @param Interface* can be used in determining the icon. - * @return QString the icon name (minus .png, .gif etc) - */ + * @return QString the icon name (minus .png, .gif etc) + */ QString WLANModule::getPixmapName(Interface* ){ return "wlan"; } @@ -43,12 +43,12 @@ QString WLANModule::getPixmapName(Interface* ){ * Check to see if the interface i is owned by this module. * @param Interface* interface to check against * @return bool true if i is owned by this module, false otherwise. - */ + */ bool WLANModule::isOwner(Interface *i){ WExtensions we(i->getInterfaceName()); if(!we.doesHaveWirelessExtensions()) return false; - + i->setHardwareName("802.11b"); list.append(i); return true; @@ -57,7 +57,7 @@ bool WLANModule::isOwner(Interface *i){ /** * Create, and return the WLANConfigure Module * @return QWidget* pointer to this modules configure. - */ + */ QWidget *WLANModule::configure(Interface *i){ WLANImp *wlanconfig = new WLANImp(0, "WlanConfig", i, false, Qt::WDestructiveClose); wlanconfig->setProfile(profile); @@ -67,12 +67,12 @@ QWidget *WLANModule::configure(Interface *i){ /** * Create, and return the Information Module * @return QWidget* pointer to this modules info. - */ + */ QWidget *WLANModule::information(Interface *i){ WExtensions we(i->getInterfaceName()); if(!we.doesHaveWirelessExtensions()) return NULL; - + WlanInfoImp *info = new WlanInfoImp(0, i->getInterfaceName(), Qt::WDestructiveClose); InterfaceInformationImp *information = new InterfaceInformationImp(info->tabWidget, "InterfaceSetupImp", i); info->tabWidget->insertTab(information, "TCP/IP"); @@ -93,21 +93,61 @@ QList WLANModule::getInterfaces(){ * @param name the name of the type of interface that should be created given * by possibleNewInterfaces(); * @return Interface* NULL if it was unable to be created. - */ + */ Interface *WLANModule::addNewInterface(const QString &){ // We can't add a 802.11 interface, either the hardware will be there - // or it wont. - return NULL; + // or it wont. + return NULL; } /** * Attempts to remove the interface, doesn't delete i * @return bool true if successfull, false otherwise. - */ + */ bool WLANModule::remove(Interface*){ // Can't remove a hardware device, you can stop it though. - return false; + return false; } -// wlanmodule.cpp +void WLANModule::receive(const QCString ¶m, const QByteArray &arg) +{ + qDebug("WLANModule::receive "+param); + QStringList params = QStringList::split(",",param); + int count = params.count(); + qDebug("got %i params", count ); + if (count < 2){ + qDebug("Erorr less than 2 parameter"); + qDebug("RETURNING"); + return; + } + + QDataStream stream(arg,IO_ReadOnly); + QString interface; + QString action; + + stream >> interface; + stream >> action; + qDebug("got interface %s and acion %s", interface.latin1(), action.latin1()); + + if (count == 2){ + // those should call the interface + if ( action.contains("start" ) ){ + qDebug("starting %s not yet implemented",interface.latin1()); + } else if ( action.contains("restart" ) ){ + qDebug("restarting %s not yet implemented",interface.latin1()); + } else if ( action.contains("stop" ) ){ + qDebug("stopping %s not yet implemented",interface.latin1()); + } + }else if (count == 3){ + QString value; + stream >> value; + qDebug("setting %s of %s to %s", action.latin1(), interface.latin1(), value.latin1() ); + } + // if (param.contains("QString,QString,QString")) { +// QDataStream stream(arg,IO_ReadOnly); +// QString arg1, arg2, arg3; +// stream >> arg1 >> arg2 >> arg3 ; +// qDebug("interface >%s< setting >%s< value >%s<",arg1.latin1(),arg2.latin1(),arg3.latin1()); +// } +} diff --git a/noncore/settings/networksettings/wlan/wlanmodule.h b/noncore/settings/networksettings/wlan/wlanmodule.h index 3a54de6..a617a90 100644 --- a/noncore/settings/networksettings/wlan/wlanmodule.h +++ b/noncore/settings/networksettings/wlan/wlanmodule.h @@ -12,6 +12,8 @@ public: WLANModule(); ~WLANModule(); + + virtual const QString type() {return "wlan";}; void setProfile(const QString &newProfile); bool isOwner(Interface *); QWidget *configure(Interface *i); @@ -21,6 +23,7 @@ public: Interface *addNewInterface(const QString &name); bool remove(Interface* i); QString getPixmapName(Interface* i); + virtual void receive(const QCString&, const QByteArray&); private: QList list; -- cgit v0.9.0.2