summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/net/networksetup/TODO2
-rw-r--r--noncore/net/networksetup/interface.cpp77
-rw-r--r--noncore/net/networksetup/interface.h29
-rw-r--r--noncore/net/networksetup/interfaceadvanced.ui11
-rw-r--r--noncore/net/networksetup/interfaceinformationimp.cpp51
-rw-r--r--noncore/net/networksetup/interfaceinformationimp.h6
-rw-r--r--noncore/net/networksetup/mainwindowimp.cpp31
-rw-r--r--noncore/net/networksetup/wlan/wlanmodule.cpp4
-rw-r--r--noncore/settings/networksettings/TODO2
-rw-r--r--noncore/settings/networksettings/interface.cpp77
-rw-r--r--noncore/settings/networksettings/interface.h29
-rw-r--r--noncore/settings/networksettings/interfaceadvanced.ui11
-rw-r--r--noncore/settings/networksettings/interfaceinformationimp.cpp51
-rw-r--r--noncore/settings/networksettings/interfaceinformationimp.h6
-rw-r--r--noncore/settings/networksettings/mainwindowimp.cpp31
-rw-r--r--noncore/settings/networksettings/wlan/wlanmodule.cpp4
16 files changed, 244 insertions, 178 deletions
diff --git a/noncore/net/networksetup/TODO b/noncore/net/networksetup/TODO
index 7386646..c8e2989 100644
--- a/noncore/net/networksetup/TODO
+++ b/noncore/net/networksetup/TODO
@@ -1 +1,3 @@
+Write a class that parses /proc and not ifconfig
+
[ ] Wlanmodule needs to check if an interface supports wireless
diff --git a/noncore/net/networksetup/interface.cpp b/noncore/net/networksetup/interface.cpp
index 1f32093..1e01da4 100644
--- a/noncore/net/networksetup/interface.cpp
+++ b/noncore/net/networksetup/interface.cpp
@@ -13,3 +13,3 @@
-Interface::Interface(QString name, bool newSatus): status(newSatus), attached(false), interfaceName(name), hardareName("Unknown"), moduleOwner(NULL), macAddress(""), ip("0.0.0.0"), broadcast(""), subnetMask("0.0.0.0"), dhcp(false){
+Interface::Interface(QObject * parent, const char * name, bool newSatus): QObject(parent, name), status(newSatus), attached(false), hardareName("Unknown"), moduleOwner(NULL), macAddress(""), ip("0.0.0.0"), broadcast(""), subnetMask("0.0.0.0"), dhcp(false){
refresh();
@@ -18,13 +18,56 @@ Interface::Interface(QString name, bool newSatus): status(newSatus), attached(fa
/**
+ * Set status
+ * @param newStatus - the new status
+ * emit updateInterface
+ */
+void Interface::setStatus(bool newStatus){
+ if(status != newStatus){
+ status = newStatus;
+ refresh();
+ }
+};
+
+/**
+ * Set if attached or not (802.11 card pulled out for example)
+ * @param isAttached - if attached
+ * emit updateInterface
+ */
+void Interface::setAttached(bool isAttached){
+ attached = isAttached;
+ emit(updateInterface(this));
+};
+
+/**
+ * Set Hardware name
+ * @param name - the new name
+ * emit updateInterface
+ */
+void Interface::setHardwareName(QString name){
+ hardareName = name;
+ emit(updateInterface(this));
+};
+
+/**
+ * Set Module owner
+ * @param owner - the new owner
+ * emit updateInterface
+ */
+void Interface::setModuleOwner(Module *owner){
+ moduleOwner = owner;
+ emit(updateInterface(this));
+};
+
+
+/**
* Try to start the interface.
- * @return bool true if successfull.
*/
-bool Interface::start(){
+void Interface::start(){
// check to see if we are already running.
- if(status)
- return false;
+ if(true == status)
+ return;
int ret = system(QString("%1 %2 up").arg(IFCONFIG).arg(interfaceName).latin1());
+ // See if it was successfull...
if(ret != 0)
- return false;
+ return;
@@ -32,3 +75,2 @@ bool Interface::start(){
refresh();
- return true;
}
@@ -37,8 +79,7 @@ bool Interface::start(){
* Try to stop the interface.
- * @return bool true if successfull.
*/
-bool Interface::stop(){
+void Interface::stop(){
// check to see if we are already stopped.
- if(status == false)
- return false;
+ if(false == status)
+ return;
@@ -46,3 +87,3 @@ bool Interface::stop(){
if(ret != 0)
- return false;
+ return;
@@ -50,10 +91,10 @@ bool Interface::stop(){
refresh();
- return true;
}
+
/**
* Try to restart the interface.
- * @return bool true if successfull.
*/
-bool Interface::restart(){
- return (stop() && start());
+void Interface::restart(){
+ stop();
+ start();
}
@@ -76,2 +117,3 @@ bool Interface::refresh(){
leaseExpires = "";
+ emit(updateInterface(this));
return true;
@@ -140,2 +182,3 @@ bool Interface::refresh(){
if(!QFile::exists(dhcpFile)){
+ emit(updateInterface(this));
return true;
@@ -237,2 +280,4 @@ bool Interface::refresh(){
dhcp = true;
+
+ emit(updateInterface(this));
return true;
diff --git a/noncore/net/networksetup/interface.h b/noncore/net/networksetup/interface.h
index 1406e99..980171a 100644
--- a/noncore/net/networksetup/interface.h
+++ b/noncore/net/networksetup/interface.h
@@ -4,2 +4,3 @@
#include <qstring.h>
+#include <qobject.h>
@@ -7,22 +8,25 @@ class Module;
-class Interface {
+class Interface : public QObject{
+ Q_OBJECT
+
+signals:
+ void updateInterface(Interface *i);
public:
- Interface(QString name = "unknown", bool status = false);
+ Interface(QObject * parent=0, const char * name= "unknown", bool status = false);
virtual ~Interface(){};
+ virtual QString getInterfaceName(){ QString n(this->name()); return n; };
+
virtual bool getStatus(){ return status; };
- virtual void setStatus(bool newSatus){ status = newSatus; refresh(); };
+ virtual void setStatus(bool newStatus);
virtual bool isAttached(){ return attached; };
- virtual void setAttached(bool isAttached=false){ attached = isAttached; };
-
- virtual QString getInterfaceName(){ return interfaceName; };
- virtual void setInterfaceName(QString name="unknown"){ interfaceName = name; };
+ virtual void setAttached(bool isAttached=false);
virtual QString getHardwareName(){ return hardareName; };
- virtual void setHardwareName(QString name="Unknown"){ hardareName = name; };
+ virtual void setHardwareName(QString name="Unknown");
virtual Module* getModuleOwner(){ return moduleOwner; };
- virtual void setModuleOwner(Module *owner=NULL){ moduleOwner = owner; };
+ virtual void setModuleOwner(Module *owner=NULL);
@@ -38,6 +42,7 @@ public:
+public slots:
bool refresh();
- bool start();
- bool stop();
- bool restart();
+ void start();
+ void stop();
+ void restart();
diff --git a/noncore/net/networksetup/interfaceadvanced.ui b/noncore/net/networksetup/interfaceadvanced.ui
index 7520abe..efe67b0 100644
--- a/noncore/net/networksetup/interfaceadvanced.ui
+++ b/noncore/net/networksetup/interfaceadvanced.ui
@@ -13,4 +13,4 @@
<y>0</y>
- <width>188</width>
- <height>277</height>
+ <width>214</width>
+ <height>286</height>
</rect>
@@ -18,2 +18,9 @@
<property stdset="1">
+ <name>maximumSize</name>
+ <size>
+ <width>320</width>
+ <height>32767</height>
+ </size>
+ </property>
+ <property stdset="1">
<name>caption</name>
diff --git a/noncore/net/networksetup/interfaceinformationimp.cpp b/noncore/net/networksetup/interfaceinformationimp.cpp
index e37e0f8..59a6400 100644
--- a/noncore/net/networksetup/interfaceinformationimp.cpp
+++ b/noncore/net/networksetup/interfaceinformationimp.cpp
@@ -15,7 +15,8 @@ InterfaceInformationImp::InterfaceInformationImp(QWidget *parent, const char *na
interface = i;
- updateInterface();
- connect(startButton, SIGNAL(clicked()), this, SLOT(start()));
- connect(stopButton, SIGNAL(clicked()), this, SLOT(stop()));
- connect(restartButton, SIGNAL(clicked()), this, SLOT(restart()));
- connect(refreshButton, SIGNAL(clicked()), this, SLOT(refresh()));
+ connect(i, SIGNAL(updateInterface(Interface *)), this, SLOT(updateInterface(Interface *)));
+ updateInterface(interface);
+ connect(startButton, SIGNAL(clicked()), interface, SLOT(start()));
+ connect(stopButton, SIGNAL(clicked()), interface, SLOT(stop()));
+ connect(restartButton, SIGNAL(clicked()), interface, SLOT(restart()));
+ connect(refreshButton, SIGNAL(clicked()), interface, SLOT(refresh()));
connect(advancedButton, SIGNAL(clicked()), this, SLOT(advanced()));
@@ -24,3 +25,8 @@ InterfaceInformationImp::InterfaceInformationImp(QWidget *parent, const char *na
-void InterfaceInformationImp::updateInterface(){
+/**
+ * Update the interface information and buttons.
+ * @param Intarface *i the interface to update (should be the one we already
+ * know about).
+ */
+void InterfaceInformationImp::updateInterface(Interface *i){
if(interface->getStatus()){
@@ -42,35 +48,2 @@ void InterfaceInformationImp::updateInterface(){
/**
- * Start the interface. Update the information if successfull
- */
-void InterfaceInformationImp::start(){
- if(interface->start()){
- updateInterface();
- }
-}
-
-/**
- * Stop the interface.
- */
-void InterfaceInformationImp::stop(){
- if(interface->stop()){
- updateInterface();
- }
-}
-
-/***
- * Tell the interface to refresh its information.
- **/
-void InterfaceInformationImp::refresh(){
- if(interface->refresh())
- updateInterface();
-}
-
-void InterfaceInformationImp::restart(){
- if(interface->restart()){
- updateInterface();
- }
-}
-
-
-/**
* Create the advanced widget. Fill it with the current interface's information.
diff --git a/noncore/net/networksetup/interfaceinformationimp.h b/noncore/net/networksetup/interfaceinformationimp.h
index c8a478e..42213cc 100644
--- a/noncore/net/networksetup/interfaceinformationimp.h
+++ b/noncore/net/networksetup/interfaceinformationimp.h
@@ -15,7 +15,4 @@ public:
private slots:
- void start();
- void stop();
- void refresh();
- void restart();
void advanced();
+ void updateInterface(Interface *i);
@@ -23,3 +20,2 @@ private:
Interface *interface;
- void updateInterface();
diff --git a/noncore/net/networksetup/mainwindowimp.cpp b/noncore/net/networksetup/mainwindowimp.cpp
index b46362f..117bac1 100644
--- a/noncore/net/networksetup/mainwindowimp.cpp
+++ b/noncore/net/networksetup/mainwindowimp.cpp
@@ -306,2 +306,4 @@ void MainWindowImp::jobDone(KProcess *process){
Interface *i;
+ // We have found an interface
+ //qDebug(QString("MainWindowImp: Found Interface: %1").arg(line).latin1());
// See if we already have it
@@ -309,14 +311,6 @@ void MainWindowImp::jobDone(KProcess *process){
if(fileName == TEMP_ALL)
- i = new Interface(interfaceName, false);
+ i = new Interface(this, interfaceName, false);
else
- i = new Interface(interfaceName, true);
- }
- else{
- i = interfaceNames[interfaceName];
- if(fileName != TEMP_ALL)
- i->setStatus(true);
- }
-
+ i = new Interface(this, interfaceName, true);
i->setAttached(true);
- i->setInterfaceName(interfaceName);
@@ -329,6 +323,13 @@ void MainWindowImp::jobDone(KProcess *process){
i->setHardwareName(line.mid(hardwareName+11, macAddress-(hardwareName+11)) + QString(" (%1)").arg(i->getInterfaceName()));
- // We have found an interface
- //qDebug(QString("MainWindowImp: Found Interface: %1").arg(line).latin1());
+
interfaceNames.insert(i->getInterfaceName(), i);
updateInterface(i);
+ connect(i, SIGNAL(updateInterface(Interface *)), this, SLOT(updateInterface(Interface *)));
+ }
+ // It was an interface we already had.
+ else{
+ i = interfaceNames[interfaceName];
+ if(fileName != TEMP_ALL)
+ i->setStatus(true);
+ }
}
@@ -349,8 +350,8 @@ void MainWindowImp::jobDone(KProcess *process){
if(!found){
- Interface *i = new Interface(*ni, false);
+ Interface *i = new Interface(this, *ni, false);
i->setAttached(false);
i->setHardwareName(QString("Disconnected (%1)").arg(*ni));
- i->setInterfaceName(*ni);
interfaceNames.insert(i->getInterfaceName(), i);
updateInterface(i);
+ connect(i, SIGNAL(updateInterface(Interface *)), this, SLOT(updateInterface(Interface *)));
}
@@ -397,2 +398,4 @@ void MainWindowImp::updateInterface(Interface *i){
typeName = "wlan";
+ if(i->getInterfaceName().contains("usb"))
+ typeName = "usb";
diff --git a/noncore/net/networksetup/wlan/wlanmodule.cpp b/noncore/net/networksetup/wlan/wlanmodule.cpp
index 98d2eb6..f0394b4 100644
--- a/noncore/net/networksetup/wlan/wlanmodule.cpp
+++ b/noncore/net/networksetup/wlan/wlanmodule.cpp
@@ -26,4 +26,6 @@ QString WLANModule::getPixmapName(Interface* ){
bool WLANModule::isOwner(Interface *i){
- if(i->getInterfaceName() == "eth0" || i->getInterfaceName() == "wlan0")
+ if(i->getInterfaceName() == "eth0" || i->getInterfaceName() == "wlan0"){
+ i->setHardwareName(QString("802.11b (%1)").arg(i->getInterfaceName()));
return true;
+ }
return false;
diff --git a/noncore/settings/networksettings/TODO b/noncore/settings/networksettings/TODO
index 7386646..c8e2989 100644
--- a/noncore/settings/networksettings/TODO
+++ b/noncore/settings/networksettings/TODO
@@ -1 +1,3 @@
+Write a class that parses /proc and not ifconfig
+
[ ] Wlanmodule needs to check if an interface supports wireless
diff --git a/noncore/settings/networksettings/interface.cpp b/noncore/settings/networksettings/interface.cpp
index 1f32093..1e01da4 100644
--- a/noncore/settings/networksettings/interface.cpp
+++ b/noncore/settings/networksettings/interface.cpp
@@ -13,3 +13,3 @@
-Interface::Interface(QString name, bool newSatus): status(newSatus), attached(false), interfaceName(name), hardareName("Unknown"), moduleOwner(NULL), macAddress(""), ip("0.0.0.0"), broadcast(""), subnetMask("0.0.0.0"), dhcp(false){
+Interface::Interface(QObject * parent, const char * name, bool newSatus): QObject(parent, name), status(newSatus), attached(false), hardareName("Unknown"), moduleOwner(NULL), macAddress(""), ip("0.0.0.0"), broadcast(""), subnetMask("0.0.0.0"), dhcp(false){
refresh();
@@ -18,13 +18,56 @@ Interface::Interface(QString name, bool newSatus): status(newSatus), attached(fa
/**
+ * Set status
+ * @param newStatus - the new status
+ * emit updateInterface
+ */
+void Interface::setStatus(bool newStatus){
+ if(status != newStatus){
+ status = newStatus;
+ refresh();
+ }
+};
+
+/**
+ * Set if attached or not (802.11 card pulled out for example)
+ * @param isAttached - if attached
+ * emit updateInterface
+ */
+void Interface::setAttached(bool isAttached){
+ attached = isAttached;
+ emit(updateInterface(this));
+};
+
+/**
+ * Set Hardware name
+ * @param name - the new name
+ * emit updateInterface
+ */
+void Interface::setHardwareName(QString name){
+ hardareName = name;
+ emit(updateInterface(this));
+};
+
+/**
+ * Set Module owner
+ * @param owner - the new owner
+ * emit updateInterface
+ */
+void Interface::setModuleOwner(Module *owner){
+ moduleOwner = owner;
+ emit(updateInterface(this));
+};
+
+
+/**
* Try to start the interface.
- * @return bool true if successfull.
*/
-bool Interface::start(){
+void Interface::start(){
// check to see if we are already running.
- if(status)
- return false;
+ if(true == status)
+ return;
int ret = system(QString("%1 %2 up").arg(IFCONFIG).arg(interfaceName).latin1());
+ // See if it was successfull...
if(ret != 0)
- return false;
+ return;
@@ -32,3 +75,2 @@ bool Interface::start(){
refresh();
- return true;
}
@@ -37,8 +79,7 @@ bool Interface::start(){
* Try to stop the interface.
- * @return bool true if successfull.
*/
-bool Interface::stop(){
+void Interface::stop(){
// check to see if we are already stopped.
- if(status == false)
- return false;
+ if(false == status)
+ return;
@@ -46,3 +87,3 @@ bool Interface::stop(){
if(ret != 0)
- return false;
+ return;
@@ -50,10 +91,10 @@ bool Interface::stop(){
refresh();
- return true;
}
+
/**
* Try to restart the interface.
- * @return bool true if successfull.
*/
-bool Interface::restart(){
- return (stop() && start());
+void Interface::restart(){
+ stop();
+ start();
}
@@ -76,2 +117,3 @@ bool Interface::refresh(){
leaseExpires = "";
+ emit(updateInterface(this));
return true;
@@ -140,2 +182,3 @@ bool Interface::refresh(){
if(!QFile::exists(dhcpFile)){
+ emit(updateInterface(this));
return true;
@@ -237,2 +280,4 @@ bool Interface::refresh(){
dhcp = true;
+
+ emit(updateInterface(this));
return true;
diff --git a/noncore/settings/networksettings/interface.h b/noncore/settings/networksettings/interface.h
index 1406e99..980171a 100644
--- a/noncore/settings/networksettings/interface.h
+++ b/noncore/settings/networksettings/interface.h
@@ -4,2 +4,3 @@
#include <qstring.h>
+#include <qobject.h>
@@ -7,22 +8,25 @@ class Module;
-class Interface {
+class Interface : public QObject{
+ Q_OBJECT
+
+signals:
+ void updateInterface(Interface *i);
public:
- Interface(QString name = "unknown", bool status = false);
+ Interface(QObject * parent=0, const char * name= "unknown", bool status = false);
virtual ~Interface(){};
+ virtual QString getInterfaceName(){ QString n(this->name()); return n; };
+
virtual bool getStatus(){ return status; };
- virtual void setStatus(bool newSatus){ status = newSatus; refresh(); };
+ virtual void setStatus(bool newStatus);
virtual bool isAttached(){ return attached; };
- virtual void setAttached(bool isAttached=false){ attached = isAttached; };
-
- virtual QString getInterfaceName(){ return interfaceName; };
- virtual void setInterfaceName(QString name="unknown"){ interfaceName = name; };
+ virtual void setAttached(bool isAttached=false);
virtual QString getHardwareName(){ return hardareName; };
- virtual void setHardwareName(QString name="Unknown"){ hardareName = name; };
+ virtual void setHardwareName(QString name="Unknown");
virtual Module* getModuleOwner(){ return moduleOwner; };
- virtual void setModuleOwner(Module *owner=NULL){ moduleOwner = owner; };
+ virtual void setModuleOwner(Module *owner=NULL);
@@ -38,6 +42,7 @@ public:
+public slots:
bool refresh();
- bool start();
- bool stop();
- bool restart();
+ void start();
+ void stop();
+ void restart();
diff --git a/noncore/settings/networksettings/interfaceadvanced.ui b/noncore/settings/networksettings/interfaceadvanced.ui
index 7520abe..efe67b0 100644
--- a/noncore/settings/networksettings/interfaceadvanced.ui
+++ b/noncore/settings/networksettings/interfaceadvanced.ui
@@ -13,4 +13,4 @@
<y>0</y>
- <width>188</width>
- <height>277</height>
+ <width>214</width>
+ <height>286</height>
</rect>
@@ -18,2 +18,9 @@
<property stdset="1">
+ <name>maximumSize</name>
+ <size>
+ <width>320</width>
+ <height>32767</height>
+ </size>
+ </property>
+ <property stdset="1">
<name>caption</name>
diff --git a/noncore/settings/networksettings/interfaceinformationimp.cpp b/noncore/settings/networksettings/interfaceinformationimp.cpp
index e37e0f8..59a6400 100644
--- a/noncore/settings/networksettings/interfaceinformationimp.cpp
+++ b/noncore/settings/networksettings/interfaceinformationimp.cpp
@@ -15,7 +15,8 @@ InterfaceInformationImp::InterfaceInformationImp(QWidget *parent, const char *na
interface = i;
- updateInterface();
- connect(startButton, SIGNAL(clicked()), this, SLOT(start()));
- connect(stopButton, SIGNAL(clicked()), this, SLOT(stop()));
- connect(restartButton, SIGNAL(clicked()), this, SLOT(restart()));
- connect(refreshButton, SIGNAL(clicked()), this, SLOT(refresh()));
+ connect(i, SIGNAL(updateInterface(Interface *)), this, SLOT(updateInterface(Interface *)));
+ updateInterface(interface);
+ connect(startButton, SIGNAL(clicked()), interface, SLOT(start()));
+ connect(stopButton, SIGNAL(clicked()), interface, SLOT(stop()));
+ connect(restartButton, SIGNAL(clicked()), interface, SLOT(restart()));
+ connect(refreshButton, SIGNAL(clicked()), interface, SLOT(refresh()));
connect(advancedButton, SIGNAL(clicked()), this, SLOT(advanced()));
@@ -24,3 +25,8 @@ InterfaceInformationImp::InterfaceInformationImp(QWidget *parent, const char *na
-void InterfaceInformationImp::updateInterface(){
+/**
+ * Update the interface information and buttons.
+ * @param Intarface *i the interface to update (should be the one we already
+ * know about).
+ */
+void InterfaceInformationImp::updateInterface(Interface *i){
if(interface->getStatus()){
@@ -42,35 +48,2 @@ void InterfaceInformationImp::updateInterface(){
/**
- * Start the interface. Update the information if successfull
- */
-void InterfaceInformationImp::start(){
- if(interface->start()){
- updateInterface();
- }
-}
-
-/**
- * Stop the interface.
- */
-void InterfaceInformationImp::stop(){
- if(interface->stop()){
- updateInterface();
- }
-}
-
-/***
- * Tell the interface to refresh its information.
- **/
-void InterfaceInformationImp::refresh(){
- if(interface->refresh())
- updateInterface();
-}
-
-void InterfaceInformationImp::restart(){
- if(interface->restart()){
- updateInterface();
- }
-}
-
-
-/**
* Create the advanced widget. Fill it with the current interface's information.
diff --git a/noncore/settings/networksettings/interfaceinformationimp.h b/noncore/settings/networksettings/interfaceinformationimp.h
index c8a478e..42213cc 100644
--- a/noncore/settings/networksettings/interfaceinformationimp.h
+++ b/noncore/settings/networksettings/interfaceinformationimp.h
@@ -15,7 +15,4 @@ public:
private slots:
- void start();
- void stop();
- void refresh();
- void restart();
void advanced();
+ void updateInterface(Interface *i);
@@ -23,3 +20,2 @@ private:
Interface *interface;
- void updateInterface();
diff --git a/noncore/settings/networksettings/mainwindowimp.cpp b/noncore/settings/networksettings/mainwindowimp.cpp
index b46362f..117bac1 100644
--- a/noncore/settings/networksettings/mainwindowimp.cpp
+++ b/noncore/settings/networksettings/mainwindowimp.cpp
@@ -306,2 +306,4 @@ void MainWindowImp::jobDone(KProcess *process){
Interface *i;
+ // We have found an interface
+ //qDebug(QString("MainWindowImp: Found Interface: %1").arg(line).latin1());
// See if we already have it
@@ -309,14 +311,6 @@ void MainWindowImp::jobDone(KProcess *process){
if(fileName == TEMP_ALL)
- i = new Interface(interfaceName, false);
+ i = new Interface(this, interfaceName, false);
else
- i = new Interface(interfaceName, true);
- }
- else{
- i = interfaceNames[interfaceName];
- if(fileName != TEMP_ALL)
- i->setStatus(true);
- }
-
+ i = new Interface(this, interfaceName, true);
i->setAttached(true);
- i->setInterfaceName(interfaceName);
@@ -329,6 +323,13 @@ void MainWindowImp::jobDone(KProcess *process){
i->setHardwareName(line.mid(hardwareName+11, macAddress-(hardwareName+11)) + QString(" (%1)").arg(i->getInterfaceName()));
- // We have found an interface
- //qDebug(QString("MainWindowImp: Found Interface: %1").arg(line).latin1());
+
interfaceNames.insert(i->getInterfaceName(), i);
updateInterface(i);
+ connect(i, SIGNAL(updateInterface(Interface *)), this, SLOT(updateInterface(Interface *)));
+ }
+ // It was an interface we already had.
+ else{
+ i = interfaceNames[interfaceName];
+ if(fileName != TEMP_ALL)
+ i->setStatus(true);
+ }
}
@@ -349,8 +350,8 @@ void MainWindowImp::jobDone(KProcess *process){
if(!found){
- Interface *i = new Interface(*ni, false);
+ Interface *i = new Interface(this, *ni, false);
i->setAttached(false);
i->setHardwareName(QString("Disconnected (%1)").arg(*ni));
- i->setInterfaceName(*ni);
interfaceNames.insert(i->getInterfaceName(), i);
updateInterface(i);
+ connect(i, SIGNAL(updateInterface(Interface *)), this, SLOT(updateInterface(Interface *)));
}
@@ -397,2 +398,4 @@ void MainWindowImp::updateInterface(Interface *i){
typeName = "wlan";
+ if(i->getInterfaceName().contains("usb"))
+ typeName = "usb";
diff --git a/noncore/settings/networksettings/wlan/wlanmodule.cpp b/noncore/settings/networksettings/wlan/wlanmodule.cpp
index 98d2eb6..f0394b4 100644
--- a/noncore/settings/networksettings/wlan/wlanmodule.cpp
+++ b/noncore/settings/networksettings/wlan/wlanmodule.cpp
@@ -26,4 +26,6 @@ QString WLANModule::getPixmapName(Interface* ){
bool WLANModule::isOwner(Interface *i){
- if(i->getInterfaceName() == "eth0" || i->getInterfaceName() == "wlan0")
+ if(i->getInterfaceName() == "eth0" || i->getInterfaceName() == "wlan0"){
+ i->setHardwareName(QString("802.11b (%1)").arg(i->getInterfaceName()));
return true;
+ }
return false;