KDEafied and bugs fixes

7 files changed, 105 insertions, 34 deletions

diff --git a/noncore/settings/networksettings/.cvsignore b/noncore/settings/networksettings/.cvsignore
index 1ba7ac7..e000724 100644
--- a/noncore/settings/networksettings/.cvsignore
+++ b/noncore/settings/networksettings/.cvsignore
@@ -1,23 +1,29 @@
 *.moc
 *.moc.o
 *.o
 .deps
 .libs
 .moc.cpp
 .moc.o
 .o
 Makefile*
 addconnection.cpp
 addconnection.h
 interfaceadvanced.cpp
 interfaceadvanced.h
 interfaceinformation.cpp
 interfaceinformation.h
 interfacesetup.cpp
 interfacesetup.h
 mainwindow.cpp
 mainwindow.h
 moc_*.cpp
 networksetup
 systemadvanced.cpp
 systemadvanced.h
+hosts.h
+hosts.cpp
+vpn.h
+vpn.cpp
+dns.h
+dns.cpp
diff --git a/noncore/settings/networksettings/addconnectionimp.cpp b/noncore/settings/networksettings/addconnectionimp.cpp
index 07545f7..f18d8d1 100644
--- a/noncore/settings/networksettings/addconnectionimp.cpp
+++ b/noncore/settings/networksettings/addconnectionimp.cpp
@@ -1,37 +1,41 @@
 #include "addconnectionimp.h"
 #include <qlistview.h>
+#if QT_VERSION < 300
 #include <qlist.h>
+#else
+#include <qptrlist.h>
+#endif
 #include <qlabel.h>
 #include <qheader.h>
 
 /**
  * Constructor
  */ 
 AddConnectionImp::AddConnectionImp(QWidget *parent, const char *name, WFlags f):AddConnection(parent, name, f){
   connect(registeredServicesList, SIGNAL(selectionChanged()), this, SLOT(changed()));
   registeredServicesList->header()->hide();
 };
 
 /**
  * The current item changed, update the discription.
  */ 
 void AddConnectionImp::changed(){
   QListViewItem *item = registeredServicesList->currentItem();
   if(item)
     help->setText(list[item->text(0)]);
 }
 
 /**
  * Save a copy of newList for the discriptions and append them all to the view
  * @param newList the new list of possible interfaces
  */ 
 void AddConnectionImp::addConnections(const QMap<QString, QString> &newList){
   list = newList;
   QMap<QString, QString>::Iterator it;
   for( it = list.begin(); it != list.end(); ++it )
     QListViewItem *item = new QListViewItem(registeredServicesList, it.key());
   registeredServicesList->setCurrentItem(registeredServicesList->firstChild());
 }
 
 // addserviceimp.cpp
 
diff --git a/noncore/settings/networksettings/addconnectionimp.h b/noncore/settings/networksettings/addconnectionimp.h
index 680a502..57e6b20 100644
--- a/noncore/settings/networksettings/addconnectionimp.h
+++ b/noncore/settings/networksettings/addconnectionimp.h
@@ -1,29 +1,28 @@
 #ifndef ADDCONNECTIONIMP_H 
 #define ADDCONNECTIONIMP_H
 
 #include "addconnection.h"
 #include <qmap.h>
-#include <qlist.h>
 
 class QListViewItem;
 
 class AddConnectionImp : public AddConnection {
 
 Q_OBJECT
 	
 public:
   AddConnectionImp(QWidget *parent=0, const char *name=0, WFlags f=0);
   void addConnections(const QMap<QString, QString> &newList);
    
 private slots:
   void changed();
 
 private:
   QMap<QString, QString> list;
 
 };
 
 #endif
 
 // addconectionimp.h
 
