summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/networksettings/interfaces/interfacesetupimp.cpp47
-rw-r--r--noncore/settings/networksettings/mainwindowimp.cpp5
-rw-r--r--noncore/settings/networksettings/wlan/wlanmodule.cpp17
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
@@ -22,5 +22,5 @@
/**
* 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) {
@@ -32,5 +32,5 @@ InterfaceSetupImp::InterfaceSetupImp(QWidget* parent, const char* name, Interfac
/**
* Destructor
- */
+ */
InterfaceSetupImp::~InterfaceSetupImp(){
if(delInterfaces) {
@@ -40,5 +40,5 @@ InterfaceSetupImp::~InterfaceSetupImp(){
/**
- * 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(){
@@ -57,23 +57,23 @@ bool InterfaceSetupImp::saveChanges(){
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();
}
@@ -84,10 +84,10 @@ bool InterfaceSetupImp::saveChanges(){
* 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
@@ -96,9 +96,9 @@ bool InterfaceSetupImp::saveSettings(){
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()) {
@@ -120,5 +120,5 @@ bool InterfaceSetupImp::saveSettings(){
}
}
-
+
// IP Information
interfaces->setAuto(interface->getInterfaceName(), autoStart->isChecked());
@@ -129,5 +129,5 @@ bool InterfaceSetupImp::saveSettings(){
* The Profile has changed.
* @param QString profile the new profile.
- */
+ */
void InterfaceSetupImp::setProfile(const QString &profile){
/*
@@ -163,11 +163,11 @@ void InterfaceSetupImp::setProfile(const QString &profile){
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;
@@ -180,17 +180,20 @@ 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(" ")));
- 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
@@ -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")){
- 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 );
@@ -201,4 +207,5 @@ void WLANModule::receive(const QCString &param, const QByteArray &arg)
}
}// while stream
+ if (toShow) toShow->exec();
}