1 files changed, 46 insertions, 27 deletions
diff --git a/noncore/settings/networksettings/mainwindowimp.cpp b/noncore/settings/networksettings/mainwindowimp.cpp
index 66ec8b5..e9429e3 100644
--- a/noncore/settings/networksettings/mainwindowimp.cpp
+++ b/noncore/settings/networksettings/mainwindowimp.cpp
@@ -1,55 +1,56 @@
 #include "mainwindowimp.h"
 #include "addconnectionimp.h"
 #include "interfaceinformationimp.h"
 #include "interfacesetupimp.h"
 #include "module.h"
 #include "kprocess.h"
+#include "namedialog.h"
 #include <qpushbutton.h>
 #include <qtabwidget.h>
 #include <qlistbox.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>
 #include <qlist.h>
 #include <qdir.h>
 #include <qfile.h>
 #include <qtextstream.h>
 #define TEMP_ALL "/tmp/ifconfig-a"
 #define TEMP_UP "/tmp/ifconfig"
 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(profilesList, SIGNAL(highlighted(const QString&)), this, SLOT(changeProfile(const QString&)));
                  
  // Load connections.
  loadModules(QDir::homeDirPath() + "/.networksetup/plugins");
  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));  
  advancedUserMode = cfg.readBoolEntry("AdvancedUserMode", false);
 }
 /**
 * Deconstructor. Save profiles.  Delete loaded libraries.
@@ -83,133 +84,153 @@ void MainWindowImp::loadModules(QString path){
  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());
  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!");
    delete lib;
    return NULL;
  }
  // Store for deletion later
  libraries.insert(object, lib);
  return object;
 }
 /**
 * 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())
+    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.", "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 == NULL) {
+  if(!item) {
-     QMessageBox::information(this, "Error","Please select an interface.", "Ok");
+    QMessageBox::information(this, "Error","Please select an interface.", "Ok");
-     return; 
+    return; 
  }
  
-  if((interfaceItems[item])->getModuleOwner() == NULL){
+  Interface *i = interfaceItems[item];
+  if(i->getModuleOwner() == NULL){
    QMessageBox::information(this, "Can't remove interface.", "Interface is built in.", "Ok");
  }
  else{
-    // Try to remove. 
+    if(!i->getModuleOwner()->remove(i))
+      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.
 */ 
 void MainWindowImp::configureClicked(){
  QListViewItem *item = connectionList->currentItem();
  if(!item){
    QMessageBox::information(this, "Error","Please select an interface.", QMessageBox::Ok);
    return;
  } 
 
  Interface *i = interfaceItems[item];
  if(i->getModuleOwner()){
    QTabWidget *tabWidget = NULL;
    QWidget *moduleConfigure = i->getModuleOwner()->configure(&tabWidget);
    if(moduleConfigure != NULL){
      if(tabWidget != NULL){
        InterfaceSetupImp *configure = new InterfaceSetupImp(tabWidget, "InterfaceSetupImp", i, true);
        tabWidget->insertTab(configure, "TCP/IP");
      }
      moduleConfigure->showMaximized();
      moduleConfigure->show();
      return;
    }
  }
  
  InterfaceSetupImp *configure = new InterfaceSetupImp(0, "InterfaceSetupImp", i, true);
  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.
 */ 
 void MainWindowImp::informationClicked(){
  QListViewItem *item = connectionList->currentItem();
  if(!item){
    QMessageBox::information(this, "Error","Please select an interface.", QMessageBox::Ok);
    return;
  } 
 
@@ -266,138 +287,136 @@ void MainWindowImp::jobDone(KProcess *process){
  
  QTextStream stream( &file );
  QString line;
  while ( !stream.eof() ) {
    line = stream.readLine();
    int space = line.find(" ");
    if(space > 1){
      // We have found an interface
      QString interfaceName = line.mid(0, space);
      if(!advancedUserMode){
        if(interfaceName == "lo")
                break;
      }
      Interface *i;
      // See if we already have it
      if(interfaceNames.find(interfaceName) == interfaceNames.end()){
        if(fileName == TEMP_ALL)
          i = new Interface(interfaceName, false);
        else
          i = new Interface(interfaceName, true);
      }
      else{
        i = interfaceNames[interfaceName];
        if(fileName != TEMP_ALL)
          i->setStatus(true);
      }
      
      i->setAttached(true);
      i->setInterfaceName(interfaceName);
      QString hardName = "Ethernet";
      int hardwareName = line.find("Link encap:");
      int macAddress = line.find("HWaddr");
      if(macAddress == -1)
        macAddress = line.length();
      if(hardwareName != -1)
        i->setHardwareName(line.mid(hardwareName+11, macAddress-(hardwareName+11)) + QString(" (%1)").arg(i->getInterfaceName()));
      // We have found an interface
      //qDebug(QString("MainWindowImp: Found Interface: %1").arg(line).latin1());
      interfaceNames.insert(i->getInterfaceName(), i);
      updateInterface(i);
    }
  }
  file.close();
  QFile::remove(fileName);
 } 
 /**
- *
+ * 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){
  QListViewItem *item = NULL;
  
-  // See if we already have it
+  // 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];
-  
+ 
-  QString statusImage = "down";
+  // Update the icons and information 
-  if(i->getStatus())
+  item->setPixmap(0, (Resource::loadPixmap(i->getStatus() ? "up": "down")));
-    statusImage = "up";
-  QPixmap status = (Resource::loadPixmap(statusImage));
-  item->setPixmap(0, status);
 
  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";
  // Actually try to use the Module
-  if(i->getModuleOwner() != NULL){
+  if(i->getModuleOwner() != NULL)
    typeName = i->getModuleOwner()->getPixmapName(i);
-  }
-  QPixmap type = (Resource::loadPixmap(typeName));
-  item->setPixmap(1, type);
-  item->setText(2, i->getHardwareName());
  
+  item->setPixmap(1, (Resource::loadPixmap(typeName)));
+  item->setText(2, i->getHardwareName());
+  item->setText(3, (i->getStatus()) ? i->getIp() : QString(""));
 }
 /**
 * Adds a new profile to the list of profiles.
 * Don't add profiles that already exists.
- * Appends to the combo and QStringList
+ * Appends to the list and QStringList
 */ 
 void MainWindowImp::addProfile(){
-  QString newProfileName = "New";
+  NameDialog foo(this, "namedialog", true);
+  QString newProfileName = foo.go();
+  if(newProfileName.length() == 0)
+    return;
+  
  if(profiles.grep(newProfileName).count() > 0){
-    QMessageBox::information(this, "Can't Add.","Profile already exists.", "Ok");
+    QMessageBox::information(this, "Can't Add","Profile already exists.", "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 anything.","Need One Profile.", "Ok");
    return;
  }
  QString profileToRemove = profilesList->currentText();
  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));
  }
 }
 /**
 * A new profile has been selected, change.
 * @param newProfile the new profile.
 */ 
 void MainWindowImp::changeProfile(const QString& newProfile){
  currentProfileLabel->setText(newProfile);
 }
 // mainwindowimp.cpp