diff --git a/noncore/settings/networksettings/mainwindow.ui b/noncore/settings/networksettings/mainwindow.ui
index dcabc52..8e17cb3 100644
--- a/noncore/settings/networksettings/mainwindow.ui
+++ b/noncore/settings/networksettings/mainwindow.ui
@@ -286,164 +286,142 @@
                     </widget>
                     <widget row="1"  column="0"  rowspan="1"  colspan="3" >
                         <class>Line</class>
                         <property stdset="1">
                             <name>name</name>
                             <cstring>Line1</cstring>
                         </property>
                         <property stdset="1">
                             <name>orientation</name>
                             <enum>Horizontal</enum>
                         </property>
                     </widget>
                     <widget row="0"  column="0" >
                         <class>QLabel</class>
                         <property stdset="1">
                             <name>name</name>
                             <cstring>TextLabel1</cstring>
                         </property>
                         <property stdset="1">
                             <name>text</name>
                             <string>Current Profile</string>
                         </property>
                     </widget>
                     <widget row="4"  column="2" >
                         <class>QPushButton</class>
                         <property stdset="1">
                             <name>name</name>
                             <cstring>removeProfileButton</cstring>
                         </property>
                         <property stdset="1">
                             <name>text</name>
                             <string>&amp;Remove</string>
                         </property>
                     </widget>
                     <widget row="3"  column="0"  rowspan="2"  colspan="2" >
                         <class>QListBox</class>
                         <property stdset="1">
                             <name>name</name>
                             <cstring>profilesList</cstring>
                         </property>
                     </widget>
                     <spacer row="0"  column="2" >
                         <property>
                             <name>name</name>
                             <cstring>Spacer2</cstring>
                         </property>
                         <property stdset="1">
                             <name>orientation</name>
                             <enum>Horizontal</enum>
                         </property>
                         <property stdset="1">
                             <name>sizeType</name>
                             <enum>Expanding</enum>
                         </property>
                         <property>
                             <name>sizeHint</name>
                             <size>
                                 <width>20</width>
                                 <height>20</height>
                             </size>
                         </property>
                     </spacer>
                     <widget row="2"  column="0" >
                         <class>QLabel</class>
                         <property stdset="1">
                             <name>name</name>
                             <cstring>TextLabel1_2</cstring>
                         </property>
                         <property stdset="1">
                             <name>text</name>
                             <string>Profiles</string>
                         </property>
                     </widget>
                     <widget row="6"  column="0"  rowspan="1"  colspan="3" >
                         <class>QLayoutWidget</class>
                         <property stdset="1">
                             <name>name</name>
                             <cstring>Layout6</cstring>
                         </property>
                         <hbox>
                             <property stdset="1">
                                 <name>margin</name>
                                 <number>0</number>
                             </property>
                             <property stdset="1">
                                 <name>spacing</name>
                                 <number>6</number>
                             </property>
                             <widget>
                                 <class>QLabel</class>
                                 <property stdset="1">
                                     <name>name</name>
                                     <cstring>TextLabel1_3</cstring>
                                 </property>
                                 <property stdset="1">
                                     <name>text</name>
                                     <string>New Profile</string>
                                 </property>
                             </widget>
                             <widget>
                                 <class>QLineEdit</class>
                                 <property stdset="1">
                                     <name>name</name>
                                     <cstring>newProfile</cstring>
                                 </property>
                             </widget>
                             <widget>
                                 <class>QPushButton</class>
                                 <property stdset="1">
                                     <name>name</name>
                                     <cstring>newProfileButton</cstring>
                                 </property>
                                 <property stdset="1">
                                     <name>enabled</name>
                                     <bool>false</bool>
                                 </property>
                                 <property stdset="1">
                                     <name>text</name>
                                     <string>&amp;Add</string>
                                 </property>
                             </widget>
                         </hbox>
                     </widget>
                 </grid>
             </widget>
         </widget>
     </vbox>
 </widget>
-<customwidgets>
-    <customwidget>
-        <class>QWidget</class>
-        <header location="local">qwidget.h</header>
-        <sizehint>
-            <width>100</width>
-            <height>100</height>
-        </sizehint>
-        <container>0</container>
-        <sizepolicy>
-            <hordata>7</hordata>
-            <verdata>7</verdata>
-        </sizepolicy>
-        <pixmap>image0</pixmap>
-    </customwidget>
-</customwidgets>
-<images>
-    <image>
-        <name>image0</name>
-        <data format="XPM.GZ" length="646">789c6dd2c10ac2300c00d07bbf2234b7229d1be245fc04c5a3201e4615f430059d0711ff5ddb2e6bb236ec90eed134cb5a19d8ef36602af5ecdbfeeac05dda0798d3abebde87e3faa374d3807fa0d633a52d38d8de6f679fe33fc776e196f53cd010188256a3600a292882096246517815ca99884606e18044a3a40d91824820924265a7923a2e8bcd05f33db1173e002913175f2a6be6d3294871a2d95fa00e8a94ee017b69d339d90df1e77c57ea072ede6758</data>
-    </image>
-</images>
 <tabstops>
     <tabstop>tabWidget</tabstop>
     <tabstop>connectionList</tabstop>
     <tabstop>informationConnectionButton</tabstop>
     <tabstop>configureConnectionButton</tabstop>
     <tabstop>addConnectionButton</tabstop>
     <tabstop>removeConnectionButton</tabstop>
     <tabstop>profilesList</tabstop>
     <tabstop>setCurrentProfileButton</tabstop>
     <tabstop>removeProfileButton</tabstop>
     <tabstop>newProfile</tabstop>
     <tabstop>newProfileButton</tabstop>
 </tabstops>
 </UI>
