1st version of qcop call in oder to let wellenreiter copy the APs it found...

... and more later.

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
@@ -8,12 +8,13 @@
 #include <qpushbutton.h>
 #include <qlistbox.h>
 #include <qlineedit.h>
 #include <qlistview.h>
 #include <qheader.h>
 #include <qlabel.h>
+#include <qpe/qcopenvelope_qws.h>
 #include <qtabwidget.h> // in order to disable the profiles tab
 
 #include <qmessagebox.h>
 
 #ifdef QWS
  #include <qpe/config.h>
@@ -58,13 +59,13 @@ MainWindowImp::MainWindowImp(QWidget *parent, const char *name) : MainWindow(par
   connect(removeProfileButton, SIGNAL(clicked()), this, SLOT(removeProfile()));
   connect(setCurrentProfileButton, SIGNAL(clicked()), this, SLOT(changeProfile()));
 
   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
 #ifdef QWS
   loadModules(QPEApplication::qpeDir() + "/plugins/networksettings");
 #else
@@ -116,12 +117,13 @@ MainWindowImp::MainWindowImp(QWidget *parent, const char *name) : MainWindow(par
         currentProfileLabel->setText(line);
         break;
       }
     }
     file.close();
   }
+  makeChannel();
 }
 
 /**
  * Deconstructor. Save profiles.  Delete loaded libraries.
  */
 MainWindowImp::~MainWindowImp(){
@@ -190,13 +192,14 @@ void MainWindowImp::getAllInterfaces(){
         ifaces += line.left(loc);
       }
     }
   }
 
   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());
 
     struct ifreq ifcopy;
     ifcopy = ifr;
@@ -621,6 +624,43 @@ 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<Module*, QLibrary*>::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
@@ -6,12 +6,13 @@
 #include <qstringlist.h>

 

 class Module;

 class Interface;

 class QLibrary;

 class KProcess;

+class QCopChannel;
 #ifdef QWS 

 class QLibrary;

 #else

 class KLibrary;

 class KLibLoader;

 #define QLibrary KLibrary

@@ -22,12 +23,14 @@ 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();

@@ -37,13 +40,16 @@ private slots:
   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

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
@@ -15,16 +15,23 @@ class QTabWidget;
 
 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.
    */ 
   virtual void setProfile(const QString &newProfile) = 0;
   
@@ -79,12 +86,17 @@ public:
   /**
    * Attempts to remove the interface, doesn't delete i
    * @return bool true if successfull, false otherwise.
    */
   virtual bool remove(Interface* i) = 0;
 
+  /**
+   * get dcop calls 
+   */
+  virtual void receive(const QCString &msg, const QByteArray &arg) = 0;
+
 };
 
 #endif
 
 // module.h
 
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,10 +1,11 @@
 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/
 DEPENDPATH  += $(OPIEDIR)/include interfaces/ wlan/
 LIBS        += -lqpe -L$(OPIEDIR)/plugins/networksettings -Linterfaces/ -linterfaces -lopie
 INTERFACES = mainwindow.ui addconnection.ui
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
@@ -9,21 +9,23 @@ signals:
     void updateInterface(Interface *i);
         
 public:
   PPPModule();
   ~PPPModule();
 
+  virtual const QString type() {return "ppp";};
   virtual void setProfile(const QString &newProfile);
   virtual bool isOwner(Interface *);
   virtual QWidget *configure(Interface *i);
   virtual QWidget *information(Interface *i);
   virtual QList<Interface> getInterfaces();
   virtual void possibleNewInterfaces(QMap<QString, QString> &);
   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<Interface> list;
   QString profile;
 
 };
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
@@ -106,8 +106,48 @@ Interface *WLANModule::addNewInterface(const QString &){
  */ 
 bool WLANModule::remove(Interface*){
   // Can't remove a hardware device, you can stop it though.
   return false; 
 }
 
-// wlanmodule.cpp
+void WLANModule::receive(const QCString &param, 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
@@ -9,21 +9,24 @@ signals:
   void updateInterface(Interface *i);
         
 public:
   WLANModule();
   ~WLANModule();
 
+
+  virtual const QString type() {return "wlan";};
   void setProfile(const QString &newProfile);
   bool isOwner(Interface *);
   QWidget *configure(Interface *i);
   QWidget *information(Interface *i);
   QList<Interface> getInterfaces();
   void possibleNewInterfaces(QMap<QString, QString> &){};
   Interface *addNewInterface(const QString &name);
   bool remove(Interface* i);
   QString getPixmapName(Interface* i);
+  virtual void receive(const QCString&, const QByteArray&);
 
 private:
   QList<Interface> list;
   QString profile;
 
 };