19 files changed, 59 insertions, 47 deletions
diff --git a/noncore/net/networksetup/TODO b/noncore/net/networksetup/TODO index 0584f81..ec6d2c6 100644 --- a/noncore/net/networksetup/TODO +++ b/noncore/net/networksetup/TODO @@ -5,12 +5,12 @@ Fix Profiles Write dns script - WLAN needs to be re-written to not use Config -WHERE Is DHCP info stored??? - -PPP module needs to be written Write a class that parses /proc and not ifconfig +udchcp needs to output the dhcp information + +Possible other modules to write: ppp, ipsec, bluetooth, ipchains + +PPP module needs to scan pppd.tdb to see what is currently active -Possible other modules: ipsec, bluetooth, ipchains diff --git a/noncore/net/networksetup/interfaces/interfacesetupimp.cpp b/noncore/net/networksetup/interfaces/interfacesetupimp.cpp index 97c05cc..d42b45d 100644 --- a/noncore/net/networksetup/interfaces/interfacesetupimp.cpp +++ b/noncore/net/networksetup/interfaces/interfacesetupimp.cpp @@ -94,4 +94,5 @@ void InterfaceSetupImp::setProfile(const QString &profile){ if(profile.length() > 0) newInterfaceName += "_" + profile; + qDebug("InterfaceSetupImp::setProfile"); // See if we have to make a interface. if(!interfaces->setInterface(newInterfaceName)){ diff --git a/noncore/net/networksetup/interfaces/interfacesetupimp.h b/noncore/net/networksetup/interfaces/interfacesetupimp.h index 936f2be..3bbf34e 100644 --- a/noncore/net/networksetup/interfaces/interfacesetupimp.h +++ b/noncore/net/networksetup/interfaces/interfacesetupimp.h @@ -30,5 +30,5 @@ class InterfaceSetupImpDialog : public QDialog { Q_OBJECT - public: +public: InterfaceSetupImpDialog(QWidget* parent = 0, const char* name = 0, Interface *i=0, bool modal = false, WFlags fl = 0) : QDialog(parent, name, modal, fl){ QVBoxLayout *InterfaceSetupLayout = new QVBoxLayout( this ); @@ -37,9 +37,15 @@ Q_OBJECT InterfaceSetupLayout->addWidget( interfaceSetup ); }; + void setProfile(QString &profile){ interfaceSetup->setProfile(profile);}; +private: InterfaceSetupImp *interfaceSetup; - protected slots: - void accept(){ interfaceSetup->saveChanges(); }; +protected slots: + void accept(){ + interfaceSetup->saveChanges(); + QDialog::accept(); + }; + }; diff --git a/noncore/net/networksetup/mainwindowimp.cpp b/noncore/net/networksetup/mainwindowimp.cpp index b9fff56..6440bd4 100644 --- a/noncore/net/networksetup/mainwindowimp.cpp +++ b/noncore/net/networksetup/mainwindowimp.cpp @@ -231,12 +231,6 @@ void MainWindowImp::configureClicked(){ }
- QString currentProfile = currentProfileLabel->text();
- if(profilesList->count() <= 1 || currentProfile == "All"){
- currentProfile = "";
- }
-
Interface *i = interfaceItems[item];
if(i->getModuleOwner()){
- i->getModuleOwner()->setProfile(currentProfile);
QWidget *moduleConfigure = i->getModuleOwner()->configure(i);
if(moduleConfigure != NULL){
@@ -248,5 +242,8 @@ void MainWindowImp::configureClicked(){ InterfaceSetupImpDialog *configure = new InterfaceSetupImpDialog(0, "InterfaceSetupImp", i, true, Qt::WDestructiveClose);
- //configure->setProfile(currentProfile);
+ QString currentProfileText = currentProfileLabel->text();
+ if(currentProfileText.upper() == "ALL");
+ currentProfileText = "";
+ configure->setProfile(currentProfileText);
configure->showMaximized();
configure->show();
@@ -271,9 +268,4 @@ void MainWindowImp::informationClicked(){ }
- QStringList list;
- for(uint i = 0; i < profilesList->count(); i++){
- list.append(profilesList->text(i));
- }
-
if(i->getModuleOwner()){
QWidget *moduleInformation = i->getModuleOwner()->information(i);
@@ -539,4 +531,5 @@ void MainWindowImp::changeProfile(){ }
}
+ // TODO change the profile in the modules
}
diff --git a/noncore/net/networksetup/networksetup.pro b/noncore/net/networksetup/networksetup.pro index 1719a35..5666a42 100644 --- a/noncore/net/networksetup/networksetup.pro +++ b/noncore/net/networksetup/networksetup.pro @@ -1,3 +1,3 @@ -DESTDIR = $(OPIEDIR)/bin +#DESTDIR = $(OPIEDIR)/bin TEMPLATE = app #CONFIG = qt warn_on debug @@ -7,5 +7,5 @@ SOURCES = main.cpp mainwindowimp.cpp addconnectionimp.cpp kprocctrl.cpp kproce INCLUDEPATH += $(OPIEDIR)/include interfaces/ DEPENDPATH += $(OPIEDIR)/include interfaces/ wlan -LIBS += -lqpe -L$(OPIEDIR)/plugins/networksetup -linterfaces +LIBS += -lqpe -L$(OPIEDIR)/plugins/networksetup -Linterfaces/ -linterfaces INTERFACES = mainwindow.ui addconnection.ui TARGET = networksetup diff --git a/noncore/net/networksetup/opie-networksetup.control b/noncore/net/networksetup/opie-networksetup.control index 35bac52..d14e2d1 100644 --- a/noncore/net/networksetup/opie-networksetup.control +++ b/noncore/net/networksetup/opie-networksetup.control @@ -1,3 +1,3 @@ -Files: bin/networksetup apps/Settings/networksetup.desktop pics/Network plugins/networksetup/* pics/networksetup $QTDIR/lib/libinterfaces.so.1.0.0 $QTDIR/lib/libinterfaces.so.1.0 $QTDIR/lib/libinterfaces.so.1 +Files: bin/networksetup apps/Settings/networksetup.desktop pics/Network plugins/networksetup/* pics/networksetup $QTDIR/lib/libinterfaces.so.1.0.0 $QTDIR/lib/libinterfaces.so.1.0 $QTDIR/lib/libinterfaces.so.1 $OPIEDIR/bin/changedns.sh $OPIEDIR/bin/getprofile.sh Priority: optional Section: opie/settings diff --git a/noncore/net/networksetup/wlan/wlanimp.cpp b/noncore/net/networksetup/wlan/wlanimp.cpp index a466020..74bf390 100644 --- a/noncore/net/networksetup/wlan/wlanimp.cpp +++ b/noncore/net/networksetup/wlan/wlanimp.cpp @@ -34,4 +34,8 @@ WLANImp::~WLANImp( ){ } +void WLANImp::setProfile(QString &profile){ + interfaceSetup->setProfile(profile); +} + void WLANImp::readConfig() { diff --git a/noncore/net/networksetup/wlan/wlanimp.h b/noncore/net/networksetup/wlan/wlanimp.h index 608d681..faa1674 100644 --- a/noncore/net/networksetup/wlan/wlanimp.h +++ b/noncore/net/networksetup/wlan/wlanimp.h @@ -14,4 +14,5 @@ public: WLANImp( QWidget* parent = 0, const char* name = 0, Interface *i=0, bool modal = FALSE, WFlags fl = 0 ); ~WLANImp( ); + void setProfile(QString &profile); protected: diff --git a/noncore/net/networksetup/wlan/wlanmodule.cpp b/noncore/net/networksetup/wlan/wlanmodule.cpp index c8becb0..b14fc0a 100644 --- a/noncore/net/networksetup/wlan/wlanmodule.cpp +++ b/noncore/net/networksetup/wlan/wlanmodule.cpp @@ -61,4 +61,5 @@ bool WLANModule::isOwner(Interface *i){ QWidget *WLANModule::configure(Interface *i){ WLANImp *wlanconfig = new WLANImp(0, "WlanConfig", i, false, Qt::WDestructiveClose); + wlanconfig->setProfile(profile); return wlanconfig; } diff --git a/noncore/settings/networksettings/TODO b/noncore/settings/networksettings/TODO index 0584f81..ec6d2c6 100644 --- a/noncore/settings/networksettings/TODO +++ b/noncore/settings/networksettings/TODO @@ -5,12 +5,12 @@ Fix Profiles Write dns script - WLAN needs to be re-written to not use Config -WHERE Is DHCP info stored??? - -PPP module needs to be written Write a class that parses /proc and not ifconfig +udchcp needs to output the dhcp information + +Possible other modules to write: ppp, ipsec, bluetooth, ipchains + +PPP module needs to scan pppd.tdb to see what is currently active -Possible other modules: ipsec, bluetooth, ipchains diff --git a/noncore/settings/networksettings/interfaces/interfacesetupimp.cpp b/noncore/settings/networksettings/interfaces/interfacesetupimp.cpp index 97c05cc..d42b45d 100644 --- a/noncore/settings/networksettings/interfaces/interfacesetupimp.cpp +++ b/noncore/settings/networksettings/interfaces/interfacesetupimp.cpp @@ -94,4 +94,5 @@ void InterfaceSetupImp::setProfile(const QString &profile){ if(profile.length() > 0) newInterfaceName += "_" + profile; + qDebug("InterfaceSetupImp::setProfile"); // See if we have to make a interface. if(!interfaces->setInterface(newInterfaceName)){ diff --git a/noncore/settings/networksettings/interfaces/interfacesetupimp.h b/noncore/settings/networksettings/interfaces/interfacesetupimp.h index 936f2be..3bbf34e 100644 --- a/noncore/settings/networksettings/interfaces/interfacesetupimp.h +++ b/noncore/settings/networksettings/interfaces/interfacesetupimp.h @@ -30,5 +30,5 @@ class InterfaceSetupImpDialog : public QDialog { Q_OBJECT - public: +public: InterfaceSetupImpDialog(QWidget* parent = 0, const char* name = 0, Interface *i=0, bool modal = false, WFlags fl = 0) : QDialog(parent, name, modal, fl){ QVBoxLayout *InterfaceSetupLayout = new QVBoxLayout( this ); @@ -37,9 +37,15 @@ Q_OBJECT InterfaceSetupLayout->addWidget( interfaceSetup ); }; + void setProfile(QString &profile){ interfaceSetup->setProfile(profile);}; +private: InterfaceSetupImp *interfaceSetup; - protected slots: - void accept(){ interfaceSetup->saveChanges(); }; +protected slots: + void accept(){ + interfaceSetup->saveChanges(); + QDialog::accept(); + }; + }; diff --git a/noncore/settings/networksettings/mainwindowimp.cpp b/noncore/settings/networksettings/mainwindowimp.cpp index b9fff56..6440bd4 100644 --- a/noncore/settings/networksettings/mainwindowimp.cpp +++ b/noncore/settings/networksettings/mainwindowimp.cpp @@ -231,12 +231,6 @@ void MainWindowImp::configureClicked(){ }
- QString currentProfile = currentProfileLabel->text();
- if(profilesList->count() <= 1 || currentProfile == "All"){
- currentProfile = "";
- }
-
Interface *i = interfaceItems[item];
if(i->getModuleOwner()){
- i->getModuleOwner()->setProfile(currentProfile);
QWidget *moduleConfigure = i->getModuleOwner()->configure(i);
if(moduleConfigure != NULL){
@@ -248,5 +242,8 @@ void MainWindowImp::configureClicked(){ InterfaceSetupImpDialog *configure = new InterfaceSetupImpDialog(0, "InterfaceSetupImp", i, true, Qt::WDestructiveClose);
- //configure->setProfile(currentProfile);
+ QString currentProfileText = currentProfileLabel->text();
+ if(currentProfileText.upper() == "ALL");
+ currentProfileText = "";
+ configure->setProfile(currentProfileText);
configure->showMaximized();
configure->show();
@@ -271,9 +268,4 @@ void MainWindowImp::informationClicked(){ }
- QStringList list;
- for(uint i = 0; i < profilesList->count(); i++){
- list.append(profilesList->text(i));
- }
-
if(i->getModuleOwner()){
QWidget *moduleInformation = i->getModuleOwner()->information(i);
@@ -539,4 +531,5 @@ void MainWindowImp::changeProfile(){ }
}
+ // TODO change the profile in the modules
}
diff --git a/noncore/settings/networksettings/networksetup.pro b/noncore/settings/networksettings/networksetup.pro index 1719a35..5666a42 100644 --- a/noncore/settings/networksettings/networksetup.pro +++ b/noncore/settings/networksettings/networksetup.pro @@ -1,3 +1,3 @@ -DESTDIR = $(OPIEDIR)/bin +#DESTDIR = $(OPIEDIR)/bin TEMPLATE = app #CONFIG = qt warn_on debug @@ -7,5 +7,5 @@ SOURCES = main.cpp mainwindowimp.cpp addconnectionimp.cpp kprocctrl.cpp kproce INCLUDEPATH += $(OPIEDIR)/include interfaces/ DEPENDPATH += $(OPIEDIR)/include interfaces/ wlan -LIBS += -lqpe -L$(OPIEDIR)/plugins/networksetup -linterfaces +LIBS += -lqpe -L$(OPIEDIR)/plugins/networksetup -Linterfaces/ -linterfaces INTERFACES = mainwindow.ui addconnection.ui TARGET = networksetup diff --git a/noncore/settings/networksettings/opie-networksettings.control b/noncore/settings/networksettings/opie-networksettings.control index 35bac52..d14e2d1 100644 --- a/noncore/settings/networksettings/opie-networksettings.control +++ b/noncore/settings/networksettings/opie-networksettings.control @@ -1,3 +1,3 @@ -Files: bin/networksetup apps/Settings/networksetup.desktop pics/Network plugins/networksetup/* pics/networksetup $QTDIR/lib/libinterfaces.so.1.0.0 $QTDIR/lib/libinterfaces.so.1.0 $QTDIR/lib/libinterfaces.so.1 +Files: bin/networksetup apps/Settings/networksetup.desktop pics/Network plugins/networksetup/* pics/networksetup $QTDIR/lib/libinterfaces.so.1.0.0 $QTDIR/lib/libinterfaces.so.1.0 $QTDIR/lib/libinterfaces.so.1 $OPIEDIR/bin/changedns.sh $OPIEDIR/bin/getprofile.sh Priority: optional Section: opie/settings diff --git a/noncore/settings/networksettings/opie-networksetup.control b/noncore/settings/networksettings/opie-networksetup.control index 35bac52..d14e2d1 100644 --- a/noncore/settings/networksettings/opie-networksetup.control +++ b/noncore/settings/networksettings/opie-networksetup.control @@ -1,3 +1,3 @@ -Files: bin/networksetup apps/Settings/networksetup.desktop pics/Network plugins/networksetup/* pics/networksetup $QTDIR/lib/libinterfaces.so.1.0.0 $QTDIR/lib/libinterfaces.so.1.0 $QTDIR/lib/libinterfaces.so.1 +Files: bin/networksetup apps/Settings/networksetup.desktop pics/Network plugins/networksetup/* pics/networksetup $QTDIR/lib/libinterfaces.so.1.0.0 $QTDIR/lib/libinterfaces.so.1.0 $QTDIR/lib/libinterfaces.so.1 $OPIEDIR/bin/changedns.sh $OPIEDIR/bin/getprofile.sh Priority: optional Section: opie/settings diff --git a/noncore/settings/networksettings/wlan/wlanimp.cpp b/noncore/settings/networksettings/wlan/wlanimp.cpp index a466020..74bf390 100644 --- a/noncore/settings/networksettings/wlan/wlanimp.cpp +++ b/noncore/settings/networksettings/wlan/wlanimp.cpp @@ -34,4 +34,8 @@ WLANImp::~WLANImp( ){ } +void WLANImp::setProfile(QString &profile){ + interfaceSetup->setProfile(profile); +} + void WLANImp::readConfig() { diff --git a/noncore/settings/networksettings/wlan/wlanimp.h b/noncore/settings/networksettings/wlan/wlanimp.h index 608d681..faa1674 100644 --- a/noncore/settings/networksettings/wlan/wlanimp.h +++ b/noncore/settings/networksettings/wlan/wlanimp.h @@ -14,4 +14,5 @@ public: WLANImp( QWidget* parent = 0, const char* name = 0, Interface *i=0, bool modal = FALSE, WFlags fl = 0 ); ~WLANImp( ); + void setProfile(QString &profile); protected: diff --git a/noncore/settings/networksettings/wlan/wlanmodule.cpp b/noncore/settings/networksettings/wlan/wlanmodule.cpp index c8becb0..b14fc0a 100644 --- a/noncore/settings/networksettings/wlan/wlanmodule.cpp +++ b/noncore/settings/networksettings/wlan/wlanmodule.cpp @@ -61,4 +61,5 @@ bool WLANModule::isOwner(Interface *i){ QWidget *WLANModule::configure(Interface *i){ WLANImp *wlanconfig = new WLANImp(0, "WlanConfig", i, false, Qt::WDestructiveClose); + wlanconfig->setProfile(profile); return wlanconfig; } |