diff --git a/noncore/settings/networksettings/mainwindowimp.cpp b/noncore/settings/networksettings/mainwindowimp.cpp
index 0ddc489..d6b708b 100644
--- a/noncore/settings/networksettings/mainwindowimp.cpp
+++ b/noncore/settings/networksettings/mainwindowimp.cpp
@@ -1,521 +1,590 @@
 #include "mainwindowimp.h"

 #include "addconnectionimp.h"

 #include "interfaceinformationimp.h"

 #include "interfacesetupimp.h"

 #include "interfaces.h"

 #include "module.h"

 

 #include <qpushbutton.h>

 #include <qlistbox.h>

 #include <qlineedit.h>

 #include <qlistview.h>

 #include <qheader.h>

 #include <qlabel.h>

 

-#include <qmainwindow.h>

 #include <qmessagebox.h>

 

+#ifdef QTE_VERSION 

 #include <qpe/config.h>

 #include <qpe/qlibrary.h>

 #include <qpe/resource.h>

 #include <qpe/qpeapplication.h>

+ #define QLibrary

+#else

+ #include <klibloader.h>

+ #define QLibrary KLibrary

+ #include <kconfig.h>

+ #define Config KConfig

+ #include <kapplication.h>

+ #include <kstandarddirs.h>

+ #include <kiconloader.h>

+ #define showMaximized show

+#endif

 

+#if QT_VERSION < 300

 #include <qlist.h>

+#else

+#include <qptrlist.h>

+#endif

 #include <qdir.h>

 #include <qfile.h>

 #include <qtextstream.h>

+#include <qregexp.h>

 

 #include <net/if.h>

 #include <sys/ioctl.h>

 

 #define DEFAULT_SCHEME "/var/lib/pcmcia/scheme"

 

-MainWindowImp::MainWindowImp(QWidget *parent, const char *name) : MainWindow(parent, name, true), advancedUserMode(false), scheme(DEFAULT_SCHEME){

+MainWindowImp::MainWindowImp(QWidget *parent, const char *name) : MainWindow(parent, name), 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&)));  

   // Load connections.

-  loadModules(QPEApplication::qpeDir() + "/plugins/networksettings");

+  // /usr/local/kde/lib/libinterfaces.la

+#ifdef QTE_VERSION 

+  loadModules(QPEApplication::kdeDir() + "/plugins/networksettings");

+#else

+  loader = KLibLoader::self();

+  loadModules(QString("/usr/")+KStandardDirs::kde_default("lib"));

