1 files changed, 29 insertions, 9 deletions
diff --git a/noncore/settings/networksettings/mainwindowimp.cpp b/noncore/settings/networksettings/mainwindowimp.cpp
index 9f07f0d..01063c2 100644
--- a/noncore/settings/networksettings/mainwindowimp.cpp
+++ b/noncore/settings/networksettings/mainwindowimp.cpp
@@ -23,50 +23,52 @@
 #include <qpe/qlibrary.h>
 #include <qpe/resource.h>
 #include <qpe/qpeapplication.h>
 
 #include <qlist.h>
 #include <qdir.h>
 #include <qfile.h>
 #include <qtextstream.h>
 
 #define TEMP_ALL "/tmp/ifconfig-a"
 #define TEMP_UP "/tmp/ifconfig"
 
-#define SCHEME "/var/lib/pcmcia/scheme"
+#define DEFAULT_SCHEME "/var/lib/pcmcia/scheme"
+
 MainWindowImp::MainWindowImp(QWidget *parent, const char *name) : MainWindow(parent, name, true), advancedUserMode(false){
   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/networksetup");
   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);
+  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();
   }
@@ -86,50 +88,50 @@ MainWindowImp::~MainWindowImp(){
   for( it = libraries.begin(); it != libraries.end(); ++it ){
     delete it.key();
     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());
+  //qDebug(path.latin1());
   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")){
       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(QString pluginFileName, QString resolveString){
-  qDebug(QString("MainWindowImp::loadPlugin: %1").arg(pluginFileName).latin1());
+  //qDebug(QString("MainWindowImp::loadPlugin: %1").arg(pluginFileName).latin1());
   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());
     delete lib;
     return NULL;
   }
   
   // Try to get an object.
   Module *object = ((Module* (*)()) functionPointer)();
   if(object == NULL){
     qDebug("MainWindowImp: Couldn't create object, but did load library!");
@@ -481,44 +483,62 @@ void MainWindowImp::removeProfile(){
   // Can't remove the curent profile
   if(profileToRemove == currentProfileLabel->text()){
     QMessageBox::information(this, "Can't remove.",QString("%1 is the current profile.").arg(profileToRemove), "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.
-  //TODO
+    // 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.", "Ok");
     return;
   }
   QString newProfile = profilesList->text(profilesList->currentItem());
   if(newProfile != currentProfileLabel->text()){
     currentProfileLabel->setText(newProfile);
-    QFile::remove(SCHEME);
-    QFile file(SCHEME);
+    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();