3 files changed, 42 insertions, 27 deletions

diff --git a/noncore/settings/networksettings/interfaces/interfacesetupimp.cpp b/noncore/settings/networksettings/interfaces/interfacesetupimp.cpp
index 49a47ae..8de30de 100644
--- a/noncore/settings/networksettings/interfaces/interfacesetupimp.cpp
+++ b/noncore/settings/networksettings/interfaces/interfacesetupimp.cpp
@@ -18,31 +18,31 @@
 #endif
 
 #define DNSSCRIPT "changedns"
 
 /**
  * Constuctor.  Set up the connection. A profile must be set.
- */ 
+ */
 InterfaceSetupImp::InterfaceSetupImp(QWidget* parent, const char* name, Interface *i, Interfaces *j, WFlags fl) : InterfaceSetup(parent, name, fl), interface(i), interfaces(j), delInterfaces(false){
   if (j == 0) {
     delInterfaces = true;
     interfaces = new Interfaces;
   }
 }
 
 /**
  * Destructor
- */ 
+ */
 InterfaceSetupImp::~InterfaceSetupImp(){
   if(delInterfaces) {
     delete interfaces;
   }
 }
 
 /**
- * Save the current settings, then write out the interfaces file and close. 
+ * Save the current settings, then write out the interfaces file and close.
  */
 bool InterfaceSetupImp::saveChanges(){
   bool error;
   QString iface = interfaces->getInterfaceName(error);
   if(!saveSettings())
     return false;
@@ -53,56 +53,56 @@ bool InterfaceSetupImp::saveChanges(){
     QString ifup;
     ifup += "ifdown ";
     ifup += iface;
     ifup += "; ifup ";
     ifup += iface;
     ifup += ";";
-  
+
     OProcess restart;
     restart << "sh";
     restart << "-c";
     restart << ifup;
-  
+
     OWait *owait = new OWait();
     Global::statusMessage( tr( "Restarting interface" ) );
-  
+
     owait->show();
     qApp->processEvents();
-  
+
     if (!restart.start(OProcess::Block, OProcess::NoCommunication) ) {
       qWarning("unstable to spawn ifdown/ifup");
     }
-  
+
     owait->hide();
     delete owait;
-  
+
     interface->refresh();
   }
   return true;
 }
 
 /**
  * Save the settings for the current Interface.
  * @return bool true if successfull, false otherwise
- */ 
+ */
 bool InterfaceSetupImp::saveSettings(){
   // eh can't really do anything about it other then return. :-D
   if(!interfaces->isInterfaceSet())
     return true;
-  
+
   bool error = false;
   // Loopback case
   if(interfaces->getInterfaceMethod(error) == INTERFACES_LOOPBACK){
     interfaces->setAuto(interface->getInterfaceName(), autoStart->isChecked());
     return true;
   }
-  
+
   if(!dhcpCheckBox->isChecked() && (ipAddressEdit->text().isEmpty() || subnetMaskEdit->text().isEmpty())){
    QMessageBox::information(this, "Not Saved.", "Please fill in the IP address and\n subnet entries.", QMessageBox::Ok);
    return false;
-          }
+  }
   // DHCP
   if(dhcpCheckBox->isChecked()) {
     interfaces->setInterfaceMethod(INTERFACES_METHOD_DHCP);
     interfaces->removeInterfaceOption("address");
     interfaces->removeInterfaceOption("netmask");
     interfaces->removeInterfaceOption("gateway");
@@ -116,22 +116,22 @@ bool InterfaceSetupImp::saveSettings(){
     if(!firstDNSLineEdit->text().isEmpty() || !secondDNSLineEdit->text().isEmpty()){
       QString dns = firstDNSLineEdit->text() + " " + secondDNSLineEdit->text();
       interfaces->setInterfaceOption("up "DNSSCRIPT" -a ", dns);
       interfaces->setInterfaceOption("down "DNSSCRIPT" -r ", dns);
     }
   }
-  
+
   // IP Information
   interfaces->setAuto(interface->getInterfaceName(), autoStart->isChecked());
   return true;
 }
 
 /**
  * The Profile has changed.
  * @param QString profile the new profile.
- */ 
+ */
 void InterfaceSetupImp::setProfile(const QString &profile){
    /*
   bool error = false;
   if(interfaces->getInterfaceMethod(error) == INTERFACES_LOOPBACK){
     staticGroupBox->hide();
     dhcpCheckBox->hide();
@@ -159,38 +159,41 @@ void InterfaceSetupImp::setProfile(const QString &profile){
       interfaces->setScript("getprofile.sh");
     }
     else{
       interfaces->addInterface(newInterfaceName, INTERFACES_FAMILY_INET, INTERFACES_METHOD_DHCP);
       if(!interfaces->setInterface(newInterfaceName)){
         qDebug("InterfaceSetupImp: Added interface, but still can't setInterface.");
-                return;      
+        return;
       }
     }
   }
-  
+
   // We must have a valid interface to get this far so read some settings.
-  
+
   // DHCP
   bool error = false;
   if(interfaces->getInterfaceMethod(error) == INTERFACES_METHOD_DHCP)
     dhcpCheckBox->setChecked(true);
   else
     dhcpCheckBox->setChecked(false);
 
   // IP Information
   autoStart->setChecked(interfaces->isAuto(interface->getInterfaceName()));
   QString dns = interfaces->getInterfaceOption("up "DNSSCRIPT" -a", error);
+  qDebug("dns >%s<",dns.latin1());
   if(dns.contains(" ")){
     firstDNSLineEdit->setText(dns.mid(0, dns.find(" ")));
-    secondDNSLineEdit->setText(dns.mid(dns.find(" ")+1, dns.length())); 
+    secondDNSLineEdit->setText(dns.mid(dns.find(" ")+1, dns.length()));
   }
   ipAddressEdit->setText(interfaces->getInterfaceOption("address", error));
   subnetMaskEdit->setText(interfaces->getInterfaceOption("netmask", error));
-  gatewayEdit->setText(interfaces->getInterfaceOption("gateway", error)); 
+  gatewayEdit->setText(interfaces->getInterfaceOption("gateway", error));
+
+
 
   qWarning("InterfaceSetupImp::setProfile(%s)\n", profile.latin1());
   qWarning("InterfaceSetupImp::setProfile: iface is %s\n", interfaces->getInterfaceName(error).latin1());
-  
+
 }
-  
+
 // interfacesetup.cpp
 
diff --git a/noncore/settings/networksettings/mainwindowimp.cpp b/noncore/settings/networksettings/mainwindowimp.cpp
index 8ea241d..2d714ca 100644
--- a/noncore/settings/networksettings/mainwindowimp.cpp
+++ b/noncore/settings/networksettings/mainwindowimp.cpp
@@ -637,12 +637,17 @@ void MainWindowImp::makeChannel()
 
 void MainWindowImp::receive(const QCString &msg, const QByteArray &arg)
 {
     bool found = false;
     qDebug("MainWindowImp::receive QCop msg >"+msg+"<");
 
+    if (msg == "raise") {
+        raise();
+        return;
+    }
+
     QString dest = msg.left(msg.find("("));
     QCString param = msg.right(msg.length() - msg.find("(") - 1);
     param = param.left( param.length() - 1 );
     qDebug("dest >%s< param >"+param+"<",dest.latin1());
 
      QMap<Module*, QLibrary*>::Iterator it;
diff --git a/noncore/settings/networksettings/wlan/wlanmodule.cpp b/noncore/settings/networksettings/wlan/wlanmodule.cpp
index 371b689..7bded85 100644
--- a/noncore/settings/networksettings/wlan/wlanmodule.cpp
+++ b/noncore/settings/networksettings/wlan/wlanmodule.cpp
@@ -67,13 +67,13 @@ bool WLANModule::isOwner(Interface *i){
 
 /**
  * Create, and return the WLANConfigure Module
  * @return QWidget* pointer to this modules configure.
  */
 QWidget *WLANModule::configure(Interface *i){
-  WLANImp *wlanconfig = new WLANImp(0, "WlanConfig", i, false,  Qt::WDestructiveClose);
+  WLANImp *wlanconfig = new WLANImp(0, "WlanConfig", i, true,  Qt::WDestructiveClose);
   wlanconfig->setProfile(profile);
   return wlanconfig;
 }
 
 /**
  * Create, and return the Information Module
@@ -129,12 +129,13 @@ void WLANModule::receive(const QCString &param, const QByteArray &arg)
         return;
     }
 
     QDataStream stream(arg,IO_ReadOnly);
     QString interface;
     QString action;
+    QDialog *toShow;
     while (! stream.atEnd() ){
         stream >> interface;
         stream >> action;
         qDebug("WLANModule got interface %s and acion %s", interface.latin1(), action.latin1());
         // find interfaces
         Interface *ifa=0;
@@ -144,14 +145,14 @@ void WLANModule::receive(const QCString &param, const QByteArray &arg)
                 ifa = i;
             }
         }
 
         if (ifa == 0){
             qDebug("WLANModule Did not find %s",interface.latin1());
-            qDebug("returning");
-            return;
+            qDebug("skipping");
+            count = 0;
         }
 
         if (count == 2){
             // those should call the interface directly
             QWidget *info = getInfo( ifa );
             info->showMaximized();
@@ -167,12 +168,13 @@ void WLANModule::receive(const QCString &param, const QByteArray &arg)
             }
         }else if (count == 3){
             QString value;
             if (!wlanconfigWiget){
                 //FIXME: what if it got closed meanwhile?
                 wlanconfigWiget = (WLANImp*) configure(ifa);
+                toShow = (QDialog*) wlanconfigWiget;
             }
             wlanconfigWiget->showMaximized();
             stream >> value;
             qDebug("WLANModule is setting %s of %s to %s", action.latin1(), interface.latin1(), value.latin1() );
             if ( action.contains("ESSID") ){
                 QComboBox *combo = wlanconfigWiget->essid;
@@ -188,21 +190,26 @@ void WLANModule::receive(const QCString &param, const QByteArray &arg)
                 for ( int i = 0; i < combo->count(); i++)
                     if ( combo->text( i ) == value ){
                     combo->setCurrentItem( i );
                     }
 
             }else if (action.contains("Channel")){
-                wlanconfigWiget->specifyChan->setChecked( true );
-                wlanconfigWiget->networkChannel->setValue( value.toInt() );
+                bool ok;
+                int chan = value.toInt( &ok );
+                if (ok){
+                    wlanconfigWiget->specifyChan->setChecked( true );
+                    wlanconfigWiget->networkChannel->setValue( chan );
+                }
             }else if (action.contains("MacAddr")){
                 wlanconfigWiget->specifyAp->setChecked( true );
                 wlanconfigWiget->macEdit->setText( value );
             }else
                 qDebug("wlan plugin has no clue");
         }
     }// while stream
+    if (toShow) toShow->exec();
 }
 
 QWidget *WLANModule::getInfo( Interface *i)
 {
     qDebug("WLANModule::getInfo start");
     WlanInfoImp *info = new WlanInfoImp(0, i->getInterfaceName(), Qt::WDestructiveClose);