summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/networksetup/ppp/ppp.pro12
-rw-r--r--noncore/net/networksetup/ppp/ppp.ui20
-rw-r--r--noncore/net/networksetup/ppp/pppimp.cpp4
-rw-r--r--noncore/net/networksetup/ppp/pppimp.h17
-rw-r--r--noncore/net/networksetup/ppp/pppmodule.cpp104
-rw-r--r--noncore/net/networksetup/ppp/pppmodule.h41
-rw-r--r--noncore/settings/networksettings/ppp/ppp.pro12
-rw-r--r--noncore/settings/networksettings/ppp/ppp.ui20
-rw-r--r--noncore/settings/networksettings/ppp/pppimp.cpp4
-rw-r--r--noncore/settings/networksettings/ppp/pppimp.h17
-rw-r--r--noncore/settings/networksettings/ppp/pppmodule.cpp104
-rw-r--r--noncore/settings/networksettings/ppp/pppmodule.h41
12 files changed, 376 insertions, 20 deletions
diff --git a/noncore/net/networksetup/ppp/ppp.pro b/noncore/net/networksetup/ppp/ppp.pro
new file mode 100644
index 0000000..075cc5f
--- a/dev/null
+++ b/noncore/net/networksetup/ppp/ppp.pro
@@ -0,0 +1,12 @@
+TEMPLATE = lib
+CONFIG += qt warn_on release
+#CONFIG += qt warn_on debug
+DESTDIR = $(OPIEDIR)/plugins/networksetup
+HEADERS = pppimp.h pppmodule.h
+SOURCES = pppimp.cpp pppmodule.cpp
+INCLUDEPATH += $(OPIEDIR)/include ../ ../interfaces/
+DEPENDPATH += $(OPIEDIR)/include
+LIBS += -lqpe -L../interfaces/ -linterfaces
+INTERFACES = ppp.ui
+TARGET = pppplugin
+VERSION = 1.0.0
diff --git a/noncore/net/networksetup/ppp/ppp.ui b/noncore/net/networksetup/ppp/ppp.ui
index d08eda0..67d6735 100644
--- a/noncore/net/networksetup/ppp/ppp.ui
+++ b/noncore/net/networksetup/ppp/ppp.ui
@@ -1,38 +1,38 @@
<!DOCTYPE UI><UI>
-<class>DialupBase</class>
+<class>PPP</class>
<widget>
<class>QDialog</class>
<property stdset="1">
<name>name</name>
- <cstring>Form1</cstring>
+ <cstring>PPP</cstring>
</property>
<property stdset="1">
<name>geometry</name>
<rect>
<x>0</x>
<y>0</y>
- <width>273</width>
+ <width>277</width>
<height>340</height>
</rect>
</property>
<property stdset="1">
<name>caption</name>
<string>Dial-up </string>
</property>
<property>
<name>layoutMargin</name>
</property>
<property>
<name>layoutSpacing</name>
</property>
<vbox>
<property stdset="1">
<name>margin</name>
<number>1</number>
</property>
<property stdset="1">
<name>spacing</name>
<number>0</number>
</property>
<widget>
<class>QTabWidget</class>
@@ -325,49 +325,49 @@
<property stdset="1">
<name>name</name>
<cstring>TextLabel1_3</cstring>
</property>
<property stdset="1">
<name>text</name>
<string>Wait time</string>
</property>
</widget>
<widget row="3" column="2" >
<class>QLabel</class>
<property stdset="1">
<name>name</name>
<cstring>connectdelay_text</cstring>
</property>
<property stdset="1">
<name>minimumSize</name>
<size>
<width>15</width>
<height>0</height>
</size>
</property>
<property stdset="1">
<name>text</name>
- <string>1</string>
+ <string>6</string>
</property>
<property stdset="1">
<name>alignment</name>
<set>AlignVCenter|AlignRight</set>
</property>
<property>
<name>hAlign</name>
</property>
</widget>
<widget row="3" column="3" >
<class>QLabel</class>
<property stdset="1">
<name>name</name>
<cstring>TextLabel5</cstring>
</property>
<property stdset="1">
<name>text</name>
<string>sec</string>
</property>
</widget>
<widget row="2" column="0" >
<class>QLabel</class>
<property stdset="1">
<name>name</name>
@@ -714,57 +714,57 @@
<string>Second DNS</string>
</property>
</widget>
</grid>
</widget>
</grid>
</widget>
</widget>
</vbox>
</widget>
<connections>
<connection>
<sender>defaultroute</sender>
<signal>toggled(bool)</signal>
<receiver>gatewaybox</receiver>
<slot>setDisabled(bool)</slot>
</connection>
<connection>
<sender>usepeerdns</sender>
<signal>toggled(bool)</signal>
<receiver>dnsbox</receiver>
<slot>setDisabled(bool)</slot>
</connection>
<connection>
- <sender>connectdelay</sender>
- <signal>valueChanged(int)</signal>
- <receiver>connectdelay_text</receiver>
- <slot>setNum(int)</slot>
- </connection>
- <connection>
<sender>dial_manual</sender>
<signal>toggled(bool)</signal>
<receiver>idletime</receiver>
<slot>setDisabled(bool)</slot>
</connection>
+ <connection>
+ <sender>connectdelay</sender>
+ <signal>valueChanged(int)</signal>
+ <receiver>connectdelay_text</receiver>
+ <slot>setNum(int)</slot>
+ </connection>
</connections>
<tabstops>
<tabstop>TabWidget2</tabstop>
<tabstop>acname</tabstop>
<tabstop>username</tabstop>
<tabstop>password</tabstop>
<tabstop>phone</tabstop>
<tabstop>atdial</tabstop>
<tabstop>speed</tabstop>
<tabstop>crtscts</tabstop>
<tabstop>connectdelay</tabstop>
<tabstop>dial_manual</tabstop>
<tabstop>dial_idle</tabstop>
<tabstop>dial_demand</tabstop>
<tabstop>idletime</tabstop>
<tabstop>defaultroute</tabstop>
<tabstop>gateway</tabstop>
<tabstop>usepeerdns</tabstop>
<tabstop>dns1</tabstop>
<tabstop>dns2</tabstop>
</tabstops>
</UI>
diff --git a/noncore/net/networksetup/ppp/pppimp.cpp b/noncore/net/networksetup/ppp/pppimp.cpp
new file mode 100644
index 0000000..e3a7481
--- a/dev/null
+++ b/noncore/net/networksetup/ppp/pppimp.cpp
@@ -0,0 +1,4 @@
+#include "pppimp.h"
+
+// pppconfigureimp.h
+
diff --git a/noncore/net/networksetup/ppp/pppimp.h b/noncore/net/networksetup/ppp/pppimp.h
new file mode 100644
index 0000000..60d29b5
--- a/dev/null
+++ b/noncore/net/networksetup/ppp/pppimp.h
@@ -0,0 +1,17 @@
+#ifndef PPPIMP_H
+#define PPPIMP_H
+
+#include "ppp.h"
+
+class PPPConfigureImp : public PPP {
+
+public:
+ PPPConfigureImp();
+ ~PPPConfigureImp();
+
+};
+
+#endif
+
+// pppconfigureimp.h
+
diff --git a/noncore/net/networksetup/ppp/pppmodule.cpp b/noncore/net/networksetup/ppp/pppmodule.cpp
new file mode 100644
index 0000000..68bb0a0
--- a/dev/null
+++ b/noncore/net/networksetup/ppp/pppmodule.cpp
@@ -0,0 +1,104 @@
+#include "pppmodule.h"
+#include "interfaceinformationimp.h"
+
+/**
+ * Constructor, find all of the possible interfaces
+ */
+PPPModule::PPPModule() : Module() {
+}
+
+/**
+ * Delete any interfaces that we own.
+ */
+PPPModule::~PPPModule(){
+ Interface *i;
+ for ( i=list.first(); i != 0; i=list.next() )
+ delete i;
+}
+
+/**
+ * Change the current profile
+ */
+void PPPModule::setProfile(const QString &newProfile){
+ profile = newProfile;
+}
+
+/**
+ * get the icon name for this device.
+ * @param Interface* can be used in determining the icon.
+ * @return QString the icon name (minus .png, .gif etc)
+ */
+QString PPPModule::getPixmapName(Interface* ){
+ return "ppp";
+}
+
+/**
+ * Check to see if the interface i is owned by this module.
+ * @param Interface* interface to check against
+ * @return bool true if i is owned by this module, false otherwise.
+ */
+bool PPPModule::isOwner(Interface *i){
+ // Scan the ppp database
+ return false;
+
+ i->setHardwareName("PPP");
+ list.append(i);
+ return true;
+}
+
+/**
+ * Create, and return the WLANConfigure Module
+ * @return QWidget* pointer to this modules configure.
+ */
+QWidget *PPPModule::configure(Interface *i){
+ return NULL;
+ //PPPConfigureImp *pppconfig = new PPPConfigureImp(0, "PPPConfig", i, false, Qt::WDestructiveClose);
+ //pppconfig->setProfile(profile);
+ //return wlanconfig;
+}
+
+/**
+ * Create, and return the Information Module
+ * @return QWidget* pointer to this modules info.
+ */
+QWidget *PPPModule::information(Interface *i){
+ return NULL;
+
+ //WlanInfoImp *info = new WlanInfoImp(0, i->getInterfaceName(), Qt::WDestructiveClose);
+ //InterfaceInformationImp *information = new InterfaceInformationImp(info->tabWidget, "InterfaceSetupImp", i);
+ //info->tabWidget->insertTab(information, "TCP/IP");
+ //return info;
+}
+
+/**
+ * Get all active (up or down) interfaces
+ * @return QList<Interface> A list of interfaces that exsist that havn't
+ * been called by isOwner()
+ */
+QList<Interface> PPPModule::getInterfaces(){
+ return list;
+}
+
+/**
+ * Attempt to add a new interface as defined by name
+ * @param name the name of the type of interface that should be created given
+ * by possibleNewInterfaces();
+ * @return Interface* NULL if it was unable to be created.
+ */
+Interface *PPPModule::addNewInterface(const QString &newInterface){
+ // We can't add a 802.11 interface, either the hardware will be there
+ // or it wont.
+ return NULL;
+}
+
+/**
+ * Attempts to remove the interface, doesn't delete i
+ * @return bool true if successfull, false otherwise.
+ */
+bool PPPModule::remove(Interface*){
+ // Can't remove a hardware device, you can stop it though.
+ return false;
+}
+
+// pppmodule.cpp
+
diff --git a/noncore/net/networksetup/ppp/pppmodule.h b/noncore/net/networksetup/ppp/pppmodule.h
new file mode 100644
index 0000000..c8e77e2
--- a/dev/null
+++ b/noncore/net/networksetup/ppp/pppmodule.h
@@ -0,0 +1,41 @@
+#ifndef PPP_MODULE_H
+#define PPP_MODULE_H
+
+#include "module.h"
+
+class PPPModule : Module {
+
+signals:
+ void updateInterface(Interface *i);
+
+public:
+ PPPModule();
+ ~PPPModule();
+
+ virtual void setProfile(const QString &newProfile);
+ virtual bool isOwner(Interface *);
+ virtual QWidget *configure(Interface *i);
+ virtual QWidget *information(Interface *i);
+ virtual QList<Interface> getInterfaces();
+ virtual void possibleNewInterfaces(QMap<QString, QString> &){};
+ virtual Interface *addNewInterface(const QString &name);
+ virtual bool remove(Interface* i);
+ virtual QString getPixmapName(Interface* i);
+
+private:
+ QList<Interface> list;
+ QString profile;
+
+};
+
+extern "C"
+{
+ void* create_plugin() {
+ return new PPPModule();
+ }
+};
+
+#endif
+
+// pppmodule.h
+
diff --git a/noncore/settings/networksettings/ppp/ppp.pro b/noncore/settings/networksettings/ppp/ppp.pro
new file mode 100644
index 0000000..075cc5f
--- a/dev/null
+++ b/noncore/settings/networksettings/ppp/ppp.pro
@@ -0,0 +1,12 @@
+TEMPLATE = lib
+CONFIG += qt warn_on release
+#CONFIG += qt warn_on debug
+DESTDIR = $(OPIEDIR)/plugins/networksetup
+HEADERS = pppimp.h pppmodule.h
+SOURCES = pppimp.cpp pppmodule.cpp
+INCLUDEPATH += $(OPIEDIR)/include ../ ../interfaces/
+DEPENDPATH += $(OPIEDIR)/include
+LIBS += -lqpe -L../interfaces/ -linterfaces
+INTERFACES = ppp.ui
+TARGET = pppplugin
+VERSION = 1.0.0
diff --git a/noncore/settings/networksettings/ppp/ppp.ui b/noncore/settings/networksettings/ppp/ppp.ui
index d08eda0..67d6735 100644
--- a/noncore/settings/networksettings/ppp/ppp.ui
+++ b/noncore/settings/networksettings/ppp/ppp.ui
@@ -1,38 +1,38 @@
<!DOCTYPE UI><UI>
-<class>DialupBase</class>
+<class>PPP</class>
<widget>
<class>QDialog</class>
<property stdset="1">
<name>name</name>
- <cstring>Form1</cstring>
+ <cstring>PPP</cstring>
</property>
<property stdset="1">
<name>geometry</name>
<rect>
<x>0</x>
<y>0</y>
- <width>273</width>
+ <width>277</width>
<height>340</height>
</rect>
</property>
<property stdset="1">
<name>caption</name>
<string>Dial-up </string>
</property>
<property>
<name>layoutMargin</name>
</property>
<property>
<name>layoutSpacing</name>
</property>
<vbox>
<property stdset="1">
<name>margin</name>
<number>1</number>
</property>
<property stdset="1">
<name>spacing</name>
<number>0</number>
</property>
<widget>
<class>QTabWidget</class>
@@ -325,49 +325,49 @@
<property stdset="1">
<name>name</name>
<cstring>TextLabel1_3</cstring>
</property>
<property stdset="1">
<name>text</name>
<string>Wait time</string>
</property>
</widget>
<widget row="3" column="2" >
<class>QLabel</class>
<property stdset="1">
<name>name</name>
<cstring>connectdelay_text</cstring>
</property>
<property stdset="1">
<name>minimumSize</name>
<size>
<width>15</width>
<height>0</height>
</size>
</property>
<property stdset="1">
<name>text</name>
- <string>1</string>
+ <string>6</string>
</property>
<property stdset="1">
<name>alignment</name>
<set>AlignVCenter|AlignRight</set>
</property>
<property>
<name>hAlign</name>
</property>
</widget>
<widget row="3" column="3" >
<class>QLabel</class>
<property stdset="1">
<name>name</name>
<cstring>TextLabel5</cstring>
</property>
<property stdset="1">
<name>text</name>
<string>sec</string>
</property>
</widget>
<widget row="2" column="0" >
<class>QLabel</class>
<property stdset="1">
<name>name</name>
@@ -714,57 +714,57 @@
<string>Second DNS</string>
</property>
</widget>
</grid>
</widget>
</grid>
</widget>
</widget>
</vbox>
</widget>
<connections>
<connection>
<sender>defaultroute</sender>
<signal>toggled(bool)</signal>
<receiver>gatewaybox</receiver>
<slot>setDisabled(bool)</slot>
</connection>
<connection>
<sender>usepeerdns</sender>
<signal>toggled(bool)</signal>
<receiver>dnsbox</receiver>
<slot>setDisabled(bool)</slot>
</connection>
<connection>
- <sender>connectdelay</sender>
- <signal>valueChanged(int)</signal>
- <receiver>connectdelay_text</receiver>
- <slot>setNum(int)</slot>
- </connection>
- <connection>
<sender>dial_manual</sender>
<signal>toggled(bool)</signal>
<receiver>idletime</receiver>
<slot>setDisabled(bool)</slot>
</connection>
+ <connection>
+ <sender>connectdelay</sender>
+ <signal>valueChanged(int)</signal>
+ <receiver>connectdelay_text</receiver>
+ <slot>setNum(int)</slot>
+ </connection>
</connections>
<tabstops>
<tabstop>TabWidget2</tabstop>
<tabstop>acname</tabstop>
<tabstop>username</tabstop>
<tabstop>password</tabstop>
<tabstop>phone</tabstop>
<tabstop>atdial</tabstop>
<tabstop>speed</tabstop>
<tabstop>crtscts</tabstop>
<tabstop>connectdelay</tabstop>
<tabstop>dial_manual</tabstop>
<tabstop>dial_idle</tabstop>
<tabstop>dial_demand</tabstop>
<tabstop>idletime</tabstop>
<tabstop>defaultroute</tabstop>
<tabstop>gateway</tabstop>
<tabstop>usepeerdns</tabstop>
<tabstop>dns1</tabstop>
<tabstop>dns2</tabstop>
</tabstops>
</UI>
diff --git a/noncore/settings/networksettings/ppp/pppimp.cpp b/noncore/settings/networksettings/ppp/pppimp.cpp
new file mode 100644
index 0000000..e3a7481
--- a/dev/null
+++ b/noncore/settings/networksettings/ppp/pppimp.cpp
@@ -0,0 +1,4 @@
+#include "pppimp.h"
+
+// pppconfigureimp.h
+
diff --git a/noncore/settings/networksettings/ppp/pppimp.h b/noncore/settings/networksettings/ppp/pppimp.h
new file mode 100644
index 0000000..60d29b5
--- a/dev/null
+++ b/noncore/settings/networksettings/ppp/pppimp.h
@@ -0,0 +1,17 @@
+#ifndef PPPIMP_H
+#define PPPIMP_H
+
+#include "ppp.h"
+
+class PPPConfigureImp : public PPP {
+
+public:
+ PPPConfigureImp();
+ ~PPPConfigureImp();
+
+};
+
+#endif
+
+// pppconfigureimp.h
+
diff --git a/noncore/settings/networksettings/ppp/pppmodule.cpp b/noncore/settings/networksettings/ppp/pppmodule.cpp
new file mode 100644
index 0000000..68bb0a0
--- a/dev/null
+++ b/noncore/settings/networksettings/ppp/pppmodule.cpp
@@ -0,0 +1,104 @@
+#include "pppmodule.h"
+#include "interfaceinformationimp.h"
+
+/**
+ * Constructor, find all of the possible interfaces
+ */
+PPPModule::PPPModule() : Module() {
+}
+
+/**
+ * Delete any interfaces that we own.
+ */
+PPPModule::~PPPModule(){
+ Interface *i;
+ for ( i=list.first(); i != 0; i=list.next() )
+ delete i;
+}
+
+/**
+ * Change the current profile
+ */
+void PPPModule::setProfile(const QString &newProfile){
+ profile = newProfile;
+}
+
+/**
+ * get the icon name for this device.
+ * @param Interface* can be used in determining the icon.
+ * @return QString the icon name (minus .png, .gif etc)
+ */
+QString PPPModule::getPixmapName(Interface* ){
+ return "ppp";
+}
+
+/**
+ * Check to see if the interface i is owned by this module.
+ * @param Interface* interface to check against
+ * @return bool true if i is owned by this module, false otherwise.
+ */
+bool PPPModule::isOwner(Interface *i){
+ // Scan the ppp database
+ return false;
+
+ i->setHardwareName("PPP");
+ list.append(i);
+ return true;
+}
+
+/**
+ * Create, and return the WLANConfigure Module
+ * @return QWidget* pointer to this modules configure.
+ */
+QWidget *PPPModule::configure(Interface *i){
+ return NULL;
+ //PPPConfigureImp *pppconfig = new PPPConfigureImp(0, "PPPConfig", i, false, Qt::WDestructiveClose);
+ //pppconfig->setProfile(profile);
+ //return wlanconfig;
+}
+
+/**
+ * Create, and return the Information Module
+ * @return QWidget* pointer to this modules info.
+ */
+QWidget *PPPModule::information(Interface *i){
+ return NULL;
+
+ //WlanInfoImp *info = new WlanInfoImp(0, i->getInterfaceName(), Qt::WDestructiveClose);
+ //InterfaceInformationImp *information = new InterfaceInformationImp(info->tabWidget, "InterfaceSetupImp", i);
+ //info->tabWidget->insertTab(information, "TCP/IP");
+ //return info;
+}
+
+/**
+ * Get all active (up or down) interfaces
+ * @return QList<Interface> A list of interfaces that exsist that havn't
+ * been called by isOwner()
+ */
+QList<Interface> PPPModule::getInterfaces(){
+ return list;
+}
+
+/**
+ * Attempt to add a new interface as defined by name
+ * @param name the name of the type of interface that should be created given
+ * by possibleNewInterfaces();
+ * @return Interface* NULL if it was unable to be created.
+ */
+Interface *PPPModule::addNewInterface(const QString &newInterface){
+ // We can't add a 802.11 interface, either the hardware will be there
+ // or it wont.
+ return NULL;
+}
+
+/**
+ * Attempts to remove the interface, doesn't delete i
+ * @return bool true if successfull, false otherwise.
+ */
+bool PPPModule::remove(Interface*){
+ // Can't remove a hardware device, you can stop it though.
+ return false;
+}
+
+// pppmodule.cpp
+
diff --git a/noncore/settings/networksettings/ppp/pppmodule.h b/noncore/settings/networksettings/ppp/pppmodule.h
new file mode 100644
index 0000000..c8e77e2
--- a/dev/null
+++ b/noncore/settings/networksettings/ppp/pppmodule.h
@@ -0,0 +1,41 @@
+#ifndef PPP_MODULE_H
+#define PPP_MODULE_H
+
+#include "module.h"
+
+class PPPModule : Module {
+
+signals:
+ void updateInterface(Interface *i);
+
+public:
+ PPPModule();
+ ~PPPModule();
+
+ virtual void setProfile(const QString &newProfile);
+ virtual bool isOwner(Interface *);
+ virtual QWidget *configure(Interface *i);
+ virtual QWidget *information(Interface *i);
+ virtual QList<Interface> getInterfaces();
+ virtual void possibleNewInterfaces(QMap<QString, QString> &){};
+ virtual Interface *addNewInterface(const QString &name);
+ virtual bool remove(Interface* i);
+ virtual QString getPixmapName(Interface* i);
+
+private:
+ QList<Interface> list;
+ QString profile;
+
+};
+
+extern "C"
+{
+ void* create_plugin() {
+ return new PPPModule();
+ }
+};
+
+#endif
+
+// pppmodule.h
+