Diffstat (limited to 'noncore/settings/networksettings') (more/less context) (show whitespace changes)
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 @@ -181,2 +181,3 @@ void InterfaceSetupImp::setProfile(const QString &profile){ QString dns = interfaces->getInterfaceOption("up "DNSSCRIPT" -a", error); + qDebug("dns >%s<",dns.latin1()); if(dns.contains(" ")){ @@ -189,2 +190,4 @@ void InterfaceSetupImp::setProfile(const QString &profile){ + + qWarning("InterfaceSetupImp::setProfile(%s)\n", profile.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 @@ -642,2 +642,7 @@ void MainWindowImp::receive(const QCString &msg, const QByteArray &arg) + if (msg == "raise") { + raise(); + return; + } + QString dest = msg.left(msg.find("(")); 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 @@ -72,3 +72,3 @@ 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); @@ -134,2 +134,3 @@ void WLANModule::receive(const QCString ¶m, const QByteArray &arg) QString action; + QDialog *toShow; while (! stream.atEnd() ){ @@ -149,4 +150,4 @@ void WLANModule::receive(const QCString ¶m, const QByteArray &arg) qDebug("WLANModule Did not find %s",interface.latin1()); - qDebug("returning"); - return; + qDebug("skipping"); + count = 0; } @@ -172,2 +173,3 @@ void WLANModule::receive(const QCString ¶m, const QByteArray &arg) wlanconfigWiget = (WLANImp*) configure(ifa); + toShow = (QDialog*) wlanconfigWiget; } @@ -193,4 +195,8 @@ void WLANModule::receive(const QCString ¶m, 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")){ @@ -202,2 +208,3 @@ void WLANModule::receive(const QCString ¶m, const QByteArray &arg) }// while stream + if (toShow) toShow->exec(); } |