+#endif

   getAllInterfaces();

   

   Interfaces i;

   QStringList list = i.getInterfaceList();

   QMap<QString, Interface*>::Iterator it;

   for ( QStringList::Iterator ni = list.begin(); ni != list.end(); ++ni ) {

     bool found = false;

     for( it = interfaceNames.begin(); it != interfaceNames.end(); ++it ){

       if(it.key() == (*ni))

         found = true;

     }

     if(!found){

       if(!(*ni).contains("_")){

         Interface *i = new Interface(this, *ni, false);

         i->setAttached(false);

         i->setHardwareName("Disconnected");

         interfaceNames.insert(i->getInterfaceName(), i);

         updateInterface(i);

         connect(i, SIGNAL(updateInterface(Interface *)), this, SLOT(updateInterface(Interface *)));

       }

     }

   }

   

   //getInterfaceList();

   connectionList->header()->hide();

 

   Config cfg("NetworkSetup");

   profiles = QStringList::split(" ", cfg.readEntry("Profiles", "All"));

   for ( QStringList::Iterator it = profiles.begin(); it != profiles.end(); ++it)

     profilesList->insertItem((*it));  

   currentProfileLabel->setText(cfg.readEntry("CurrentProfile", "All"));

   advancedUserMode = cfg.readBoolEntry("AdvancedUserMode", false);

   scheme = cfg.readEntry("SchemeFile", DEFAULT_SCHEME);

 

   QFile file(scheme);

   if ( file.open(IO_ReadOnly) ) {    // file opened successfully

     QTextStream stream( &file );        // use a text stream

     while ( !stream.eof() ) {        // until end of file...

       QString line = stream.readLine();       // line of text excluding '\n'

       if(line.contains("SCHEME")){

         line = line.mid(7, line.length());

         currentProfileLabel->setText(line);

         break;

       }

     }

     file.close();

   }

 }

 

 /**

  * Deconstructor. Save profiles.  Delete loaded libraries.

  */

 MainWindowImp::~MainWindowImp(){

   // Save profiles.

   Config cfg("NetworkSetup");

   cfg.setGroup("General");

   cfg.writeEntry("Profiles", profiles.join(" "));

   

   // Delete all interfaces that don't have owners.

   QMap<Interface*, QListViewItem*>::Iterator iIt;

   for( iIt = items.begin(); iIt != items.end(); ++iIt ){

     if(iIt.key()->getModuleOwner() == NULL)

       delete iIt.key();

   }

   

+#ifdef QTE_VERSION

   // Delete Modules and Libraries

   QMap<Module*, QLibrary*>::Iterator it;

   for( it = libraries.begin(); it != libraries.end(); ++it ){

     delete it.key();

     // I wonder why I can't delete the libraries

     // What fucking shit this is.

     //delete it.data();

   }

+#else

+  // klibloader automaticly deletes the libraries for us...

+#endif

 }

 

 /**

  * Query the kernel for all of the interfaces.

  */ 

 void MainWindowImp::getAllInterfaces(){

   int sockfd = socket(AF_INET, SOCK_DGRAM, 0);

   if(sockfd == -1)

     return;

   

   char buf[8*1024];

   struct ifconf ifc;

   ifc.ifc_len = sizeof(buf);

   ifc.ifc_req = (struct ifreq *) buf;

   int result=ioctl(sockfd, SIOCGIFCONF, &ifc);

 

   for (char* ptr = buf; ptr < buf + ifc.ifc_len; ){

     struct ifreq *ifr =(struct ifreq *) ptr;

     int len = sizeof(struct sockaddr);

 #ifdef  HAVE_SOCKADDR_SA_LEN

     if (ifr->ifr_addr.sa_len > len)

       len = ifr->ifr_addr.sa_len;    /* length > 16 */

 #endif

     ptr += sizeof(ifr->ifr_name) + len;  /* for next one in buffer */

 

     int flags;

     struct sockaddr_in *sinptr;

     Interface *i = NULL;

     switch (ifr->ifr_addr.sa_family){

       case AF_INET:

         sinptr = (struct sockaddr_in *) &ifr->ifr_addr;

         flags=0;

 

         struct ifreq ifcopy;

         ifcopy=*ifr;

         result=ioctl(sockfd,SIOCGIFFLAGS,&ifcopy);

         flags=ifcopy.ifr_flags;

         i = new Interface(this, ifr->ifr_name, false);

 	i->setAttached(true);

         if ((flags & IFF_UP) == IFF_UP)

           i->setStatus(true);

         else

           i->setStatus(false);

 

         if ((flags & IFF_BROADCAST) == IFF_BROADCAST)

           i->setHardwareName("Ethernet");

         else if ((flags & IFF_POINTOPOINT) == IFF_POINTOPOINT)

           i->setHardwareName("Point to Point");

         else if ((flags & IFF_MULTICAST) == IFF_MULTICAST)

           i->setHardwareName("Multicast");

         else if ((flags & IFF_LOOPBACK) == IFF_LOOPBACK)

           i->setHardwareName("Loopback");

         else

           i->setHardwareName("Unknown");

 

         interfaceNames.insert(i->getInterfaceName(), i);

         updateInterface(i);

         connect(i, SIGNAL(updateInterface(Interface *)), this, SLOT(updateInterface(Interface *)));

 	break;

 

       default:

 	qDebug(ifr->ifr_name);

 	qDebug(QString("%1").arg(ifr->ifr_addr.sa_family).latin1());

         break;

     }

   }

 }

 

 /**

  * Load all modules that are found in the path

  * @param path a directory that is scaned for any plugins that can be loaded

  *  and attempts to load them

  */ 

 void MainWindowImp::loadModules(const QString &path){

-  //qDebug(path.latin1());

+#ifdef DEBUG

+  qDebug("MainWindowImp::loadModules: %s", path.latin1());

+#endif

   QDir d(path);

   if(!d.exists())

     return;

 

   // Don't want sym links

   d.setFilter( QDir::Files | QDir::NoSymLinks );

   const QFileInfoList *list = d.entryInfoList();

   QFileInfoListIterator it( *list );

   QFileInfo *fi;

   while ( (fi=it.current()) ) {

-    if(fi->fileName().contains(".so")){

+    if(fi->fileName().contains(".so") && fi->fileName().contains("networksettings_")){

       loadPlugin(path + "/" + fi->fileName());

     }

     ++it;

   }

 }

 

 /**

  * Attempt to load a function and resolve a function.

  * @param pluginFileName - the name of the file in which to attempt to load

  * @param resolveString - function pointer to resolve 

  * @return pointer to the function with name resolveString or NULL

  */ 

 Module* MainWindowImp::loadPlugin(const QString &pluginFileName, const QString &resolveString){

-  //qDebug(QString("MainWindowImp::loadPlugin: %1").arg(pluginFileName).latin1());

+#ifdef DEBUG

+  qDebug("MainWindowImp::loadPlugin: %s", pluginFileName.latin1());

+#endif

+#ifdef QTE_VERSION 

   QLibrary *lib = new QLibrary(pluginFileName);

   void *functionPointer = lib->resolve(resolveString);

   if( !functionPointer ){

-    qDebug(QString("MainWindowImp: File: %1 is not a plugin, but though was.").arg(pluginFileName).latin1());

+#ifdef DEBUG

+  qDebug("MainWindowImp::loadPlugin: File: %s is not a plugin, but though was.", pluginFileName.latin1());

+#endif

     delete lib;

     return NULL;

   }

-  

   // Try to get an object.

   Module *object = ((Module* (*)()) functionPointer)();

   if(object == NULL){

+#ifdef DEBUG

     qDebug("MainWindowImp: Couldn't create object, but did load library!");

+#endif

     delete lib;

     return NULL;

   }

 

   // Store for deletion later

   libraries.insert(object, lib);

   return object;

+

+#else

+  QLibrary *lib = loader->library(pluginFileName);

+  if( !lib || !lib->hasSymbol(resolveString) ){

+#ifdef DEBUG

+    qDebug(QString("MainWindowImp::loadPlugin: File: %1 is not a plugin, but though was.").arg(pluginFileName).latin1());

+#endif

+    return NULL;

+  }

+  // Try to get an object.

+  Module *object = ((Module* (*)()) lib->symbol(resolveString))();

+  if(object == NULL){

+#ifdef DEBUG

+    qDebug("MainWindowImp: Couldn't create object, but did load library!");

+#endif

+    return NULL;

+  }

+#ifdef DEBUG

+  qDebug("MainWindowImp::loadPlugin:: Found object, storing.");

+#endif

+  // Store for deletion later

+  libraries.insert(object, lib);

+  return object;

+#endif

 }

 

 /**

  * The Add button was clicked.  Bring up the add dialog and if OK is hit

  * load the plugin and append it to the list

  */ 

 void MainWindowImp::addClicked(){

   QMap<Module*, QLibrary*>::Iterator it;

   QMap<QString, QString> list;

   QMap<QString, Module*> newInterfaceOwners;

   //list.insert("USB (PPP) / (ADD_TEST)", "A dialup connection over the USB port");

   //list.insert("IrDa (PPP) / (ADD_TEST)", "A dialup connection over the IdDa port");

   for( it = libraries.begin(); it != libraries.end(); ++it ){

     if(it.key()){

       (it.key())->possibleNewInterfaces(list);

     }

   }

   // See if the list has anything that we can add.

   if(list.count() == 0){

     QMessageBox::information(this, "Sorry", "Nothing to add.", QMessageBox::Ok);

     return;

   }

   AddConnectionImp addNewConnection(this, "AddConnectionImp", true);

   addNewConnection.addConnections(list);

   addNewConnection.showMaximized();

   if(QDialog::Accepted == addNewConnection.exec()){

     QListViewItem *item = addNewConnection.registeredServicesList->currentItem();

     if(!item)

       return;

     

     for( it = libraries.begin(); it != libraries.end(); ++it ){

       if(it.key()){

         Interface *i = (it.key())->addNewInterface(item->text(0));

         if(i){

           interfaceNames.insert(i->getInterfaceName(), i);

           updateInterface(i);

         }

       }

     }

   }

 }

 

 /**

  * Prompt the user to see if they really want to do this.

  * If they do then remove from the list and unload.

  */ 

 void MainWindowImp::removeClicked(){

   QListViewItem *item = connectionList->currentItem();

   if(!item) {

     QMessageBox::information(this, "Sorry","Please select an interface First.", QMessageBox::Ok);

     return; 

   }

   

   Interface *i = interfaceItems[item];

   if(i->getModuleOwner() == NULL){

     QMessageBox::information(this, "Can't remove interface.", "Interface is built in.", QMessageBox::Ok);

   }

   else{

     if(!i->getModuleOwner()->remove(i))

       QMessageBox::information(this, "Error", "Unable to remove.", QMessageBox::Ok);

     else{

       QMessageBox::information(this, "Success", "Interface was removed.", QMessageBox::Ok);

       // TODO memory managment....

       // who deletes the interface?

     }

   }

 }

 

 /**

  * Pull up the configure about the currently selected interface.

  * Report an error if no interface is selected.

  * If the interface has a module owner then request its configure.

  */ 

 void MainWindowImp::configureClicked(){

   QListViewItem *item = connectionList->currentItem();

   if(!item){

     QMessageBox::information(this, "Sorry","Please select an interface first.", QMessageBox::Ok);

     return;

   } 

 

   Interface *i = interfaceItems[item];

   if(i->getModuleOwner()){

     QWidget *moduleConfigure = i->getModuleOwner()->configure(i);

     if(moduleConfigure != NULL){

       moduleConfigure->showMaximized();

       return;

     }

   }

   

-  InterfaceSetupImpDialog *configure = new InterfaceSetupImpDialog(0, "InterfaceSetupImp", i, true, Qt::WDestructiveClose);

+  InterfaceSetupImpDialog *configure = new InterfaceSetupImpDialog(this, "InterfaceSetupImp", i, true, Qt::WShowModal | Qt::WDestructiveClose | Qt::WType_Dialog);

   QString currentProfileText = currentProfileLabel->text();

   if(currentProfileText.upper() == "ALL");

     currentProfileText = "";

   configure->setProfile(currentProfileText);

   configure->showMaximized();

 }

 

 /**

  * Pull up the information about the currently selected interface.

  * Report an error if no interface is selected.

  * If the interface has a module owner then request its configure.

  */ 

 void MainWindowImp::informationClicked(){

   QListViewItem *item = connectionList->currentItem();

   if(!item){

     QMessageBox::information(this, "Sorry","Please select an interface First.", QMessageBox::Ok);

     return;

   } 

  

   Interface *i = interfaceItems[item];

   if(!i->isAttached()){

     QMessageBox::information(this, "Sorry","No information about\na disconnected interface.", QMessageBox::Ok);

     return;

   }

 

   if(i->getModuleOwner()){

     QWidget *moduleInformation = i->getModuleOwner()->information(i);

     if(moduleInformation != NULL){

       moduleInformation->showMaximized();

+#ifdef DEBUG

+      qDebug("MainWindowImp::informationClicked:: Module owner has created, we showed.");

+#endif

       return;

     }

   }  

-  InterfaceInformationImp information(0, "InterfaceSetupImp", i);

-  information.showMaximized();

+  InterfaceInformationImp *information = new InterfaceInformationImp(this, "InterfaceSetupImp", i, Qt::WShowModal | Qt::WDestructiveClose | Qt::WType_Dialog);

+  information->showMaximized();

 }

 

 /**

  * Update this interface.  If no QListViewItem exists create one.

  * @param Interface* pointer to the interface that needs to be updated.

  */ 

 void MainWindowImp::updateInterface(Interface *i){

   if(!advancedUserMode){

     if(i->getInterfaceName() == "lo")

       return;

   }

   

   QListViewItem *item = NULL;

   

   // Find the interface, making it if needed.

   if(items.find(i) == items.end()){

     item = new QListViewItem(connectionList, "", "", "");

     // See if you can't find a module owner for this interface

     QMap<Module*, QLibrary*>::Iterator it;

     for( it = libraries.begin(); it != libraries.end(); ++it ){

       if(it.key()->isOwner(i))

         i->setModuleOwner(it.key());

     }

     items.insert(i, item);

     interfaceItems.insert(item, i);

   }

   else

     item = items[i];

  

   // Update the icons and information 

+#ifdef QTE_VERSION

   item->setPixmap(0, (Resource::loadPixmap(i->getStatus() ? "up": "down")));

+#else

+  item->setPixmap(0, (SmallIcon(i->getStatus() ? "up": "down")));

+#endif

  

   QString typeName = "lan";

   if(i->getHardwareName().contains("Local Loopback"))

     typeName = "lo";

   if(i->getInterfaceName().contains("irda"))

     typeName = "irda";

   if(i->getInterfaceName().contains("wlan"))

     typeName = "wlan";

   if(i->getInterfaceName().contains("usb"))

     typeName = "usb";

   

   if(!i->isAttached())

     typeName = "connect_no";

   // Actually try to use the Module

   if(i->getModuleOwner() != NULL)

     typeName = i->getModuleOwner()->getPixmapName(i);

   

+#ifdef QTE_VERSION

   item->setPixmap(1, (Resource::loadPixmap(QString("networksettings/") + typeName)));

+#else

+  item->setPixmap(1, (SmallIcon(typeName)));

+#endif

   item->setText(2, i->getHardwareName());

   item->setText(3, QString("(%1)").arg(i->getInterfaceName()));

   item->setText(4, (i->getStatus()) ? i->getIp() : QString(""));

 }

 

 void MainWindowImp::newProfileChanged(const QString& newText){

   if(newText.length() > 0)

    newProfileButton->setEnabled(true);

   else

     newProfileButton->setEnabled(false);

 }

 

 /**

  * Adds a new profile to the list of profiles.

  * Don't add profiles that already exists.

  * Appends to the list and QStringList

  */ 

 void MainWindowImp::addProfile(){

   QString newProfileName = newProfile->text();

   if(profiles.grep(newProfileName).count() > 0){

     QMessageBox::information(this, "Can't Add","Profile already exists.", QMessageBox::Ok);

     return;

   }

   profiles.append(newProfileName);

   profilesList->insertItem(newProfileName);

 }

 

 /**

  * Removes the currently selected profile in the combo.

  * Doesn't delete if there are less then 2 profiles.

  */

 void MainWindowImp::removeProfile(){

   if(profilesList->count() <= 1){

     QMessageBox::information(this, "Can't remove.","At least one profile\nis needed.", QMessageBox::Ok);

     return;

   }

   QString profileToRemove = profilesList->currentText();

   if(profileToRemove == "All"){

     QMessageBox::information(this, "Can't remove.","Can't remove default.", QMessageBox::Ok);

     return;

   }

   // Can't remove the curent profile

   if(profileToRemove == currentProfileLabel->text()){

     QMessageBox::information(this, "Can't remove.",QString("%1 is the current profile.").arg(profileToRemove), QMessageBox::Ok);

     return;

 

   }

   

   if(QMessageBox::information(this, "Question",QString("Remove profile: %1").arg(profileToRemove), QMessageBox::Ok, QMessageBox::Cancel) == QMessageBox::Ok){

     profiles = QStringList::split(" ", profiles.join(" ").replace(QRegExp(profileToRemove), ""));

     profilesList->clear();

     for ( QStringList::Iterator it = profiles.begin(); it != profiles.end(); ++it)

       profilesList->insertItem((*it));

 

     // Remove any interface settings and mappings.

     Interfaces interfaces;

     // Go through them one by one

     QMap<Interface*, QListViewItem*>::Iterator it;

     for( it = items.begin(); it != items.end(); ++it ){

       QString interfaceName = it.key()->getInterfaceName();

       qDebug(interfaceName.latin1());

       if(interfaces.setInterface(interfaceName + "_" + profileToRemove)){

        interfaces.removeInterface();

        if(interfaces.setMapping(interfaceName)){

          if(profilesList->count() == 1)

             interfaces.removeMapping();

           else{

             interfaces.removeMap("map", interfaceName + "_" + profileToRemove);

           }

         }

         interfaces.write();

         break;

       }

     }

   }

 }

 

 /**

  * A new profile has been selected, change.

  * @param newProfile the new profile.

  */ 

 void MainWindowImp::changeProfile(){

   if(profilesList->currentItem() == -1){

     QMessageBox::information(this, "Can't Change.","Please select a profile.", QMessageBox::Ok);

     return;

   }

   QString newProfile = profilesList->text(profilesList->currentItem());

   if(newProfile != currentProfileLabel->text()){

     currentProfileLabel->setText(newProfile);

     QFile::remove(scheme);

     QFile file(scheme);

     if ( file.open(IO_ReadWrite) ) {

       QTextStream stream( &file );

       stream << QString("SCHEME=%1").arg(newProfile);

       file.close();

     }

     // restart all up devices?

     if(QMessageBox::information(this, "Question","Restart all running interfaces?", QMessageBox::Ok, QMessageBox::No) == QMessageBox::Ok){

       // Go through them one by one

       QMap<Interface*, QListViewItem*>::Iterator it;

       for( it = items.begin(); it != items.end(); ++it ){

         if(it.key()->getStatus() == true)

           it.key()->restart();

       }

     }

   }

   // TODO change the profile in the modules

 }

 

 // mainwindowimp.cpp

 

diff --git a/noncore/settings/networksettings/mainwindowimp.h b/noncore/settings/networksettings/mainwindowimp.h
index 4f09d6c..2ebf304 100644
--- a/noncore/settings/networksettings/mainwindowimp.h
+++ b/noncore/settings/networksettings/mainwindowimp.h
@@ -1,58 +1,69 @@
 #ifndef MAINWINOWIMP_H

 #define MAINWINOWIMP_H

 

 #include "mainwindow.h"

 #include <qmap.h>

 #include <qstringlist.h>

 

 class Module;

 class Interface;

 class QLibrary;

 class KProcess;

+#ifdef QTE_VERSION 

+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<QString, Interface*> interfaceNames;

 

   QMap<Module*, QLibrary*> libraries;

   QMap<Interface*, QListViewItem*> items;

   QMap<QListViewItem*, Interface*> interfaceItems;

   

   QMap<KProcess*, QString> threads;

   QStringList profiles;

 

   bool advancedUserMode;

   QString scheme;

+#ifndef QTE_VERSION

+  KLibLoader *loader;

+#endif

 };

 

 #endif

 

 // mainwindowimp.h

 

