summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/net/networksetup/interfaceadvanced.ui140
-rw-r--r--noncore/net/networksetup/interfaceinformation.ui165
-rw-r--r--noncore/net/networksetup/interfacesetup.ui138
-rw-r--r--noncore/net/networksetup/mainwindow.ui2
-rw-r--r--noncore/net/networksetup/mainwindowimp.cpp74
-rw-r--r--noncore/net/networksetup/module.h4
-rw-r--r--noncore/net/networksetup/networksetup.pro4
-rw-r--r--noncore/settings/networksettings/interfaceadvanced.ui140
-rw-r--r--noncore/settings/networksettings/interfaceinformation.ui165
-rw-r--r--noncore/settings/networksettings/interfacesetup.ui138
-rw-r--r--noncore/settings/networksettings/mainwindow.ui2
-rw-r--r--noncore/settings/networksettings/mainwindowimp.cpp74
-rw-r--r--noncore/settings/networksettings/module.h4
-rw-r--r--noncore/settings/networksettings/networksetup.pro4
14 files changed, 570 insertions, 484 deletions
diff --git a/noncore/net/networksetup/interfaceadvanced.ui b/noncore/net/networksetup/interfaceadvanced.ui
index 8ef0b29..7520abe 100644
--- a/noncore/net/networksetup/interfaceadvanced.ui
+++ b/noncore/net/networksetup/interfaceadvanced.ui
@@ -11,8 +11,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>197</width>
- <height>253</height>
+ <width>188</width>
+ <height>277</height>
</rect>
</property>
<property stdset="1">
@@ -99,22 +99,26 @@
<string>Interface</string>
</property>
</widget>
- <widget row="8" column="0" >
+ <widget row="4" column="0" >
<class>QLabel</class>
<property stdset="1">
<name>name</name>
- <cstring>TextLabel9</cstring>
+ <cstring>TextLabel4</cstring>
+ </property>
+ <property stdset="1">
+ <name>enabled</name>
+ <bool>true</bool>
</property>
<property stdset="1">
<name>text</name>
- <string>Lease Expires</string>
+ <string>Subnet Mask</string>
</property>
</widget>
- <widget row="8" column="1" >
+ <widget row="2" column="1" >
<class>QLabel</class>
<property stdset="1">
<name>name</name>
- <cstring>leaseExpiresLabel</cstring>
+ <cstring>ipAddressLabel</cstring>
</property>
<property stdset="1">
<name>frameShape</name>
@@ -126,14 +130,14 @@
</property>
<property stdset="1">
<name>text</name>
- <string></string>
+ <string>0.0.0.0</string>
</property>
</widget>
- <widget row="7" column="1" >
+ <widget row="4" column="1" >
<class>QLabel</class>
<property stdset="1">
<name>name</name>
- <cstring>leaseObtainedLabel</cstring>
+ <cstring>subnetMaskLabel</cstring>
</property>
<property stdset="1">
<name>frameShape</name>
@@ -145,25 +149,25 @@
</property>
<property stdset="1">
<name>text</name>
- <string></string>
+ <string>0.0.0.0</string>
</property>
</widget>
- <widget row="7" column="0" >
+ <widget row="3" column="0" >
<class>QLabel</class>
<property stdset="1">
<name>name</name>
- <cstring>TextLabel8</cstring>
+ <cstring>TextLabel2</cstring>
</property>
<property stdset="1">
<name>text</name>
- <string>Lease Obtained</string>
+ <string>Broadcast</string>
</property>
</widget>
- <widget row="6" column="1" >
+ <widget row="3" column="1" >
<class>QLabel</class>
<property stdset="1">
<name>name</name>
- <cstring>dhcpServerLabel</cstring>
+ <cstring>broadcastLabel</cstring>
</property>
<property stdset="1">
<name>frameShape</name>
@@ -173,38 +177,42 @@
<name>frameShadow</name>
<enum>Sunken</enum>
</property>
- <property stdset="1">
- <name>text</name>
- <string>255.255.255.255</string>
- </property>
</widget>
- <widget row="6" column="0" >
- <class>QLabel</class>
+ <widget row="5" column="0" rowspan="1" colspan="2" >
+ <class>QGroupBox</class>
<property stdset="1">
<name>name</name>
- <cstring>TextLabel6</cstring>
+ <cstring>GroupBox2</cstring>
</property>
<property stdset="1">
- <name>text</name>
- <string>DHCP Server</string>
+ <name>title</name>
+ <string>DHCP Information</string>
</property>
- </widget>
- <widget row="4" column="0" >
+ <grid>
+ <property stdset="1">
+ <name>margin</name>
+ <number>11</number>
+ </property>
+ <property stdset="1">
+ <name>spacing</name>
+ <number>6</number>
+ </property>
+ <widget row="0" column="0" >
<class>QLabel</class>
<property stdset="1">
<name>name</name>
- <cstring>TextLabel4</cstring>
+ <cstring>TextLabel6</cstring>
</property>
<property stdset="1">
<name>text</name>
- <string>Subnet Mask</string>
+ <string>DHCP Server</string>
</property>
</widget>
<widget row="2" column="1" >
<class>QLabel</class>
<property stdset="1">
<name>name</name>
- <cstring>ipAddressLabel</cstring>
+ <cstring>leaseExpiresLabel</cstring>
</property>
<property stdset="1">
<name>frameShape</name>
@@ -216,14 +224,14 @@
</property>
<property stdset="1">
<name>text</name>
- <string>0.0.0.0</string>
+ <string></string>
</property>
</widget>
- <widget row="4" column="1" >
+ <widget row="1" column="1" >
<class>QLabel</class>
<property stdset="1">
<name>name</name>
- <cstring>subnetMaskLabel</cstring>
+ <cstring>leaseObtainedLabel</cstring>
</property>
<property stdset="1">
<name>frameShape</name>
@@ -235,46 +243,36 @@
</property>
<property stdset="1">
<name>text</name>
- <string>0.0.0.0</string>
+ <string></string>
</property>
</widget>
- <spacer row="9" column="1" >
- <property>
- <name>name</name>
- <cstring>Spacer2</cstring>
- </property>
+ <widget row="2" column="0" >
+ <class>QLabel</class>
<property stdset="1">
- <name>orientation</name>
- <enum>Vertical</enum>
+ <name>name</name>
+ <cstring>TextLabel9</cstring>
</property>
<property stdset="1">
- <name>sizeType</name>
- <enum>Expanding</enum>
- </property>
- <property>
- <name>sizeHint</name>
- <size>
- <width>20</width>
- <height>20</height>
- </size>
+ <name>text</name>
+ <string>Lease Expires</string>
</property>
- </spacer>
- <widget row="3" column="0" >
+ </widget>
+ <widget row="1" column="0" >
<class>QLabel</class>
<property stdset="1">
<name>name</name>
- <cstring>TextLabel2</cstring>
+ <cstring>TextLabel8</cstring>
</property>
<property stdset="1">
<name>text</name>
- <string>Broadcast</string>
+ <string>Lease Obtained</string>
</property>
</widget>
- <widget row="3" column="1" >
+ <widget row="0" column="1" >
<class>QLabel</class>
<property stdset="1">
<name>name</name>
- <cstring>broadcastLabel</cstring>
+ <cstring>dhcpServerLabel</cstring>
</property>
<property stdset="1">
<name>frameShape</name>
@@ -284,18 +282,34 @@
<name>frameShadow</name>
<enum>Sunken</enum>
</property>
- </widget>
- <widget row="5" column="0" rowspan="1" colspan="2" >
- <class>Line</class>
<property stdset="1">
+ <name>text</name>
+ <string></string>
+ </property>
+ </widget>
+ </grid>
+ </widget>
+ <spacer row="6" column="1" >
+ <property>
<name>name</name>
- <cstring>Line2</cstring>
+ <cstring>Spacer2</cstring>
</property>
<property stdset="1">
<name>orientation</name>
- <enum>Horizontal</enum>
+ <enum>Vertical</enum>
</property>
- </widget>
+ <property stdset="1">
+ <name>sizeType</name>
+ <enum>Expanding</enum>
+ </property>
+ <property>
+ <name>sizeHint</name>
+ <size>
+ <width>20</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
</grid>
</widget>
<customwidgets>
@@ -317,7 +331,7 @@
<images>
<image>
<name>image0</name>
- <data format="XPM.GZ" length="45">789cd3d7528808f055d0d2e72a2e492cc94c5648ce482c52d04a29cdcdad8c8eb5ade6523250004143a55a6b2e0026630c4f</data>
+ <data format="XPM.GZ" length="646">789c6dd2c10ac2300c00d07bbf2234b7229d1be245fc04c5a3201e4615f430059d0711ff5ddb2e6bb236ec90eed134cb5a19d8ef36602af5ecdbfeeac05dda0798d3abebde87e3faa374d3807fa0d633a52d38d8de6f679fe33fc776e196f53cd010188256a3600a292882096246517815ca99884606e18044a3a40d91824820924265a7923a2e8bcd05f33db1173e002913175f2a6be6d3294871a2d95fa00e8a94ee017b69d339d90df1e77c57ea072ede6758</data>
</image>
</images>
</UI>
diff --git a/noncore/net/networksetup/interfaceinformation.ui b/noncore/net/networksetup/interfaceinformation.ui
index 2a9b3fb..8b6280d 100644
--- a/noncore/net/networksetup/interfaceinformation.ui
+++ b/noncore/net/networksetup/interfaceinformation.ui
@@ -11,8 +11,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>191</width>
- <height>241</height>
+ <width>203</width>
+ <height>244</height>
</rect>
</property>
<property stdset="1">
@@ -100,76 +100,6 @@
<enum>Horizontal</enum>
</property>
</widget>
- <spacer row="6" column="1" >
- <property>
- <name>name</name>
- <cstring>Spacer18</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" >
- <class>QLayoutWidget</class>
- <property stdset="1">
- <name>name</name>
- <cstring>Layout2</cstring>
- </property>
- <hbox>
- <property stdset="1">
- <name>margin</name>
- <number>0</number>
- </property>
- <property stdset="1">
- <name>spacing</name>
- <number>6</number>
- </property>
- <spacer>
- <property>
- <name>name</name>
- <cstring>Spacer10</cstring>
- </property>
- <property stdset="1">
- <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>
- <widget>
- <class>QPushButton</class>
- <property stdset="1">
- <name>name</name>
- <cstring>advancedButton</cstring>
- </property>
- <property stdset="1">
- <name>text</name>
- <string>View Advanced Information</string>
- </property>
- </widget>
- </hbox>
- </widget>
<widget row="0" column="0" >
<class>QLabel</class>
<property stdset="1">
@@ -210,6 +140,14 @@
<cstring>TextLabel24</cstring>
</property>
<property stdset="1">
+ <name>frameShape</name>
+ <enum>MShape</enum>
+ </property>
+ <property stdset="1">
+ <name>frameShadow</name>
+ <enum>MShadow</enum>
+ </property>
+ <property stdset="1">
<name>text</name>
<string>Broadcast</string>
</property>
@@ -290,6 +228,87 @@
<string>0.0.0.0</string>
</property>
</widget>
+ <spacer row="7" column="1" >
+ <property>
+ <name>name</name>
+ <cstring>Spacer18</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="6" column="0" rowspan="1" colspan="2" >
+ <class>QLayoutWidget</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>Layout2</cstring>
+ </property>
+ <hbox>
+ <property stdset="1">
+ <name>margin</name>
+ <number>0</number>
+ </property>
+ <property stdset="1">
+ <name>spacing</name>
+ <number>6</number>
+ </property>
+ <spacer>
+ <property>
+ <name>name</name>
+ <cstring>Spacer10</cstring>
+ </property>
+ <property stdset="1">
+ <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>
+ <widget>
+ <class>QPushButton</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>advancedButton</cstring>
+ </property>
+ <property stdset="1">
+ <name>text</name>
+ <string>View Advanced Information</string>
+ </property>
+ </widget>
+ </hbox>
+ </widget>
+ <widget row="5" column="0" rowspan="1" colspan="2" >
+ <class>Line</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>Line5</cstring>
+ </property>
+ <property stdset="1">
+ <name>orientation</name>
+ <enum>Horizontal</enum>
+ </property>
+ </widget>
</grid>
</widget>
<customwidgets>
@@ -314,4 +333,6 @@
<data format="XPM.GZ" length="646">789c6dd2c10ac2300c00d07bbf2234b7229d1be245fc04c5a3201e4615f430059d0711ff5ddb2e6bb236ec90eed134cb5a19d8ef36602af5ecdbfeeac05dda0798d3abebde87e3faa374d3807fa0d633a52d38d8de6f679fe33fc776e196f53cd010188256a3600a292882096246517815ca99884606e18044a3a40d91824820924265a7923a2e8bcd05f33db1173e002913175f2a6be6d3294871a2d95fa00e8a94ee017b69d339d90df1e77c57ea072ede6758</data>
</image>
</images>
+<connections>
+</connections>
</UI>
diff --git a/noncore/net/networksetup/interfacesetup.ui b/noncore/net/networksetup/interfacesetup.ui
index 698422c..ff9810e 100644
--- a/noncore/net/networksetup/interfacesetup.ui
+++ b/noncore/net/networksetup/interfacesetup.ui
@@ -11,8 +11,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>193</width>
- <height>310</height>
+ <width>177</width>
+ <height>320</height>
</rect>
</property>
<property stdset="1">
@@ -39,17 +39,6 @@
<enum>Horizontal</enum>
</property>
</widget>
- <widget row="6" column="0" >
- <class>QLabel</class>
- <property stdset="1">
- <name>name</name>
- <cstring>TextLabel4</cstring>
- </property>
- <property stdset="1">
- <name>text</name>
- <string>IP Address</string>
- </property>
- </widget>
<widget row="0" column="0" rowspan="1" colspan="2" >
<class>QCheckBox</class>
<property stdset="1">
@@ -74,28 +63,6 @@
<cstring>profileCombo</cstring>
</property>
</widget>
- <widget row="5" column="0" rowspan="1" colspan="2" >
- <class>QGroupBox</class>
- <property stdset="1">
- <name>name</name>
- <cstring>staticGroupBox</cstring>
- </property>
- <property stdset="1">
- <name>enabled</name>
- <bool>false</bool>
- </property>
- <property stdset="1">
- <name>title</name>
- <string>Static Ip Configuration</string>
- </property>
- </widget>
- <widget row="6" column="1" >
- <class>QLineEdit</class>
- <property stdset="1">
- <name>name</name>
- <cstring>ipAddressEdit</cstring>
- </property>
- </widget>
<widget row="4" column="0" >
<class>QLabel</class>
<property stdset="1">
@@ -122,17 +89,6 @@
<bool>true</bool>
</property>
</widget>
- <widget row="7" column="0" >
- <class>QLabel</class>
- <property stdset="1">
- <name>name</name>
- <cstring>TextLabel5</cstring>
- </property>
- <property stdset="1">
- <name>text</name>
- <string>Subnet Mask</string>
- </property>
- </widget>
<widget row="2" column="0" >
<class>QLabel</class>
<property stdset="1">
@@ -167,7 +123,7 @@
<number>24</number>
</property>
</widget>
- <spacer row="11" column="1" >
+ <spacer row="6" column="1" >
<property>
<name>name</name>
<cstring>Spacer9</cstring>
@@ -188,25 +144,69 @@
</size>
</property>
</spacer>
- <widget row="10" column="1" >
+ <widget row="5" column="0" rowspan="1" colspan="2" >
+ <class>QGroupBox</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>staticGroupBox</cstring>
+ </property>
+ <property stdset="1">
+ <name>enabled</name>
+ <bool>false</bool>
+ </property>
+ <property stdset="1">
+ <name>title</name>
+ <string>Static Ip Configuration</string>
+ </property>
+ <grid>
+ <property stdset="1">
+ <name>margin</name>
+ <number>11</number>
+ </property>
+ <property stdset="1">
+ <name>spacing</name>
+ <number>6</number>
+ </property>
+ <widget row="3" column="1" >
<class>QLineEdit</class>
<property stdset="1">
<name>name</name>
- <cstring>secondDNSLineEdit</cstring>
+ <cstring>firstDNSLineEdit</cstring>
</property>
</widget>
- <widget row="10" column="0" >
+ <widget row="1" column="0" >
<class>QLabel</class>
<property stdset="1">
<name>name</name>
- <cstring>TextLabel3</cstring>
+ <cstring>TextLabel5</cstring>
</property>
<property stdset="1">
<name>text</name>
- <string>Second DNS</string>
+ <string>Subnet Mask</string>
+ </property>
+ </widget>
+ <widget row="2" column="1" >
+ <class>QLineEdit</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>gatewayEdit</cstring>
+ </property>
+ </widget>
+ <widget row="1" column="1" >
+ <class>QLineEdit</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>subnetMaskEdit</cstring>
+ </property>
+ </widget>
+ <widget row="0" column="1" >
+ <class>QLineEdit</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>ipAddressEdit</cstring>
</property>
</widget>
- <widget row="9" column="0" >
+ <widget row="3" column="0" >
<class>QLabel</class>
<property stdset="1">
<name>name</name>
@@ -217,37 +217,47 @@
<string>First DNS</string>
</property>
</widget>
- <widget row="9" column="1" >
+ <widget row="4" column="1" >
<class>QLineEdit</class>
<property stdset="1">
<name>name</name>
- <cstring>firstDNSLineEdit</cstring>
+ <cstring>secondDNSLineEdit</cstring>
</property>
</widget>
- <widget row="8" column="0" >
+ <widget row="0" column="0" >
<class>QLabel</class>
<property stdset="1">
<name>name</name>
- <cstring>TextLabel1_2</cstring>
+ <cstring>TextLabel4</cstring>
</property>
<property stdset="1">
<name>text</name>
- <string>Gateway</string>
+ <string>IP Address</string>
</property>
</widget>
- <widget row="7" column="1" >
- <class>QLineEdit</class>
+ <widget row="2" column="0" >
+ <class>QLabel</class>
<property stdset="1">
<name>name</name>
- <cstring>subnetMaskEdit</cstring>
+ <cstring>TextLabel1_2</cstring>
+ </property>
+ <property stdset="1">
+ <name>text</name>
+ <string>Gateway</string>
</property>
</widget>
- <widget row="8" column="1" >
- <class>QLineEdit</class>
+ <widget row="4" column="0" >
+ <class>QLabel</class>
<property stdset="1">
<name>name</name>
- <cstring>gatewayEdit</cstring>
+ <cstring>TextLabel3</cstring>
</property>
+ <property stdset="1">
+ <name>text</name>
+ <string>Second DNS</string>
+ </property>
+ </widget>
+ </grid>
</widget>
</grid>
</widget>
diff --git a/noncore/net/networksetup/mainwindow.ui b/noncore/net/networksetup/mainwindow.ui
index f7efe99..c1fa101 100644
--- a/noncore/net/networksetup/mainwindow.ui
+++ b/noncore/net/networksetup/mainwindow.ui
@@ -271,7 +271,7 @@
</property>
<property stdset="1">
<name>text</name>
- <string>Set Current</string>
+ <string>&amp;Set Current</string>
</property>
</widget>
<widget row="3" column="1" rowspan="1" colspan="2" >
diff --git a/noncore/net/networksetup/mainwindowimp.cpp b/noncore/net/networksetup/mainwindowimp.cpp
index 2f821a9..0f48a4b 100644
--- a/noncore/net/networksetup/mainwindowimp.cpp
+++ b/noncore/net/networksetup/mainwindowimp.cpp
@@ -2,10 +2,10 @@
#include "addserviceimp.h"
#include "interfaceinformationimp.h"
#include "interfacesetupimp.h"
-#include "interface.h"
#include "kprocess.h"
#include "module.h"
+
#include <qpushbutton.h>
#include <qtabwidget.h>
#include <qlistbox.h>
@@ -31,11 +31,6 @@
#define TEMP_ALL "/tmp/ifconfig-a"
#define TEMP_UP "/tmp/ifconfig"
-#define NO_SELECT_ERROR_AND_RETURN { \
- QMessageBox::information(this, "Error","Please select an interface.", "Ok"); \
- return; \
-}
-
MainWindowImp::MainWindowImp(QWidget *parent, const char *name) : MainWindow(parent, name, true) {
connect(addServiceButton, SIGNAL(clicked()), this, SLOT(addClicked()));
connect(removeServiceButton, SIGNAL(clicked()), this, SLOT(removeClicked()));
@@ -81,6 +76,24 @@ MainWindowImp::~MainWindowImp(){
}
void MainWindowImp::loadModules(QString path){
+ qDebug(path.latin1());
+ QDir d;
+ d.setPath(path);
+ if(!d.exists()){
+ qDebug("MainWindowImp:: Path doesn't exists");
+ return;
+ }
+ d.setFilter( QDir::Files | QDir::NoSymLinks );
+ const QFileInfoList *list = d.entryInfoList();
+ QFileInfoListIterator it( *list );
+ QFileInfo *fi;
+ while ( (fi=it.current()) ) {
+ if(fi->fileName().contains(".so")){
+ qDebug("Found");
+ Module *foo = loadPlugin(path + "/" + fi->fileName());
+ }
+ ++it;
+ }
}
/**
@@ -90,7 +103,7 @@ void MainWindowImp::loadModules(QString path){
* @return pointer to the function with name resolveString or NULL
*/
Module* MainWindowImp::loadPlugin(QString pluginFileName, QString resolveString){
- //qDebug(pluginFileName.latin1());
+ qDebug(pluginFileName.latin1());
QLibrary *lib = new QLibrary(pluginFileName);
void *functionPointer = lib->resolve(resolveString);
if( !functionPointer ){
@@ -112,34 +125,6 @@ Module* MainWindowImp::loadPlugin(QString pluginFileName, QString resolveString)
return object;
}
-/*
-QList<QString> MainWindowImp::retrieveUnloadedPluginList(){
- QString DirStr = QDir::homeDirPath() + "/.networksetup/" ;
- QString path = DirStr + "plugins";
- QDir d(path);
- d.setFilter( QDir::Files | QDir::Hidden );
-
- QMap<QObject*, QLibrary*>::Iterator libraryIt;
- QList<QString> rlist;
- rlist.setAutoDelete(false);
-
- const QFileInfoList *list = d.entryInfoList();
- QFileInfoListIterator it( *list );
- QFileInfo *fi;
- while ( (fi=it.current()) ) {
- if(fi->fileName().contains(".so")){
- for( libraryIt = libraries.begin(); libraryIt != libraries.end(); ++libraryIt )
- if((path + "/" + fi->fileName()) != (libraryIt.data())->library()){
- QString *s = new QString(path + "/" + fi->fileName());
- rlist.append(s);
- }
- }
- ++it;
- }
- return rlist;
-}
-*/
-
/**
* The Add button was clicked. Bring up the add dialog and if OK is hit
* load the plugin and append it to the list
@@ -161,7 +146,10 @@ void MainWindowImp::addClicked(){
*/
void MainWindowImp::removeClicked(){
QListViewItem *item = serviceList->currentItem();
- if(item == NULL) NO_SELECT_ERROR_AND_RETURN
+ if(item == NULL) {
+ QMessageBox::information(this, "Error","Please select an interface.", "Ok");
+ return;
+ }
if(modules.find(interfaceItems[item]) == modules.end()){
QMessageBox::information(this, "Can't remove interface.", "Interface is built in.", "Ok");
@@ -178,7 +166,10 @@ void MainWindowImp::removeClicked(){
*/
void MainWindowImp::configureClicked(){
QListViewItem *item = serviceList->currentItem();
- if(item == NULL) NO_SELECT_ERROR_AND_RETURN
+ if(item == NULL){
+ QMessageBox::information(this, "Error","Please select an interface.", "Ok");
+ return;
+ }
if(modules.find(interfaceItems[item]) == modules.end()){
InterfaceSetupImp *conf = new InterfaceSetupImp(0, "InterfaceConfiguration", interfaceItems[item]);
@@ -197,7 +188,10 @@ void MainWindowImp::configureClicked(){
*/
void MainWindowImp::informationClicked(){
QListViewItem *item = serviceList->currentItem();
- if(item == NULL)NO_SELECT_ERROR_AND_RETURN
+ if(item == NULL){
+ QMessageBox::information(this, "Error","Please select an interface.", "Ok");
+ return;
+ }
if(modules.find(interfaceItems[item]) == modules.end()){
InterfaceInformationImp *i = new InterfaceInformationImp(0, "InterfaceInformationImp", interfaceItems[item]);
@@ -311,6 +305,10 @@ void MainWindowImp::updateInterface(Interface *i){
QString typeName = "lan";
if(i->getHardwareName().contains("Local Loopback"))
typeName = "lo";
+ if(i->getInterfaceName().contains("irda"))
+ typeName = "irda";
+ if(i->getInterfaceName().contains("wlan"))
+ typeName = "wlan";
QPixmap type = (Resource::loadPixmap(typeName));
item->setPixmap(1, type);
diff --git a/noncore/net/networksetup/module.h b/noncore/net/networksetup/module.h
index f146d8c..13fd523 100644
--- a/noncore/net/networksetup/module.h
+++ b/noncore/net/networksetup/module.h
@@ -1,5 +1,5 @@
-#ifndef MODULE_H
-#define MODULE_H
+#ifndef NETCONF_MODULE_H
+#define NETCONF_MODULE_H
#include <qobject.h>
#include <qlist.h>
diff --git a/noncore/net/networksetup/networksetup.pro b/noncore/net/networksetup/networksetup.pro
index 7d9918b..a01b050 100644
--- a/noncore/net/networksetup/networksetup.pro
+++ b/noncore/net/networksetup/networksetup.pro
@@ -3,8 +3,8 @@ 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
SOURCES = main.cpp mainwindowimp.cpp addserviceimp.cpp interface.cpp interfaceinformationimp.cpp interfacesetupimp.cpp kprocctrl.cpp kprocess.cpp interfaces.cpp
-INCLUDEPATH += $(QPEDIR)/include
-DEPENDPATH += $(QPEDIR)/include
+#INCLUDEPATH += $(QPEDIR)/include
+#DEPENDPATH += $(QPEDIR)/include
LIBS += -lqpe
INTERFACES = mainwindow.ui addservice.ui interfaceinformation.ui interfaceadvanced.ui interfacesetup.ui
TARGET = networksetup
diff --git a/noncore/settings/networksettings/interfaceadvanced.ui b/noncore/settings/networksettings/interfaceadvanced.ui
index 8ef0b29..7520abe 100644
--- a/noncore/settings/networksettings/interfaceadvanced.ui
+++ b/noncore/settings/networksettings/interfaceadvanced.ui
@@ -11,8 +11,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>197</width>
- <height>253</height>
+ <width>188</width>
+ <height>277</height>
</rect>
</property>
<property stdset="1">
@@ -99,22 +99,26 @@
<string>Interface</string>
</property>
</widget>
- <widget row="8" column="0" >
+ <widget row="4" column="0" >
<class>QLabel</class>
<property stdset="1">
<name>name</name>
- <cstring>TextLabel9</cstring>
+ <cstring>TextLabel4</cstring>
+ </property>
+ <property stdset="1">
+ <name>enabled</name>
+ <bool>true</bool>
</property>
<property stdset="1">
<name>text</name>
- <string>Lease Expires</string>
+ <string>Subnet Mask</string>
</property>
</widget>
- <widget row="8" column="1" >
+ <widget row="2" column="1" >
<class>QLabel</class>
<property stdset="1">
<name>name</name>
- <cstring>leaseExpiresLabel</cstring>
+ <cstring>ipAddressLabel</cstring>
</property>
<property stdset="1">
<name>frameShape</name>
@@ -126,14 +130,14 @@
</property>
<property stdset="1">
<name>text</name>
- <string></string>
+ <string>0.0.0.0</string>
</property>
</widget>
- <widget row="7" column="1" >
+ <widget row="4" column="1" >
<class>QLabel</class>
<property stdset="1">
<name>name</name>
- <cstring>leaseObtainedLabel</cstring>
+ <cstring>subnetMaskLabel</cstring>
</property>
<property stdset="1">
<name>frameShape</name>
@@ -145,25 +149,25 @@
</property>
<property stdset="1">
<name>text</name>
- <string></string>
+ <string>0.0.0.0</string>
</property>
</widget>
- <widget row="7" column="0" >
+ <widget row="3" column="0" >
<class>QLabel</class>
<property stdset="1">
<name>name</name>
- <cstring>TextLabel8</cstring>
+ <cstring>TextLabel2</cstring>
</property>
<property stdset="1">
<name>text</name>
- <string>Lease Obtained</string>
+ <string>Broadcast</string>
</property>
</widget>
- <widget row="6" column="1" >
+ <widget row="3" column="1" >
<class>QLabel</class>
<property stdset="1">
<name>name</name>
- <cstring>dhcpServerLabel</cstring>
+ <cstring>broadcastLabel</cstring>
</property>
<property stdset="1">
<name>frameShape</name>
@@ -173,38 +177,42 @@
<name>frameShadow</name>
<enum>Sunken</enum>
</property>
- <property stdset="1">
- <name>text</name>
- <string>255.255.255.255</string>
- </property>
</widget>
- <widget row="6" column="0" >
- <class>QLabel</class>
+ <widget row="5" column="0" rowspan="1" colspan="2" >
+ <class>QGroupBox</class>
<property stdset="1">
<name>name</name>
- <cstring>TextLabel6</cstring>
+ <cstring>GroupBox2</cstring>
</property>
<property stdset="1">
- <name>text</name>
- <string>DHCP Server</string>
+ <name>title</name>
+ <string>DHCP Information</string>
</property>
- </widget>
- <widget row="4" column="0" >
+ <grid>
+ <property stdset="1">
+ <name>margin</name>
+ <number>11</number>
+ </property>
+ <property stdset="1">
+ <name>spacing</name>
+ <number>6</number>
+ </property>
+ <widget row="0" column="0" >
<class>QLabel</class>
<property stdset="1">
<name>name</name>
- <cstring>TextLabel4</cstring>
+ <cstring>TextLabel6</cstring>
</property>
<property stdset="1">
<name>text</name>
- <string>Subnet Mask</string>
+ <string>DHCP Server</string>
</property>
</widget>
<widget row="2" column="1" >
<class>QLabel</class>
<property stdset="1">
<name>name</name>
- <cstring>ipAddressLabel</cstring>
+ <cstring>leaseExpiresLabel</cstring>
</property>
<property stdset="1">
<name>frameShape</name>
@@ -216,14 +224,14 @@
</property>
<property stdset="1">
<name>text</name>
- <string>0.0.0.0</string>
+ <string></string>
</property>
</widget>
- <widget row="4" column="1" >
+ <widget row="1" column="1" >
<class>QLabel</class>
<property stdset="1">
<name>name</name>
- <cstring>subnetMaskLabel</cstring>
+ <cstring>leaseObtainedLabel</cstring>
</property>
<property stdset="1">
<name>frameShape</name>
@@ -235,46 +243,36 @@
</property>
<property stdset="1">
<name>text</name>
- <string>0.0.0.0</string>
+ <string></string>
</property>
</widget>
- <spacer row="9" column="1" >
- <property>
- <name>name</name>
- <cstring>Spacer2</cstring>
- </property>
+ <widget row="2" column="0" >
+ <class>QLabel</class>
<property stdset="1">
- <name>orientation</name>
- <enum>Vertical</enum>
+ <name>name</name>
+ <cstring>TextLabel9</cstring>
</property>
<property stdset="1">
- <name>sizeType</name>
- <enum>Expanding</enum>
- </property>
- <property>
- <name>sizeHint</name>
- <size>
- <width>20</width>
- <height>20</height>
- </size>
+ <name>text</name>
+ <string>Lease Expires</string>
</property>
- </spacer>
- <widget row="3" column="0" >
+ </widget>
+ <widget row="1" column="0" >
<class>QLabel</class>
<property stdset="1">
<name>name</name>
- <cstring>TextLabel2</cstring>
+ <cstring>TextLabel8</cstring>
</property>
<property stdset="1">
<name>text</name>
- <string>Broadcast</string>
+ <string>Lease Obtained</string>
</property>
</widget>
- <widget row="3" column="1" >
+ <widget row="0" column="1" >
<class>QLabel</class>
<property stdset="1">
<name>name</name>
- <cstring>broadcastLabel</cstring>
+ <cstring>dhcpServerLabel</cstring>
</property>
<property stdset="1">
<name>frameShape</name>
@@ -284,18 +282,34 @@
<name>frameShadow</name>
<enum>Sunken</enum>
</property>
- </widget>
- <widget row="5" column="0" rowspan="1" colspan="2" >
- <class>Line</class>
<property stdset="1">
+ <name>text</name>
+ <string></string>
+ </property>
+ </widget>
+ </grid>
+ </widget>
+ <spacer row="6" column="1" >
+ <property>
<name>name</name>
- <cstring>Line2</cstring>
+ <cstring>Spacer2</cstring>
</property>
<property stdset="1">
<name>orientation</name>
- <enum>Horizontal</enum>
+ <enum>Vertical</enum>
</property>
- </widget>
+ <property stdset="1">
+ <name>sizeType</name>
+ <enum>Expanding</enum>
+ </property>
+ <property>
+ <name>sizeHint</name>
+ <size>
+ <width>20</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
</grid>
</widget>
<customwidgets>
@@ -317,7 +331,7 @@
<images>
<image>
<name>image0</name>
- <data format="XPM.GZ" length="45">789cd3d7528808f055d0d2e72a2e492cc94c5648ce482c52d04a29cdcdad8c8eb5ade6523250004143a55a6b2e0026630c4f</data>
+ <data format="XPM.GZ" length="646">789c6dd2c10ac2300c00d07bbf2234b7229d1be245fc04c5a3201e4615f430059d0711ff5ddb2e6bb236ec90eed134cb5a19d8ef36602af5ecdbfeeac05dda0798d3abebde87e3faa374d3807fa0d633a52d38d8de6f679fe33fc776e196f53cd010188256a3600a292882096246517815ca99884606e18044a3a40d91824820924265a7923a2e8bcd05f33db1173e002913175f2a6be6d3294871a2d95fa00e8a94ee017b69d339d90df1e77c57ea072ede6758</data>
</image>
</images>
</UI>
diff --git a/noncore/settings/networksettings/interfaceinformation.ui b/noncore/settings/networksettings/interfaceinformation.ui
index 2a9b3fb..8b6280d 100644
--- a/noncore/settings/networksettings/interfaceinformation.ui
+++ b/noncore/settings/networksettings/interfaceinformation.ui
@@ -11,8 +11,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>191</width>
- <height>241</height>
+ <width>203</width>
+ <height>244</height>
</rect>
</property>
<property stdset="1">
@@ -100,76 +100,6 @@
<enum>Horizontal</enum>
</property>
</widget>
- <spacer row="6" column="1" >
- <property>
- <name>name</name>
- <cstring>Spacer18</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" >
- <class>QLayoutWidget</class>
- <property stdset="1">
- <name>name</name>
- <cstring>Layout2</cstring>
- </property>
- <hbox>
- <property stdset="1">
- <name>margin</name>
- <number>0</number>
- </property>
- <property stdset="1">
- <name>spacing</name>
- <number>6</number>
- </property>
- <spacer>
- <property>
- <name>name</name>
- <cstring>Spacer10</cstring>
- </property>
- <property stdset="1">
- <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>
- <widget>
- <class>QPushButton</class>
- <property stdset="1">
- <name>name</name>
- <cstring>advancedButton</cstring>
- </property>
- <property stdset="1">
- <name>text</name>
- <string>View Advanced Information</string>
- </property>
- </widget>
- </hbox>
- </widget>
<widget row="0" column="0" >
<class>QLabel</class>
<property stdset="1">
@@ -210,6 +140,14 @@
<cstring>TextLabel24</cstring>
</property>
<property stdset="1">
+ <name>frameShape</name>
+ <enum>MShape</enum>
+ </property>
+ <property stdset="1">
+ <name>frameShadow</name>
+ <enum>MShadow</enum>
+ </property>
+ <property stdset="1">
<name>text</name>
<string>Broadcast</string>
</property>
@@ -290,6 +228,87 @@
<string>0.0.0.0</string>
</property>
</widget>
+ <spacer row="7" column="1" >
+ <property>
+ <name>name</name>
+ <cstring>Spacer18</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="6" column="0" rowspan="1" colspan="2" >
+ <class>QLayoutWidget</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>Layout2</cstring>
+ </property>
+ <hbox>
+ <property stdset="1">
+ <name>margin</name>
+ <number>0</number>
+ </property>
+ <property stdset="1">
+ <name>spacing</name>
+ <number>6</number>
+ </property>
+ <spacer>
+ <property>
+ <name>name</name>
+ <cstring>Spacer10</cstring>
+ </property>
+ <property stdset="1">
+ <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>
+ <widget>
+ <class>QPushButton</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>advancedButton</cstring>
+ </property>
+ <property stdset="1">
+ <name>text</name>
+ <string>View Advanced Information</string>
+ </property>
+ </widget>
+ </hbox>
+ </widget>
+ <widget row="5" column="0" rowspan="1" colspan="2" >
+ <class>Line</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>Line5</cstring>
+ </property>
+ <property stdset="1">
+ <name>orientation</name>
+ <enum>Horizontal</enum>
+ </property>
+ </widget>
</grid>
</widget>
<customwidgets>
@@ -314,4 +333,6 @@
<data format="XPM.GZ" length="646">789c6dd2c10ac2300c00d07bbf2234b7229d1be245fc04c5a3201e4615f430059d0711ff5ddb2e6bb236ec90eed134cb5a19d8ef36602af5ecdbfeeac05dda0798d3abebde87e3faa374d3807fa0d633a52d38d8de6f679fe33fc776e196f53cd010188256a3600a292882096246517815ca99884606e18044a3a40d91824820924265a7923a2e8bcd05f33db1173e002913175f2a6be6d3294871a2d95fa00e8a94ee017b69d339d90df1e77c57ea072ede6758</data>
</image>
</images>
+<connections>
+</connections>
</UI>
diff --git a/noncore/settings/networksettings/interfacesetup.ui b/noncore/settings/networksettings/interfacesetup.ui
index 698422c..ff9810e 100644
--- a/noncore/settings/networksettings/interfacesetup.ui
+++ b/noncore/settings/networksettings/interfacesetup.ui
@@ -11,8 +11,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>193</width>
- <height>310</height>
+ <width>177</width>
+ <height>320</height>
</rect>
</property>
<property stdset="1">
@@ -39,17 +39,6 @@
<enum>Horizontal</enum>
</property>
</widget>
- <widget row="6" column="0" >
- <class>QLabel</class>
- <property stdset="1">
- <name>name</name>
- <cstring>TextLabel4</cstring>
- </property>
- <property stdset="1">
- <name>text</name>
- <string>IP Address</string>
- </property>
- </widget>
<widget row="0" column="0" rowspan="1" colspan="2" >
<class>QCheckBox</class>
<property stdset="1">
@@ -74,28 +63,6 @@
<cstring>profileCombo</cstring>
</property>
</widget>
- <widget row="5" column="0" rowspan="1" colspan="2" >
- <class>QGroupBox</class>
- <property stdset="1">
- <name>name</name>
- <cstring>staticGroupBox</cstring>
- </property>
- <property stdset="1">
- <name>enabled</name>
- <bool>false</bool>
- </property>
- <property stdset="1">
- <name>title</name>
- <string>Static Ip Configuration</string>
- </property>
- </widget>
- <widget row="6" column="1" >
- <class>QLineEdit</class>
- <property stdset="1">
- <name>name</name>
- <cstring>ipAddressEdit</cstring>
- </property>
- </widget>
<widget row="4" column="0" >
<class>QLabel</class>
<property stdset="1">
@@ -122,17 +89,6 @@
<bool>true</bool>
</property>
</widget>
- <widget row="7" column="0" >
- <class>QLabel</class>
- <property stdset="1">
- <name>name</name>
- <cstring>TextLabel5</cstring>
- </property>
- <property stdset="1">
- <name>text</name>
- <string>Subnet Mask</string>
- </property>
- </widget>
<widget row="2" column="0" >
<class>QLabel</class>
<property stdset="1">
@@ -167,7 +123,7 @@
<number>24</number>
</property>
</widget>
- <spacer row="11" column="1" >
+ <spacer row="6" column="1" >
<property>
<name>name</name>
<cstring>Spacer9</cstring>
@@ -188,25 +144,69 @@
</size>
</property>
</spacer>
- <widget row="10" column="1" >
+ <widget row="5" column="0" rowspan="1" colspan="2" >
+ <class>QGroupBox</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>staticGroupBox</cstring>
+ </property>
+ <property stdset="1">
+ <name>enabled</name>
+ <bool>false</bool>
+ </property>
+ <property stdset="1">
+ <name>title</name>
+ <string>Static Ip Configuration</string>
+ </property>
+ <grid>
+ <property stdset="1">
+ <name>margin</name>
+ <number>11</number>
+ </property>
+ <property stdset="1">
+ <name>spacing</name>
+ <number>6</number>
+ </property>
+ <widget row="3" column="1" >
<class>QLineEdit</class>
<property stdset="1">
<name>name</name>
- <cstring>secondDNSLineEdit</cstring>
+ <cstring>firstDNSLineEdit</cstring>
</property>
</widget>
- <widget row="10" column="0" >
+ <widget row="1" column="0" >
<class>QLabel</class>
<property stdset="1">
<name>name</name>
- <cstring>TextLabel3</cstring>
+ <cstring>TextLabel5</cstring>
</property>
<property stdset="1">
<name>text</name>
- <string>Second DNS</string>
+ <string>Subnet Mask</string>
+ </property>
+ </widget>
+ <widget row="2" column="1" >
+ <class>QLineEdit</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>gatewayEdit</cstring>
+ </property>
+ </widget>
+ <widget row="1" column="1" >
+ <class>QLineEdit</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>subnetMaskEdit</cstring>
+ </property>
+ </widget>
+ <widget row="0" column="1" >
+ <class>QLineEdit</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>ipAddressEdit</cstring>
</property>
</widget>
- <widget row="9" column="0" >
+ <widget row="3" column="0" >
<class>QLabel</class>
<property stdset="1">
<name>name</name>
@@ -217,37 +217,47 @@
<string>First DNS</string>
</property>
</widget>
- <widget row="9" column="1" >
+ <widget row="4" column="1" >
<class>QLineEdit</class>
<property stdset="1">
<name>name</name>
- <cstring>firstDNSLineEdit</cstring>
+ <cstring>secondDNSLineEdit</cstring>
</property>
</widget>
- <widget row="8" column="0" >
+ <widget row="0" column="0" >
<class>QLabel</class>
<property stdset="1">
<name>name</name>
- <cstring>TextLabel1_2</cstring>
+ <cstring>TextLabel4</cstring>
</property>
<property stdset="1">
<name>text</name>
- <string>Gateway</string>
+ <string>IP Address</string>
</property>
</widget>
- <widget row="7" column="1" >
- <class>QLineEdit</class>
+ <widget row="2" column="0" >
+ <class>QLabel</class>
<property stdset="1">
<name>name</name>
- <cstring>subnetMaskEdit</cstring>
+ <cstring>TextLabel1_2</cstring>
+ </property>
+ <property stdset="1">
+ <name>text</name>
+ <string>Gateway</string>
</property>
</widget>
- <widget row="8" column="1" >
- <class>QLineEdit</class>
+ <widget row="4" column="0" >
+ <class>QLabel</class>
<property stdset="1">
<name>name</name>
- <cstring>gatewayEdit</cstring>
+ <cstring>TextLabel3</cstring>
</property>
+ <property stdset="1">
+ <name>text</name>
+ <string>Second DNS</string>
+ </property>
+ </widget>
+ </grid>
</widget>
</grid>
</widget>
diff --git a/noncore/settings/networksettings/mainwindow.ui b/noncore/settings/networksettings/mainwindow.ui
index f7efe99..c1fa101 100644
--- a/noncore/settings/networksettings/mainwindow.ui
+++ b/noncore/settings/networksettings/mainwindow.ui
@@ -271,7 +271,7 @@
</property>
<property stdset="1">
<name>text</name>
- <string>Set Current</string>
+ <string>&amp;Set Current</string>
</property>
</widget>
<widget row="3" column="1" rowspan="1" colspan="2" >
diff --git a/noncore/settings/networksettings/mainwindowimp.cpp b/noncore/settings/networksettings/mainwindowimp.cpp
index 2f821a9..0f48a4b 100644
--- a/noncore/settings/networksettings/mainwindowimp.cpp
+++ b/noncore/settings/networksettings/mainwindowimp.cpp
@@ -2,10 +2,10 @@
#include "addserviceimp.h"
#include "interfaceinformationimp.h"
#include "interfacesetupimp.h"
-#include "interface.h"
#include "kprocess.h"
#include "module.h"
+
#include <qpushbutton.h>
#include <qtabwidget.h>
#include <qlistbox.h>
@@ -31,11 +31,6 @@
#define TEMP_ALL "/tmp/ifconfig-a"
#define TEMP_UP "/tmp/ifconfig"
-#define NO_SELECT_ERROR_AND_RETURN { \
- QMessageBox::information(this, "Error","Please select an interface.", "Ok"); \
- return; \
-}
-
MainWindowImp::MainWindowImp(QWidget *parent, const char *name) : MainWindow(parent, name, true) {
connect(addServiceButton, SIGNAL(clicked()), this, SLOT(addClicked()));
connect(removeServiceButton, SIGNAL(clicked()), this, SLOT(removeClicked()));
@@ -81,6 +76,24 @@ MainWindowImp::~MainWindowImp(){
}
void MainWindowImp::loadModules(QString path){
+ qDebug(path.latin1());
+ QDir d;
+ d.setPath(path);
+ if(!d.exists()){
+ qDebug("MainWindowImp:: Path doesn't exists");
+ return;
+ }
+ d.setFilter( QDir::Files | QDir::NoSymLinks );
+ const QFileInfoList *list = d.entryInfoList();
+ QFileInfoListIterator it( *list );
+ QFileInfo *fi;
+ while ( (fi=it.current()) ) {
+ if(fi->fileName().contains(".so")){
+ qDebug("Found");
+ Module *foo = loadPlugin(path + "/" + fi->fileName());
+ }
+ ++it;
+ }
}
/**
@@ -90,7 +103,7 @@ void MainWindowImp::loadModules(QString path){
* @return pointer to the function with name resolveString or NULL
*/
Module* MainWindowImp::loadPlugin(QString pluginFileName, QString resolveString){
- //qDebug(pluginFileName.latin1());
+ qDebug(pluginFileName.latin1());
QLibrary *lib = new QLibrary(pluginFileName);
void *functionPointer = lib->resolve(resolveString);
if( !functionPointer ){
@@ -112,34 +125,6 @@ Module* MainWindowImp::loadPlugin(QString pluginFileName, QString resolveString)
return object;
}
-/*
-QList<QString> MainWindowImp::retrieveUnloadedPluginList(){
- QString DirStr = QDir::homeDirPath() + "/.networksetup/" ;
- QString path = DirStr + "plugins";
- QDir d(path);
- d.setFilter( QDir::Files | QDir::Hidden );
-
- QMap<QObject*, QLibrary*>::Iterator libraryIt;
- QList<QString> rlist;
- rlist.setAutoDelete(false);
-
- const QFileInfoList *list = d.entryInfoList();
- QFileInfoListIterator it( *list );
- QFileInfo *fi;
- while ( (fi=it.current()) ) {
- if(fi->fileName().contains(".so")){
- for( libraryIt = libraries.begin(); libraryIt != libraries.end(); ++libraryIt )
- if((path + "/" + fi->fileName()) != (libraryIt.data())->library()){
- QString *s = new QString(path + "/" + fi->fileName());
- rlist.append(s);
- }
- }
- ++it;
- }
- return rlist;
-}
-*/
-
/**
* The Add button was clicked. Bring up the add dialog and if OK is hit
* load the plugin and append it to the list
@@ -161,7 +146,10 @@ void MainWindowImp::addClicked(){
*/
void MainWindowImp::removeClicked(){
QListViewItem *item = serviceList->currentItem();
- if(item == NULL) NO_SELECT_ERROR_AND_RETURN
+ if(item == NULL) {
+ QMessageBox::information(this, "Error","Please select an interface.", "Ok");
+ return;
+ }
if(modules.find(interfaceItems[item]) == modules.end()){
QMessageBox::information(this, "Can't remove interface.", "Interface is built in.", "Ok");
@@ -178,7 +166,10 @@ void MainWindowImp::removeClicked(){
*/
void MainWindowImp::configureClicked(){
QListViewItem *item = serviceList->currentItem();
- if(item == NULL) NO_SELECT_ERROR_AND_RETURN
+ if(item == NULL){
+ QMessageBox::information(this, "Error","Please select an interface.", "Ok");
+ return;
+ }
if(modules.find(interfaceItems[item]) == modules.end()){
InterfaceSetupImp *conf = new InterfaceSetupImp(0, "InterfaceConfiguration", interfaceItems[item]);
@@ -197,7 +188,10 @@ void MainWindowImp::configureClicked(){
*/
void MainWindowImp::informationClicked(){
QListViewItem *item = serviceList->currentItem();
- if(item == NULL)NO_SELECT_ERROR_AND_RETURN
+ if(item == NULL){
+ QMessageBox::information(this, "Error","Please select an interface.", "Ok");
+ return;
+ }
if(modules.find(interfaceItems[item]) == modules.end()){
InterfaceInformationImp *i = new InterfaceInformationImp(0, "InterfaceInformationImp", interfaceItems[item]);
@@ -311,6 +305,10 @@ void MainWindowImp::updateInterface(Interface *i){
QString typeName = "lan";
if(i->getHardwareName().contains("Local Loopback"))
typeName = "lo";
+ if(i->getInterfaceName().contains("irda"))
+ typeName = "irda";
+ if(i->getInterfaceName().contains("wlan"))
+ typeName = "wlan";
QPixmap type = (Resource::loadPixmap(typeName));
item->setPixmap(1, type);
diff --git a/noncore/settings/networksettings/module.h b/noncore/settings/networksettings/module.h
index f146d8c..13fd523 100644
--- a/noncore/settings/networksettings/module.h
+++ b/noncore/settings/networksettings/module.h
@@ -1,5 +1,5 @@
-#ifndef MODULE_H
-#define MODULE_H
+#ifndef NETCONF_MODULE_H
+#define NETCONF_MODULE_H
#include <qobject.h>
#include <qlist.h>
diff --git a/noncore/settings/networksettings/networksetup.pro b/noncore/settings/networksettings/networksetup.pro
index 7d9918b..a01b050 100644
--- a/noncore/settings/networksettings/networksetup.pro
+++ b/noncore/settings/networksettings/networksetup.pro
@@ -3,8 +3,8 @@ 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
SOURCES = main.cpp mainwindowimp.cpp addserviceimp.cpp interface.cpp interfaceinformationimp.cpp interfacesetupimp.cpp kprocctrl.cpp kprocess.cpp interfaces.cpp
-INCLUDEPATH += $(QPEDIR)/include
-DEPENDPATH += $(QPEDIR)/include
+#INCLUDEPATH += $(QPEDIR)/include
+#DEPENDPATH += $(QPEDIR)/include
LIBS += -lqpe
INTERFACES = mainwindow.ui addservice.ui interfaceinformation.ui interfaceadvanced.ui interfacesetup.ui
TARGET = networksetup