author | benmeyer <benmeyer> | 2002-09-30 19:41:41 (UTC) |
---|---|---|
committer | benmeyer <benmeyer> | 2002-09-30 19:41:41 (UTC) |
commit | a0f88d7d0fb0ffaf8d1aa7b753b0d48ee344e34f (patch) (side-by-side diff) | |
tree | 10e1141777f657881af01cab036962c128109ec2 /noncore | |
parent | d49bd63f3b15795a1ee2497960f00eb3fb075e69 (diff) | |
download | opie-a0f88d7d0fb0ffaf8d1aa7b753b0d48ee344e34f.zip opie-a0f88d7d0fb0ffaf8d1aa7b753b0d48ee344e34f.tar.gz opie-a0f88d7d0fb0ffaf8d1aa7b753b0d48ee344e34f.tar.bz2 |
ui cleanup with groupboxes
-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 @@ -12,6 +12,6 @@ <x>0</x> <y>0</y> - <width>197</width> - <height>253</height> + <width>188</width> + <height>277</height> </rect> </property> @@ -100,20 +100,24 @@ </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"> @@ -127,12 +131,12 @@ <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"> @@ -146,23 +150,23 @@ <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"> @@ -174,29 +178,33 @@ <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> @@ -205,5 +213,5 @@ <property stdset="1"> <name>name</name> - <cstring>ipAddressLabel</cstring> + <cstring>leaseExpiresLabel</cstring> </property> <property stdset="1"> @@ -217,12 +225,12 @@ <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"> @@ -236,44 +244,34 @@ <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"> @@ -285,16 +283,32 @@ <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> @@ -318,5 +332,5 @@ <image> <name>image0</name> - <data format="XPM.GZ" length="45">789cd3d7528808f055d0d2e72a2e492cc94c5648ce482c52d04a29cdcdad8c8eb5ade6523250004143a55a6b2e0026630c4f</data> + <data format="XPM.GZ" length="646">789c6dd2c10ac2300c00d07bbf2234b7229d1be245fc04c5a3201e4615f430059d0711ff5ddb2e6bb236ec90eed134cb5a19d8ef36602af5ecdbfeeac05dda0798d3abebde87e3faa374d3807fa0d633a52d38d8de6f679fe33fc776e196f53cd010188256a3600a292882096246517815ca99884606e18044a3a40d91824820924265a7923a2e8bcd05f33db1173e002913175f2a6be6d3294871a2d95fa00e8a94ee017b69d339d90df1e77c57ea072ede6758</data> </image> </images> 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 @@ -12,6 +12,6 @@ <x>0</x> <y>0</y> - <width>191</width> - <height>241</height> + <width>203</width> + <height>244</height> </rect> </property> @@ -101,74 +101,4 @@ </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> @@ -211,4 +141,12 @@ </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> @@ -291,4 +229,85 @@ </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> @@ -315,3 +334,5 @@ </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 @@ -12,6 +12,6 @@ <x>0</x> <y>0</y> - <width>193</width> - <height>310</height> + <width>177</width> + <height>320</height> </rect> </property> @@ -40,15 +40,4 @@ </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> @@ -75,26 +64,4 @@ </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> @@ -123,15 +90,4 @@ </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> @@ -168,5 +124,5 @@ </property> </widget> - <spacer row="11" column="1" > + <spacer row="6" column="1" > <property> <name>name</name> @@ -189,23 +145,67 @@ </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"> @@ -218,35 +218,45 @@ </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> 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 @@ -272,5 +272,5 @@ <property stdset="1"> <name>text</name> - <string>Set Current</string> + <string>&Set Current</string> </property> </widget> 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 @@ -3,8 +3,8 @@ #include "interfaceinformationimp.h"
#include "interfacesetupimp.h"
-#include "interface.h"
#include "kprocess.h"
#include "module.h"
+
#include <qpushbutton.h>
#include <qtabwidget.h>
@@ -32,9 +32,4 @@ #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()));
@@ -82,4 +77,22 @@ 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;
+ }
}
@@ -91,5 +104,5 @@ void MainWindowImp::loadModules(QString path){ */
Module* MainWindowImp::loadPlugin(QString pluginFileName, QString resolveString){
- //qDebug(pluginFileName.latin1());
+ qDebug(pluginFileName.latin1());
QLibrary *lib = new QLibrary(pluginFileName);
void *functionPointer = lib->resolve(resolveString);
@@ -113,32 +126,4 @@ 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;
-}
-*/
-
/**
* The Add button was clicked. Bring up the add dialog and if OK is hit
@@ -162,5 +147,8 @@ 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()){
@@ -179,5 +167,8 @@ 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()){
@@ -198,5 +189,8 @@ 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()){
@@ -312,4 +306,8 @@ void MainWindowImp::updateInterface(Interface *i){ 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,4 +1,4 @@ -#ifndef MODULE_H -#define MODULE_H +#ifndef NETCONF_MODULE_H +#define NETCONF_MODULE_H #include <qobject.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 @@ -4,6 +4,6 @@ CONFIG = qt warn_on debug 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 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 @@ -12,6 +12,6 @@ <x>0</x> <y>0</y> - <width>197</width> - <height>253</height> + <width>188</width> + <height>277</height> </rect> </property> @@ -100,20 +100,24 @@ </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"> @@ -127,12 +131,12 @@ <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"> @@ -146,23 +150,23 @@ <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"> @@ -174,29 +178,33 @@ <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> @@ -205,5 +213,5 @@ <property stdset="1"> <name>name</name> - <cstring>ipAddressLabel</cstring> + <cstring>leaseExpiresLabel</cstring> </property> <property stdset="1"> @@ -217,12 +225,12 @@ <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"> @@ -236,44 +244,34 @@ <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"> @@ -285,16 +283,32 @@ <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> @@ -318,5 +332,5 @@ <image> <name>image0</name> - <data format="XPM.GZ" length="45">789cd3d7528808f055d0d2e72a2e492cc94c5648ce482c52d04a29cdcdad8c8eb5ade6523250004143a55a6b2e0026630c4f</data> + <data format="XPM.GZ" length="646">789c6dd2c10ac2300c00d07bbf2234b7229d1be245fc04c5a3201e4615f430059d0711ff5ddb2e6bb236ec90eed134cb5a19d8ef36602af5ecdbfeeac05dda0798d3abebde87e3faa374d3807fa0d633a52d38d8de6f679fe33fc776e196f53cd010188256a3600a292882096246517815ca99884606e18044a3a40d91824820924265a7923a2e8bcd05f33db1173e002913175f2a6be6d3294871a2d95fa00e8a94ee017b69d339d90df1e77c57ea072ede6758</data> </image> </images> 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 @@ -12,6 +12,6 @@ <x>0</x> <y>0</y> - <width>191</width> - <height>241</height> + <width>203</width> + <height>244</height> </rect> </property> @@ -101,74 +101,4 @@ </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> @@ -211,4 +141,12 @@ </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> @@ -291,4 +229,85 @@ </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> @@ -315,3 +334,5 @@ </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 @@ -12,6 +12,6 @@ <x>0</x> <y>0</y> - <width>193</width> - <height>310</height> + <width>177</width> + <height>320</height> </rect> </property> @@ -40,15 +40,4 @@ </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> @@ -75,26 +64,4 @@ </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> @@ -123,15 +90,4 @@ </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> @@ -168,5 +124,5 @@ </property> </widget> - <spacer row="11" column="1" > + <spacer row="6" column="1" > <property> <name>name</name> @@ -189,23 +145,67 @@ </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"> @@ -218,35 +218,45 @@ </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> 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 @@ -272,5 +272,5 @@ <property stdset="1"> <name>text</name> - <string>Set Current</string> + <string>&Set Current</string> </property> </widget> 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 @@ -3,8 +3,8 @@ #include "interfaceinformationimp.h"
#include "interfacesetupimp.h"
-#include "interface.h"
#include "kprocess.h"
#include "module.h"
+
#include <qpushbutton.h>
#include <qtabwidget.h>
@@ -32,9 +32,4 @@ #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()));
@@ -82,4 +77,22 @@ 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;
+ }
}
@@ -91,5 +104,5 @@ void MainWindowImp::loadModules(QString path){ */
Module* MainWindowImp::loadPlugin(QString pluginFileName, QString resolveString){
- //qDebug(pluginFileName.latin1());
+ qDebug(pluginFileName.latin1());
QLibrary *lib = new QLibrary(pluginFileName);
void *functionPointer = lib->resolve(resolveString);
@@ -113,32 +126,4 @@ 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;
-}
-*/
-
/**
* The Add button was clicked. Bring up the add dialog and if OK is hit
@@ -162,5 +147,8 @@ 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()){
@@ -179,5 +167,8 @@ 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()){
@@ -198,5 +189,8 @@ 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()){
@@ -312,4 +306,8 @@ void MainWindowImp::updateInterface(Interface *i){ 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,4 +1,4 @@ -#ifndef MODULE_H -#define MODULE_H +#ifndef NETCONF_MODULE_H +#define NETCONF_MODULE_H #include <qobject.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 @@ -4,6 +4,6 @@ CONFIG = qt warn_on debug 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 |