-rw-r--r-- | noncore/net/networksetup/TODO | 6 | ||||
-rw-r--r-- | noncore/net/networksetup/interfaces/interface.cpp | 2 | ||||
-rw-r--r-- | noncore/net/networksetup/interfaces/interface.h | 41 | ||||
-rw-r--r-- | noncore/net/networksetup/interfaces/interfaces.cpp | 6 | ||||
-rw-r--r-- | noncore/net/networksetup/interfaces/interfaces.h | 8 | ||||
-rw-r--r-- | noncore/net/networksetup/interfaces/interfaces.pro | 2 | ||||
-rw-r--r-- | noncore/net/networksetup/ppp/pppmodule.cpp | 23 | ||||
-rw-r--r-- | noncore/net/networksetup/wlan/infoimp.cpp | 3 | ||||
-rw-r--r-- | noncore/settings/networksettings/TODO | 6 | ||||
-rw-r--r-- | noncore/settings/networksettings/interfaces/interface.cpp | 2 | ||||
-rw-r--r-- | noncore/settings/networksettings/interfaces/interface.h | 41 | ||||
-rw-r--r-- | noncore/settings/networksettings/interfaces/interfaces.cpp | 6 | ||||
-rw-r--r-- | noncore/settings/networksettings/interfaces/interfaces.h | 8 | ||||
-rw-r--r-- | noncore/settings/networksettings/interfaces/interfaces.pro | 2 | ||||
-rw-r--r-- | noncore/settings/networksettings/ppp/pppmodule.cpp | 23 | ||||
-rw-r--r-- | noncore/settings/networksettings/wlan/infoimp.cpp | 3 |
16 files changed, 94 insertions, 88 deletions
diff --git a/noncore/net/networksetup/TODO b/noncore/net/networksetup/TODO index 04b3a7c..020339f 100644 --- a/noncore/net/networksetup/TODO +++ b/noncore/net/networksetup/TODO | |||
@@ -1,8 +1,6 @@ | |||
1 | AndyQ - Fixed a bug in wlanimp.cpp : accept method - put braces round key | 1 | test WEP |
2 | field if so that settings get saved if WEP is enabled | 2 | WEP key in file wireless.conf is not encrypted !, therefore it is very easy to get the key out of the zaurus.. |
3 | |||
4 | CLEAN UP | ||
5 | 3 | ||
6 | udchcp needs to output the dhcp information so interfaces can read it | 4 | udchcp needs to output the dhcp information so interfaces can read it |
7 | 5 | ||
8 | interfacesetupimp really doesn't need a interface* pointer | 6 | interfacesetupimp really doesn't need a interface* pointer |
diff --git a/noncore/net/networksetup/interfaces/interface.cpp b/noncore/net/networksetup/interfaces/interface.cpp index 4129b3d..7ffa76f 100644 --- a/noncore/net/networksetup/interfaces/interface.cpp +++ b/noncore/net/networksetup/interfaces/interface.cpp | |||
@@ -10,9 +10,9 @@ | |||
10 | 10 | ||
11 | #include <stdio.h> | 11 | #include <stdio.h> |
12 | #include <stdlib.h> | 12 | #include <stdlib.h> |
13 | 13 | ||
14 | Interface::Interface(QObject * parent, const char * name, bool newSatus): QObject(parent, name), status(newSatus), attached(false), hardwareName("Unknown"), moduleOwner(NULL), macAddress(""), ip("0.0.0.0"), broadcast(""), subnetMask("0.0.0.0"), dhcp(false){ | 14 | Interface::Interface(QObject * parent, const char * name, bool newSatus): QObject(parent, name), hardwareName("Unknown"), moduleOwner(NULL), status(newSatus), attached(false), dhcp(false), macAddress(""), ip("0.0.0.0"), broadcast(""), subnetMask("0.0.0.0"){ |
15 | refresh(); | 15 | refresh(); |
16 | } | 16 | } |
17 | 17 | ||
18 | /** | 18 | /** |
diff --git a/noncore/net/networksetup/interfaces/interface.h b/noncore/net/networksetup/interfaces/interface.h index 989d6d8..d37834a 100644 --- a/noncore/net/networksetup/interfaces/interface.h +++ b/noncore/net/networksetup/interfaces/interface.h | |||
@@ -15,31 +15,31 @@ signals: | |||
15 | 15 | ||
16 | public: | 16 | public: |
17 | Interface(QObject * parent=0, const char * name= "unknown", bool status = false); | 17 | Interface(QObject * parent=0, const char * name= "unknown", bool status = false); |
18 | 18 | ||
19 | QString getInterfaceName(){ QString n(this->name()); return n; }; | 19 | QString getInterfaceName() const { QString n(this->name()); return n; }; |
20 | 20 | ||
21 | bool getStatus(){ return status; }; | 21 | bool getStatus() const { return status; }; |
22 | void setStatus(bool newStatus); | 22 | void setStatus(bool newStatus); |
23 | 23 | ||
24 | bool isAttached(){ return attached; }; | 24 | bool isAttached() const { return attached; }; |
25 | void setAttached(bool isAttached=false); | 25 | void setAttached(bool isAttached=false); |
26 | 26 | ||
27 | QString getHardwareName(){ return hardwareName; }; | 27 | QString getHardwareName() const { return hardwareName; }; |
28 | void setHardwareName(const QString &name="Unknown"); | 28 | void setHardwareName(const QString &name="Unknown"); |
29 | 29 | ||
30 | Module* getModuleOwner(){ return moduleOwner; }; | 30 | Module* getModuleOwner() const { return moduleOwner; }; |
31 | void setModuleOwner(Module *owner=NULL); | 31 | void setModuleOwner(Module *owner=NULL); |
32 | 32 | ||
33 | // inet information. | 33 | // inet information. |
34 | QString getMacAddress(){ return macAddress; }; | 34 | QString getMacAddress() const { return macAddress; }; |
35 | QString getIp(){ return ip; }; | 35 | QString getIp() const { return ip; }; |
36 | QString getSubnetMask(){ return subnetMask; }; | 36 | QString getSubnetMask() const { return subnetMask; }; |
37 | QString getBroadcast(){ return broadcast; }; | 37 | QString getBroadcast() const { return broadcast; }; |
38 | bool isDhcp(){ return dhcp; }; | 38 | bool isDhcp() const { return dhcp; }; |
39 | QString getDhcpServerIp(){ return dhcpServerIp; }; | 39 | QString getDhcpServerIp() const { return dhcpServerIp; }; |
40 | QString getLeaseObtained(){ return leaseObtained; }; | 40 | QString getLeaseObtained() const { return leaseObtained; }; |
41 | QString getLeaseExpires(){ return leaseExpires; }; | 41 | QString getLeaseExpires() const { return leaseExpires; }; |
42 | 42 | ||
43 | public slots: | 43 | public slots: |
44 | bool refresh(); | 44 | bool refresh(); |
45 | void start(); | 45 | void start(); |
@@ -47,23 +47,24 @@ public slots: | |||
47 | void restart(); | 47 | void restart(); |
48 | 48 | ||
49 | private: | 49 | private: |
50 | // Interface information | 50 | // Interface information |
51 | bool status; | ||
52 | bool attached; | ||
53 | QString hardwareName; | 51 | QString hardwareName; |
54 | Module *moduleOwner; | 52 | Module *moduleOwner; |
55 | 53 | bool status; | |
54 | bool attached; | ||
55 | |||
56 | // Network information | 56 | // Network information |
57 | QString macAddress; | ||
58 | QString ip; | ||
59 | QString broadcast; | ||
60 | QString subnetMask; | ||
61 | bool dhcp; | 57 | bool dhcp; |
62 | QString dhcpServerIp; | 58 | QString dhcpServerIp; |
63 | QString leaseObtained; | 59 | QString leaseObtained; |
64 | QString leaseExpires; | 60 | QString leaseExpires; |
65 | 61 | ||
62 | QString macAddress; | ||
63 | QString ip; | ||
64 | QString broadcast; | ||
65 | QString subnetMask; | ||
66 | |||
66 | }; | 67 | }; |
67 | 68 | ||
68 | #endif | 69 | #endif |
69 | 70 | ||
diff --git a/noncore/net/networksetup/interfaces/interfaces.cpp b/noncore/net/networksetup/interfaces/interfaces.cpp index e49998e..8f685fe 100644 --- a/noncore/net/networksetup/interfaces/interfaces.cpp +++ b/noncore/net/networksetup/interfaces/interfaces.cpp | |||
@@ -70,9 +70,9 @@ QStringList Interfaces::getInterfaceList(){ | |||
70 | * Report any duplicates such as eth0 being in two differnt auto's | 70 | * Report any duplicates such as eth0 being in two differnt auto's |
71 | * @param interface interface to check to see if it is on or not. | 71 | * @param interface interface to check to see if it is on or not. |
72 | * @return true is interface is in auto | 72 | * @return true is interface is in auto |
73 | */ | 73 | */ |
74 | bool Interfaces::isAuto(const QString &interface){ | 74 | bool Interfaces::isAuto(const QString &interface) const { |
75 | QStringList autoLines = interfaces.grep(QRegExp(AUTO)); | 75 | QStringList autoLines = interfaces.grep(QRegExp(AUTO)); |
76 | QStringList awi = autoLines.grep(QRegExp(interface)); | 76 | QStringList awi = autoLines.grep(QRegExp(interface)); |
77 | if(awi.count() > 1) | 77 | if(awi.count() > 1) |
78 | qDebug(QString("Interfaces: Found more then auto group with interface: %1.").arg(interface).latin1()); | 78 | qDebug(QString("Interfaces: Found more then auto group with interface: %1.").arg(interface).latin1()); |
@@ -138,10 +138,10 @@ bool Interfaces::setInterface(QString interface){ | |||
138 | /** | 138 | /** |
139 | * A quick helper funtion to see if the current interface is set. | 139 | * A quick helper funtion to see if the current interface is set. |
140 | * @return bool true if set, false otherwise. | 140 | * @return bool true if set, false otherwise. |
141 | */ | 141 | */ |
142 | bool Interfaces::isInterfaceSet(){ | 142 | bool Interfaces::isInterfaceSet() const { |
143 | return (currentIface != interfaces.end()); | 143 | return (interfaces.end() != currentIface); |
144 | } | 144 | } |
145 | 145 | ||
146 | /** | 146 | /** |
147 | * Add a new interface of with the settings - family and method | 147 | * Add a new interface of with the settings - family and method |
diff --git a/noncore/net/networksetup/interfaces/interfaces.h b/noncore/net/networksetup/interfaces/interfaces.h index d662919..bac2a7e 100644 --- a/noncore/net/networksetup/interfaces/interfaces.h +++ b/noncore/net/networksetup/interfaces/interfaces.h | |||
@@ -24,16 +24,16 @@ class Interfaces { | |||
24 | public: | 24 | public: |
25 | Interfaces(QString useInterfacesFile = "/etc/network/interfaces"); | 25 | Interfaces(QString useInterfacesFile = "/etc/network/interfaces"); |
26 | QStringList getInterfaceList(); | 26 | QStringList getInterfaceList(); |
27 | 27 | ||
28 | bool isAuto(const QString &interface); | 28 | bool isAuto(const QString &interface) const ; |
29 | bool setAuto(const QString &interface, bool setAuto); | 29 | bool setAuto(const QString &interface, bool setAuto); |
30 | 30 | ||
31 | bool removeInterface(); | 31 | bool removeInterface(); |
32 | bool addInterface(const QString &interface, const QString &family, const QString &method); | 32 | bool addInterface(const QString &interface, const QString &family, const QString &method); |
33 | bool copyInterface(const QString &oldInterface, const QString &newInterface); | 33 | bool copyInterface(const QString &oldInterface, const QString &newInterface); |
34 | bool setInterface(QString interface); | 34 | bool setInterface(QString interface); |
35 | bool isInterfaceSet(); | 35 | bool isInterfaceSet() const ; |
36 | QString getInterfaceName(bool &error); | 36 | QString getInterfaceName(bool &error); |
37 | bool setInterfaceName(const QString &newName); | 37 | bool setInterfaceName(const QString &newName); |
38 | QString getInterfaceFamily(bool &error); | 38 | QString getInterfaceFamily(bool &error); |
39 | bool setInterfaceFamily(const QString &newName); | 39 | bool setInterfaceFamily(const QString &newName); |
@@ -56,13 +56,13 @@ public: | |||
56 | bool write(); | 56 | bool write(); |
57 | 57 | ||
58 | private: | 58 | private: |
59 | bool setStanza(const QString &stanza, const QString &option, QStringList::Iterator &iterator); | 59 | bool setStanza(const QString &stanza, const QString &option, QStringList::Iterator &iterator); |
60 | bool removeStanza(QStringList::Iterator &stanza); | ||
60 | bool setOption(const QStringList::Iterator &start, const QString &option, const QString &value); | 61 | bool setOption(const QStringList::Iterator &start, const QString &option, const QString &value); |
62 | bool removeAllOptions(const QStringList::Iterator &start); | ||
61 | bool removeOption(const QStringList::Iterator &start, const QString &option, const QString &value); | 63 | bool removeOption(const QStringList::Iterator &start, const QString &option, const QString &value); |
62 | QString getOption(const QStringList::Iterator &start, const QString &option, bool &error); | 64 | QString getOption(const QStringList::Iterator &start, const QString &option, bool &error); |
63 | bool removeStanza(QStringList::Iterator &stanza); | ||
64 | bool removeAllOptions(const QStringList::Iterator &start); | ||
65 | 65 | ||
66 | QString interfacesFile; | 66 | QString interfacesFile; |
67 | QStringList interfaces; | 67 | QStringList interfaces; |
68 | QStringList::Iterator currentIface; | 68 | QStringList::Iterator currentIface; |
diff --git a/noncore/net/networksetup/interfaces/interfaces.pro b/noncore/net/networksetup/interfaces/interfaces.pro index 9a024f6..d6b43fb 100644 --- a/noncore/net/networksetup/interfaces/interfaces.pro +++ b/noncore/net/networksetup/interfaces/interfaces.pro | |||
@@ -1,8 +1,8 @@ | |||
1 | TEMPLATE = lib | 1 | TEMPLATE = lib |
2 | CONFIG += qt warn_on release | 2 | CONFIG += qt warn_on release |
3 | #CONFIG += qt warn_on debug | 3 | #CONFIG += qt warn_on debug |
4 | DESTDIR = $(QTDIR)/lib$(PROJMAK) | 4 | #DESTDIR = $(QTDIR)/lib$(PROJMAK) |
5 | HEADERS = interface.h interfaceinformationimp.h interfaces.h interfacesetupimp.h | 5 | HEADERS = interface.h interfaceinformationimp.h interfaces.h interfacesetupimp.h |
6 | SOURCES = interface.cpp interfaces.cpp interfaceinformationimp.cpp interfacesetupimp.cpp | 6 | SOURCES = interface.cpp interfaces.cpp interfaceinformationimp.cpp interfacesetupimp.cpp |
7 | INCLUDEPATH+= $(OPIEDIR)/include ../ | 7 | INCLUDEPATH+= $(OPIEDIR)/include ../ |
8 | DEPENDPATH+= $(OPIEDIR)/include | 8 | DEPENDPATH+= $(OPIEDIR)/include |
diff --git a/noncore/net/networksetup/ppp/pppmodule.cpp b/noncore/net/networksetup/ppp/pppmodule.cpp index 68bb0a0..72cd45e 100644 --- a/noncore/net/networksetup/ppp/pppmodule.cpp +++ b/noncore/net/networksetup/ppp/pppmodule.cpp | |||
@@ -1,5 +1,6 @@ | |||
1 | #include "pppmodule.h" | 1 | #include "pppmodule.h" |
2 | #include "pppimp.h" | ||
2 | #include "interfaceinformationimp.h" | 3 | #include "interfaceinformationimp.h" |
3 | 4 | ||
4 | /** | 5 | /** |
5 | * Constructor, find all of the possible interfaces | 6 | * Constructor, find all of the possible interfaces |
@@ -37,10 +38,10 @@ QString PPPModule::getPixmapName(Interface* ){ | |||
37 | * @param Interface* interface to check against | 38 | * @param Interface* interface to check against |
38 | * @return bool true if i is owned by this module, false otherwise. | 39 | * @return bool true if i is owned by this module, false otherwise. |
39 | */ | 40 | */ |
40 | bool PPPModule::isOwner(Interface *i){ | 41 | bool PPPModule::isOwner(Interface *i){ |
41 | // Scan the ppp database | 42 | if(!i->getInterfaceName().upper().contains("PPP")) |
42 | return false; | 43 | return false; |
43 | 44 | ||
44 | i->setHardwareName("PPP"); | 45 | i->setHardwareName("PPP"); |
45 | list.append(i); | 46 | list.append(i); |
46 | return true; | 47 | return true; |
@@ -61,22 +62,21 @@ QWidget *PPPModule::configure(Interface *i){ | |||
61 | * Create, and return the Information Module | 62 | * Create, and return the Information Module |
62 | * @return QWidget* pointer to this modules info. | 63 | * @return QWidget* pointer to this modules info. |
63 | */ | 64 | */ |
64 | QWidget *PPPModule::information(Interface *i){ | 65 | QWidget *PPPModule::information(Interface *i){ |
65 | return NULL; | 66 | // We don't have any advanced pppd information widget yet :-D |
66 | 67 | // TODO ^ | |
67 | //WlanInfoImp *info = new WlanInfoImp(0, i->getInterfaceName(), Qt::WDestructiveClose); | 68 | InterfaceInformationImp *information = new InterfaceInformationImp(0, "InterfaceSetupImp", i); |
68 | //InterfaceInformationImp *information = new InterfaceInformationImp(info->tabWidget, "InterfaceSetupImp", i); | 69 | return information; |
69 | //info->tabWidget->insertTab(information, "TCP/IP"); | ||
70 | //return info; | ||
71 | } | 70 | } |
72 | 71 | ||
73 | /** | 72 | /** |
74 | * Get all active (up or down) interfaces | 73 | * Get all active (up or down) interfaces |
75 | * @return QList<Interface> A list of interfaces that exsist that havn't | 74 | * @return QList<Interface> A list of interfaces that exsist that havn't |
76 | * been called by isOwner() | 75 | * been called by isOwner() |
77 | */ | 76 | */ |
78 | QList<Interface> PPPModule::getInterfaces(){ | 77 | QList<Interface> PPPModule::getInterfaces(){ |
78 | // List all of the files in the peer directory | ||
79 | return list; | 79 | return list; |
80 | } | 80 | } |
81 | 81 | ||
82 | /** | 82 | /** |
@@ -85,10 +85,13 @@ QList<Interface> PPPModule::getInterfaces(){ | |||
85 | * by possibleNewInterfaces(); | 85 | * by possibleNewInterfaces(); |
86 | * @return Interface* NULL if it was unable to be created. | 86 | * @return Interface* NULL if it was unable to be created. |
87 | */ | 87 | */ |
88 | Interface *PPPModule::addNewInterface(const QString &newInterface){ | 88 | Interface *PPPModule::addNewInterface(const QString &newInterface){ |
89 | // We can't add a 802.11 interface, either the hardware will be there | 89 | // If the |
90 | // or it wont. | 90 | PPPConfigureImp imp(0, "PPPConfigImp"); |
91 | if(imp.exec() == QDialog::Accepted ){ | ||
92 | |||
93 | } | ||
91 | return NULL; | 94 | return NULL; |
92 | } | 95 | } |
93 | 96 | ||
94 | /** | 97 | /** |
diff --git a/noncore/net/networksetup/wlan/infoimp.cpp b/noncore/net/networksetup/wlan/infoimp.cpp index e1eef81..6d3e167 100644 --- a/noncore/net/networksetup/wlan/infoimp.cpp +++ b/noncore/net/networksetup/wlan/infoimp.cpp | |||
@@ -1,6 +1,7 @@ | |||
1 | #include "infoimp.h" | 1 | #include "infoimp.h" |
2 | #include "wextensions.h" | 2 | #include "wextensions.h" |
3 | |||
3 | #include <qtimer.h> | 4 | #include <qtimer.h> |
4 | #include <qprogressbar.h> | 5 | #include <qprogressbar.h> |
5 | #include <qlabel.h> | 6 | #include <qlabel.h> |
6 | 7 | ||
@@ -11,9 +12,9 @@ | |||
11 | WlanInfoImp::WlanInfoImp( QWidget* parent, const char* name, WFlags fl): WlanInfo(parent, name, fl){ | 12 | WlanInfoImp::WlanInfoImp( QWidget* parent, const char* name, WFlags fl): WlanInfo(parent, name, fl){ |
12 | WExtensions *wExtensions = new WExtensions(name); | 13 | WExtensions *wExtensions = new WExtensions(name); |
13 | if(!wExtensions->doesHaveWirelessExtensions()){ | 14 | if(!wExtensions->doesHaveWirelessExtensions()){ |
14 | delete wExtensions; | 15 | delete wExtensions; |
15 | qDebug("No extension"); | 16 | qDebug("WlanInfoImp::No wireless extension"); |
16 | return; | 17 | return; |
17 | } | 18 | } |
18 | delete wExtensions; | 19 | delete wExtensions; |
19 | timer = new QTimer( this ); | 20 | timer = new QTimer( this ); |
diff --git a/noncore/settings/networksettings/TODO b/noncore/settings/networksettings/TODO index 04b3a7c..020339f 100644 --- a/noncore/settings/networksettings/TODO +++ b/noncore/settings/networksettings/TODO | |||
@@ -1,8 +1,6 @@ | |||
1 | AndyQ - Fixed a bug in wlanimp.cpp : accept method - put braces round key | 1 | test WEP |
2 | field if so that settings get saved if WEP is enabled | 2 | WEP key in file wireless.conf is not encrypted !, therefore it is very easy to get the key out of the zaurus.. |
3 | |||
4 | CLEAN UP | ||
5 | 3 | ||
6 | udchcp needs to output the dhcp information so interfaces can read it | 4 | udchcp needs to output the dhcp information so interfaces can read it |
7 | 5 | ||
8 | interfacesetupimp really doesn't need a interface* pointer | 6 | interfacesetupimp really doesn't need a interface* pointer |
diff --git a/noncore/settings/networksettings/interfaces/interface.cpp b/noncore/settings/networksettings/interfaces/interface.cpp index 4129b3d..7ffa76f 100644 --- a/noncore/settings/networksettings/interfaces/interface.cpp +++ b/noncore/settings/networksettings/interfaces/interface.cpp | |||
@@ -10,9 +10,9 @@ | |||
10 | 10 | ||
11 | #include <stdio.h> | 11 | #include <stdio.h> |
12 | #include <stdlib.h> | 12 | #include <stdlib.h> |
13 | 13 | ||
14 | Interface::Interface(QObject * parent, const char * name, bool newSatus): QObject(parent, name), status(newSatus), attached(false), hardwareName("Unknown"), moduleOwner(NULL), macAddress(""), ip("0.0.0.0"), broadcast(""), subnetMask("0.0.0.0"), dhcp(false){ | 14 | Interface::Interface(QObject * parent, const char * name, bool newSatus): QObject(parent, name), hardwareName("Unknown"), moduleOwner(NULL), status(newSatus), attached(false), dhcp(false), macAddress(""), ip("0.0.0.0"), broadcast(""), subnetMask("0.0.0.0"){ |
15 | refresh(); | 15 | refresh(); |
16 | } | 16 | } |
17 | 17 | ||
18 | /** | 18 | /** |
diff --git a/noncore/settings/networksettings/interfaces/interface.h b/noncore/settings/networksettings/interfaces/interface.h index 989d6d8..d37834a 100644 --- a/noncore/settings/networksettings/interfaces/interface.h +++ b/noncore/settings/networksettings/interfaces/interface.h | |||
@@ -15,31 +15,31 @@ signals: | |||
15 | 15 | ||
16 | public: | 16 | public: |
17 | Interface(QObject * parent=0, const char * name= "unknown", bool status = false); | 17 | Interface(QObject * parent=0, const char * name= "unknown", bool status = false); |
18 | 18 | ||
19 | QString getInterfaceName(){ QString n(this->name()); return n; }; | 19 | QString getInterfaceName() const { QString n(this->name()); return n; }; |
20 | 20 | ||
21 | bool getStatus(){ return status; }; | 21 | bool getStatus() const { return status; }; |
22 | void setStatus(bool newStatus); | 22 | void setStatus(bool newStatus); |
23 | 23 | ||
24 | bool isAttached(){ return attached; }; | 24 | bool isAttached() const { return attached; }; |
25 | void setAttached(bool isAttached=false); | 25 | void setAttached(bool isAttached=false); |
26 | 26 | ||
27 | QString getHardwareName(){ return hardwareName; }; | 27 | QString getHardwareName() const { return hardwareName; }; |
28 | void setHardwareName(const QString &name="Unknown"); | 28 | void setHardwareName(const QString &name="Unknown"); |
29 | 29 | ||
30 | Module* getModuleOwner(){ return moduleOwner; }; | 30 | Module* getModuleOwner() const { return moduleOwner; }; |
31 | void setModuleOwner(Module *owner=NULL); | 31 | void setModuleOwner(Module *owner=NULL); |
32 | 32 | ||
33 | // inet information. | 33 | // inet information. |
34 | QString getMacAddress(){ return macAddress; }; | 34 | QString getMacAddress() const { return macAddress; }; |
35 | QString getIp(){ return ip; }; | 35 | QString getIp() const { return ip; }; |
36 | QString getSubnetMask(){ return subnetMask; }; | 36 | QString getSubnetMask() const { return subnetMask; }; |
37 | QString getBroadcast(){ return broadcast; }; | 37 | QString getBroadcast() const { return broadcast; }; |
38 | bool isDhcp(){ return dhcp; }; | 38 | bool isDhcp() const { return dhcp; }; |
39 | QString getDhcpServerIp(){ return dhcpServerIp; }; | 39 | QString getDhcpServerIp() const { return dhcpServerIp; }; |
40 | QString getLeaseObtained(){ return leaseObtained; }; | 40 | QString getLeaseObtained() const { return leaseObtained; }; |
41 | QString getLeaseExpires(){ return leaseExpires; }; | 41 | QString getLeaseExpires() const { return leaseExpires; }; |
42 | 42 | ||
43 | public slots: | 43 | public slots: |
44 | bool refresh(); | 44 | bool refresh(); |
45 | void start(); | 45 | void start(); |
@@ -47,23 +47,24 @@ public slots: | |||
47 | void restart(); | 47 | void restart(); |
48 | 48 | ||
49 | private: | 49 | private: |
50 | // Interface information | 50 | // Interface information |
51 | bool status; | ||
52 | bool attached; | ||
53 | QString hardwareName; | 51 | QString hardwareName; |
54 | Module *moduleOwner; | 52 | Module *moduleOwner; |
55 | 53 | bool status; | |
54 | bool attached; | ||
55 | |||
56 | // Network information | 56 | // Network information |
57 | QString macAddress; | ||
58 | QString ip; | ||
59 | QString broadcast; | ||
60 | QString subnetMask; | ||
61 | bool dhcp; | 57 | bool dhcp; |
62 | QString dhcpServerIp; | 58 | QString dhcpServerIp; |
63 | QString leaseObtained; | 59 | QString leaseObtained; |
64 | QString leaseExpires; | 60 | QString leaseExpires; |
65 | 61 | ||
62 | QString macAddress; | ||
63 | QString ip; | ||
64 | QString broadcast; | ||
65 | QString subnetMask; | ||
66 | |||
66 | }; | 67 | }; |
67 | 68 | ||
68 | #endif | 69 | #endif |
69 | 70 | ||
diff --git a/noncore/settings/networksettings/interfaces/interfaces.cpp b/noncore/settings/networksettings/interfaces/interfaces.cpp index e49998e..8f685fe 100644 --- a/noncore/settings/networksettings/interfaces/interfaces.cpp +++ b/noncore/settings/networksettings/interfaces/interfaces.cpp | |||
@@ -70,9 +70,9 @@ QStringList Interfaces::getInterfaceList(){ | |||
70 | * Report any duplicates such as eth0 being in two differnt auto's | 70 | * Report any duplicates such as eth0 being in two differnt auto's |
71 | * @param interface interface to check to see if it is on or not. | 71 | * @param interface interface to check to see if it is on or not. |
72 | * @return true is interface is in auto | 72 | * @return true is interface is in auto |
73 | */ | 73 | */ |
74 | bool Interfaces::isAuto(const QString &interface){ | 74 | bool Interfaces::isAuto(const QString &interface) const { |
75 | QStringList autoLines = interfaces.grep(QRegExp(AUTO)); | 75 | QStringList autoLines = interfaces.grep(QRegExp(AUTO)); |
76 | QStringList awi = autoLines.grep(QRegExp(interface)); | 76 | QStringList awi = autoLines.grep(QRegExp(interface)); |
77 | if(awi.count() > 1) | 77 | if(awi.count() > 1) |
78 | qDebug(QString("Interfaces: Found more then auto group with interface: %1.").arg(interface).latin1()); | 78 | qDebug(QString("Interfaces: Found more then auto group with interface: %1.").arg(interface).latin1()); |
@@ -138,10 +138,10 @@ bool Interfaces::setInterface(QString interface){ | |||
138 | /** | 138 | /** |
139 | * A quick helper funtion to see if the current interface is set. | 139 | * A quick helper funtion to see if the current interface is set. |
140 | * @return bool true if set, false otherwise. | 140 | * @return bool true if set, false otherwise. |
141 | */ | 141 | */ |
142 | bool Interfaces::isInterfaceSet(){ | 142 | bool Interfaces::isInterfaceSet() const { |
143 | return (currentIface != interfaces.end()); | 143 | return (interfaces.end() != currentIface); |
144 | } | 144 | } |
145 | 145 | ||
146 | /** | 146 | /** |
147 | * Add a new interface of with the settings - family and method | 147 | * Add a new interface of with the settings - family and method |
diff --git a/noncore/settings/networksettings/interfaces/interfaces.h b/noncore/settings/networksettings/interfaces/interfaces.h index d662919..bac2a7e 100644 --- a/noncore/settings/networksettings/interfaces/interfaces.h +++ b/noncore/settings/networksettings/interfaces/interfaces.h | |||
@@ -24,16 +24,16 @@ class Interfaces { | |||
24 | public: | 24 | public: |
25 | Interfaces(QString useInterfacesFile = "/etc/network/interfaces"); | 25 | Interfaces(QString useInterfacesFile = "/etc/network/interfaces"); |
26 | QStringList getInterfaceList(); | 26 | QStringList getInterfaceList(); |
27 | 27 | ||
28 | bool isAuto(const QString &interface); | 28 | bool isAuto(const QString &interface) const ; |
29 | bool setAuto(const QString &interface, bool setAuto); | 29 | bool setAuto(const QString &interface, bool setAuto); |
30 | 30 | ||
31 | bool removeInterface(); | 31 | bool removeInterface(); |
32 | bool addInterface(const QString &interface, const QString &family, const QString &method); | 32 | bool addInterface(const QString &interface, const QString &family, const QString &method); |
33 | bool copyInterface(const QString &oldInterface, const QString &newInterface); | 33 | bool copyInterface(const QString &oldInterface, const QString &newInterface); |
34 | bool setInterface(QString interface); | 34 | bool setInterface(QString interface); |
35 | bool isInterfaceSet(); | 35 | bool isInterfaceSet() const ; |
36 | QString getInterfaceName(bool &error); | 36 | QString getInterfaceName(bool &error); |
37 | bool setInterfaceName(const QString &newName); | 37 | bool setInterfaceName(const QString &newName); |
38 | QString getInterfaceFamily(bool &error); | 38 | QString getInterfaceFamily(bool &error); |
39 | bool setInterfaceFamily(const QString &newName); | 39 | bool setInterfaceFamily(const QString &newName); |
@@ -56,13 +56,13 @@ public: | |||
56 | bool write(); | 56 | bool write(); |
57 | 57 | ||
58 | private: | 58 | private: |
59 | bool setStanza(const QString &stanza, const QString &option, QStringList::Iterator &iterator); | 59 | bool setStanza(const QString &stanza, const QString &option, QStringList::Iterator &iterator); |
60 | bool removeStanza(QStringList::Iterator &stanza); | ||
60 | bool setOption(const QStringList::Iterator &start, const QString &option, const QString &value); | 61 | bool setOption(const QStringList::Iterator &start, const QString &option, const QString &value); |
62 | bool removeAllOptions(const QStringList::Iterator &start); | ||
61 | bool removeOption(const QStringList::Iterator &start, const QString &option, const QString &value); | 63 | bool removeOption(const QStringList::Iterator &start, const QString &option, const QString &value); |
62 | QString getOption(const QStringList::Iterator &start, const QString &option, bool &error); | 64 | QString getOption(const QStringList::Iterator &start, const QString &option, bool &error); |
63 | bool removeStanza(QStringList::Iterator &stanza); | ||
64 | bool removeAllOptions(const QStringList::Iterator &start); | ||
65 | 65 | ||
66 | QString interfacesFile; | 66 | QString interfacesFile; |
67 | QStringList interfaces; | 67 | QStringList interfaces; |
68 | QStringList::Iterator currentIface; | 68 | QStringList::Iterator currentIface; |
diff --git a/noncore/settings/networksettings/interfaces/interfaces.pro b/noncore/settings/networksettings/interfaces/interfaces.pro index 9a024f6..d6b43fb 100644 --- a/noncore/settings/networksettings/interfaces/interfaces.pro +++ b/noncore/settings/networksettings/interfaces/interfaces.pro | |||
@@ -1,8 +1,8 @@ | |||
1 | TEMPLATE = lib | 1 | TEMPLATE = lib |
2 | CONFIG += qt warn_on release | 2 | CONFIG += qt warn_on release |
3 | #CONFIG += qt warn_on debug | 3 | #CONFIG += qt warn_on debug |
4 | DESTDIR = $(QTDIR)/lib$(PROJMAK) | 4 | #DESTDIR = $(QTDIR)/lib$(PROJMAK) |
5 | HEADERS = interface.h interfaceinformationimp.h interfaces.h interfacesetupimp.h | 5 | HEADERS = interface.h interfaceinformationimp.h interfaces.h interfacesetupimp.h |
6 | SOURCES = interface.cpp interfaces.cpp interfaceinformationimp.cpp interfacesetupimp.cpp | 6 | SOURCES = interface.cpp interfaces.cpp interfaceinformationimp.cpp interfacesetupimp.cpp |
7 | INCLUDEPATH+= $(OPIEDIR)/include ../ | 7 | INCLUDEPATH+= $(OPIEDIR)/include ../ |
8 | DEPENDPATH+= $(OPIEDIR)/include | 8 | DEPENDPATH+= $(OPIEDIR)/include |
diff --git a/noncore/settings/networksettings/ppp/pppmodule.cpp b/noncore/settings/networksettings/ppp/pppmodule.cpp index 68bb0a0..72cd45e 100644 --- a/noncore/settings/networksettings/ppp/pppmodule.cpp +++ b/noncore/settings/networksettings/ppp/pppmodule.cpp | |||
@@ -1,5 +1,6 @@ | |||
1 | #include "pppmodule.h" | 1 | #include "pppmodule.h" |
2 | #include "pppimp.h" | ||
2 | #include "interfaceinformationimp.h" | 3 | #include "interfaceinformationimp.h" |
3 | 4 | ||
4 | /** | 5 | /** |
5 | * Constructor, find all of the possible interfaces | 6 | * Constructor, find all of the possible interfaces |
@@ -37,10 +38,10 @@ QString PPPModule::getPixmapName(Interface* ){ | |||
37 | * @param Interface* interface to check against | 38 | * @param Interface* interface to check against |
38 | * @return bool true if i is owned by this module, false otherwise. | 39 | * @return bool true if i is owned by this module, false otherwise. |
39 | */ | 40 | */ |
40 | bool PPPModule::isOwner(Interface *i){ | 41 | bool PPPModule::isOwner(Interface *i){ |
41 | // Scan the ppp database | 42 | if(!i->getInterfaceName().upper().contains("PPP")) |
42 | return false; | 43 | return false; |
43 | 44 | ||
44 | i->setHardwareName("PPP"); | 45 | i->setHardwareName("PPP"); |
45 | list.append(i); | 46 | list.append(i); |
46 | return true; | 47 | return true; |
@@ -61,22 +62,21 @@ QWidget *PPPModule::configure(Interface *i){ | |||
61 | * Create, and return the Information Module | 62 | * Create, and return the Information Module |
62 | * @return QWidget* pointer to this modules info. | 63 | * @return QWidget* pointer to this modules info. |
63 | */ | 64 | */ |
64 | QWidget *PPPModule::information(Interface *i){ | 65 | QWidget *PPPModule::information(Interface *i){ |
65 | return NULL; | 66 | // We don't have any advanced pppd information widget yet :-D |
66 | 67 | // TODO ^ | |
67 | //WlanInfoImp *info = new WlanInfoImp(0, i->getInterfaceName(), Qt::WDestructiveClose); | 68 | InterfaceInformationImp *information = new InterfaceInformationImp(0, "InterfaceSetupImp", i); |
68 | //InterfaceInformationImp *information = new InterfaceInformationImp(info->tabWidget, "InterfaceSetupImp", i); | 69 | return information; |
69 | //info->tabWidget->insertTab(information, "TCP/IP"); | ||
70 | //return info; | ||
71 | } | 70 | } |
72 | 71 | ||
73 | /** | 72 | /** |
74 | * Get all active (up or down) interfaces | 73 | * Get all active (up or down) interfaces |
75 | * @return QList<Interface> A list of interfaces that exsist that havn't | 74 | * @return QList<Interface> A list of interfaces that exsist that havn't |
76 | * been called by isOwner() | 75 | * been called by isOwner() |
77 | */ | 76 | */ |
78 | QList<Interface> PPPModule::getInterfaces(){ | 77 | QList<Interface> PPPModule::getInterfaces(){ |
78 | // List all of the files in the peer directory | ||
79 | return list; | 79 | return list; |
80 | } | 80 | } |
81 | 81 | ||
82 | /** | 82 | /** |
@@ -85,10 +85,13 @@ QList<Interface> PPPModule::getInterfaces(){ | |||
85 | * by possibleNewInterfaces(); | 85 | * by possibleNewInterfaces(); |
86 | * @return Interface* NULL if it was unable to be created. | 86 | * @return Interface* NULL if it was unable to be created. |
87 | */ | 87 | */ |
88 | Interface *PPPModule::addNewInterface(const QString &newInterface){ | 88 | Interface *PPPModule::addNewInterface(const QString &newInterface){ |
89 | // We can't add a 802.11 interface, either the hardware will be there | 89 | // If the |
90 | // or it wont. | 90 | PPPConfigureImp imp(0, "PPPConfigImp"); |
91 | if(imp.exec() == QDialog::Accepted ){ | ||
92 | |||
93 | } | ||
91 | return NULL; | 94 | return NULL; |
92 | } | 95 | } |
93 | 96 | ||
94 | /** | 97 | /** |
diff --git a/noncore/settings/networksettings/wlan/infoimp.cpp b/noncore/settings/networksettings/wlan/infoimp.cpp index e1eef81..6d3e167 100644 --- a/noncore/settings/networksettings/wlan/infoimp.cpp +++ b/noncore/settings/networksettings/wlan/infoimp.cpp | |||
@@ -1,6 +1,7 @@ | |||
1 | #include "infoimp.h" | 1 | #include "infoimp.h" |
2 | #include "wextensions.h" | 2 | #include "wextensions.h" |
3 | |||
3 | #include <qtimer.h> | 4 | #include <qtimer.h> |
4 | #include <qprogressbar.h> | 5 | #include <qprogressbar.h> |
5 | #include <qlabel.h> | 6 | #include <qlabel.h> |
6 | 7 | ||
@@ -11,9 +12,9 @@ | |||
11 | WlanInfoImp::WlanInfoImp( QWidget* parent, const char* name, WFlags fl): WlanInfo(parent, name, fl){ | 12 | WlanInfoImp::WlanInfoImp( QWidget* parent, const char* name, WFlags fl): WlanInfo(parent, name, fl){ |
12 | WExtensions *wExtensions = new WExtensions(name); | 13 | WExtensions *wExtensions = new WExtensions(name); |
13 | if(!wExtensions->doesHaveWirelessExtensions()){ | 14 | if(!wExtensions->doesHaveWirelessExtensions()){ |
14 | delete wExtensions; | 15 | delete wExtensions; |
15 | qDebug("No extension"); | 16 | qDebug("WlanInfoImp::No wireless extension"); |
16 | return; | 17 | return; |
17 | } | 18 | } |
18 | delete wExtensions; | 19 | delete wExtensions; |
19 | timer = new QTimer( this ); | 20 | timer = new QTimer( this ); |