Diffstat (limited to 'noncore/settings/networksettings/mainwindowimp.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/settings/networksettings/mainwindowimp.cpp | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/noncore/settings/networksettings/mainwindowimp.cpp b/noncore/settings/networksettings/mainwindowimp.cpp index 3c13143..ad9362f 100644 --- a/noncore/settings/networksettings/mainwindowimp.cpp +++ b/noncore/settings/networksettings/mainwindowimp.cpp | |||
@@ -1,16 +1,19 @@ | |||
1 | #include "mainwindowimp.h" | 1 | #include "mainwindowimp.h" |
2 | #include "addserviceimp.h" | 2 | #include "addserviceimp.h" |
3 | #include "interfaceinformationimp.h" | 3 | #include "interfaceinformationimp.h" |
4 | #include "interfacesetupimp.h" | 4 | #include "interfacesetupimp.h" |
5 | #include "interface.h" | ||
6 | #include "kprocess.h" | ||
7 | #include "module.h" | ||
5 | 8 | ||
6 | #include <qpushbutton.h> | 9 | #include <qpushbutton.h> |
7 | #include <qdir.h> | 10 | #include <qdir.h> |
8 | #include <qtabwidget.h> | 11 | #include <qtabwidget.h> |
9 | #include <qmainwindow.h> | 12 | #include <qmainwindow.h> |
10 | #include <qmessagebox.h> | 13 | #include <qmessagebox.h> |
11 | #include <qlistbox.h> | 14 | #include <qlistbox.h> |
12 | #include <qpe/config.h> | 15 | #include <qpe/config.h> |
13 | #include <qpe/qlibrary.h> | 16 | #include <qpe/qlibrary.h> |
14 | #include <qpe/resource.h> | 17 | #include <qpe/resource.h> |
15 | #include <qlist.h> | 18 | #include <qlist.h> |
16 | 19 | ||
@@ -41,30 +44,38 @@ MainWindowImp::MainWindowImp(QWidget *parent, const char *name) : MainWindow(par | |||
41 | pluginDir.mkdir( ( DirStr + "plugins/" ) ); | 44 | pluginDir.mkdir( ( DirStr + "plugins/" ) ); |
42 | QString path = DirStr + "plugins"; | 45 | QString path = DirStr + "plugins"; |
43 | pluginDir.setPath(path); | 46 | pluginDir.setPath(path); |
44 | if(!pluginDir.exists()){ | 47 | if(!pluginDir.exists()){ |
45 | qDebug(QString("MainWindowImp: ERROR: %1 %2").arg(__FILE__).arg(__LINE__).latin1()); | 48 | qDebug(QString("MainWindowImp: ERROR: %1 %2").arg(__FILE__).arg(__LINE__).latin1()); |
46 | return; | 49 | return; |
47 | } | 50 | } |
48 | 51 | ||
49 | // Load any saved services. | 52 | // Load any saved services. |
50 | loadModules(path); | 53 | loadModules(path); |
51 | getInterfaceList(); | 54 | getInterfaceList(); |
52 | serviceList->header()->hide(); | 55 | serviceList->header()->hide(); |
56 | |||
57 | |||
58 | Config cfg("NetworkSetup"); | ||
59 | profiles = QStringList::split(" ", cfg.readEntry("Profiles", "All")); | ||
53 | } | 60 | } |
54 | 61 | ||
55 | /** | 62 | /** |
56 | * Deconstructor. Unload libraries and save. | 63 | * Deconstructor. Unload libraries and save profile list. |
57 | */ | 64 | */ |
58 | MainWindowImp::~MainWindowImp(){ | 65 | MainWindowImp::~MainWindowImp(){ |
66 | if(profiles.count() > 1){ | ||
67 | Config cfg("NetworkSetup"); | ||
68 | cfg.writeEntry("Profiles", profiles.join(" ")); | ||
69 | } | ||
59 | } | 70 | } |
60 | 71 | ||
61 | void MainWindowImp::loadModules(QString path){ | 72 | void MainWindowImp::loadModules(QString path){ |
62 | } | 73 | } |
63 | 74 | ||
64 | /** | 75 | /** |
65 | * Attempt to load a function and resolve a function. | 76 | * Attempt to load a function and resolve a function. |
66 | * @param pluginFileName - the name of the file in which to attempt to load | 77 | * @param pluginFileName - the name of the file in which to attempt to load |
67 | * @param resolveString - function pointer to resolve | 78 | * @param resolveString - function pointer to resolve |
68 | * @return pointer to the function with name resolveString or NULL | 79 | * @return pointer to the function with name resolveString or NULL |
69 | */ | 80 | */ |
70 | Module* MainWindowImp::loadPlugin(QString pluginFileName, QString resolveString){ | 81 | Module* MainWindowImp::loadPlugin(QString pluginFileName, QString resolveString){ |
@@ -243,25 +254,25 @@ void MainWindowImp::jobDone(KProcess *process){ | |||
243 | i->setStatus(true); | 254 | i->setStatus(true); |
244 | } | 255 | } |
245 | 256 | ||
246 | i->setAttached(true); | 257 | i->setAttached(true); |
247 | i->setInterfaceName(interfaceName); | 258 | i->setInterfaceName(interfaceName); |
248 | 259 | ||
249 | QString hardName = "Ethernet"; | 260 | QString hardName = "Ethernet"; |
250 | int hardwareName = line.find("Link encap:"); | 261 | int hardwareName = line.find("Link encap:"); |
251 | int macAddress = line.find("HWaddr"); | 262 | int macAddress = line.find("HWaddr"); |
252 | if(macAddress == -1) | 263 | if(macAddress == -1) |
253 | macAddress = line.length(); | 264 | macAddress = line.length(); |
254 | if(hardwareName != -1) | 265 | if(hardwareName != -1) |
255 | i->setHardwareName(line.mid(hardwareName+11, macAddress-(hardwareName+11))); | 266 | i->setHardwareName(line.mid(hardwareName+11, macAddress-(hardwareName+11)) + QString(" (%1)").arg(i->getInterfaceName())); |
256 | // We have found an interface | 267 | // We have found an interface |
257 | //qDebug(QString("MainWindowImp: Found Interface: %1").arg(line).latin1()); | 268 | //qDebug(QString("MainWindowImp: Found Interface: %1").arg(line).latin1()); |
258 | interfaceNames.insert(i->getInterfaceName(), i); | 269 | interfaceNames.insert(i->getInterfaceName(), i); |
259 | updateInterface(i); | 270 | updateInterface(i); |
260 | } | 271 | } |
261 | } | 272 | } |
262 | file.close(); | 273 | file.close(); |
263 | QFile::remove(fileName); | 274 | QFile::remove(fileName); |
264 | } | 275 | } |
265 | 276 | ||
266 | void MainWindowImp::updateInterface(Interface *i){ | 277 | void MainWindowImp::updateInterface(Interface *i){ |
267 | QListViewItem *item = NULL; | 278 | QListViewItem *item = NULL; |