diff --git a/noncore/settings/networksettings/module.h b/noncore/settings/networksettings/module.h
index 2e6272b..46a3c77 100644
--- a/noncore/settings/networksettings/module.h
+++ b/noncore/settings/networksettings/module.h
@@ -1,86 +1,90 @@
 #ifndef NETCONF_MODULE_H
 #define NETCONF_MODULE_H
 
 #include <qobject.h>
+#if QT_VERSION < 300
 #include <qlist.h>
+#else
+#include <qptrlist.h>
+#endif
 #include <qmap.h>
 #include "interface.h"
 
 class QWidget;
 class QTabWidget;
 
 class Module : QObject{
 
 signals:
   void updateInterface(Interface *i);
 	
 public:
   Module(){};
 
   /**
    * 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;
   
   /**
    * 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) 
    */ 
   virtual QString getPixmapName(Interface *) = 0;
 
   /**
    * 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.
    */
   virtual bool isOwner(Interface *){ return false; };
   
   /**
    * Create and return the WLANConfigure Module
    * @param Interface *i the interface to configure.
    * @return QWidget* pointer to this modules configure.
    */
   virtual QWidget *configure(Interface *){ return NULL; } ;
   
   /**
    * Create, and return the Information Module
    * @param Interface *i the interface to get info on.
    * @return QWidget* pointer to this modules info.
    */
   virtual QWidget *information(Interface *){ return NULL; };
   
   /**
    * Get all active (up or down) interfaces
    * @return QList<Interface> A list of interfaces that exsist that havn't
    * been called by isOwner()
    */  
   virtual QList<Interface> getInterfaces() = 0;
   
   /**
    * Adds possible new interfaces to the list (Example: usb(ppp), ir(ppp),
    *  modem ppp)
    */
   virtual void possibleNewInterfaces(QMap<QString, QString> &list) = 0;
   
   /**
    * Attempts to create a new interface from name
    * @return Interface* NULL if it was unable to be created.
    * @param name the type of interface to create
    */  
   virtual Interface *addNewInterface(const QString &name) = 0;
   
   /**
    * Attempts to remove the interface, doesn't delete i
    * @return bool true if successfull, false otherwise.
    */
   virtual bool remove(Interface* i) = 0;
 
 };
 
 #endif
 
 // module.h