-rw-r--r-- | noncore/settings/networksettings/TODO | 6 | ||||
-rw-r--r-- | noncore/settings/networksettings/interface.cpp | 4 | ||||
-rw-r--r-- | noncore/settings/networksettings/mainwindowimp.cpp | 2 | ||||
-rw-r--r-- | noncore/settings/networksettings/wlan/wextensions.cpp | 2 | ||||
-rw-r--r-- | noncore/settings/networksettings/wlan/wlanimp.cpp | 2 | ||||
-rw-r--r-- | noncore/settings/networksettings/wlan/wlanmodule.cpp | 20 |
6 files changed, 18 insertions, 18 deletions
diff --git a/noncore/settings/networksettings/TODO b/noncore/settings/networksettings/TODO index 7a71142..d61c510 100644 --- a/noncore/settings/networksettings/TODO +++ b/noncore/settings/networksettings/TODO @@ -1,6 +1,4 @@ WLAN needs to be re-written to not use Config --remove WLAN Config item --sub class out the wlan info --check if an interface supports wireless extensions before config. +WHERE Is DHCP info stored??? PPP module needs to be written @@ -8,4 +6,4 @@ PPP module needs to be written Write a class that parses /proc and not ifconfig -Possible other modules: ipsec, bluetooth +Possible other modules: ipsec, bluetooth, ipchains diff --git a/noncore/settings/networksettings/interface.cpp b/noncore/settings/networksettings/interface.cpp index a84b91f..929b3a1 100644 --- a/noncore/settings/networksettings/interface.cpp +++ b/noncore/settings/networksettings/interface.cpp @@ -7,5 +7,5 @@ #define IFCONFIG "/sbin/ifconfig" -#define HDCP_INFO_DIR "/etc/dhcpc" +#define DHCP_INFO_DIR "/etc/dhcpc" #include <stdio.h> @@ -172,5 +172,5 @@ bool Interface::refresh(){ dhcp = false; - QString dhcpDirectory(HDCP_INFO_DIR); + QString dhcpDirectory(DHCP_INFO_DIR); QDir d(dhcpDirectory); if(!d.exists(dhcpDirectory)) diff --git a/noncore/settings/networksettings/mainwindowimp.cpp b/noncore/settings/networksettings/mainwindowimp.cpp index 9d81ab1..c86acdc 100644 --- a/noncore/settings/networksettings/mainwindowimp.cpp +++ b/noncore/settings/networksettings/mainwindowimp.cpp @@ -79,4 +79,5 @@ MainWindowImp::MainWindowImp(QWidget *parent, const char *name) : MainWindow(par */
MainWindowImp::~MainWindowImp(){
+ qDebug("start Saving mainwindow");
// Save profiles.
Config cfg("NetworkSetup");
@@ -97,4 +98,5 @@ MainWindowImp::~MainWindowImp(){ delete it.data();
}
+ qDebug("done Saving mainwindow");
}
diff --git a/noncore/settings/networksettings/wlan/wextensions.cpp b/noncore/settings/networksettings/wlan/wextensions.cpp index ef4ba8f..e545bd1 100644 --- a/noncore/settings/networksettings/wlan/wextensions.cpp +++ b/noncore/settings/networksettings/wlan/wextensions.cpp @@ -158,5 +158,5 @@ bool WExtensions::stats(int &signal, int &noise, int &quality){ if ( ( noise > IW_UPPER ) || ( noise < IW_LOWER ) ) qDebug( "WIFIAPPLET: Doh! Noise %d > estimated max!\n", noise ); - qDebug(QString("q:%1, s:%2, n:%3").arg(quality).arg(signal).arg(noise).latin1()); + //qDebug(QString("q:%1, s:%2, n:%3").arg(quality).arg(signal).arg(noise).latin1()); signal = ( ( signal-IW_LOWER ) * 100 ) / IW_UPPER; noise = ( ( noise-IW_LOWER ) * 100 ) / IW_UPPER; diff --git a/noncore/settings/networksettings/wlan/wlanimp.cpp b/noncore/settings/networksettings/wlan/wlanimp.cpp index ea19207..94c7518 100644 --- a/noncore/settings/networksettings/wlan/wlanimp.cpp +++ b/noncore/settings/networksettings/wlan/wlanimp.cpp @@ -17,5 +17,5 @@ #include <qregexp.h> -WLANImp::WLANImp( QWidget* parent, const char* name):WLAN(parent, name){ +WLANImp::WLANImp( QWidget* parent, const char* name):WLAN(parent, name, Qt::WDestructiveClose){ config = new Config("wireless"); readConfig(); diff --git a/noncore/settings/networksettings/wlan/wlanmodule.cpp b/noncore/settings/networksettings/wlan/wlanmodule.cpp index 73e753c..7507c54 100644 --- a/noncore/settings/networksettings/wlan/wlanmodule.cpp +++ b/noncore/settings/networksettings/wlan/wlanmodule.cpp @@ -11,5 +11,4 @@ */ WLANModule::WLANModule() : Module() { - // get output from iwconfig } @@ -19,5 +18,5 @@ WLANModule::~WLANModule(){ Interface *i; for ( i=list.first(); i != 0; i=list.next() ) - delete i; + delete i; } @@ -48,10 +47,7 @@ bool WLANModule::isOwner(Interface *i){ return false; - //if(i->getInterfaceName() == "eth0" || i->getInterfaceName() == "wlan0"){ - i->setHardwareName("802.11b"); - list.append(i); - return true; - //} - //return false; + i->setHardwareName("802.11b"); + list.append(i); + return true; } @@ -76,6 +72,6 @@ QWidget *WLANModule::information(Interface *i, QTabWidget **tabWidget){ if(!we.doesHaveWirelessExtensions()) return NULL; - - WlanInfo *info = new WlanInfo(0, "wireless info"); + + WlanInfo *info = new WlanInfo(0, "wireless info", Qt::WDestructiveClose); (*tabWidget) = info->tabWidget; @@ -93,4 +89,8 @@ QWidget *WLANModule::information(Interface *i, QTabWidget **tabWidget){ info->qualityProgressBar->setProgress(quality); info->rateLabel->setText(QString("%1 Mb/s").arg(we.rate())); + //WlanInfo info (0, "wireless info", true); + //info.show(); + //return NULL; + return info; } |