summaryrefslogtreecommitdiff
path: root/noncore
Unidiff
Diffstat (limited to 'noncore') (more/less context) (show whitespace changes)
-rw-r--r--noncore/settings/networksettings/mainwindowimp.cpp44
-rw-r--r--noncore/settings/networksettings/mainwindowimp.h6
-rw-r--r--noncore/settings/networksettings/module.h12
-rw-r--r--noncore/settings/networksettings/networksettings.pro5
-rw-r--r--noncore/settings/networksettings/ppp/pppmodule.h2
-rw-r--r--noncore/settings/networksettings/wlan/wlanmodule.cpp42
-rw-r--r--noncore/settings/networksettings/wlan/wlanmodule.h3
7 files changed, 109 insertions, 5 deletions
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
@@ -13,2 +13,3 @@
13#include <qlabel.h> 13#include <qlabel.h>
14#include <qpe/qcopenvelope_qws.h>
14#include <qtabwidget.h> // in order to disable the profiles tab 15#include <qtabwidget.h> // in order to disable the profiles tab
@@ -63,3 +64,3 @@ MainWindowImp::MainWindowImp(QWidget *parent, const char *name) : MainWindow(par
63 //FIXME: disable profiles for the moment: 64 //FIXME: disable profiles for the moment:
64 tabWidget->setTabEnabled( tab, false ); 65// tabWidget->setTabEnabled( tab, false );
65 66
@@ -121,2 +122,3 @@ MainWindowImp::MainWindowImp(QWidget *parent, const char *name) : MainWindow(par
121 } 122 }
123 makeChannel();
122} 124}
@@ -195,3 +197,4 @@ void MainWindowImp::getAllInterfaces(){
195 for (QStringList::Iterator it = ifaces.begin(); it != ifaces.end(); ++it) { 197 for (QStringList::Iterator it = ifaces.begin(); it != ifaces.end(); ++it) {
196 int flags = 0, family; 198 int flags = 0;
199// int family;
197 i = NULL; 200 i = NULL;
@@ -626 +629,38 @@ void MainWindowImp::changeProfile(){
626 629
630
631void MainWindowImp::makeChannel()
632{
633 channel = new QCopChannel( "QPE/Application/networksettings", this );
634 connect( channel, SIGNAL(received(const QCString&, const QByteArray&)),
635 this, SLOT(receive(const QCString&, const QByteArray&)) );
636}
637
638void MainWindowImp::receive(const QCString &msg, const QByteArray &arg)
639{
640 bool found = false;
641 qDebug("MainWindowImp::receive QCop msg >"+msg+"<");
642
643 QString dest = msg.left(msg.find("("));
644 QCString param = msg.right(msg.length() - msg.find("(") - 1);
645 param = param.left( param.length() - 1 );
646 qDebug("dest >%s< param >"+param+"<",dest.latin1());
647
648// if (param.contains("QString,QString,QString")) {
649// QDataStream stream(arg,IO_ReadOnly);
650// QString arg1, arg2, arg3;
651// stream >> arg1 >> arg2 >> arg3 ;
652// qDebug("args: >%s< >%s< >%s<",arg1.latin1(),arg2.latin1(),arg3.latin1());
653// }
654
655 QMap<Module*, QLibrary*>::Iterator it;
656 for( it = libraries.begin(); it != libraries.end(); ++it ){
657 qDebug("plugin >%s<", it.key()->type().latin1() );
658 if(it.key()->type() == dest){
659 it.key()->receive( param, arg );
660 found = true;
661 }
662 }
663
664
665 if (!found) qDebug("Huh what do ya want");
666}
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
@@ -11,2 +11,3 @@ class QLibrary;
11class KProcess; 11class KProcess;
12class QCopChannel;
12#ifdef QWS 13#ifdef QWS
@@ -27,2 +28,4 @@ public:
27 28
29 QCopChannel *channel;
30
28private slots: 31private slots:
@@ -42,3 +45,6 @@ private slots:
42 45
46 void receive (const QCString &, const QByteArray &);
47
43private: 48private:
49 void makeChannel();
44 void loadModules(const QString &path); 50 void loadModules(const QString &path);
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
@@ -20,2 +20,3 @@ signals:
20 20
21
21public: 22public:
@@ -24,2 +25,8 @@ public:
24 /** 25 /**
26 * The type of the plugin
27 * and the name of the dcop call
28 */
29 virtual const QString type() = 0;
30
31 /**
25 * The current profile has been changed and the module should do any 32 * The current profile has been changed and the module should do any
@@ -84,2 +91,7 @@ public:
84 91
92 /**
93 * get dcop calls
94 */
95 virtual void receive(const QCString &msg, const QByteArray &arg) = 0;
96
85}; 97};
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
@@ -2,4 +2,5 @@ DESTDIR = $(OPIEDIR)/bin
2TEMPLATE = app 2TEMPLATE = app
3#CONFIG = qt warn_on debug 3#
4CONFIG = qt warn_on release 4CONFIG = qt warn_on debug
5#CONFIG = qt warn_on release
5HEADERS = mainwindowimp.h addconnectionimp.h defaultmodule.h module.h 6HEADERS = mainwindowimp.h addconnectionimp.h defaultmodule.h module.h
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
@@ -14,2 +14,3 @@ public:
14 14
15 virtual const QString type() {return "ppp";};
15 virtual void setProfile(const QString &newProfile); 16 virtual void setProfile(const QString &newProfile);
@@ -23,2 +24,3 @@ public:
23 virtual QString getPixmapName(Interface* i); 24 virtual QString getPixmapName(Interface* i);
25 virtual void receive(const QCString &msg, const QByteArray &arg) {};
24 26
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
@@ -111,3 +111,43 @@ bool WLANModule::remove(Interface*){
111 111
112// wlanmodule.cpp 112void WLANModule::receive(const QCString &param, const QByteArray &arg)
113{
114 qDebug("WLANModule::receive "+param);
115 QStringList params = QStringList::split(",",param);
116 int count = params.count();
117 qDebug("got %i params", count );
118 if (count < 2){
119 qDebug("Erorr less than 2 parameter");
120 qDebug("RETURNING");
121 return;
122 }
123
124 QDataStream stream(arg,IO_ReadOnly);
125 QString interface;
126 QString action;
127
128 stream >> interface;
129 stream >> action;
130 qDebug("got interface %s and acion %s", interface.latin1(), action.latin1());
131
132 if (count == 2){
133 // those should call the interface
134 if ( action.contains("start" ) ){
135 qDebug("starting %s not yet implemented",interface.latin1());
136 } else if ( action.contains("restart" ) ){
137 qDebug("restarting %s not yet implemented",interface.latin1());
138 } else if ( action.contains("stop" ) ){
139 qDebug("stopping %s not yet implemented",interface.latin1());
140 }
141 }else if (count == 3){
142 QString value;
143 stream >> value;
144 qDebug("setting %s of %s to %s", action.latin1(), interface.latin1(), value.latin1() );
145 }
146 // if (param.contains("QString,QString,QString")) {
147// QDataStream stream(arg,IO_ReadOnly);
148// QString arg1, arg2, arg3;
149// stream >> arg1 >> arg2 >> arg3 ;
150// qDebug("interface >%s< setting >%s< value >%s<",arg1.latin1(),arg2.latin1(),arg3.latin1());
151// }
152}
113 153
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
@@ -14,2 +14,4 @@ public:
14 14
15
16 virtual const QString type() {return "wlan";};
15 void setProfile(const QString &newProfile); 17 void setProfile(const QString &newProfile);
@@ -23,2 +25,3 @@ public:
23 QString getPixmapName(Interface* i); 25 QString getPixmapName(Interface* i);
26 virtual void receive(const QCString&, const QByteArray&);
24 27