wellenreiter qcop call works now

dns are saved and read in again

3 files changed, 19 insertions, 4 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
@@ -180,4 +180,5 @@ void InterfaceSetupImp::setProfile(const QString &profile){
   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(" ")));
@@ -188,4 +189,6 @@ void InterfaceSetupImp::setProfile(const QString &profile){
   gatewayEdit->setText(interfaces->getInterfaceOption("gateway", error)); 
 
+
+
   qWarning("InterfaceSetupImp::setProfile(%s)\n", profile.latin1());
   qWarning("InterfaceSetupImp::setProfile: iface is %s\n", interfaces->getInterfaceName(error).latin1());
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
@@ -641,4 +641,9 @@ void MainWindowImp::receive(const QCString &msg, const QByteArray &arg)
     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);
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
@@ -71,5 +71,5 @@ bool WLANModule::isOwner(Interface *i){
  */
 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;
@@ -133,4 +133,5 @@ void WLANModule::receive(const QCString &param, const QByteArray &arg)
     QString interface;
     QString action;
+    QDialog *toShow;
     while (! stream.atEnd() ){
         stream >> interface;
@@ -148,6 +149,6 @@ void WLANModule::receive(const QCString &param, const QByteArray &arg)
         if (ifa == 0){
             qDebug("WLANModule Did not find %s",interface.latin1());
-            qDebug("returning");
-            return;
+            qDebug("skipping");
+            count = 0;
         }
 
@@ -171,4 +172,5 @@ void WLANModule::receive(const QCString &param, const QByteArray &arg)
                 //FIXME: what if it got closed meanwhile?
                 wlanconfigWiget = (WLANImp*) configure(ifa);
+                toShow = (QDialog*) wlanconfigWiget;
             }
             wlanconfigWiget->showMaximized();
@@ -192,6 +194,10 @@ void WLANModule::receive(const QCString &param, const QByteArray &arg)
 
             }else if (action.contains("Channel")){
+                bool ok;
+                int chan = value.toInt( &ok );
+                if (ok){
                 wlanconfigWiget->specifyChan->setChecked( true );
-                wlanconfigWiget->networkChannel->setValue( value.toInt() );
+                    wlanconfigWiget->networkChannel->setValue( chan );
+                }
             }else if (action.contains("MacAddr")){
                 wlanconfigWiget->specifyAp->setChecked( true );
@@ -201,4 +207,5 @@ void WLANModule::receive(const QCString &param, const QByteArray &arg)
         }
     }// while stream
+    if (toShow) toShow->exec();
 }