author | kergoth <kergoth> | 2002-10-15 22:26:57 (UTC) |
---|---|---|
committer | kergoth <kergoth> | 2002-10-15 22:26:57 (UTC) |
commit | 9e38d78e1c1bcdd3841cc0edfacad731814754ba (patch) (unidiff) | |
tree | 312bc9d2adae9206db2d2f23d8acbe1ff4372a42 | |
parent | fcc5702d6c6b4d6ecba51451ea491bcc4799b88a (diff) | |
download | opie-9e38d78e1c1bcdd3841cc0edfacad731814754ba.zip opie-9e38d78e1c1bcdd3841cc0edfacad731814754ba.tar.gz opie-9e38d78e1c1bcdd3841cc0edfacad731814754ba.tar.bz2 |
Change plugin path to QPEApplication::qpeDir + /plugins/networksetup
-rw-r--r-- | noncore/net/networksetup/mainwindowimp.cpp | 2 | ||||
-rw-r--r-- | noncore/settings/networksettings/mainwindowimp.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/noncore/net/networksetup/mainwindowimp.cpp b/noncore/net/networksetup/mainwindowimp.cpp index e895971..3715da0 100644 --- a/noncore/net/networksetup/mainwindowimp.cpp +++ b/noncore/net/networksetup/mainwindowimp.cpp | |||
@@ -20,49 +20,49 @@ | |||
20 | #include <qpe/config.h> | 20 | #include <qpe/config.h> |
21 | #include <qpe/qlibrary.h> | 21 | #include <qpe/qlibrary.h> |
22 | #include <qpe/resource.h> | 22 | #include <qpe/resource.h> |
23 | 23 | ||
24 | #include <qlist.h> | 24 | #include <qlist.h> |
25 | #include <qdir.h> | 25 | #include <qdir.h> |
26 | #include <qfile.h> | 26 | #include <qfile.h> |
27 | #include <qtextstream.h> | 27 | #include <qtextstream.h> |
28 | 28 | ||
29 | #define TEMP_ALL "/tmp/ifconfig-a" | 29 | #define TEMP_ALL "/tmp/ifconfig-a" |
30 | #define TEMP_UP "/tmp/ifconfig" | 30 | #define TEMP_UP "/tmp/ifconfig" |
31 | 31 | ||
32 | MainWindowImp::MainWindowImp(QWidget *parent, const char *name) : MainWindow(parent, name, true), advancedUserMode(false){ | 32 | MainWindowImp::MainWindowImp(QWidget *parent, const char *name) : MainWindow(parent, name, true), advancedUserMode(false){ |
33 | connect(addConnectionButton, SIGNAL(clicked()), this, SLOT(addClicked())); | 33 | connect(addConnectionButton, SIGNAL(clicked()), this, SLOT(addClicked())); |
34 | connect(removeConnectionButton, SIGNAL(clicked()), this, SLOT(removeClicked())); | 34 | connect(removeConnectionButton, SIGNAL(clicked()), this, SLOT(removeClicked())); |
35 | connect(informationConnectionButton, SIGNAL(clicked()), this, SLOT(informationClicked())); | 35 | connect(informationConnectionButton, SIGNAL(clicked()), this, SLOT(informationClicked())); |
36 | connect(configureConnectionButton, SIGNAL(clicked()), this, SLOT(configureClicked())); | 36 | connect(configureConnectionButton, SIGNAL(clicked()), this, SLOT(configureClicked())); |
37 | 37 | ||
38 | connect(newProfileButton, SIGNAL(clicked()), this, SLOT(addProfile())); | 38 | connect(newProfileButton, SIGNAL(clicked()), this, SLOT(addProfile())); |
39 | connect(removeProfileButton, SIGNAL(clicked()), this, SLOT(removeProfile())); | 39 | connect(removeProfileButton, SIGNAL(clicked()), this, SLOT(removeProfile())); |
40 | connect(setCurrentProfileButton, SIGNAL(clicked()), this, SLOT(changeProfile())); | 40 | connect(setCurrentProfileButton, SIGNAL(clicked()), this, SLOT(changeProfile())); |
41 | 41 | ||
42 | connect(newProfile, SIGNAL(textChanged(const QString&)), this, SLOT(newProfileChanged(const QString&))); | 42 | connect(newProfile, SIGNAL(textChanged(const QString&)), this, SLOT(newProfileChanged(const QString&))); |
43 | // Load connections. | 43 | // Load connections. |
44 | loadModules(QDir::homeDirPath() + "/.networksetup/plugins"); | 44 | loadModules(QPEApplication::qpeDir() + "/plugins/networksetup"); |
45 | getInterfaceList(); | 45 | getInterfaceList(); |
46 | connectionList->header()->hide(); | 46 | connectionList->header()->hide(); |
47 | 47 | ||
48 | 48 | ||
49 | Config cfg("NetworkSetup"); | 49 | Config cfg("NetworkSetup"); |
50 | profiles = QStringList::split(" ", cfg.readEntry("Profiles", "All")); | 50 | profiles = QStringList::split(" ", cfg.readEntry("Profiles", "All")); |
51 | for ( QStringList::Iterator it = profiles.begin(); it != profiles.end(); ++it) | 51 | for ( QStringList::Iterator it = profiles.begin(); it != profiles.end(); ++it) |
52 | profilesList->insertItem((*it)); | 52 | profilesList->insertItem((*it)); |
53 | advancedUserMode = cfg.readBoolEntry("AdvancedUserMode", false); | 53 | advancedUserMode = cfg.readBoolEntry("AdvancedUserMode", false); |
54 | } | 54 | } |
55 | 55 | ||
56 | /** | 56 | /** |
57 | * Deconstructor. Save profiles. Delete loaded libraries. | 57 | * Deconstructor. Save profiles. Delete loaded libraries. |
58 | */ | 58 | */ |
59 | MainWindowImp::~MainWindowImp(){ | 59 | MainWindowImp::~MainWindowImp(){ |
60 | // Save profiles. | 60 | // Save profiles. |
61 | if(profiles.count() > 1){ | 61 | if(profiles.count() > 1){ |
62 | Config cfg("NetworkSetup"); | 62 | Config cfg("NetworkSetup"); |
63 | cfg.setGroup("General"); | 63 | cfg.setGroup("General"); |
64 | cfg.writeEntry("Profiles", profiles.join(" ")); | 64 | cfg.writeEntry("Profiles", profiles.join(" ")); |
65 | } | 65 | } |
66 | // Delete Modules and Libraries | 66 | // Delete Modules and Libraries |
67 | QMap<Module*, QLibrary*>::Iterator it; | 67 | QMap<Module*, QLibrary*>::Iterator it; |
68 | for( it = libraries.begin(); it != libraries.end(); ++it ){ | 68 | for( it = libraries.begin(); it != libraries.end(); ++it ){ |
diff --git a/noncore/settings/networksettings/mainwindowimp.cpp b/noncore/settings/networksettings/mainwindowimp.cpp index e895971..3715da0 100644 --- a/noncore/settings/networksettings/mainwindowimp.cpp +++ b/noncore/settings/networksettings/mainwindowimp.cpp | |||
@@ -20,49 +20,49 @@ | |||
20 | #include <qpe/config.h> | 20 | #include <qpe/config.h> |
21 | #include <qpe/qlibrary.h> | 21 | #include <qpe/qlibrary.h> |
22 | #include <qpe/resource.h> | 22 | #include <qpe/resource.h> |
23 | 23 | ||
24 | #include <qlist.h> | 24 | #include <qlist.h> |
25 | #include <qdir.h> | 25 | #include <qdir.h> |
26 | #include <qfile.h> | 26 | #include <qfile.h> |
27 | #include <qtextstream.h> | 27 | #include <qtextstream.h> |
28 | 28 | ||
29 | #define TEMP_ALL "/tmp/ifconfig-a" | 29 | #define TEMP_ALL "/tmp/ifconfig-a" |
30 | #define TEMP_UP "/tmp/ifconfig" | 30 | #define TEMP_UP "/tmp/ifconfig" |
31 | 31 | ||
32 | MainWindowImp::MainWindowImp(QWidget *parent, const char *name) : MainWindow(parent, name, true), advancedUserMode(false){ | 32 | MainWindowImp::MainWindowImp(QWidget *parent, const char *name) : MainWindow(parent, name, true), advancedUserMode(false){ |
33 | connect(addConnectionButton, SIGNAL(clicked()), this, SLOT(addClicked())); | 33 | connect(addConnectionButton, SIGNAL(clicked()), this, SLOT(addClicked())); |
34 | connect(removeConnectionButton, SIGNAL(clicked()), this, SLOT(removeClicked())); | 34 | connect(removeConnectionButton, SIGNAL(clicked()), this, SLOT(removeClicked())); |
35 | connect(informationConnectionButton, SIGNAL(clicked()), this, SLOT(informationClicked())); | 35 | connect(informationConnectionButton, SIGNAL(clicked()), this, SLOT(informationClicked())); |
36 | connect(configureConnectionButton, SIGNAL(clicked()), this, SLOT(configureClicked())); | 36 | connect(configureConnectionButton, SIGNAL(clicked()), this, SLOT(configureClicked())); |
37 | 37 | ||
38 | connect(newProfileButton, SIGNAL(clicked()), this, SLOT(addProfile())); | 38 | connect(newProfileButton, SIGNAL(clicked()), this, SLOT(addProfile())); |
39 | connect(removeProfileButton, SIGNAL(clicked()), this, SLOT(removeProfile())); | 39 | connect(removeProfileButton, SIGNAL(clicked()), this, SLOT(removeProfile())); |
40 | connect(setCurrentProfileButton, SIGNAL(clicked()), this, SLOT(changeProfile())); | 40 | connect(setCurrentProfileButton, SIGNAL(clicked()), this, SLOT(changeProfile())); |
41 | 41 | ||
42 | connect(newProfile, SIGNAL(textChanged(const QString&)), this, SLOT(newProfileChanged(const QString&))); | 42 | connect(newProfile, SIGNAL(textChanged(const QString&)), this, SLOT(newProfileChanged(const QString&))); |
43 | // Load connections. | 43 | // Load connections. |
44 | loadModules(QDir::homeDirPath() + "/.networksetup/plugins"); | 44 | loadModules(QPEApplication::qpeDir() + "/plugins/networksetup"); |
45 | getInterfaceList(); | 45 | getInterfaceList(); |
46 | connectionList->header()->hide(); | 46 | connectionList->header()->hide(); |
47 | 47 | ||
48 | 48 | ||
49 | Config cfg("NetworkSetup"); | 49 | Config cfg("NetworkSetup"); |
50 | profiles = QStringList::split(" ", cfg.readEntry("Profiles", "All")); | 50 | profiles = QStringList::split(" ", cfg.readEntry("Profiles", "All")); |
51 | for ( QStringList::Iterator it = profiles.begin(); it != profiles.end(); ++it) | 51 | for ( QStringList::Iterator it = profiles.begin(); it != profiles.end(); ++it) |
52 | profilesList->insertItem((*it)); | 52 | profilesList->insertItem((*it)); |
53 | advancedUserMode = cfg.readBoolEntry("AdvancedUserMode", false); | 53 | advancedUserMode = cfg.readBoolEntry("AdvancedUserMode", false); |
54 | } | 54 | } |
55 | 55 | ||
56 | /** | 56 | /** |
57 | * Deconstructor. Save profiles. Delete loaded libraries. | 57 | * Deconstructor. Save profiles. Delete loaded libraries. |
58 | */ | 58 | */ |
59 | MainWindowImp::~MainWindowImp(){ | 59 | MainWindowImp::~MainWindowImp(){ |
60 | // Save profiles. | 60 | // Save profiles. |
61 | if(profiles.count() > 1){ | 61 | if(profiles.count() > 1){ |
62 | Config cfg("NetworkSetup"); | 62 | Config cfg("NetworkSetup"); |
63 | cfg.setGroup("General"); | 63 | cfg.setGroup("General"); |
64 | cfg.writeEntry("Profiles", profiles.join(" ")); | 64 | cfg.writeEntry("Profiles", profiles.join(" ")); |
65 | } | 65 | } |
66 | // Delete Modules and Libraries | 66 | // Delete Modules and Libraries |
67 | QMap<Module*, QLibrary*>::Iterator it; | 67 | QMap<Module*, QLibrary*>::Iterator it; |
68 | for( it = libraries.begin(); it != libraries.end(); ++it ){ | 68 | for( it = libraries.begin(); it != libraries.end(); ++it ){ |