1 files changed, 76 insertions, 13 deletions

diff --git a/noncore/settings/networksettings/mainwindowimp.cpp b/noncore/settings/networksettings/mainwindowimp.cpp
index a446d29..3c0af6a 100644
--- a/noncore/settings/networksettings/mainwindowimp.cpp
+++ b/noncore/settings/networksettings/mainwindowimp.cpp
@@ -23,58 +23,73 @@
 #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"

 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);

+

+  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.

-  if(profiles.count() > 1){

-    Config cfg("NetworkSetup");

-    cfg.setGroup("General");

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

-  }

+  Config cfg("NetworkSetup");

+  cfg.setGroup("General");

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

+  

   // Delete Modules and Libraries

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

   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

@@ -196,63 +211,78 @@ void MainWindowImp::removeClicked(){
 /**

  * 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;

   } 

- 

+

+  QString currentProfile = currentProfileLabel->text();

+  if(profilesList->count() <= 1 || currentProfile == "All"){

+    currentProfile = "";

+  }

+  

   Interface *i = interfaceItems[item];

   if(i->getModuleOwner()){

+    i->getModuleOwner()->setProfile(currentProfileLabel->text());

     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");

+        configure->setProfile(currentProfileLabel->text());

+        tabWidget->insertTab(configure, "TCP/IP");

+      

       }

       moduleConfigure->showMaximized();

       moduleConfigure->show();

       return;

     }

   }

   

   InterfaceSetupImp *configure = new InterfaceSetupImp(0, "InterfaceSetupImp", i, true);

+  configure->setProfile(currentProfileLabel->text());

   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;

   } 

  

   Interface *i = interfaceItems[item];

   if(!i->isAttached()){

     QMessageBox::information(this, "Error","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(&tabWidget);

     if(moduleInformation != NULL){

       if(tabWidget != NULL){

         InterfaceInformationImp *information = new InterfaceInformationImp(tabWidget, "InterfaceSetupImp", i, true);

         tabWidget->insertTab(information, "TCP/IP");

       }

       moduleInformation->showMaximized();

       moduleInformation->show();

       return;

     }

@@ -311,25 +341,25 @@ void MainWindowImp::jobDone(KProcess *process){
         if(fileName == TEMP_ALL)

           i = new Interface(this, interfaceName, false);

         else

           i = new Interface(this, interfaceName, true);

         i->setAttached(true);

 

         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()));

+          i->setHardwareName(line.mid(hardwareName+11, macAddress-(hardwareName+11)) );

       

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

         updateInterface(i);

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

       }

       // It was an interface we already had.

       else{

         if(fileName != TEMP_ALL)

           (interfaceNames[interfaceName])->setStatus(true);

       }

     }

   }

@@ -340,25 +370,25 @@ void MainWindowImp::jobDone(KProcess *process){
     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){

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

         i->setAttached(false);

-        i->setHardwareName(QString("Disconnected (%1)").arg(*ni));

+        i->setHardwareName("Disconnected");

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

         updateInterface(i);

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

       }

     }

   }

 } 

 

 /**

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

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

  */ 

@@ -397,25 +427,26 @@ void MainWindowImp::updateInterface(Interface *i){
     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);

   

   item->setPixmap(1, (Resource::loadPixmap(typeName)));

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

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

+  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.

@@ -428,35 +459,67 @@ void MainWindowImp::addProfile(){
     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");

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

     return;

   }

   QString profileToRemove = profilesList->currentText();

+  if(profileToRemove == "All"){

+    QMessageBox::information(this, "Can't remove.","Can't remove default.", "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), "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));

   }

-

 }

 

 /**

  * A new profile has been selected, change.

  * @param newProfile the new profile.

  */ 

 void MainWindowImp::changeProfile(){

-  currentProfileLabel->setText(profilesList->text(profilesList->currentItem()));

+  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 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();

+      }

+    }

+  }

 }

 

 // mainwindowimp.cpp