1 files changed, 80 insertions, 11 deletions

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
@@ -3,55 +3,77 @@
 #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){

@@ -99,32 +121,36 @@ 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;

@@ -181,69 +207,101 @@ void MainWindowImp::getAllInterfaces(){
         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");

@@ -315,25 +373,25 @@ void MainWindowImp::configureClicked(){
     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.

  */ 

@@ -345,29 +403,32 @@ void MainWindowImp::informationClicked(){
   } 

  

   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;

   }

   

@@ -380,43 +441,51 @@ void MainWindowImp::updateInterface(Interface *i){
     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);

 }