summaryrefslogtreecommitdiff
path: root/noncore
Side-by-side diff
Diffstat (limited to 'noncore') (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/networksetup/interfacesetupimp.cpp2
-rw-r--r--noncore/net/networksetup/interfacesetupimp.h2
-rw-r--r--noncore/net/networksetup/mainwindowimp.cpp13
-rw-r--r--noncore/net/networksetup/networksetup.pro6
-rw-r--r--noncore/net/networksetup/wlan/wlan.pro6
-rw-r--r--noncore/net/networksetup/wlan/wlanimp.cpp9
-rw-r--r--noncore/net/networksetup/wlan/wlanimp.h3
-rw-r--r--noncore/net/networksetup/wlan/wlanmodule.cpp7
-rw-r--r--noncore/settings/networksettings/interfacesetupimp.cpp2
-rw-r--r--noncore/settings/networksettings/interfacesetupimp.h2
-rw-r--r--noncore/settings/networksettings/mainwindowimp.cpp13
-rw-r--r--noncore/settings/networksettings/networksetup.pro6
-rw-r--r--noncore/settings/networksettings/wlan/wlan.pro6
-rw-r--r--noncore/settings/networksettings/wlan/wlanimp.cpp9
-rw-r--r--noncore/settings/networksettings/wlan/wlanimp.h3
-rw-r--r--noncore/settings/networksettings/wlan/wlanmodule.cpp7
16 files changed, 38 insertions, 58 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
@@ -38,7 +38,7 @@ void InterfaceSetupImp::accept(){
if(!saveSettings())
return;
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
@@ -11,7 +11,7 @@ class InterfaceSetupImp : public InterfaceSetup {
public:
InterfaceSetupImp( QWidget* parent = 0, const char* name = 0, Interface *i=0, bool modal = FALSE, WFlags fl = 0);
-
+
protected slots:
void accept();
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
@@ -78,7 +78,7 @@ MainWindowImp::MainWindowImp(QWidget *parent, const char *name) : MainWindow(par
* Deconstructor. Save profiles. Delete loaded libraries.
*/
MainWindowImp::~MainWindowImp(){
- qDebug("start Saving mainwindow");
+ qDebug("Deleting main window");
// Save profiles.
Config cfg("NetworkSetup");
cfg.setGroup("General");
@@ -90,14 +90,14 @@ MainWindowImp::~MainWindowImp(){
if(iIt.key()->getModuleOwner() == NULL)
delete iIt.key();
}
-
+
// Delete Modules and Libraries
QMap<Module*, QLibrary*>::Iterator it;
for( it = libraries.begin(); it != libraries.end(); ++it ){
delete it.key();
- delete it.data();
+ //delete it.data();
}
- qDebug("done Saving mainwindow");
+ qDebug("Done deleting main window");
}
/**
@@ -244,10 +244,9 @@ void MainWindowImp::configureClicked(){
QWidget *moduleConfigure = i->getModuleOwner()->configure(i, &tabWidget);
if(moduleConfigure != NULL){
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");
-
}
moduleConfigure->showMaximized();
moduleConfigure->show();
@@ -255,7 +254,7 @@ void MainWindowImp::configureClicked(){
}
}
- InterfaceSetupImp *configure = new InterfaceSetupImp(0, "InterfaceSetupImp", i, true);
+ InterfaceSetupImp *configure = new InterfaceSetupImp(0, "InterfaceSetupImp", i, false, Qt::WDestructiveClose);
configure->setProfile(currentProfile);
configure->showMaximized();
configure->show();
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,7 +1,7 @@
-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
SOURCES = main.cpp mainwindowimp.cpp addconnectionimp.cpp interface.cpp interfaceinformationimp.cpp interfacesetupimp.cpp kprocctrl.cpp kprocess.cpp interfaces.cpp
INCLUDEPATH += $(OPIEDIR)/include
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,7 +1,7 @@
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
SOURCES = wlanimp.cpp wlanmodule.cpp wextensions.cpp
INCLUDEPATH += $(OPIEDIR)/include ../
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
@@ -16,7 +16,7 @@
#include <qcheckbox.h>
#include <qregexp.h>
-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");
readConfig();
}
@@ -101,6 +101,7 @@ bool WLANImp::writeConfig()
config->writeEntry( "dot11WEPDefaultKey1", keyLineEdit1->text() );
config->writeEntry( "dot11WEPDefaultKey2", keyLineEdit2->text() );
config->writeEntry( "dot11WEPDefaultKey3", keyLineEdit3->text() );
+ return true;
return writeWirelessOpts( );
}
@@ -112,12 +113,6 @@ void WLANImp::accept()
QDialog::accept();
}
-void WLANImp::done ( int r )
-{
- QDialog::done ( r );
- close ( );
-}
-
bool WLANImp::writeWirelessOpts( QString scheme )
{
qWarning( "WLANImp::writeWirelessOpts entered." );
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
@@ -9,12 +9,11 @@ class WLANImp : public WLAN {
Q_OBJECT
public:
- WLANImp( QWidget* parent = 0, const char* name = 0);
+ WLANImp( QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
~WLANImp( );
protected:
void accept();
- void done ( int r );
private:
void readConfig();
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
@@ -15,6 +15,7 @@ WLANModule::WLANModule() : Module() {
/**
*/
WLANModule::~WLANModule(){
+ qDebug("Deleting module");
Interface *i;
for ( i=list.first(); i != 0; i=list.next() )
delete i;
@@ -57,7 +58,7 @@ bool WLANModule::isOwner(Interface *i){
* @return QWidget* pointer to the tab widget in this modules configure.
*/
QWidget *WLANModule::configure(Interface *, QTabWidget **tabWidget){
- WLANImp *wlanconfig = new WLANImp(0, "WlanConfig");
+ WLANImp *wlanconfig = new WLANImp(0, "WlanConfig", false, Qt::WDestructiveClose);
(*tabWidget) = wlanconfig->tabWidget;
return wlanconfig;
}
@@ -88,10 +89,6 @@ QWidget *WLANModule::information(Interface *i, QTabWidget **tabWidget){
info->noiseProgressBar->setProgress(noise);
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;
}
diff --git a/noncore/settings/networksettings/interfacesetupimp.cpp b/noncore/settings/networksettings/interfacesetupimp.cpp
index 1327726..a8731a9 100644
--- a/noncore/settings/networksettings/interfacesetupimp.cpp
+++ b/noncore/settings/networksettings/interfacesetupimp.cpp
@@ -38,7 +38,7 @@ void InterfaceSetupImp::accept(){
if(!saveSettings())
return;
interfaces->write();
- close(true);
+ QDialog::accept();
}
/**
diff --git a/noncore/settings/networksettings/interfacesetupimp.h b/noncore/settings/networksettings/interfacesetupimp.h
index 7df0d46..a0bec32 100644
--- a/noncore/settings/networksettings/interfacesetupimp.h
+++ b/noncore/settings/networksettings/interfacesetupimp.h
@@ -11,7 +11,7 @@ class InterfaceSetupImp : public InterfaceSetup {
public:
InterfaceSetupImp( QWidget* parent = 0, const char* name = 0, Interface *i=0, bool modal = FALSE, WFlags fl = 0);
-
+
protected slots:
void accept();
diff --git a/noncore/settings/networksettings/mainwindowimp.cpp b/noncore/settings/networksettings/mainwindowimp.cpp
index c86acdc..4a088cb 100644
--- a/noncore/settings/networksettings/mainwindowimp.cpp
+++ b/noncore/settings/networksettings/mainwindowimp.cpp
@@ -78,7 +78,7 @@ MainWindowImp::MainWindowImp(QWidget *parent, const char *name) : MainWindow(par
* Deconstructor. Save profiles. Delete loaded libraries.
*/
MainWindowImp::~MainWindowImp(){
- qDebug("start Saving mainwindow");
+ qDebug("Deleting main window");
// Save profiles.
Config cfg("NetworkSetup");
cfg.setGroup("General");
@@ -90,14 +90,14 @@ MainWindowImp::~MainWindowImp(){
if(iIt.key()->getModuleOwner() == NULL)
delete iIt.key();
}
-
+
// Delete Modules and Libraries
QMap<Module*, QLibrary*>::Iterator it;
for( it = libraries.begin(); it != libraries.end(); ++it ){
delete it.key();
- delete it.data();
+ //delete it.data();
}
- qDebug("done Saving mainwindow");
+ qDebug("Done deleting main window");
}
/**
@@ -244,10 +244,9 @@ void MainWindowImp::configureClicked(){
QWidget *moduleConfigure = i->getModuleOwner()->configure(i, &tabWidget);
if(moduleConfigure != NULL){
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");
-
}
moduleConfigure->showMaximized();
moduleConfigure->show();
@@ -255,7 +254,7 @@ void MainWindowImp::configureClicked(){
}
}
- InterfaceSetupImp *configure = new InterfaceSetupImp(0, "InterfaceSetupImp", i, true);
+ InterfaceSetupImp *configure = new InterfaceSetupImp(0, "InterfaceSetupImp", i, false, Qt::WDestructiveClose);
configure->setProfile(currentProfile);
configure->showMaximized();
configure->show();
diff --git a/noncore/settings/networksettings/networksetup.pro b/noncore/settings/networksettings/networksetup.pro
index f09db93..7299cc6 100644
--- a/noncore/settings/networksettings/networksetup.pro
+++ b/noncore/settings/networksettings/networksetup.pro
@@ -1,7 +1,7 @@
-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
SOURCES = main.cpp mainwindowimp.cpp addconnectionimp.cpp interface.cpp interfaceinformationimp.cpp interfacesetupimp.cpp kprocctrl.cpp kprocess.cpp interfaces.cpp
INCLUDEPATH += $(OPIEDIR)/include
diff --git a/noncore/settings/networksettings/wlan/wlan.pro b/noncore/settings/networksettings/wlan/wlan.pro
index 432a096..814a0b4 100644
--- a/noncore/settings/networksettings/wlan/wlan.pro
+++ b/noncore/settings/networksettings/wlan/wlan.pro
@@ -1,7 +1,7 @@
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
SOURCES = wlanimp.cpp wlanmodule.cpp wextensions.cpp
INCLUDEPATH += $(OPIEDIR)/include ../
diff --git a/noncore/settings/networksettings/wlan/wlanimp.cpp b/noncore/settings/networksettings/wlan/wlanimp.cpp
index 94c7518..45952b9 100644
--- a/noncore/settings/networksettings/wlan/wlanimp.cpp
+++ b/noncore/settings/networksettings/wlan/wlanimp.cpp
@@ -16,7 +16,7 @@
#include <qcheckbox.h>
#include <qregexp.h>
-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");
readConfig();
}
@@ -101,6 +101,7 @@ bool WLANImp::writeConfig()
config->writeEntry( "dot11WEPDefaultKey1", keyLineEdit1->text() );
config->writeEntry( "dot11WEPDefaultKey2", keyLineEdit2->text() );
config->writeEntry( "dot11WEPDefaultKey3", keyLineEdit3->text() );
+ return true;
return writeWirelessOpts( );
}
@@ -112,12 +113,6 @@ void WLANImp::accept()
QDialog::accept();
}
-void WLANImp::done ( int r )
-{
- QDialog::done ( r );
- close ( );
-}
-
bool WLANImp::writeWirelessOpts( QString scheme )
{
qWarning( "WLANImp::writeWirelessOpts entered." );
diff --git a/noncore/settings/networksettings/wlan/wlanimp.h b/noncore/settings/networksettings/wlan/wlanimp.h
index 22ce143..59b7c59 100644
--- a/noncore/settings/networksettings/wlan/wlanimp.h
+++ b/noncore/settings/networksettings/wlan/wlanimp.h
@@ -9,12 +9,11 @@ class WLANImp : public WLAN {
Q_OBJECT
public:
- WLANImp( QWidget* parent = 0, const char* name = 0);
+ WLANImp( QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
~WLANImp( );
protected:
void accept();
- void done ( int r );
private:
void readConfig();
diff --git a/noncore/settings/networksettings/wlan/wlanmodule.cpp b/noncore/settings/networksettings/wlan/wlanmodule.cpp
index 7507c54..3363b8a 100644
--- a/noncore/settings/networksettings/wlan/wlanmodule.cpp
+++ b/noncore/settings/networksettings/wlan/wlanmodule.cpp
@@ -15,6 +15,7 @@ WLANModule::WLANModule() : Module() {
/**
*/
WLANModule::~WLANModule(){
+ qDebug("Deleting module");
Interface *i;
for ( i=list.first(); i != 0; i=list.next() )
delete i;
@@ -57,7 +58,7 @@ bool WLANModule::isOwner(Interface *i){
* @return QWidget* pointer to the tab widget in this modules configure.
*/
QWidget *WLANModule::configure(Interface *, QTabWidget **tabWidget){
- WLANImp *wlanconfig = new WLANImp(0, "WlanConfig");
+ WLANImp *wlanconfig = new WLANImp(0, "WlanConfig", false, Qt::WDestructiveClose);
(*tabWidget) = wlanconfig->tabWidget;
return wlanconfig;
}
@@ -88,10 +89,6 @@ QWidget *WLANModule::information(Interface *i, QTabWidget **tabWidget){
info->noiseProgressBar->setProgress(noise);
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;
}