summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/settings/networksettings/interfaces/interfacesetupimp.cpp3
-rw-r--r--noncore/settings/networksettings/mainwindowimp.cpp5
-rw-r--r--noncore/settings/networksettings/wlan/wlanmodule.cpp15
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
@@ -179,6 +179,7 @@ void InterfaceSetupImp::setProfile(const QString &profile){
// 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()));
@@ -187,6 +188,8 @@ void InterfaceSetupImp::setProfile(const QString &profile){
subnetMaskEdit->setText(interfaces->getInterfaceOption("netmask", 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());
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
@@ -640,6 +640,11 @@ 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 );
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
@@ -70,7 +70,7 @@ bool WLANModule::isOwner(Interface *i){
* @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;
}
@@ -132,6 +132,7 @@ void WLANModule::receive(const QCString &param, const QByteArray &arg)
QDataStream stream(arg,IO_ReadOnly);
QString interface;
QString action;
+ QDialog *toShow;
while (! stream.atEnd() ){
stream >> interface;
stream >> action;
@@ -147,8 +148,8 @@ 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;
}
if (count == 2){
@@ -170,6 +171,7 @@ void WLANModule::receive(const QCString &param, const QByteArray &arg)
if (!wlanconfigWiget){
//FIXME: what if it got closed meanwhile?
wlanconfigWiget = (WLANImp*) configure(ifa);
+ toShow = (QDialog*) wlanconfigWiget;
}
wlanconfigWiget->showMaximized();
stream >> value;
@@ -191,8 +193,12 @@ 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 );
wlanconfigWiget->macEdit->setText( value );
@@ -200,6 +206,7 @@ void WLANModule::receive(const QCString &param, const QByteArray &arg)
qDebug("wlan plugin has no clue");
}
}// while stream
+ if (toShow) toShow->exec();
}
QWidget *WLANModule::getInfo( Interface *i)