-rw-r--r-- | noncore/net/networksetup/interfacesetupimp.cpp | 2 | ||||
-rw-r--r-- | noncore/net/networksetup/interfacesetupimp.h | 0 | ||||
-rw-r--r-- | noncore/net/networksetup/mainwindowimp.cpp | 11 | ||||
-rw-r--r-- | noncore/net/networksetup/networksetup.pro | 6 | ||||
-rw-r--r-- | noncore/net/networksetup/wlan/wlan.pro | 6 | ||||
-rw-r--r-- | noncore/net/networksetup/wlan/wlanimp.cpp | 9 | ||||
-rw-r--r-- | noncore/net/networksetup/wlan/wlanimp.h | 3 | ||||
-rw-r--r-- | noncore/net/networksetup/wlan/wlanmodule.cpp | 7 |
8 files changed, 17 insertions, 27 deletions
diff --git a/noncore/net/networksetup/interfacesetupimp.cpp b/noncore/net/networksetup/interfacesetupimp.cpp index 1327726..a8731a9 100644 --- a/noncore/net/networksetup/interfacesetupimp.cpp +++ b/noncore/net/networksetup/interfacesetupimp.cpp @@ -40,3 +40,3 @@ void InterfaceSetupImp::accept(){ interfaces->write(); - close(true); + QDialog::accept(); } diff --git a/noncore/net/networksetup/interfacesetupimp.h b/noncore/net/networksetup/interfacesetupimp.h index 7df0d46..a0bec32 100644 --- a/noncore/net/networksetup/interfacesetupimp.h +++ b/noncore/net/networksetup/interfacesetupimp.h diff --git a/noncore/net/networksetup/mainwindowimp.cpp b/noncore/net/networksetup/mainwindowimp.cpp index c86acdc..4a088cb 100644 --- a/noncore/net/networksetup/mainwindowimp.cpp +++ b/noncore/net/networksetup/mainwindowimp.cpp @@ -80,3 +80,3 @@ MainWindowImp::MainWindowImp(QWidget *parent, const char *name) : MainWindow(par MainWindowImp::~MainWindowImp(){
- qDebug("start Saving mainwindow");
+ qDebug("Deleting main window");
// Save profiles.
@@ -97,5 +97,5 @@ MainWindowImp::~MainWindowImp(){ delete it.key();
- delete it.data();
+ //delete it.data();
}
- qDebug("done Saving mainwindow");
+ qDebug("Done deleting main window");
}
@@ -246,6 +246,5 @@ void MainWindowImp::configureClicked(){ if(tabWidget != NULL){
- InterfaceSetupImp *configure = new InterfaceSetupImp(tabWidget, "InterfaceSetupImp", i, true);
+ InterfaceSetupImp *configure = new InterfaceSetupImp(tabWidget, "InterfaceSetupImp", i, false, Qt::WDestructiveClose);
configure->setProfile(currentProfile);
tabWidget->insertTab(configure, "TCP/IP");
-
}
@@ -257,3 +256,3 @@ void MainWindowImp::configureClicked(){ - InterfaceSetupImp *configure = new InterfaceSetupImp(0, "InterfaceSetupImp", i, true);
+ InterfaceSetupImp *configure = new InterfaceSetupImp(0, "InterfaceSetupImp", i, false, Qt::WDestructiveClose);
configure->setProfile(currentProfile);
diff --git a/noncore/net/networksetup/networksetup.pro b/noncore/net/networksetup/networksetup.pro index f09db93..7299cc6 100644 --- a/noncore/net/networksetup/networksetup.pro +++ b/noncore/net/networksetup/networksetup.pro @@ -1,5 +1,5 @@ -DESTDIR = $(OPIEDIR)/bin +#DESTDIR = $(OPIEDIR)/bin TEMPLATE = app -#CONFIG = qt warn_on debug -CONFIG = qt warn_on release +CONFIG = qt warn_on debug +#CONFIG = qt warn_on release HEADERS = mainwindowimp.h addconnectionimp.h interface.h interfaceinformationimp.h interfacesetupimp.h interfaces.h defaultmodule.h kprocctrl.h module.h kprocess.h diff --git a/noncore/net/networksetup/wlan/wlan.pro b/noncore/net/networksetup/wlan/wlan.pro index 432a096..814a0b4 100644 --- a/noncore/net/networksetup/wlan/wlan.pro +++ b/noncore/net/networksetup/wlan/wlan.pro @@ -1,5 +1,5 @@ TEMPLATE = lib -CONFIG += qt warn_on release -#CONFIG += qt warn_on debug -DESTDIR = $(OPIEDIR)/plugins/networksetup +#CONFIG += qt warn_on release +CONFIG += qt warn_on debug +#DESTDIR = $(OPIEDIR)/plugins/networksetup HEADERS = wlanimp.h wlanmodule.h wextensions.h diff --git a/noncore/net/networksetup/wlan/wlanimp.cpp b/noncore/net/networksetup/wlan/wlanimp.cpp index 94c7518..45952b9 100644 --- a/noncore/net/networksetup/wlan/wlanimp.cpp +++ b/noncore/net/networksetup/wlan/wlanimp.cpp @@ -18,3 +18,3 @@ -WLANImp::WLANImp( QWidget* parent, const char* name):WLAN(parent, name, Qt::WDestructiveClose){ +WLANImp::WLANImp( QWidget* parent, const char* name, bool modal, WFlags fl):WLAN(parent, name, modal, fl){ config = new Config("wireless"); @@ -103,2 +103,3 @@ bool WLANImp::writeConfig() config->writeEntry( "dot11WEPDefaultKey3", keyLineEdit3->text() ); + return true; return writeWirelessOpts( ); @@ -114,8 +115,2 @@ void WLANImp::accept() -void WLANImp::done ( int r ) -{ - QDialog::done ( r ); - close ( ); -} - bool WLANImp::writeWirelessOpts( QString scheme ) diff --git a/noncore/net/networksetup/wlan/wlanimp.h b/noncore/net/networksetup/wlan/wlanimp.h index 22ce143..59b7c59 100644 --- a/noncore/net/networksetup/wlan/wlanimp.h +++ b/noncore/net/networksetup/wlan/wlanimp.h @@ -11,3 +11,3 @@ class WLANImp : public WLAN { public: - WLANImp( QWidget* parent = 0, const char* name = 0); + WLANImp( QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ~WLANImp( ); @@ -16,3 +16,2 @@ protected: void accept(); - void done ( int r ); diff --git a/noncore/net/networksetup/wlan/wlanmodule.cpp b/noncore/net/networksetup/wlan/wlanmodule.cpp index 7507c54..3363b8a 100644 --- a/noncore/net/networksetup/wlan/wlanmodule.cpp +++ b/noncore/net/networksetup/wlan/wlanmodule.cpp @@ -17,2 +17,3 @@ WLANModule::WLANModule() : Module() { WLANModule::~WLANModule(){ + qDebug("Deleting module"); Interface *i; @@ -59,3 +60,3 @@ bool WLANModule::isOwner(Interface *i){ QWidget *WLANModule::configure(Interface *, QTabWidget **tabWidget){ - WLANImp *wlanconfig = new WLANImp(0, "WlanConfig"); + WLANImp *wlanconfig = new WLANImp(0, "WlanConfig", false, Qt::WDestructiveClose); (*tabWidget) = wlanconfig->tabWidget; @@ -90,6 +91,2 @@ QWidget *WLANModule::information(Interface *i, QTabWidget **tabWidget){ info->rateLabel->setText(QString("%1 Mb/s").arg(we.rate())); - //WlanInfo info (0, "wireless info", true); - //info.show(); - //return NULL; - return info; |