summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/networksettings/config.in4
-rw-r--r--noncore/settings/networksettings/interfaces/.cvsignore3
-rw-r--r--noncore/settings/networksettings/interfaces/config.in2
-rw-r--r--noncore/settings/networksettings/interfaces/interfacesetupimp.cpp6
-rw-r--r--noncore/settings/networksettings/main.cpp2
-rw-r--r--noncore/settings/networksettings/networksettings.pro2
-rw-r--r--noncore/settings/networksettings/opie-networksettings.control2
-rw-r--r--noncore/settings/networksettings/wlan/.cvsignore2
-rw-r--r--noncore/settings/networksettings/wlan/config.in4
-rw-r--r--noncore/settings/networksettings/wlan/opie-networksettingsplugin-wlan.control4
-rw-r--r--noncore/settings/networksettings/wlan/wlanimp.cpp96
-rw-r--r--noncore/settings/networksettings/wlan/wlanimp2.cpp18
12 files changed, 74 insertions, 71 deletions
diff --git a/noncore/settings/networksettings/config.in b/noncore/settings/networksettings/config.in
index 4965a6e..e23e96a 100644
--- a/noncore/settings/networksettings/config.in
+++ b/noncore/settings/networksettings/config.in
@@ -1,13 +1,13 @@
config NETWORKSETUP
boolean "opie-networksettings (TCP/IP network settings)"
default "y"
- depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE && LIBOPIE2NET
+ depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2UI && LIBOPIE2NET
config NETWORKSETUP-CORE
boolean
default "y" if NETWORKSETUP
- depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE && NETWORKSETUP && INTERFACES
+ depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2UI && NETWORKSETUP && INTERFACES
source noncore/settings/networksettings/ppp/config.in
source noncore/settings/networksettings/wlan/config.in
source noncore/settings/networksettings/interfaces/config.in
diff --git a/noncore/settings/networksettings/interfaces/.cvsignore b/noncore/settings/networksettings/interfaces/.cvsignore
index 1655b12..0b2d203 100644
--- a/noncore/settings/networksettings/interfaces/.cvsignore
+++ b/noncore/settings/networksettings/interfaces/.cvsignore
@@ -1,5 +1,4 @@
-
Makefile
Makefile.in
interfaceadvanced.cpp
interfaceadvanced.h
@@ -8,4 +7,6 @@ interfaceinformation.h
interfacesetup.cpp
interfacesetup.h
lib*.so*
moc*
+.moc
+.obj \ No newline at end of file
diff --git a/noncore/settings/networksettings/interfaces/config.in b/noncore/settings/networksettings/interfaces/config.in
index 6c21aeb..d84cd24 100644
--- a/noncore/settings/networksettings/interfaces/config.in
+++ b/noncore/settings/networksettings/interfaces/config.in
@@ -1,4 +1,4 @@
config INTERFACES
boolean
default "y" if NETWORKSETUP
- depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
+ depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE
diff --git a/noncore/settings/networksettings/interfaces/interfacesetupimp.cpp b/noncore/settings/networksettings/interfaces/interfacesetupimp.cpp
index 78466d0..ab0e4cc 100644
--- a/noncore/settings/networksettings/interfaces/interfacesetupimp.cpp
+++ b/noncore/settings/networksettings/interfaces/interfacesetupimp.cpp
@@ -11,9 +11,9 @@
#include <opie/oprocess.h>
#ifdef QWS
-#include <opie/owait.h>
+#include <opie2/owait.h>
#include <qpe/global.h>
#include <qapplication.h>
#endif
@@ -154,11 +154,11 @@ void InterfaceSetupImp::setProfile(const QString &profile){
interfaces->copyInterface(interface->getInterfaceName(), newInterfaceName);
if(!interfaces->setMapping(interface->getInterfaceName())){
interfaces->addMapping(interface->getInterfaceName());
if(!interfaces->setMapping(interface->getInterfaceName())){
- qDebug("InterfaceSetupImp: Added Mapping, but still can't setInterface.");
+ qDebug("InterfaceSetupImp: Added Mapping, but still can't setInterface.");
return;
- }
+ }
}
interfaces->setMap("map", newInterfaceName);
interfaces->setScript("getprofile.sh");
}
diff --git a/noncore/settings/networksettings/main.cpp b/noncore/settings/networksettings/main.cpp
index 5d275ac..bc11ab4 100644
--- a/noncore/settings/networksettings/main.cpp
+++ b/noncore/settings/networksettings/main.cpp
@@ -1,6 +1,6 @@
#include "mainwindowimp.h"
-#include <opie/oapplicationfactory.h>
+#include <opie2/oapplicationfactory.h>
OPIE_EXPORT_APP( OApplicationFactory<MainWindowImp> )
diff --git a/noncore/settings/networksettings/networksettings.pro b/noncore/settings/networksettings/networksettings.pro
index 0615ea4..5db2d6b 100644
--- a/noncore/settings/networksettings/networksettings.pro
+++ b/noncore/settings/networksettings/networksettings.pro
@@ -2,9 +2,9 @@ CONFIG = qt warn_on debug quick-app
HEADERS = mainwindowimp.h addconnectionimp.h defaultmodule.h module.h
SOURCES = main.cpp mainwindowimp.cpp addconnectionimp.cpp
INCLUDEPATH += $(OPIEDIR)/include interfaces/
DEPENDPATH += $(OPIEDIR)/include interfaces/ wlan/ ppp/
-LIBS += -lqpe -L$(OPIEDIR)/plugins/networksettings -Linterfaces/ -linterfaces -lopie
+LIBS += -lqpe -L$(OPIEDIR)/plugins/networksettings -Linterfaces/ -linterfaces -lopiecore2 -lopieui2
INTERFACES = mainwindow.ui addconnection.ui
TARGET = networksettings
diff --git a/noncore/settings/networksettings/opie-networksettings.control b/noncore/settings/networksettings/opie-networksettings.control
index 25e1e26..fbbddca 100644
--- a/noncore/settings/networksettings/opie-networksettings.control
+++ b/noncore/settings/networksettings/opie-networksettings.control
@@ -3,8 +3,8 @@ Files: plugins/application/libnetworksettings.so* bin/networksettings apps/Setti
Priority: optional
Section: opie/settings
Maintainer: Patrick S. Vogt <tille@handhelds.org>
Architecture: arm
-Depends: task-opie-minimal, libopiecore2, libopienet2
+Depends: task-opie-minimal, libopiecore2, libopieui2, libopienet2
Description: Network settings.
Replaces: opie-networksetup
Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/settings/networksettings/wlan/.cvsignore b/noncore/settings/networksettings/wlan/.cvsignore
index 7073cac..ae45698 100644
--- a/noncore/settings/networksettings/wlan/.cvsignore
+++ b/noncore/settings/networksettings/wlan/.cvsignore
@@ -4,4 +4,6 @@ info.cpp
info.h
moc_*
wlan.cpp
wlan.h
+.moc
+.obj
diff --git a/noncore/settings/networksettings/wlan/config.in b/noncore/settings/networksettings/wlan/config.in
index e459788..97fa468 100644
--- a/noncore/settings/networksettings/wlan/config.in
+++ b/noncore/settings/networksettings/wlan/config.in
@@ -1,6 +1,6 @@
config WLAN
boolean "opie-networksettingsplugin-wlan (wireless LAN module)"
default "n" if NETWORKSETUP
- depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE && NETWORKSETUP && NETWORKSETUP-CORE && INTERFACES && LIBOPIE2NET
- #comment "opie-networksettingsplugin-wlan needs libopie, libopie2net and networksetup"
+ depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2UI && NETWORKSETUP && NETWORKSETUP-CORE && INTERFACES && LIBOPIE2NET
+ #comment "opie-networksettingsplugin-wlan needs libopie2ui, libopie2net and networksetup"
#depends !( LIBOPIE2NET && LIBOPIE && NETWORKSETUP) \ No newline at end of file
diff --git a/noncore/settings/networksettings/wlan/opie-networksettingsplugin-wlan.control b/noncore/settings/networksettings/wlan/opie-networksettingsplugin-wlan.control
index 1147621..f4f20b1 100644
--- a/noncore/settings/networksettings/wlan/opie-networksettingsplugin-wlan.control
+++ b/noncore/settings/networksettings/wlan/opie-networksettingsplugin-wlan.control
@@ -1,9 +1,9 @@
Package: opie-networksettingsplugin-wlan
-Files: plugins/networksettings/libwlan.so*
+Files: plugins/networksettings/libwlan.so*
Priority: optional
Section: opie/settings
Maintainer: Patrick S. Vogt <tille@handhelds.org>
Architecture: arm
-Depends: opie-networksettings, libopienet2
+Depends: opie-networksettings, libopiecore2, libopienet2
Description: Network settings wavelan plugin.
Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/settings/networksettings/wlan/wlanimp.cpp b/noncore/settings/networksettings/wlan/wlanimp.cpp
index 719be1b..95f4abe 100644
--- a/noncore/settings/networksettings/wlan/wlanimp.cpp
+++ b/noncore/settings/networksettings/wlan/wlanimp.cpp
@@ -12,10 +12,10 @@
#include <qcheckbox.h>
#include <qtabwidget.h>
#include <qcombobox.h>
-#ifdef QWS
- #include <opie/oprocess.h>
+#ifdef QWS
+ #include <opie2/oprocess.h>
#else
#define OProcess KProcess
#include <kprocess.h>
#endif
@@ -23,9 +23,9 @@
#define WIRELESS_OPTS "/etc/pcmcia/wireless.opts"
/**
* Constructor, read in the wireless.opts file for parsing later.
- */
+ */
WLANImp::WLANImp( QWidget* parent, const char* name, Interface *i, bool modal, WFlags fl):WLAN(parent, name, modal, fl), currentProfile("*") {
interfaceSetup = new InterfaceSetupImp(tabWidget, "InterfaceSetupImp", i);
tabWidget->insertTab(interfaceSetup, "TCP/IP");
@@ -54,26 +54,26 @@ void WLANImp::typeChanged(int mod){
}
/**
* Change the profile for both wireless settings and network settings.
- */
+ */
void WLANImp::setProfile(const QString &profile){
interfaceSetup->setProfile(profile);
parseSettingFile();
}
/**
* Parses the settings file that was read in and gets any setting from it.
- */
+ */
void WLANImp::parseSettingFile(){
bool foundCase = false;
bool found = false;
for ( QStringList::Iterator it = settingsFileText.begin(); it != settingsFileText.end(); ++it ) {
QString line = (*it).simplifyWhiteSpace();
if(line.contains("case"))
foundCase = true;
// See if we found our scheme to write or the sceme couldn't be found
- if((foundCase && line.contains("esac")) ||
+ if((foundCase && line.contains("esac")) ||
(foundCase && line.left(currentProfile.length()+7) == currentProfile + ",*,*,*)" && line.at(0) != '#'))
found = true;
if(line.contains(";;"))
@@ -83,25 +83,25 @@ void WLANImp::parseSettingFile(){
if(line.contains("ESSID=")){
QString id = line.mid(line.find("ESSID=")+6, line.length());
if(id == "any"){
essAny->setChecked(false);
- }else{
+ }else{
essAny->setChecked(true);
- essSpecificLineEdit->setText(id);
- }
+ essSpecificLineEdit->setText(id);
+ }
}
if(line.contains("MODE=")){
QString mode = line.mid(line.find("MODE=")+5, line.length());
if(mode == "Managed"){
networkType->setCurrentItem(0);
- channelLabel->setEnabled(false);
- networkChannel->setEnabled(false);
- }
- else{
- networkType->setCurrentItem(1);
+ channelLabel->setEnabled(false);
+ networkChannel->setEnabled(false);
+ }
+ else{
+ networkType->setCurrentItem(1);
networkChannel->setEnabled(true);
- channelLabel->setEnabled(true);
- }
+ channelLabel->setEnabled(true);
+ }
}
if(line.contains("#KEY0="))
keyLineEdit0->setText(line.mid(6, line.length()));
if(line.contains("#KEY1="))
@@ -109,26 +109,26 @@ void WLANImp::parseSettingFile(){
if(line.contains("#KEY2="))
keyLineEdit2->setText(line.mid(6, line.length()));
if(line.contains("#KEY3="))
keyLineEdit3->setText(line.mid(6, line.length()));
-
+
if(line.contains("KEY=")){
wepEnabled->setChecked(true);
QString key;
- if(line.right(5) == (" open")){
- key = line.mid(4, line.length()-5);
- authOpen->setChecked(true);
- authShared->setChecked(false);
- }
- else{
- authOpen->setChecked(false);
- authShared->setChecked(true);
- key = line.mid(4, line.length());
- }
+ if(line.right(5) == (" open")){
+ key = line.mid(4, line.length()-5);
+ authOpen->setChecked(true);
+ authShared->setChecked(false);
+ }
+ else{
+ authOpen->setChecked(false);
+ authShared->setChecked(true);
+ key = line.mid(4, line.length());
+ }
if(key == keyLineEdit0->text()) keyRadio0->setChecked(true);
- if(key == keyLineEdit1->text()) keyRadio1->setChecked(true);
- if(key == keyLineEdit2->text()) keyRadio2->setChecked(true);
- if(key == keyLineEdit3->text()) keyRadio3->setChecked(true);
+ if(key == keyLineEdit1->text()) keyRadio1->setChecked(true);
+ if(key == keyLineEdit2->text()) keyRadio2->setChecked(true);
+ if(key == keyLineEdit3->text()) keyRadio3->setChecked(true);
}
if(line.contains("CHANNEL=")){
networkChannel->setValue(line.mid(line.find("CHANNEL=")+8, line.length()).toInt());
}
@@ -137,9 +137,9 @@ void WLANImp::parseSettingFile(){
}
/**
* Saves settings to the wireless.opts file using the current profile
- */
+ */
void WLANImp::changeAndSaveSettingFile(){
QString wlanFile = WIRELESS_OPTS;
QFile::remove(wlanFile);
QFile file(wlanFile);
@@ -147,9 +147,9 @@ void WLANImp::changeAndSaveSettingFile(){
if (!file.open(IO_ReadWrite)){
qDebug(QString("WLANImp::changeAndSaveSettingFile(): Can't open file: %1 for writing.").arg(wlanFile).latin1());
return;
}
-
+
QTextStream stream( &file );
bool foundCase = false;
bool found = false;
bool output = true;
@@ -157,46 +157,46 @@ void WLANImp::changeAndSaveSettingFile(){
QString line = (*it).simplifyWhiteSpace();
if(line.contains("case"))
foundCase = true;
// See if we found our scheme to write or the sceme couldn't be found
- if((foundCase && line.contains("esac") && !found) ||
+ if((foundCase && line.contains("esac") && !found) ||
(foundCase && line.left(currentProfile.length()+7) == currentProfile + ",*,*,*)" && line.at(0) != '#')){
// write out scheme
found = true;
output = false;
-
+
if(!line.contains("esac"))
- stream << line << "\n";
+ stream << line << "\n";
if(!essAny->isChecked() == true){
stream << "\tESSID=any\n";
- stream << "\tMODE=Managed\n";
+ stream << "\tMODE=Managed\n";
}
else{
stream << "\tESSID=" << essSpecificLineEdit->text() << '\n';
stream << "\tMODE=" << ( networkType->currentItem() == 0 ? "Managed" : "ad-hoc") << '\n';
stream << "\tCHANNEL=" << networkChannel->value() << "\n";
- }
+ }
stream << "\t#KEY0=" << keyLineEdit0->text() << "\n";
stream << "\t#KEY1=" << keyLineEdit1->text() << "\n";
stream << "\t#KEY2=" << keyLineEdit2->text() << "\n";
stream << "\t#KEY3=" << keyLineEdit3->text() << "\n";
-
+
if(wepEnabled->isChecked()){
stream << "\tKEY=\"";
if(keyRadio0->isChecked()) stream << keyLineEdit0->text();
if(keyRadio1->isChecked()) stream << keyLineEdit1->text();
if(keyRadio2->isChecked()) stream << keyLineEdit2->text();
if(keyRadio3->isChecked()) stream << keyLineEdit3->text();
- if(authOpen->isChecked())
- stream << " open";
- else
- stream << " restricted";
- stream << "\"\n";
+ if(authOpen->isChecked())
+ stream << " open";
+ else
+ stream << " restricted";
+ stream << "\"\n";
}
stream << "\tRATE=auto\n";
if(line.contains("esac"))
- stream << line << "\n";
+ stream << line << "\n";
}
if(line.contains(";;"))
output = true;
if(output && (*it).length() )
@@ -214,18 +214,18 @@ void WLANImp::accept(){
if(keyLineEdit0->text().isEmpty() && keyLineEdit1->text().isEmpty() && keyLineEdit2->text().isEmpty() && keyLineEdit3->text().isEmpty() ){
QMessageBox::information(this, "Error", "Please enter a key for WEP.", QMessageBox::Ok);
return;
}
- }
-
+ }
+
if(essAny->isChecked() && essSpecificLineEdit->text().isEmpty()){
QMessageBox::information(this, "Error", "Please enter a SSID.", QMessageBox::Ok);
return;
}
-
+
// Ok settings are good here, save
changeAndSaveSettingFile();
-
+
// Try to save the interfaces settings.
if(!interfaceSetup->saveChanges())
return;
diff --git a/noncore/settings/networksettings/wlan/wlanimp2.cpp b/noncore/settings/networksettings/wlan/wlanimp2.cpp
index e7d6ff5..92339d6 100644
--- a/noncore/settings/networksettings/wlan/wlanimp2.cpp
+++ b/noncore/settings/networksettings/wlan/wlanimp2.cpp
@@ -27,9 +27,9 @@
#include <qprogressbar.h>
#ifdef QWS
#include <qpe/resource.h>
- #include <opie/oprocess.h>
+ #include <opie2/oprocess.h>
#include <opie2/onetwork.h>
#include <opie2/opcap.h>
#else
#define OProcess KProcess
@@ -138,18 +138,18 @@ void WLANImp::parseKeyStr(QString keystr) {
// switch current key to index
switch (index) {
case 1:
keyRadio0->setChecked(true);
- break;
+ break;
case 2:
keyRadio1->setChecked(true);
- break;
+ break;
case 3:
keyRadio2->setChecked(true);
- break;
+ break;
case 4:
keyRadio3->setChecked(true);
- break;
+ break;
}
} else {
// key
key = (*it);
@@ -169,18 +169,18 @@ void WLANImp::parseKeyStr(QString keystr) {
}
switch (index) {
case 1:
keyLineEdit0->setText(key);
- break;
+ break;
case 2:
keyLineEdit1->setText(key);
- break;
+ break;
case 3:
keyLineEdit2->setText(key);
- break;
+ break;
case 4:
keyLineEdit3->setText(key);
- break;
+ break;
}
key = QString::null;
}
}