From 154d6deef15b9f7f83ea7a25f2079d9fca034910 Mon Sep 17 00:00:00 2001 From: tille Date: Tue, 17 Jun 2003 13:05:55 +0000 Subject: wellenreiter qcop call works now dns are saved and read in again --- (limited to 'noncore/settings') 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 @@ -21,7 +21,7 @@ /** * 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; @@ -31,7 +31,7 @@ InterfaceSetupImp::InterfaceSetupImp(QWidget* parent, const char* name, Interfac /** * Destructor - */ + */ InterfaceSetupImp::~InterfaceSetupImp(){ if(delInterfaces) { delete interfaces; @@ -39,7 +39,7 @@ 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(){ bool error; @@ -56,25 +56,25 @@ bool InterfaceSetupImp::saveChanges(){ 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; @@ -83,23 +83,23 @@ 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 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); @@ -119,7 +119,7 @@ bool InterfaceSetupImp::saveSettings(){ interfaces->setInterfaceOption("down "DNSSCRIPT" -r ", dns); } } - + // IP Information interfaces->setAuto(interface->getInterfaceName(), autoStart->isChecked()); return true; @@ -128,7 +128,7 @@ bool InterfaceSetupImp::saveSettings(){ /** * The Profile has changed. * @param QString profile the new profile. - */ + */ void InterfaceSetupImp::setProfile(const QString &profile){ /* bool error = false; @@ -162,13 +162,13 @@ void InterfaceSetupImp::setProfile(const QString &profile){ 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) @@ -179,18 +179,21 @@ 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())); + 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 @@ -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 ¶m, 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 ¶m, 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 ¶m, 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 ¶m, 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 ); wlanconfigWiget->macEdit->setText( value ); @@ -200,6 +206,7 @@ void WLANModule::receive(const QCString ¶m, const QByteArray &arg) qDebug("wlan plugin has no clue"); } }// while stream + if (toShow) toShow->exec(); } QWidget *WLANModule::getInfo( Interface *i) -- cgit v0.9.0.2