author | benmeyer <benmeyer> | 2002-10-17 15:03:35 (UTC) |
---|---|---|
committer | benmeyer <benmeyer> | 2002-10-17 15:03:35 (UTC) |
commit | 1fa7ebd9512ac0497c3ede198621899a10e961af (patch) (unidiff) | |
tree | 45be4e45b5408f46c3f2e59b1241aebf9a9bf869 /noncore | |
parent | 6c8ae3c8af454c87f5f467fe17cbdffe4c8f5494 (diff) | |
download | opie-1fa7ebd9512ac0497c3ede198621899a10e961af.zip opie-1fa7ebd9512ac0497c3ede198621899a10e961af.tar.gz opie-1fa7ebd9512ac0497c3ede198621899a10e961af.tar.bz2 |
added interface listing
-rw-r--r-- | noncore/net/networksetup/TODO | 1 | ||||
-rw-r--r-- | noncore/net/networksetup/interfaces.cpp | 26 | ||||
-rw-r--r-- | noncore/net/networksetup/interfaces.h | 1 | ||||
-rw-r--r-- | noncore/net/networksetup/mainwindowimp.cpp | 22 | ||||
-rw-r--r-- | noncore/net/networksetup/networksetup.pro | 6 | ||||
-rw-r--r-- | noncore/settings/networksettings/TODO | 1 | ||||
-rw-r--r-- | noncore/settings/networksettings/interfaces.cpp | 26 | ||||
-rw-r--r-- | noncore/settings/networksettings/interfaces.h | 1 | ||||
-rw-r--r-- | noncore/settings/networksettings/mainwindowimp.cpp | 22 | ||||
-rw-r--r-- | noncore/settings/networksettings/networksetup.pro | 6 |
10 files changed, 104 insertions, 8 deletions
diff --git a/noncore/net/networksetup/TODO b/noncore/net/networksetup/TODO index 70d6717..7386646 100644 --- a/noncore/net/networksetup/TODO +++ b/noncore/net/networksetup/TODO | |||
@@ -4,4 +4,5 @@ | |||
4 | networksetup, doesnt bring you back to the main screen. | 4 | networksetup, doesnt bring you back to the main screen. |
5 | [x] Wlanmodule isnt writing out wireless.opts | 5 | [x] Wlanmodule isnt writing out wireless.opts |
6 | [ ] Need a means of bringing an interface up and down (calling | 6 | [ ] Need a means of bringing an interface up and down (calling |
7 | out ifup/ifdown) from the gui. | 7 | out ifup/ifdown) from the gui. |
8 | -Ben- Click information, then click up or down... :-D | ||
diff --git a/noncore/net/networksetup/interfaces.cpp b/noncore/net/networksetup/interfaces.cpp index b8a3e7f..1287d90 100644 --- a/noncore/net/networksetup/interfaces.cpp +++ b/noncore/net/networksetup/interfaces.cpp | |||
@@ -39,12 +39,36 @@ Interfaces::Interfaces(QString useInterfacesFile){ | |||
39 | currentIface = interfaces.end(); | 39 | currentIface = interfaces.end(); |
40 | currentMapping = interfaces.end(); | 40 | currentMapping = interfaces.end(); |
41 | } | 41 | } |
42 | 42 | ||
43 | |||
44 | /** | ||
45 | * Get a list of all interfaces in the interface file. Usefull for | ||
46 | * hardware that is not currently connected such as an 802.11b card | ||
47 | * not plugged in, but configured for when it is plugged in. | ||
48 | * @return Return string list of interfaces. | ||
49 | **/ | ||
50 | QStringList Interfaces::getInterfaceList(){ | ||
51 | QStringList list; | ||
52 | for ( QStringList::Iterator it = interfaces.begin(); it != interfaces.end(); ++it ) { | ||
53 | QString line = (*it).simplifyWhiteSpace(); | ||
54 | if(line.contains(IFACE)){ | ||
55 | line = line.mid(QString(IFACE).length() +1, line.length()); | ||
56 | line = line.simplifyWhiteSpace(); | ||
57 | int findSpace = line.find(" "); | ||
58 | if( findSpace >= 0){ | ||
59 | line = line.mid(0, findSpace); | ||
60 | list.append(line); | ||
61 | } | ||
62 | } | ||
63 | } | ||
64 | return list; | ||
65 | } | ||
66 | |||
43 | /** | 67 | /** |
44 | * Find out if interface is in an "auto" group or not. | 68 | * Find out if interface is in an "auto" group or not. |
45 | * Report any duplicates such as eth0 being in two differnt auto's | 69 | * Report any duplicates such as eth0 being in two differnt auto's |
46 | * @param | 70 | * @param interface interface to check to see if it is on or not. |
47 | * @return true is interface is in auto | 71 | * @return true is interface is in auto |
48 | */ | 72 | */ |
49 | bool Interfaces::isAuto(QString interface){ | 73 | bool Interfaces::isAuto(QString interface){ |
50 | QStringList autoLines = interfaces.grep(QRegExp(AUTO)); | 74 | QStringList autoLines = interfaces.grep(QRegExp(AUTO)); |
diff --git a/noncore/net/networksetup/interfaces.h b/noncore/net/networksetup/interfaces.h index 2cc9689..8b4788c 100644 --- a/noncore/net/networksetup/interfaces.h +++ b/noncore/net/networksetup/interfaces.h | |||
@@ -22,8 +22,9 @@ | |||
22 | class Interfaces { | 22 | class Interfaces { |
23 | 23 | ||
24 | public: | 24 | public: |
25 | Interfaces(QString useInterfacesFile = "/etc/network/interfaces"); | 25 | Interfaces(QString useInterfacesFile = "/etc/network/interfaces"); |
26 | QStringList getInterfaceList(); | ||
26 | 27 | ||
27 | bool isAuto(QString interface); | 28 | bool isAuto(QString interface); |
28 | bool setAuto(QString interface, bool setAuto); | 29 | bool setAuto(QString interface, bool setAuto); |
29 | 30 | ||
diff --git a/noncore/net/networksetup/mainwindowimp.cpp b/noncore/net/networksetup/mainwindowimp.cpp index 36f12e0..24af1ec 100644 --- a/noncore/net/networksetup/mainwindowimp.cpp +++ b/noncore/net/networksetup/mainwindowimp.cpp | |||
@@ -1,8 +1,10 @@ | |||
1 | #include "mainwindowimp.h" | 1 | #include "mainwindowimp.h" |
2 | #include "addconnectionimp.h" | 2 | #include "addconnectionimp.h" |
3 | #include "interfaceinformationimp.h" | 3 | #include "interfaceinformationimp.h" |
4 | #include "interfacesetupimp.h" | 4 | #include "interfacesetupimp.h" |
5 | #include "interfaces.h" | ||
6 | |||
5 | #include "module.h" | 7 | #include "module.h" |
6 | 8 | ||
7 | #include "kprocess.h" | 9 | #include "kprocess.h" |
8 | 10 | ||
@@ -331,8 +333,25 @@ void MainWindowImp::jobDone(KProcess *process){ | |||
331 | } | 333 | } |
332 | } | 334 | } |
333 | file.close(); | 335 | file.close(); |
334 | QFile::remove(fileName); | 336 | QFile::remove(fileName); |
337 | if(threads.count() == 0){ | ||
338 | Interfaces i; | ||
339 | QStringList list = i.getInterfaceList(); | ||
340 | QMap<QString, Interface*>::Iterator it; | ||
341 | for ( QStringList::Iterator ni = list.begin(); ni != list.end(); ++ni ) { | ||
342 | for( it = interfaceNames.begin(); it != interfaceNames.end(); ++it ){ | ||
343 | if(it.key() == (*ni)){ | ||
344 | Interface *i = new Interface(*ni, false); | ||
345 | i->setAttached(false); | ||
346 | i->setHardwareName(QString("Disconnected (%1)").arg(*ni)); | ||
347 | i->setInterfaceName(*ni); | ||
348 | interfaceNames.insert(i->getInterfaceName(), i); | ||
349 | updateInterface(i); | ||
350 | } | ||
351 | } | ||
352 | } | ||
353 | } | ||
335 | } | 354 | } |
336 | 355 | ||
337 | /** | 356 | /** |
338 | * Update this interface. If no QListViewItem exists create one. | 357 | * Update this interface. If no QListViewItem exists create one. |
@@ -365,8 +384,11 @@ void MainWindowImp::updateInterface(Interface *i){ | |||
365 | if(i->getInterfaceName().contains("irda")) | 384 | if(i->getInterfaceName().contains("irda")) |
366 | typeName = "irda"; | 385 | typeName = "irda"; |
367 | if(i->getInterfaceName().contains("wlan")) | 386 | if(i->getInterfaceName().contains("wlan")) |
368 | typeName = "wlan"; | 387 | typeName = "wlan"; |
388 | |||
389 | if(!i->isAttached()) | ||
390 | typeName = "connect_no"; | ||
369 | // Actually try to use the Module | 391 | // Actually try to use the Module |
370 | if(i->getModuleOwner() != NULL) | 392 | if(i->getModuleOwner() != NULL) |
371 | typeName = i->getModuleOwner()->getPixmapName(i); | 393 | typeName = i->getModuleOwner()->getPixmapName(i); |
372 | 394 | ||
diff --git a/noncore/net/networksetup/networksetup.pro b/noncore/net/networksetup/networksetup.pro index f09db93..441bbaa 100644 --- a/noncore/net/networksetup/networksetup.pro +++ b/noncore/net/networksetup/networksetup.pro | |||
@@ -1,11 +1,11 @@ | |||
1 | DESTDIR = $(OPIEDIR)/bin | 1 | #DESTDIR = $(OPIEDIR)/bin |
2 | TEMPLATE= app | 2 | TEMPLATE= app |
3 | #CONFIG = qt warn_on debug | 3 | #CONFIG = qt warn_on debug |
4 | CONFIG = qt warn_on release | 4 | CONFIG = qt warn_on release |
5 | HEADERS = mainwindowimp.h addconnectionimp.h interface.h interfaceinformationimp.h interfacesetupimp.h interfaces.h defaultmodule.h kprocctrl.h module.h kprocess.h | 5 | HEADERS = mainwindowimp.h addconnectionimp.h interface.h interfaceinformationimp.h interfacesetupimp.h interfaces.h defaultmodule.h kprocctrl.h module.h kprocess.h |
6 | SOURCES = main.cpp mainwindowimp.cpp addconnectionimp.cpp interface.cpp interfaceinformationimp.cpp interfacesetupimp.cpp kprocctrl.cpp kprocess.cpp interfaces.cpp | 6 | SOURCES = main.cpp mainwindowimp.cpp addconnectionimp.cpp interface.cpp interfaceinformationimp.cpp interfacesetupimp.cpp kprocctrl.cpp kprocess.cpp interfaces.cpp |
7 | INCLUDEPATH+= $(OPIEDIR)/include | 7 | #INCLUDEPATH+= $(OPIEDIR)/include |
8 | DEPENDPATH+= $(OPIEDIR)/include | 8 | #DEPENDPATH+= $(OPIEDIR)/include |
9 | LIBS += -lqpe | 9 | LIBS += -lqpe |
10 | INTERFACES= mainwindow.ui addconnection.ui interfaceinformation.ui interfaceadvanced.ui interfacesetup.ui | 10 | INTERFACES= mainwindow.ui addconnection.ui interfaceinformation.ui interfaceadvanced.ui interfacesetup.ui |
11 | TARGET = networksetup | 11 | TARGET = networksetup |
diff --git a/noncore/settings/networksettings/TODO b/noncore/settings/networksettings/TODO index 70d6717..7386646 100644 --- a/noncore/settings/networksettings/TODO +++ b/noncore/settings/networksettings/TODO | |||
@@ -4,4 +4,5 @@ | |||
4 | networksetup, doesnt bring you back to the main screen. | 4 | networksetup, doesnt bring you back to the main screen. |
5 | [x] Wlanmodule isnt writing out wireless.opts | 5 | [x] Wlanmodule isnt writing out wireless.opts |
6 | [ ] Need a means of bringing an interface up and down (calling | 6 | [ ] Need a means of bringing an interface up and down (calling |
7 | out ifup/ifdown) from the gui. | 7 | out ifup/ifdown) from the gui. |
8 | -Ben- Click information, then click up or down... :-D | ||
diff --git a/noncore/settings/networksettings/interfaces.cpp b/noncore/settings/networksettings/interfaces.cpp index b8a3e7f..1287d90 100644 --- a/noncore/settings/networksettings/interfaces.cpp +++ b/noncore/settings/networksettings/interfaces.cpp | |||
@@ -39,12 +39,36 @@ Interfaces::Interfaces(QString useInterfacesFile){ | |||
39 | currentIface = interfaces.end(); | 39 | currentIface = interfaces.end(); |
40 | currentMapping = interfaces.end(); | 40 | currentMapping = interfaces.end(); |
41 | } | 41 | } |
42 | 42 | ||
43 | |||
44 | /** | ||
45 | * Get a list of all interfaces in the interface file. Usefull for | ||
46 | * hardware that is not currently connected such as an 802.11b card | ||
47 | * not plugged in, but configured for when it is plugged in. | ||
48 | * @return Return string list of interfaces. | ||
49 | **/ | ||
50 | QStringList Interfaces::getInterfaceList(){ | ||
51 | QStringList list; | ||
52 | for ( QStringList::Iterator it = interfaces.begin(); it != interfaces.end(); ++it ) { | ||
53 | QString line = (*it).simplifyWhiteSpace(); | ||
54 | if(line.contains(IFACE)){ | ||
55 | line = line.mid(QString(IFACE).length() +1, line.length()); | ||
56 | line = line.simplifyWhiteSpace(); | ||
57 | int findSpace = line.find(" "); | ||
58 | if( findSpace >= 0){ | ||
59 | line = line.mid(0, findSpace); | ||
60 | list.append(line); | ||
61 | } | ||
62 | } | ||
63 | } | ||
64 | return list; | ||
65 | } | ||
66 | |||
43 | /** | 67 | /** |
44 | * Find out if interface is in an "auto" group or not. | 68 | * Find out if interface is in an "auto" group or not. |
45 | * Report any duplicates such as eth0 being in two differnt auto's | 69 | * Report any duplicates such as eth0 being in two differnt auto's |
46 | * @param | 70 | * @param interface interface to check to see if it is on or not. |
47 | * @return true is interface is in auto | 71 | * @return true is interface is in auto |
48 | */ | 72 | */ |
49 | bool Interfaces::isAuto(QString interface){ | 73 | bool Interfaces::isAuto(QString interface){ |
50 | QStringList autoLines = interfaces.grep(QRegExp(AUTO)); | 74 | QStringList autoLines = interfaces.grep(QRegExp(AUTO)); |
diff --git a/noncore/settings/networksettings/interfaces.h b/noncore/settings/networksettings/interfaces.h index 2cc9689..8b4788c 100644 --- a/noncore/settings/networksettings/interfaces.h +++ b/noncore/settings/networksettings/interfaces.h | |||
@@ -22,8 +22,9 @@ | |||
22 | class Interfaces { | 22 | class Interfaces { |
23 | 23 | ||
24 | public: | 24 | public: |
25 | Interfaces(QString useInterfacesFile = "/etc/network/interfaces"); | 25 | Interfaces(QString useInterfacesFile = "/etc/network/interfaces"); |
26 | QStringList getInterfaceList(); | ||
26 | 27 | ||
27 | bool isAuto(QString interface); | 28 | bool isAuto(QString interface); |
28 | bool setAuto(QString interface, bool setAuto); | 29 | bool setAuto(QString interface, bool setAuto); |
29 | 30 | ||
diff --git a/noncore/settings/networksettings/mainwindowimp.cpp b/noncore/settings/networksettings/mainwindowimp.cpp index 36f12e0..24af1ec 100644 --- a/noncore/settings/networksettings/mainwindowimp.cpp +++ b/noncore/settings/networksettings/mainwindowimp.cpp | |||
@@ -1,8 +1,10 @@ | |||
1 | #include "mainwindowimp.h" | 1 | #include "mainwindowimp.h" |
2 | #include "addconnectionimp.h" | 2 | #include "addconnectionimp.h" |
3 | #include "interfaceinformationimp.h" | 3 | #include "interfaceinformationimp.h" |
4 | #include "interfacesetupimp.h" | 4 | #include "interfacesetupimp.h" |
5 | #include "interfaces.h" | ||
6 | |||
5 | #include "module.h" | 7 | #include "module.h" |
6 | 8 | ||
7 | #include "kprocess.h" | 9 | #include "kprocess.h" |
8 | 10 | ||
@@ -331,8 +333,25 @@ void MainWindowImp::jobDone(KProcess *process){ | |||
331 | } | 333 | } |
332 | } | 334 | } |
333 | file.close(); | 335 | file.close(); |
334 | QFile::remove(fileName); | 336 | QFile::remove(fileName); |
337 | if(threads.count() == 0){ | ||
338 | Interfaces i; | ||
339 | QStringList list = i.getInterfaceList(); | ||
340 | QMap<QString, Interface*>::Iterator it; | ||
341 | for ( QStringList::Iterator ni = list.begin(); ni != list.end(); ++ni ) { | ||
342 | for( it = interfaceNames.begin(); it != interfaceNames.end(); ++it ){ | ||
343 | if(it.key() == (*ni)){ | ||
344 | Interface *i = new Interface(*ni, false); | ||
345 | i->setAttached(false); | ||
346 | i->setHardwareName(QString("Disconnected (%1)").arg(*ni)); | ||
347 | i->setInterfaceName(*ni); | ||
348 | interfaceNames.insert(i->getInterfaceName(), i); | ||
349 | updateInterface(i); | ||
350 | } | ||
351 | } | ||
352 | } | ||
353 | } | ||
335 | } | 354 | } |
336 | 355 | ||
337 | /** | 356 | /** |
338 | * Update this interface. If no QListViewItem exists create one. | 357 | * Update this interface. If no QListViewItem exists create one. |
@@ -365,8 +384,11 @@ void MainWindowImp::updateInterface(Interface *i){ | |||
365 | if(i->getInterfaceName().contains("irda")) | 384 | if(i->getInterfaceName().contains("irda")) |
366 | typeName = "irda"; | 385 | typeName = "irda"; |
367 | if(i->getInterfaceName().contains("wlan")) | 386 | if(i->getInterfaceName().contains("wlan")) |
368 | typeName = "wlan"; | 387 | typeName = "wlan"; |
388 | |||
389 | if(!i->isAttached()) | ||
390 | typeName = "connect_no"; | ||
369 | // Actually try to use the Module | 391 | // Actually try to use the Module |
370 | if(i->getModuleOwner() != NULL) | 392 | if(i->getModuleOwner() != NULL) |
371 | typeName = i->getModuleOwner()->getPixmapName(i); | 393 | typeName = i->getModuleOwner()->getPixmapName(i); |
372 | 394 | ||
diff --git a/noncore/settings/networksettings/networksetup.pro b/noncore/settings/networksettings/networksetup.pro index f09db93..441bbaa 100644 --- a/noncore/settings/networksettings/networksetup.pro +++ b/noncore/settings/networksettings/networksetup.pro | |||
@@ -1,11 +1,11 @@ | |||
1 | DESTDIR = $(OPIEDIR)/bin | 1 | #DESTDIR = $(OPIEDIR)/bin |
2 | TEMPLATE= app | 2 | TEMPLATE= app |
3 | #CONFIG = qt warn_on debug | 3 | #CONFIG = qt warn_on debug |
4 | CONFIG = qt warn_on release | 4 | CONFIG = qt warn_on release |
5 | HEADERS = mainwindowimp.h addconnectionimp.h interface.h interfaceinformationimp.h interfacesetupimp.h interfaces.h defaultmodule.h kprocctrl.h module.h kprocess.h | 5 | HEADERS = mainwindowimp.h addconnectionimp.h interface.h interfaceinformationimp.h interfacesetupimp.h interfaces.h defaultmodule.h kprocctrl.h module.h kprocess.h |
6 | SOURCES = main.cpp mainwindowimp.cpp addconnectionimp.cpp interface.cpp interfaceinformationimp.cpp interfacesetupimp.cpp kprocctrl.cpp kprocess.cpp interfaces.cpp | 6 | SOURCES = main.cpp mainwindowimp.cpp addconnectionimp.cpp interface.cpp interfaceinformationimp.cpp interfacesetupimp.cpp kprocctrl.cpp kprocess.cpp interfaces.cpp |
7 | INCLUDEPATH+= $(OPIEDIR)/include | 7 | #INCLUDEPATH+= $(OPIEDIR)/include |
8 | DEPENDPATH+= $(OPIEDIR)/include | 8 | #DEPENDPATH+= $(OPIEDIR)/include |
9 | LIBS += -lqpe | 9 | LIBS += -lqpe |
10 | INTERFACES= mainwindow.ui addconnection.ui interfaceinformation.ui interfaceadvanced.ui interfacesetup.ui | 10 | INTERFACES= mainwindow.ui addconnection.ui interfaceinformation.ui interfaceadvanced.ui interfacesetup.ui |
11 | TARGET = networksetup | 11 | TARGET = networksetup |