1 files changed, 18 insertions, 5 deletions

diff --git a/noncore/settings/networksettings/mainwindowimp.cpp b/noncore/settings/networksettings/mainwindowimp.cpp
index 2d714ca..f74cf87 100644
--- a/noncore/settings/networksettings/mainwindowimp.cpp
+++ b/noncore/settings/networksettings/mainwindowimp.cpp
@@ -10,12 +10,13 @@
 #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 <qpe/qpeapplication.h>
 
 #include <qmessagebox.h>
 
 #ifdef QWS
  #include <qpe/config.h>
  #include <qpe/qlibrary.h>
@@ -46,26 +47,26 @@
 #include <sys/ioctl.h>
 #include <sys/socket.h>
 
 #define DEFAULT_SCHEME "/var/lib/pcmcia/scheme"
 #define _PROCNETDEV "/proc/net/dev"
 
-MainWindowImp::MainWindowImp(QWidget *parent, const char *name) : MainWindow(parent, name), advancedUserMode(true), scheme(DEFAULT_SCHEME){
+MainWindowImp::MainWindowImp(QWidget *parent, const char *name) : MainWindow(parent, name, Qt::WStyle_ContextHelp), advancedUserMode(true), scheme(DEFAULT_SCHEME){
   connect(addConnectionButton, SIGNAL(clicked()), this, SLOT(addClicked()));
   connect(removeConnectionButton, SIGNAL(clicked()), this, SLOT(removeClicked()));
   connect(informationConnectionButton, SIGNAL(clicked()), this, SLOT(informationClicked()));
   connect(configureConnectionButton, SIGNAL(clicked()), this, SLOT(configureClicked()));
 
   connect(newProfileButton, SIGNAL(clicked()), this, SLOT(addProfile()));
   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
@@ -75,12 +76,20 @@ MainWindowImp::MainWindowImp(QWidget *parent, const char *name) : MainWindow(par
   getAllInterfaces();
 
   Interfaces i;
   QStringList list = i.getInterfaceList();
   QMap<QString, Interface*>::Iterator it;
   for ( QStringList::Iterator ni = list.begin(); ni != list.end(); ++ni ) {
+      /*
+       * we skipped it in getAllInterfaces now
+       * we need to ignore it as well
+       */
+      if (m_handledIfaces.contains( *ni) ) {
+          qDebug("Not up iface handled by module");
+          continue;
+      }
     bool found = false;
     for( it = interfaceNames.begin(); it != interfaceNames.end(); ++it ){
       if(it.key() == (*ni))
         found = true;
     }
     if(!found){
@@ -193,12 +202,16 @@ void MainWindowImp::getAllInterfaces(){
       }
     }
   }
 
   for (QStringList::Iterator it = ifaces.begin(); it != ifaces.end(); ++it) {
     int flags = 0;
+    if ( m_handledIfaces.contains( (*it) ) ) {
+        qDebug(" %s is handled by a module", (*it).latin1() );
+        continue;
+    }
 //    int family;
     i = NULL;
 
     strcpy(ifr.ifr_name, (*it).latin1());
 
     struct ifreq ifcopy;
@@ -304,12 +317,13 @@ Module* MainWindowImp::loadPlugin(const QString &pluginFileName, const QString &
     qDebug("MainWindowImp: Couldn't create object, but did load library!");
 #endif
     delete lib;
     return NULL;
   }
 
+  m_handledIfaces += object->handledInterfaceNames();
   // Store for deletion later
   libraries.insert(object, lib);
   return object;
 
 #else
   QLibrary *lib = loader->library(pluginFileName);
@@ -423,13 +437,13 @@ void MainWindowImp::configureClicked(){
       i->getModuleOwner()->setProfile(currentProfileText);
       moduleConfigure->showMaximized();
       return;
     }
   }
 
-  InterfaceSetupImpDialog *configure = new InterfaceSetupImpDialog(this, "InterfaceSetupImp", i, true, Qt::WDestructiveClose );
+  InterfaceSetupImpDialog *configure = new InterfaceSetupImpDialog(this, "InterfaceSetupImp", i, true, Qt::WDestructiveClose  | Qt::WStyle_ContextHelp );
   configure->setProfile(currentProfileText);
   configure->showMaximized();
 }
 
 /**
  * Pull up the information about the currently selected interface.
@@ -456,13 +470,13 @@ void MainWindowImp::informationClicked(){
 #ifdef DEBUG
       qDebug("MainWindowImp::informationClicked:: Module owner has created, we showed.");
 #endif
       return;
     }
   }
-  InterfaceInformationImp *information = new InterfaceInformationImp(this, "InterfaceSetupImp", i, Qt::WType_Modal | Qt::WDestructiveClose | Qt::WStyle_Dialog);
+  InterfaceInformationImp *information = new InterfaceInformationImp(this, "InterfaceSetupImp", i, Qt::WType_Modal | Qt::WDestructiveClose | Qt::WStyle_Dialog  | Qt::WStyle_ContextHelp);
   information->showMaximized();
 }
 
 /**
  * Update this interface.  If no QListViewItem exists create one.
  * @param Interface* pointer to the interface that needs to be updated.
@@ -636,13 +650,12 @@ void MainWindowImp::makeChannel()
 }
 
 void MainWindowImp::receive(const QCString &msg, const QByteArray &arg)
 {
     bool found = false;
     qDebug("MainWindowImp::receive QCop msg >"+msg+"<");
-
     if (msg == "raise") {
         raise();
         return;
     }
 
     QString dest = msg.left(msg.find("("));