Diffstat (limited to 'noncore/settings/networksettings') (more/less context) (ignore whitespace changes)
4 files changed, 21 insertions, 7 deletions
diff --git a/noncore/settings/networksettings/interface.cpp b/noncore/settings/networksettings/interface.cpp index b9b09ad..f6eed00 100644 --- a/noncore/settings/networksettings/interface.cpp +++ b/noncore/settings/networksettings/interface.cpp | |||
@@ -196,5 +196,5 @@ bool Interface::refresh(){ | |||
196 | // Grab the start time | 196 | // Grab the start time |
197 | // pid com state ppid pgrp session tty_nr tpgid flags | 197 | // pid com state ppid pgrp session tty_nr tpgid flags |
198 | int r = sscanf(line.latin1(), "%*d %*s %*c %*d %*d %*d %*d %*d %*u " | 198 | sscanf(line.latin1(), "%*d %*s %*c %*d %*d %*d %*d %*d %*u " |
199 | // minflt cminflt majflt cmajflt utime stime cutime cstime priority | 199 | // minflt cminflt majflt cmajflt utime stime cutime cstime priority |
200 | "%*u %*u %*u %*u %*u %*u %*d %*d %*d " | 200 | "%*u %*u %*u %*u %*u %*u %*d %*d %*d " |
diff --git a/noncore/settings/networksettings/interfaceinformationimp.h b/noncore/settings/networksettings/interfaceinformationimp.h index 6fc2384..c8a478e 100644 --- a/noncore/settings/networksettings/interfaceinformationimp.h +++ b/noncore/settings/networksettings/interfaceinformationimp.h | |||
@@ -19,7 +19,7 @@ private slots: | |||
19 | void restart(); | 19 | void restart(); |
20 | void advanced(); | 20 | void advanced(); |
21 | Interface *interface; | ||
22 | 21 | ||
23 | private: | 22 | private: |
23 | Interface *interface; | ||
24 | void updateInterface(); | 24 | void updateInterface(); |
25 | 25 | ||
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 | |||
@@ -3,4 +3,7 @@ | |||
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> |
@@ -51,10 +54,18 @@ MainWindowImp::MainWindowImp(QWidget *parent, const char *name) : MainWindow(par | |||
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 | ||
@@ -253,5 +264,5 @@ void MainWindowImp::jobDone(KProcess *process){ | |||
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()); |
diff --git a/noncore/settings/networksettings/mainwindowimp.h b/noncore/settings/networksettings/mainwindowimp.h index 95ec2a1..0618dd2 100644 --- a/noncore/settings/networksettings/mainwindowimp.h +++ b/noncore/settings/networksettings/mainwindowimp.h | |||
@@ -3,10 +3,11 @@ | |||
3 | 3 | ||
4 | #include "mainwindow.h" | 4 | #include "mainwindow.h" |
5 | #include "module.h" | ||
6 | #include "interface.h" | ||
7 | #include "kprocess.h" | ||
8 | #include <qmap.h> | 5 | #include <qmap.h> |
6 | #include <qstringlist.h> | ||
9 | 7 | ||
8 | class Module; | ||
9 | class Interface; | ||
10 | class QLibrary; | 10 | class QLibrary; |
11 | class KProcess; | ||
11 | 12 | ||
12 | class MainWindowImp : public MainWindow { | 13 | class MainWindowImp : public MainWindow { |
@@ -46,4 +47,6 @@ private: | |||
46 | 47 | ||
47 | QMap<KProcess*, QString> threads; | 48 | QMap<KProcess*, QString> threads; |
49 | QStringList profiles; | ||
50 | |||
48 | }; | 51 | }; |
49 | 52 | ||