| -rw-r--r-- | noncore/net/networksetup/interfaceadvanced.ui | 140 | ||||
| -rw-r--r-- | noncore/net/networksetup/interfaceinformation.ui | 165 | ||||
| -rw-r--r-- | noncore/net/networksetup/interfacesetup.ui | 138 | ||||
| -rw-r--r-- | noncore/net/networksetup/mainwindow.ui | 2 | ||||
| -rw-r--r-- | noncore/net/networksetup/mainwindowimp.cpp | 74 | ||||
| -rw-r--r-- | noncore/net/networksetup/module.h | 4 | ||||
| -rw-r--r-- | noncore/net/networksetup/networksetup.pro | 4 | ||||
| -rw-r--r-- | noncore/settings/networksettings/interfaceadvanced.ui | 140 | ||||
| -rw-r--r-- | noncore/settings/networksettings/interfaceinformation.ui | 165 | ||||
| -rw-r--r-- | noncore/settings/networksettings/interfacesetup.ui | 138 | ||||
| -rw-r--r-- | noncore/settings/networksettings/mainwindow.ui | 2 | ||||
| -rw-r--r-- | noncore/settings/networksettings/mainwindowimp.cpp | 74 | ||||
| -rw-r--r-- | noncore/settings/networksettings/module.h | 4 | ||||
| -rw-r--r-- | noncore/settings/networksettings/networksetup.pro | 4 |
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 @@ -13,4 +13,4 @@ <y>0</y> - <width>197</width> - <height>253</height> + <width>188</width> + <height>277</height> </rect> @@ -101,3 +101,3 @@ </widget> - <widget row="8" column="0" > + <widget row="4" column="0" > <class>QLabel</class> @@ -105,3 +105,7 @@ <name>name</name> - <cstring>TextLabel9</cstring> + <cstring>TextLabel4</cstring> + </property> + <property stdset="1"> + <name>enabled</name> + <bool>true</bool> </property> @@ -109,6 +113,6 @@ <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> @@ -116,3 +120,3 @@ <name>name</name> - <cstring>leaseExpiresLabel</cstring> + <cstring>ipAddressLabel</cstring> </property> @@ -128,6 +132,6 @@ <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> @@ -135,3 +139,3 @@ <name>name</name> - <cstring>leaseObtainedLabel</cstring> + <cstring>subnetMaskLabel</cstring> </property> @@ -147,6 +151,6 @@ <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> @@ -154,3 +158,3 @@ <name>name</name> - <cstring>TextLabel8</cstring> + <cstring>TextLabel2</cstring> </property> @@ -158,6 +162,6 @@ <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> @@ -165,3 +169,3 @@ <name>name</name> - <cstring>dhcpServerLabel</cstring> + <cstring>broadcastLabel</cstring> </property> @@ -175,19 +179,23 @@ </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> @@ -195,3 +203,3 @@ <name>name</name> - <cstring>TextLabel4</cstring> + <cstring>TextLabel6</cstring> </property> @@ -199,3 +207,3 @@ <name>text</name> - <string>Subnet Mask</string> + <string>DHCP Server</string> </property> @@ -206,3 +214,3 @@ <name>name</name> - <cstring>ipAddressLabel</cstring> + <cstring>leaseExpiresLabel</cstring> </property> @@ -218,6 +226,6 @@ <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> @@ -225,3 +233,3 @@ <name>name</name> - <cstring>subnetMaskLabel</cstring> + <cstring>leaseObtainedLabel</cstring> </property> @@ -237,27 +245,17 @@ <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> @@ -265,3 +263,3 @@ <name>name</name> - <cstring>TextLabel2</cstring> + <cstring>TextLabel8</cstring> </property> @@ -269,6 +267,6 @@ <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> @@ -276,3 +274,3 @@ <name>name</name> - <cstring>broadcastLabel</cstring> + <cstring>dhcpServerLabel</cstring> </property> @@ -286,8 +284,13 @@ </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> @@ -295,5 +298,16 @@ <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> @@ -319,3 +333,3 @@ <name>image0</name> - <data format="XPM.GZ" length="45">789cd3d7528808f055d0d2e72a2e492cc94c5648ce482c52d04a29cdcdad8c8eb5ade6523250004143a55a6b2e0026630c4f</data> + <data format="XPM.GZ" length="646">789c6dd2c10ac2300c00d07bbf2234b7229d1be245fc04c5a3201e4615f430059d0711ff5ddb2e6bb236ec90eed134cb5a19d8ef36602af5ecdbfeeac05dda0798d3abebde87e3faa374d3807fa0d633a52d38d8de6f679fe33fc776e196f53cd010188256a3600a292882096246517815ca99884606e18044a3a40d91824820924265a7923a2e8bcd05f33db1173e002913175f2a6be6d3294871a2d95fa00e8a94ee017b69d339d90df1e77c57ea072ede6758</data> </image> 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 @@ -13,4 +13,4 @@ <y>0</y> - <width>191</width> - <height>241</height> + <width>203</width> + <height>244</height> </rect> @@ -102,72 +102,2 @@ </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" > @@ -212,2 +142,10 @@ <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> @@ -292,2 +230,83 @@ </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> @@ -316,2 +335,4 @@ </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 @@ -13,4 +13,4 @@ <y>0</y> - <width>193</width> - <height>310</height> + <width>177</width> + <height>320</height> </rect> @@ -41,13 +41,2 @@ </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" > @@ -76,24 +65,2 @@ </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" > @@ -124,13 +91,2 @@ </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" > @@ -169,3 +125,3 @@ </widget> - <spacer row="11" column="1" > + <spacer row="6" column="1" > <property> @@ -190,3 +146,26 @@ </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> @@ -194,6 +173,6 @@ <name>name</name> - <cstring>secondDNSLineEdit</cstring> + <cstring>firstDNSLineEdit</cstring> </property> </widget> - <widget row="10" column="0" > + <widget row="1" column="0" > <class>QLabel</class> @@ -201,3 +180,3 @@ <name>name</name> - <cstring>TextLabel3</cstring> + <cstring>TextLabel5</cstring> </property> @@ -205,6 +184,27 @@ <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> @@ -219,3 +219,3 @@ </widget> - <widget row="9" column="1" > + <widget row="4" column="1" > <class>QLineEdit</class> @@ -223,6 +223,6 @@ <name>name</name> - <cstring>firstDNSLineEdit</cstring> + <cstring>secondDNSLineEdit</cstring> </property> </widget> - <widget row="8" column="0" > + <widget row="0" column="0" > <class>QLabel</class> @@ -230,3 +230,3 @@ <name>name</name> - <cstring>TextLabel1_2</cstring> + <cstring>TextLabel4</cstring> </property> @@ -234,18 +234,28 @@ <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> 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 @@ -273,3 +273,3 @@ <name>text</name> - <string>Set Current</string> + <string>&Set Current</string> </property> 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 @@ -4,3 +4,2 @@ #include "interfacesetupimp.h"
-#include "interface.h"
#include "kprocess.h"
@@ -8,2 +7,3 @@ +
#include <qpushbutton.h>
@@ -33,7 +33,2 @@ -#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) {
@@ -83,2 +78,20 @@ 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;
+ }
}
@@ -92,3 +105,3 @@ void MainWindowImp::loadModules(QString path){ Module* MainWindowImp::loadPlugin(QString pluginFileName, QString resolveString){
- //qDebug(pluginFileName.latin1());
+ qDebug(pluginFileName.latin1());
QLibrary *lib = new QLibrary(pluginFileName);
@@ -114,30 +127,2 @@ Module* MainWindowImp::loadPlugin(QString pluginFileName, QString resolveString) -/*
-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;
-}
-*/
-
/**
@@ -163,3 +148,6 @@ 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;
+ }
@@ -180,3 +168,6 @@ 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;
+ }
@@ -199,3 +190,6 @@ 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;
+ }
@@ -313,2 +307,6 @@ void MainWindowImp::updateInterface(Interface *i){ typeName = "lo";
+ if(i->getInterfaceName().contains("irda"))
+ typeName = "irda";
+ if(i->getInterfaceName().contains("wlan"))
+ typeName = "wlan";
QPixmap type = (Resource::loadPixmap(typeName));
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,3 +1,3 @@ -#ifndef MODULE_H -#define MODULE_H +#ifndef NETCONF_MODULE_H +#define NETCONF_MODULE_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 @@ -5,4 +5,4 @@ HEADERS = mainwindowimp.h addserviceimp.h interface.h interfaceinformationimp.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 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 @@ -13,4 +13,4 @@ <y>0</y> - <width>197</width> - <height>253</height> + <width>188</width> + <height>277</height> </rect> @@ -101,3 +101,3 @@ </widget> - <widget row="8" column="0" > + <widget row="4" column="0" > <class>QLabel</class> @@ -105,3 +105,7 @@ <name>name</name> - <cstring>TextLabel9</cstring> + <cstring>TextLabel4</cstring> + </property> + <property stdset="1"> + <name>enabled</name> + <bool>true</bool> </property> @@ -109,6 +113,6 @@ <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> @@ -116,3 +120,3 @@ <name>name</name> - <cstring>leaseExpiresLabel</cstring> + <cstring>ipAddressLabel</cstring> </property> @@ -128,6 +132,6 @@ <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> @@ -135,3 +139,3 @@ <name>name</name> - <cstring>leaseObtainedLabel</cstring> + <cstring>subnetMaskLabel</cstring> </property> @@ -147,6 +151,6 @@ <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> @@ -154,3 +158,3 @@ <name>name</name> - <cstring>TextLabel8</cstring> + <cstring>TextLabel2</cstring> </property> @@ -158,6 +162,6 @@ <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> @@ -165,3 +169,3 @@ <name>name</name> - <cstring>dhcpServerLabel</cstring> + <cstring>broadcastLabel</cstring> </property> @@ -175,19 +179,23 @@ </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> @@ -195,3 +203,3 @@ <name>name</name> - <cstring>TextLabel4</cstring> + <cstring>TextLabel6</cstring> </property> @@ -199,3 +207,3 @@ <name>text</name> - <string>Subnet Mask</string> + <string>DHCP Server</string> </property> @@ -206,3 +214,3 @@ <name>name</name> - <cstring>ipAddressLabel</cstring> + <cstring>leaseExpiresLabel</cstring> </property> @@ -218,6 +226,6 @@ <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> @@ -225,3 +233,3 @@ <name>name</name> - <cstring>subnetMaskLabel</cstring> + <cstring>leaseObtainedLabel</cstring> </property> @@ -237,27 +245,17 @@ <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> @@ -265,3 +263,3 @@ <name>name</name> - <cstring>TextLabel2</cstring> + <cstring>TextLabel8</cstring> </property> @@ -269,6 +267,6 @@ <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> @@ -276,3 +274,3 @@ <name>name</name> - <cstring>broadcastLabel</cstring> + <cstring>dhcpServerLabel</cstring> </property> @@ -286,8 +284,13 @@ </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> @@ -295,5 +298,16 @@ <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> @@ -319,3 +333,3 @@ <name>image0</name> - <data format="XPM.GZ" length="45">789cd3d7528808f055d0d2e72a2e492cc94c5648ce482c52d04a29cdcdad8c8eb5ade6523250004143a55a6b2e0026630c4f</data> + <data format="XPM.GZ" length="646">789c6dd2c10ac2300c00d07bbf2234b7229d1be245fc04c5a3201e4615f430059d0711ff5ddb2e6bb236ec90eed134cb5a19d8ef36602af5ecdbfeeac05dda0798d3abebde87e3faa374d3807fa0d633a52d38d8de6f679fe33fc776e196f53cd010188256a3600a292882096246517815ca99884606e18044a3a40d91824820924265a7923a2e8bcd05f33db1173e002913175f2a6be6d3294871a2d95fa00e8a94ee017b69d339d90df1e77c57ea072ede6758</data> </image> 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 @@ -13,4 +13,4 @@ <y>0</y> - <width>191</width> - <height>241</height> + <width>203</width> + <height>244</height> </rect> @@ -102,72 +102,2 @@ </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" > @@ -212,2 +142,10 @@ <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> @@ -292,2 +230,83 @@ </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> @@ -316,2 +335,4 @@ </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 @@ -13,4 +13,4 @@ <y>0</y> - <width>193</width> - <height>310</height> + <width>177</width> + <height>320</height> </rect> @@ -41,13 +41,2 @@ </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" > @@ -76,24 +65,2 @@ </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" > @@ -124,13 +91,2 @@ </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" > @@ -169,3 +125,3 @@ </widget> - <spacer row="11" column="1" > + <spacer row="6" column="1" > <property> @@ -190,3 +146,26 @@ </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> @@ -194,6 +173,6 @@ <name>name</name> - <cstring>secondDNSLineEdit</cstring> + <cstring>firstDNSLineEdit</cstring> </property> </widget> - <widget row="10" column="0" > + <widget row="1" column="0" > <class>QLabel</class> @@ -201,3 +180,3 @@ <name>name</name> - <cstring>TextLabel3</cstring> + <cstring>TextLabel5</cstring> </property> @@ -205,6 +184,27 @@ <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> @@ -219,3 +219,3 @@ </widget> - <widget row="9" column="1" > + <widget row="4" column="1" > <class>QLineEdit</class> @@ -223,6 +223,6 @@ <name>name</name> - <cstring>firstDNSLineEdit</cstring> + <cstring>secondDNSLineEdit</cstring> </property> </widget> - <widget row="8" column="0" > + <widget row="0" column="0" > <class>QLabel</class> @@ -230,3 +230,3 @@ <name>name</name> - <cstring>TextLabel1_2</cstring> + <cstring>TextLabel4</cstring> </property> @@ -234,18 +234,28 @@ <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> 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 @@ -273,3 +273,3 @@ <name>text</name> - <string>Set Current</string> + <string>&Set Current</string> </property> 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 @@ -4,3 +4,2 @@ #include "interfacesetupimp.h"
-#include "interface.h"
#include "kprocess.h"
@@ -8,2 +7,3 @@ +
#include <qpushbutton.h>
@@ -33,7 +33,2 @@ -#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) {
@@ -83,2 +78,20 @@ 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;
+ }
}
@@ -92,3 +105,3 @@ void MainWindowImp::loadModules(QString path){ Module* MainWindowImp::loadPlugin(QString pluginFileName, QString resolveString){
- //qDebug(pluginFileName.latin1());
+ qDebug(pluginFileName.latin1());
QLibrary *lib = new QLibrary(pluginFileName);
@@ -114,30 +127,2 @@ Module* MainWindowImp::loadPlugin(QString pluginFileName, QString resolveString) -/*
-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;
-}
-*/
-
/**
@@ -163,3 +148,6 @@ 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;
+ }
@@ -180,3 +168,6 @@ 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;
+ }
@@ -199,3 +190,6 @@ 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;
+ }
@@ -313,2 +307,6 @@ void MainWindowImp::updateInterface(Interface *i){ typeName = "lo";
+ if(i->getInterfaceName().contains("irda"))
+ typeName = "irda";
+ if(i->getInterfaceName().contains("wlan"))
+ typeName = "wlan";
QPixmap type = (Resource::loadPixmap(typeName));
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,3 +1,3 @@ -#ifndef MODULE_H -#define MODULE_H +#ifndef NETCONF_MODULE_H +#define NETCONF_MODULE_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 @@ -5,4 +5,4 @@ HEADERS = mainwindowimp.h addserviceimp.h interface.h interfaceinformationimp.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 |