1 files changed, 7 insertions, 21 deletions
diff --git a/noncore/net/networksetup/mainwindowimp.cpp b/noncore/net/networksetup/mainwindowimp.cpp
index f9ca83b..b9fff56 100644
--- a/noncore/net/networksetup/mainwindowimp.cpp
+++ b/noncore/net/networksetup/mainwindowimp.cpp
@@ -1,24 +1,23 @@
 #include "mainwindowimp.h"
 #include "addconnectionimp.h"
 #include "interfaceinformationimp.h"
 #include "interfacesetupimp.h"
 #include "interfaces.h"
 
 #include "module.h"
 
 #include "kprocess.h"
 
 #include <qpushbutton.h>
-#include <qtabwidget.h>
 #include <qlistbox.h>
 #include <qlineedit.h>
 #include <qlistview.h>
 #include <qheader.h>
 #include <qlabel.h>
 
 #include <qmainwindow.h>
 #include <qmessagebox.h>
 
 #include <qpe/config.h>
 #include <qpe/qlibrary.h>
 #include <qpe/resource.h>
@@ -86,24 +85,25 @@ MainWindowImp::~MainWindowImp(){
   // 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();
   }
   
   // 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();
   }
 }
 
 /**
  * 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(QString path){
   //qDebug(path.latin1());
   QDir d(path);
@@ -212,100 +212,86 @@ void MainWindowImp::removeClicked(){
       QMessageBox::information(this, "Error", "Unable to remove.", "Ok");
     else{
       QMessageBox::information(this, "Success", "Interface was removed.", "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 with a empty
- * tab.  If tab is !NULL then append the interfaces setup widget to it.
+ * 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;
   } 
 
   QString currentProfile = currentProfileLabel->text();
   if(profilesList->count() <= 1 || currentProfile == "All"){
     currentProfile = "";
   }
   
   Interface *i = interfaceItems[item];
   if(i->getModuleOwner()){
     i->getModuleOwner()->setProfile(currentProfile);
-    QTabWidget *tabWidget = NULL;
-    QWidget *moduleConfigure = i->getModuleOwner()->configure(i, &tabWidget);
+    QWidget *moduleConfigure = i->getModuleOwner()->configure(i);
     if(moduleConfigure != NULL){
-      if(tabWidget != NULL){
-	InterfaceSetupImp *configure = new InterfaceSetupImp(tabWidget, "InterfaceSetupImp", i, false, Qt::WDestructiveClose);
-        configure->setProfile(currentProfile);
-	tabWidget->insertTab(configure, "TCP/IP");
-      }
       moduleConfigure->showMaximized();
       moduleConfigure->show();
       return;
     }
   }
   
-  InterfaceSetupImp *configure = new InterfaceSetupImp(0, "InterfaceSetupImp", i, false, Qt::WDestructiveClose);
-  configure->setProfile(currentProfile);
+  InterfaceSetupImpDialog *configure = new InterfaceSetupImpDialog(0, "InterfaceSetupImp", i, true, Qt::WDestructiveClose);
+  //configure->setProfile(currentProfile);
   configure->showMaximized();
   configure->show();
 }
 
 /**
  * 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 with a empty
- * tab.  If tab is !NULL then append the interfaces setup widget to it.
+ * 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;
   }
 
   QStringList list;
   for(uint i = 0; i < profilesList->count(); i++){
     list.append(profilesList->text(i));
   }
 	  
   if(i->getModuleOwner()){
-    QTabWidget *tabWidget = NULL;
-    QWidget *moduleInformation = i->getModuleOwner()->information(i, &tabWidget);
+    QWidget *moduleInformation = i->getModuleOwner()->information(i);
     if(moduleInformation != NULL){
-      if(tabWidget != NULL){
-	InterfaceInformationImp *information = new InterfaceInformationImp(tabWidget, "InterfaceSetupImp", i, true);
-        tabWidget->insertTab(information, "TCP/IP");
-      }
       moduleInformation->showMaximized();
       moduleInformation->show();
       return;
     }
   }  
-  
   InterfaceInformationImp *information = new InterfaceInformationImp(0, "InterfaceSetupImp", i, true);
   information->showMaximized();
   information->show();
 }
 
 /**
  * Aquire the list of active interfaces from ifconfig
  * Call ifconfig and ifconfig -a
  */ 
 void MainWindowImp::getInterfaceList(){
   KShellProcess *processAll = new KShellProcess();
   *processAll << "/sbin/ifconfig" << "-a" << " > " TEMP_ALL;