summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/net/networksetup/interface.cpp2
-rw-r--r--noncore/net/networksetup/interface.h7
-rw-r--r--noncore/net/networksetup/interfacesetup.ui146
-rw-r--r--noncore/net/networksetup/mainwindow.ui74
-rw-r--r--noncore/net/networksetup/mainwindowimp.cpp51
-rw-r--r--noncore/net/networksetup/mainwindowimp.h1
-rw-r--r--noncore/net/networksetup/module.h7
-rw-r--r--noncore/net/networksetup/networksetup.pro4
-rw-r--r--noncore/settings/networksettings/interface.cpp2
-rw-r--r--noncore/settings/networksettings/interface.h7
-rw-r--r--noncore/settings/networksettings/interfacesetup.ui146
-rw-r--r--noncore/settings/networksettings/mainwindow.ui74
-rw-r--r--noncore/settings/networksettings/mainwindowimp.cpp51
-rw-r--r--noncore/settings/networksettings/mainwindowimp.h1
-rw-r--r--noncore/settings/networksettings/module.h7
-rw-r--r--noncore/settings/networksettings/networksetup.pro4
16 files changed, 410 insertions, 174 deletions
diff --git a/noncore/net/networksetup/interface.cpp b/noncore/net/networksetup/interface.cpp
index f6eed00..5b21364 100644
--- a/noncore/net/networksetup/interface.cpp
+++ b/noncore/net/networksetup/interface.cpp
@@ -12,3 +12,3 @@
-Interface::Interface(QString name, bool newSatus): status(newSatus), attached(false), interfaceName(name), hardareName("Unknown"), moduleOwner("Default"), macAddress(""), ip("0.0.0.0"), broadcast(""), subnetMask("0.0.0.0"), dhcp(false){
+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){
refresh();
diff --git a/noncore/net/networksetup/interface.h b/noncore/net/networksetup/interface.h
index 1ad71eb..5dc95a4 100644
--- a/noncore/net/networksetup/interface.h
+++ b/noncore/net/networksetup/interface.h
@@ -5,2 +5,3 @@
+class Module;
class Interface {
@@ -23,4 +24,4 @@ public:
- virtual QString getModuleOwner(){ return moduleOwner; };
- virtual void setModuleOwner(QString owner="Default"){ moduleOwner = owner; };
+ virtual Module* getModuleOwner(){ return moduleOwner; };
+ virtual void setModuleOwner(Module *owner=NULL){ moduleOwner = owner; };
@@ -47,3 +48,3 @@ private:
QString hardareName;
- QString moduleOwner;
+ Module *moduleOwner;
diff --git a/noncore/net/networksetup/interfacesetup.ui b/noncore/net/networksetup/interfacesetup.ui
index ff9810e..d367608 100644
--- a/noncore/net/networksetup/interfacesetup.ui
+++ b/noncore/net/networksetup/interfacesetup.ui
@@ -13,4 +13,4 @@
<y>0</y>
- <width>177</width>
- <height>320</height>
+ <width>271</width>
+ <height>280</height>
</rect>
@@ -21,3 +21,3 @@
</property>
- <grid>
+ <vbox>
<property stdset="1">
@@ -30,18 +30,33 @@
</property>
- <widget row="1" column="0" rowspan="1" colspan="2" >
- <class>Line</class>
+ <widget>
+ <class>QCheckBox</class>
<property stdset="1">
<name>name</name>
- <cstring>Line1</cstring>
+ <cstring>autoStart</cstring>
</property>
<property stdset="1">
- <name>orientation</name>
- <enum>Horizontal</enum>
+ <name>text</name>
+ <string>Automaticly bring up</string>
</property>
</widget>
- <widget row="0" column="0" rowspan="1" colspan="2" >
- <class>QCheckBox</class>
+ <widget>
+ <class>QLayoutWidget</class>
<property stdset="1">
<name>name</name>
- <cstring>autoStart</cstring>
+ <cstring>Layout8</cstring>
+ </property>
+ <hbox>
+ <property stdset="1">
+ <name>margin</name>
+ <number>0</number>
+ </property>
+ <property stdset="1">
+ <name>spacing</name>
+ <number>6</number>
+ </property>
+ <widget>
+ <class>QLabel</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>TextLabel1</cstring>
</property>
@@ -49,6 +64,6 @@
<name>text</name>
- <string>Automaticly bring up</string>
+ <string>Profile</string>
</property>
</widget>
- <widget row="2" column="1" >
+ <widget>
<class>QComboBox</class>
@@ -65,14 +80,41 @@
</widget>
- <widget row="4" column="0" >
- <class>QLabel</class>
- <property stdset="1">
+ <spacer>
+ <property>
<name>name</name>
- <cstring>leaseHoursLabel</cstring>
+ <cstring>Spacer20</cstring>
</property>
<property stdset="1">
- <name>text</name>
- <string>Requested Lease</string>
+ <name>orientation</name>
+ <enum>Horizontal</enum>
+ </property>
+ <property stdset="1">
+ <name>sizeType</name>
+ <enum>Expanding</enum>
+ </property>
+ <property>
+ <name>sizeHint</name>
+ <size>
+ <width>20</width>
+ <height>20</height>
+ </size>
</property>
+ </spacer>
+ </hbox>
</widget>
- <widget row="3" column="0" rowspan="1" colspan="2" >
+ <widget>
+ <class>QLayoutWidget</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>Layout9</cstring>
+ </property>
+ <hbox>
+ <property stdset="1">
+ <name>margin</name>
+ <number>0</number>
+ </property>
+ <property stdset="1">
+ <name>spacing</name>
+ <number>6</number>
+ </property>
+ <widget>
<class>QCheckBox</class>
@@ -91,3 +133,3 @@
</widget>
- <widget row="2" column="0" >
+ <widget>
<class>QLabel</class>
@@ -95,3 +137,3 @@
<name>name</name>
- <cstring>TextLabel1</cstring>
+ <cstring>leaseHoursLabel</cstring>
</property>
@@ -99,6 +141,6 @@
<name>text</name>
- <string>Profile:</string>
+ <string>Requested Lease</string>
</property>
</widget>
- <widget row="4" column="1" >
+ <widget>
<class>QSpinBox</class>
@@ -125,24 +167,5 @@
</widget>
- <spacer row="6" column="1" >
- <property>
- <name>name</name>
- <cstring>Spacer9</cstring>
- </property>
- <property stdset="1">
- <name>orientation</name>
- <enum>Vertical</enum>
- </property>
- <property stdset="1">
- <name>sizeType</name>
- <enum>Expanding</enum>
- </property>
- <property>
- <name>sizeHint</name>
- <size>
- <width>20</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- <widget row="5" column="0" rowspan="1" colspan="2" >
+ </hbox>
+ </widget>
+ <widget>
<class>QGroupBox</class>
@@ -157,2 +180,10 @@
<property stdset="1">
+ <name>frameShape</name>
+ <enum>Box</enum>
+ </property>
+ <property stdset="1">
+ <name>frameShadow</name>
+ <enum>Sunken</enum>
+ </property>
+ <property stdset="1">
<name>title</name>
@@ -261,3 +292,24 @@
</widget>
- </grid>
+ <spacer>
+ <property>
+ <name>name</name>
+ <cstring>Spacer9</cstring>
+ </property>
+ <property stdset="1">
+ <name>orientation</name>
+ <enum>Vertical</enum>
+ </property>
+ <property stdset="1">
+ <name>sizeType</name>
+ <enum>Expanding</enum>
+ </property>
+ <property>
+ <name>sizeHint</name>
+ <size>
+ <width>20</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </vbox>
</widget>
diff --git a/noncore/net/networksetup/mainwindow.ui b/noncore/net/networksetup/mainwindow.ui
index c1fa101..a3f7bb1 100644
--- a/noncore/net/networksetup/mainwindow.ui
+++ b/noncore/net/networksetup/mainwindow.ui
@@ -13,3 +13,3 @@
<y>0</y>
- <width>218</width>
+ <width>217</width>
<height>289</height>
@@ -196,3 +196,14 @@
</property>
- <widget row="0" column="0" rowspan="1" colspan="2" >
+ <widget row="1" column="0" rowspan="1" colspan="3" >
+ <class>Line</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>Line1</cstring>
+ </property>
+ <property stdset="1">
+ <name>orientation</name>
+ <enum>Horizontal</enum>
+ </property>
+ </widget>
+ <widget row="0" column="0" >
<class>QLabel</class>
@@ -207,3 +218,3 @@
</widget>
- <widget row="0" column="2" >
+ <widget row="0" column="1" >
<class>QLabel</class>
@@ -226,14 +237,24 @@
</widget>
- <widget row="1" column="0" >
- <class>QLabel</class>
- <property stdset="1">
+ <spacer row="0" column="2" >
+ <property>
<name>name</name>
- <cstring>TextLabel1_2</cstring>
+ <cstring>Spacer2</cstring>
</property>
<property stdset="1">
- <name>text</name>
- <string>Profiles</string>
+ <name>orientation</name>
+ <enum>Horizontal</enum>
</property>
- </widget>
- <spacer row="5" column="2" >
+ <property stdset="1">
+ <name>sizeType</name>
+ <enum>Expanding</enum>
+ </property>
+ <property>
+ <name>sizeHint</name>
+ <size>
+ <width>20</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ <spacer row="6" column="2" >
<property>
@@ -258,10 +279,3 @@
</spacer>
- <widget row="2" column="0" rowspan="3" colspan="1" >
- <class>QListBox</class>
- <property stdset="1">
- <name>name</name>
- <cstring>profilesList</cstring>
- </property>
- </widget>
- <widget row="4" column="1" rowspan="1" colspan="2" >
+ <widget row="5" column="2" >
<class>QPushButton</class>
@@ -276,3 +290,3 @@
</widget>
- <widget row="3" column="1" rowspan="1" colspan="2" >
+ <widget row="4" column="2" >
<class>QPushButton</class>
@@ -287,3 +301,3 @@
</widget>
- <widget row="2" column="1" rowspan="1" colspan="2" >
+ <widget row="3" column="2" >
<class>QPushButton</class>
@@ -298,2 +312,20 @@
</widget>
+ <widget row="2" column="0" >
+ <class>QLabel</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>TextLabel1_2</cstring>
+ </property>
+ <property stdset="1">
+ <name>text</name>
+ <string>Profiles</string>
+ </property>
+ </widget>
+ <widget row="3" column="0" rowspan="3" colspan="2" >
+ <class>QListBox</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>profilesList</cstring>
+ </property>
+ </widget>
</grid>
diff --git a/noncore/net/networksetup/mainwindowimp.cpp b/noncore/net/networksetup/mainwindowimp.cpp
index 0f48a4b..89dac6f 100644
--- a/noncore/net/networksetup/mainwindowimp.cpp
+++ b/noncore/net/networksetup/mainwindowimp.cpp
@@ -153,3 +153,3 @@ void MainWindowImp::removeClicked(){
- if(modules.find(interfaceItems[item]) == modules.end()){
+ if((interfaceItems[item])->getModuleOwner() == NULL){
QMessageBox::information(this, "Can't remove interface.", "Interface is built in.", "Ok");
@@ -173,3 +173,3 @@ void MainWindowImp::configureClicked(){
- if(modules.find(interfaceItems[item]) == modules.end()){
+ if((interfaceItems[item])->getModuleOwner() == NULL){
InterfaceSetupImp *conf = new InterfaceSetupImp(0, "InterfaceConfiguration", interfaceItems[item]);
@@ -179,5 +179,20 @@ void MainWindowImp::configureClicked(){
else{
- InterfaceSetupImp *conf = new InterfaceSetupImp(this, "InterfaceConfiguration");
+ QTabWidget *t = NULL;
+ QWidget *conf = (interfaceItems[item])->getModuleOwner()->configure(&t);
+ if(conf != NULL){
+ qDebug("Conf found");
+ if(t != NULL){
+ qDebug("Adding Interface");
+ InterfaceSetupImp *i = new InterfaceSetupImp(t, "TCPIPInformation", interfaceItems[item], true);
+ t->insertTab(i, "TCP/IP");
+ }
+ conf->showMaximized();
conf->show();
}
+ else{
+ InterfaceSetupImp *i = new InterfaceSetupImp(0, "TCPIPInformation", interfaceItems[item], true);
+ i->showMaximized();
+ i->show();
+ }
+ }
}
@@ -195,3 +210,3 @@ void MainWindowImp::informationClicked(){
- if(modules.find(interfaceItems[item]) == modules.end()){
+ if( (interfaceItems[item])->getModuleOwner() == NULL){
InterfaceInformationImp *i = new InterfaceInformationImp(0, "InterfaceInformationImp", interfaceItems[item]);
@@ -201,6 +216,18 @@ void MainWindowImp::informationClicked(){
else{
- QTabWidget *t = new QTabWidget(this, "InterfaceInformationTAB");
+ QTabWidget *t = NULL;
+ QWidget *conf = (interfaceItems[item])->getModuleOwner()->information(&t);
+ if(conf != NULL){
+ if(t){
+ qDebug("Adding Interface");
InterfaceInformationImp *i = new InterfaceInformationImp(t, "TCPIPInformation", interfaceItems[item], true);
t->insertTab(i, "TCP/IP");
- t->show();
+ }
+ conf->showMaximized();
+ conf->show();
+ }
+ else{
+ InterfaceInformationImp *i = new InterfaceInformationImp(0, "TCPIPInformation", interfaceItems[item], true);
+ i->showMaximized();
+ i->show();
+ }
}
@@ -288,5 +315,7 @@ void MainWindowImp::updateInterface(Interface *i){
// See if you can't find a module owner for this interface
- //EmployeeMap::Iterator it;
- //for( it = map.begin(); it != map.end(); ++it )
- // printf( "%s, %s earns %d\n", it.key().latin1(), it.data().name().latin1(), it.data().salary() );
+ QMap<Module*, QLibrary*>::Iterator it;
+ for( it = libraries.begin(); it != libraries.end(); ++it ){
+ if(it.key()->isOwner(i))
+ i->setModuleOwner(it.key());
+ }
@@ -311,2 +340,6 @@ void MainWindowImp::updateInterface(Interface *i){
typeName = "wlan";
+ // Actually try to use the Module
+ if(i->getModuleOwner() != NULL){
+ typeName = i->getModuleOwner()->getPixmapName(i);
+ }
QPixmap type = (Resource::loadPixmap(typeName));
diff --git a/noncore/net/networksetup/mainwindowimp.h b/noncore/net/networksetup/mainwindowimp.h
index 8e300bf..19ebaf2 100644
--- a/noncore/net/networksetup/mainwindowimp.h
+++ b/noncore/net/networksetup/mainwindowimp.h
@@ -44,3 +44,2 @@ private:
QMap<Module*, QLibrary*> libraries;
- QMap<Interface*, Module*> modules;
QMap<Interface*, QListViewItem*> items;
diff --git a/noncore/net/networksetup/module.h b/noncore/net/networksetup/module.h
index 13fd523..c1e9488 100644
--- a/noncore/net/networksetup/module.h
+++ b/noncore/net/networksetup/module.h
@@ -9,2 +9,3 @@
class QWidget;
+class QTabWidget;
@@ -19,4 +20,4 @@ public:
virtual bool isOwner(Interface *){ return false; };
- virtual QWidget *configure(){ return NULL; } ;
- virtual QWidget *information(){ return NULL; };
+ virtual QWidget *configure(QTabWidget **tabWidget){ return NULL; } ;
+ virtual QWidget *information(QTabWidget **tabWidget){ return NULL; };
virtual QList<Interface> getInterfaces() = 0;
@@ -25,3 +26,3 @@ public:
virtual bool remove(Interface* i) = 0;
-
+ virtual QString getPixmapName(Interface* i) = 0;
diff --git a/noncore/net/networksetup/networksetup.pro b/noncore/net/networksetup/networksetup.pro
index a01b050..0d48790 100644
--- a/noncore/net/networksetup/networksetup.pro
+++ b/noncore/net/networksetup/networksetup.pro
@@ -1,4 +1,4 @@
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 addserviceimp.h interface.h interfaceinformationimp.h interfacesetupimp.h interfaces.h defaultmodule.h kprocctrl.h module.h kprocess.h
diff --git a/noncore/settings/networksettings/interface.cpp b/noncore/settings/networksettings/interface.cpp
index f6eed00..5b21364 100644
--- a/noncore/settings/networksettings/interface.cpp
+++ b/noncore/settings/networksettings/interface.cpp
@@ -12,3 +12,3 @@
-Interface::Interface(QString name, bool newSatus): status(newSatus), attached(false), interfaceName(name), hardareName("Unknown"), moduleOwner("Default"), macAddress(""), ip("0.0.0.0"), broadcast(""), subnetMask("0.0.0.0"), dhcp(false){
+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){
refresh();
diff --git a/noncore/settings/networksettings/interface.h b/noncore/settings/networksettings/interface.h
index 1ad71eb..5dc95a4 100644
--- a/noncore/settings/networksettings/interface.h
+++ b/noncore/settings/networksettings/interface.h
@@ -5,2 +5,3 @@
+class Module;
class Interface {
@@ -23,4 +24,4 @@ public:
- virtual QString getModuleOwner(){ return moduleOwner; };
- virtual void setModuleOwner(QString owner="Default"){ moduleOwner = owner; };
+ virtual Module* getModuleOwner(){ return moduleOwner; };
+ virtual void setModuleOwner(Module *owner=NULL){ moduleOwner = owner; };
@@ -47,3 +48,3 @@ private:
QString hardareName;
- QString moduleOwner;
+ Module *moduleOwner;
diff --git a/noncore/settings/networksettings/interfacesetup.ui b/noncore/settings/networksettings/interfacesetup.ui
index ff9810e..d367608 100644
--- a/noncore/settings/networksettings/interfacesetup.ui
+++ b/noncore/settings/networksettings/interfacesetup.ui
@@ -13,4 +13,4 @@
<y>0</y>
- <width>177</width>
- <height>320</height>
+ <width>271</width>
+ <height>280</height>
</rect>
@@ -21,3 +21,3 @@
</property>
- <grid>
+ <vbox>
<property stdset="1">
@@ -30,18 +30,33 @@
</property>
- <widget row="1" column="0" rowspan="1" colspan="2" >
- <class>Line</class>
+ <widget>
+ <class>QCheckBox</class>
<property stdset="1">
<name>name</name>
- <cstring>Line1</cstring>
+ <cstring>autoStart</cstring>
</property>
<property stdset="1">
- <name>orientation</name>
- <enum>Horizontal</enum>
+ <name>text</name>
+ <string>Automaticly bring up</string>
</property>
</widget>
- <widget row="0" column="0" rowspan="1" colspan="2" >
- <class>QCheckBox</class>
+ <widget>
+ <class>QLayoutWidget</class>
<property stdset="1">
<name>name</name>
- <cstring>autoStart</cstring>
+ <cstring>Layout8</cstring>
+ </property>
+ <hbox>
+ <property stdset="1">
+ <name>margin</name>
+ <number>0</number>
+ </property>
+ <property stdset="1">
+ <name>spacing</name>
+ <number>6</number>
+ </property>
+ <widget>
+ <class>QLabel</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>TextLabel1</cstring>
</property>
@@ -49,6 +64,6 @@
<name>text</name>
- <string>Automaticly bring up</string>
+ <string>Profile</string>
</property>
</widget>
- <widget row="2" column="1" >
+ <widget>
<class>QComboBox</class>
@@ -65,14 +80,41 @@
</widget>
- <widget row="4" column="0" >
- <class>QLabel</class>
- <property stdset="1">
+ <spacer>
+ <property>
<name>name</name>
- <cstring>leaseHoursLabel</cstring>
+ <cstring>Spacer20</cstring>
</property>
<property stdset="1">
- <name>text</name>
- <string>Requested Lease</string>
+ <name>orientation</name>
+ <enum>Horizontal</enum>
+ </property>
+ <property stdset="1">
+ <name>sizeType</name>
+ <enum>Expanding</enum>
+ </property>
+ <property>
+ <name>sizeHint</name>
+ <size>
+ <width>20</width>
+ <height>20</height>
+ </size>
</property>
+ </spacer>
+ </hbox>
</widget>
- <widget row="3" column="0" rowspan="1" colspan="2" >
+ <widget>
+ <class>QLayoutWidget</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>Layout9</cstring>
+ </property>
+ <hbox>
+ <property stdset="1">
+ <name>margin</name>
+ <number>0</number>
+ </property>
+ <property stdset="1">
+ <name>spacing</name>
+ <number>6</number>
+ </property>
+ <widget>
<class>QCheckBox</class>
@@ -91,3 +133,3 @@
</widget>
- <widget row="2" column="0" >
+ <widget>
<class>QLabel</class>
@@ -95,3 +137,3 @@
<name>name</name>
- <cstring>TextLabel1</cstring>
+ <cstring>leaseHoursLabel</cstring>
</property>
@@ -99,6 +141,6 @@
<name>text</name>
- <string>Profile:</string>
+ <string>Requested Lease</string>
</property>
</widget>
- <widget row="4" column="1" >
+ <widget>
<class>QSpinBox</class>
@@ -125,24 +167,5 @@
</widget>
- <spacer row="6" column="1" >
- <property>
- <name>name</name>
- <cstring>Spacer9</cstring>
- </property>
- <property stdset="1">
- <name>orientation</name>
- <enum>Vertical</enum>
- </property>
- <property stdset="1">
- <name>sizeType</name>
- <enum>Expanding</enum>
- </property>
- <property>
- <name>sizeHint</name>
- <size>
- <width>20</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- <widget row="5" column="0" rowspan="1" colspan="2" >
+ </hbox>
+ </widget>
+ <widget>
<class>QGroupBox</class>
@@ -157,2 +180,10 @@
<property stdset="1">
+ <name>frameShape</name>
+ <enum>Box</enum>
+ </property>
+ <property stdset="1">
+ <name>frameShadow</name>
+ <enum>Sunken</enum>
+ </property>
+ <property stdset="1">
<name>title</name>
@@ -261,3 +292,24 @@
</widget>
- </grid>
+ <spacer>
+ <property>
+ <name>name</name>
+ <cstring>Spacer9</cstring>
+ </property>
+ <property stdset="1">
+ <name>orientation</name>
+ <enum>Vertical</enum>
+ </property>
+ <property stdset="1">
+ <name>sizeType</name>
+ <enum>Expanding</enum>
+ </property>
+ <property>
+ <name>sizeHint</name>
+ <size>
+ <width>20</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </vbox>
</widget>
diff --git a/noncore/settings/networksettings/mainwindow.ui b/noncore/settings/networksettings/mainwindow.ui
index c1fa101..a3f7bb1 100644
--- a/noncore/settings/networksettings/mainwindow.ui
+++ b/noncore/settings/networksettings/mainwindow.ui
@@ -13,3 +13,3 @@
<y>0</y>
- <width>218</width>
+ <width>217</width>
<height>289</height>
@@ -196,3 +196,14 @@
</property>
- <widget row="0" column="0" rowspan="1" colspan="2" >
+ <widget row="1" column="0" rowspan="1" colspan="3" >
+ <class>Line</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>Line1</cstring>
+ </property>
+ <property stdset="1">
+ <name>orientation</name>
+ <enum>Horizontal</enum>
+ </property>
+ </widget>
+ <widget row="0" column="0" >
<class>QLabel</class>
@@ -207,3 +218,3 @@
</widget>
- <widget row="0" column="2" >
+ <widget row="0" column="1" >
<class>QLabel</class>
@@ -226,14 +237,24 @@
</widget>
- <widget row="1" column="0" >
- <class>QLabel</class>
- <property stdset="1">
+ <spacer row="0" column="2" >
+ <property>
<name>name</name>
- <cstring>TextLabel1_2</cstring>
+ <cstring>Spacer2</cstring>
</property>
<property stdset="1">
- <name>text</name>
- <string>Profiles</string>
+ <name>orientation</name>
+ <enum>Horizontal</enum>
</property>
- </widget>
- <spacer row="5" column="2" >
+ <property stdset="1">
+ <name>sizeType</name>
+ <enum>Expanding</enum>
+ </property>
+ <property>
+ <name>sizeHint</name>
+ <size>
+ <width>20</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ <spacer row="6" column="2" >
<property>
@@ -258,10 +279,3 @@
</spacer>
- <widget row="2" column="0" rowspan="3" colspan="1" >
- <class>QListBox</class>
- <property stdset="1">
- <name>name</name>
- <cstring>profilesList</cstring>
- </property>
- </widget>
- <widget row="4" column="1" rowspan="1" colspan="2" >
+ <widget row="5" column="2" >
<class>QPushButton</class>
@@ -276,3 +290,3 @@
</widget>
- <widget row="3" column="1" rowspan="1" colspan="2" >
+ <widget row="4" column="2" >
<class>QPushButton</class>
@@ -287,3 +301,3 @@
</widget>
- <widget row="2" column="1" rowspan="1" colspan="2" >
+ <widget row="3" column="2" >
<class>QPushButton</class>
@@ -298,2 +312,20 @@
</widget>
+ <widget row="2" column="0" >
+ <class>QLabel</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>TextLabel1_2</cstring>
+ </property>
+ <property stdset="1">
+ <name>text</name>
+ <string>Profiles</string>
+ </property>
+ </widget>
+ <widget row="3" column="0" rowspan="3" colspan="2" >
+ <class>QListBox</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>profilesList</cstring>
+ </property>
+ </widget>
</grid>
diff --git a/noncore/settings/networksettings/mainwindowimp.cpp b/noncore/settings/networksettings/mainwindowimp.cpp
index 0f48a4b..89dac6f 100644
--- a/noncore/settings/networksettings/mainwindowimp.cpp
+++ b/noncore/settings/networksettings/mainwindowimp.cpp
@@ -153,3 +153,3 @@ void MainWindowImp::removeClicked(){
- if(modules.find(interfaceItems[item]) == modules.end()){
+ if((interfaceItems[item])->getModuleOwner() == NULL){
QMessageBox::information(this, "Can't remove interface.", "Interface is built in.", "Ok");
@@ -173,3 +173,3 @@ void MainWindowImp::configureClicked(){
- if(modules.find(interfaceItems[item]) == modules.end()){
+ if((interfaceItems[item])->getModuleOwner() == NULL){
InterfaceSetupImp *conf = new InterfaceSetupImp(0, "InterfaceConfiguration", interfaceItems[item]);
@@ -179,5 +179,20 @@ void MainWindowImp::configureClicked(){
else{
- InterfaceSetupImp *conf = new InterfaceSetupImp(this, "InterfaceConfiguration");
+ QTabWidget *t = NULL;
+ QWidget *conf = (interfaceItems[item])->getModuleOwner()->configure(&t);
+ if(conf != NULL){
+ qDebug("Conf found");
+ if(t != NULL){
+ qDebug("Adding Interface");
+ InterfaceSetupImp *i = new InterfaceSetupImp(t, "TCPIPInformation", interfaceItems[item], true);
+ t->insertTab(i, "TCP/IP");
+ }
+ conf->showMaximized();
conf->show();
}
+ else{
+ InterfaceSetupImp *i = new InterfaceSetupImp(0, "TCPIPInformation", interfaceItems[item], true);
+ i->showMaximized();
+ i->show();
+ }
+ }
}
@@ -195,3 +210,3 @@ void MainWindowImp::informationClicked(){
- if(modules.find(interfaceItems[item]) == modules.end()){
+ if( (interfaceItems[item])->getModuleOwner() == NULL){
InterfaceInformationImp *i = new InterfaceInformationImp(0, "InterfaceInformationImp", interfaceItems[item]);
@@ -201,6 +216,18 @@ void MainWindowImp::informationClicked(){
else{
- QTabWidget *t = new QTabWidget(this, "InterfaceInformationTAB");
+ QTabWidget *t = NULL;
+ QWidget *conf = (interfaceItems[item])->getModuleOwner()->information(&t);
+ if(conf != NULL){
+ if(t){
+ qDebug("Adding Interface");
InterfaceInformationImp *i = new InterfaceInformationImp(t, "TCPIPInformation", interfaceItems[item], true);
t->insertTab(i, "TCP/IP");
- t->show();
+ }
+ conf->showMaximized();
+ conf->show();
+ }
+ else{
+ InterfaceInformationImp *i = new InterfaceInformationImp(0, "TCPIPInformation", interfaceItems[item], true);
+ i->showMaximized();
+ i->show();
+ }
}
@@ -288,5 +315,7 @@ void MainWindowImp::updateInterface(Interface *i){
// See if you can't find a module owner for this interface
- //EmployeeMap::Iterator it;
- //for( it = map.begin(); it != map.end(); ++it )
- // printf( "%s, %s earns %d\n", it.key().latin1(), it.data().name().latin1(), it.data().salary() );
+ QMap<Module*, QLibrary*>::Iterator it;
+ for( it = libraries.begin(); it != libraries.end(); ++it ){
+ if(it.key()->isOwner(i))
+ i->setModuleOwner(it.key());
+ }
@@ -311,2 +340,6 @@ void MainWindowImp::updateInterface(Interface *i){
typeName = "wlan";
+ // Actually try to use the Module
+ if(i->getModuleOwner() != NULL){
+ typeName = i->getModuleOwner()->getPixmapName(i);
+ }
QPixmap type = (Resource::loadPixmap(typeName));
diff --git a/noncore/settings/networksettings/mainwindowimp.h b/noncore/settings/networksettings/mainwindowimp.h
index 8e300bf..19ebaf2 100644
--- a/noncore/settings/networksettings/mainwindowimp.h
+++ b/noncore/settings/networksettings/mainwindowimp.h
@@ -44,3 +44,2 @@ private:
QMap<Module*, QLibrary*> libraries;
- QMap<Interface*, Module*> modules;
QMap<Interface*, QListViewItem*> items;
diff --git a/noncore/settings/networksettings/module.h b/noncore/settings/networksettings/module.h
index 13fd523..c1e9488 100644
--- a/noncore/settings/networksettings/module.h
+++ b/noncore/settings/networksettings/module.h
@@ -9,2 +9,3 @@
class QWidget;
+class QTabWidget;
@@ -19,4 +20,4 @@ public:
virtual bool isOwner(Interface *){ return false; };
- virtual QWidget *configure(){ return NULL; } ;
- virtual QWidget *information(){ return NULL; };
+ virtual QWidget *configure(QTabWidget **tabWidget){ return NULL; } ;
+ virtual QWidget *information(QTabWidget **tabWidget){ return NULL; };
virtual QList<Interface> getInterfaces() = 0;
@@ -25,3 +26,3 @@ public:
virtual bool remove(Interface* i) = 0;
-
+ virtual QString getPixmapName(Interface* i) = 0;
diff --git a/noncore/settings/networksettings/networksetup.pro b/noncore/settings/networksettings/networksetup.pro
index a01b050..0d48790 100644
--- a/noncore/settings/networksettings/networksetup.pro
+++ b/noncore/settings/networksettings/networksetup.pro
@@ -1,4 +1,4 @@
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 addserviceimp.h interface.h interfaceinformationimp.h interfacesetupimp.h interfaces.h defaultmodule.h kprocctrl.h module.h kprocess.h