summaryrefslogtreecommitdiff
authorjosef <josef>2002-10-06 18:34:28 (UTC)
committer josef <josef>2002-10-06 18:34:28 (UTC)
commitaa8332baeebf7056d81fc245399477c7feaa1235 (patch) (side-by-side diff)
tree4b23429bcad955d02df24b40144cf5b7b6ffe0f3
parent6da8cac26f1d610d458c91bc2daad018cf9cf887 (diff)
downloadopie-aa8332baeebf7056d81fc245399477c7feaa1235.zip
opie-aa8332baeebf7056d81fc245399477c7feaa1235.tar.gz
opie-aa8332baeebf7056d81fc245399477c7feaa1235.tar.bz2
- more factorization (is nearly complete now ;)
- move config plugins into separate file (3 classes and virtual superclass) - first stub for save function
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/opie-console/metafactory.cpp8
-rw-r--r--noncore/apps/opie-console/metafactory.h5
-rw-r--r--noncore/apps/opie-console/opie-console.pro2
-rw-r--r--noncore/apps/opie-console/profileeditordialog.cpp81
-rw-r--r--noncore/apps/opie-console/profileeditordialog.h4
-rw-r--r--noncore/apps/opie-console/profileeditorplugins.cpp164
-rw-r--r--noncore/apps/opie-console/profileeditorplugins.h37
7 files changed, 221 insertions, 80 deletions
diff --git a/noncore/apps/opie-console/metafactory.cpp b/noncore/apps/opie-console/metafactory.cpp
index ea7f739..c5e614d 100644
--- a/noncore/apps/opie-console/metafactory.cpp
+++ b/noncore/apps/opie-console/metafactory.cpp
@@ -62,4 +62,4 @@ IOLayer* MetaFactory::newIOLayer( const QString& str,const Profile& prof ) {
-QWidget *MetaFactory::newConfigWidget ( const QString& str, QWidget* parent) {
- QWidget *w = NULL;
+ProfileEditorPlugin *MetaFactory::newConfigPlugin ( const QString& str, QWidget *parent, const Profile& prof) {
+ ProfileEditorPlugin *p = NULL;
configWidget c;
@@ -67,5 +67,5 @@ QWidget *MetaFactory::newConfigWidget ( const QString& str, QWidget* parent) {
c = m_confFact[str];
- if(c) w = c(parent);
+ if(c) p = c(parent, prof);
- return w;
+ return p;
}
diff --git a/noncore/apps/opie-console/metafactory.h b/noncore/apps/opie-console/metafactory.h
index 2245231..8c714b3 100644
--- a/noncore/apps/opie-console/metafactory.h
+++ b/noncore/apps/opie-console/metafactory.h
@@ -16,2 +16,3 @@
#include "profile.h"
+#include "profileeditorplugins.h"
@@ -19,3 +20,3 @@ class MetaFactory {
public:
- typedef QWidget* (*configWidget)(QWidget* parent);
+ typedef ProfileEditorPlugin* (*configWidget)(QWidget* parent, const Profile&);
typedef IOLayer* (*iolayer)(const Profile& );
@@ -37,3 +38,3 @@ public:
IOLayer* newIOLayer( const QString&,const Profile& );
- QWidget *newConfigWidget ( const QString&, QWidget* );
+ ProfileEditorPlugin *newConfigPlugin ( const QString&, QWidget*, const Profile& );
diff --git a/noncore/apps/opie-console/opie-console.pro b/noncore/apps/opie-console/opie-console.pro
index 7abf385..831ca34 100644
--- a/noncore/apps/opie-console/opie-console.pro
+++ b/noncore/apps/opie-console/opie-console.pro
@@ -16,2 +16,3 @@ HEADERS = io_layer.h io_serial.h \
profileeditordialog.h \
+ profileeditorplugins.h \
emulation_layer.h \
@@ -35,2 +36,3 @@ SOURCES = io_layer.cpp io_serial.cpp \
profileeditordialog.cpp \
+ profileeditorplugins.cpp \
emulation_layer.cpp \
diff --git a/noncore/apps/opie-console/profileeditordialog.cpp b/noncore/apps/opie-console/profileeditordialog.cpp
index aee4051..fbe0f23 100644
--- a/noncore/apps/opie-console/profileeditordialog.cpp
+++ b/noncore/apps/opie-console/profileeditordialog.cpp
@@ -13,68 +13,5 @@
+#include "profileeditorplugins.h"
#include "metafactory.h"
-static QWidget *factory_serial(QWidget *parent)
-{
- QFrame *device_frame = new QFrame(parent);
- device_frame->setFrameStyle(QFrame::Panel | QFrame::Sunken);
-
- QLabel *frame_device = new QLabel(QObject::tr("Device"), device_frame);
-
- QLineEdit *frame_device_line = new QLineEdit("/dev/ttyS0", device_frame);
-
- QVBoxLayout *vbox_frame = new QVBoxLayout(device_frame, 2);
- vbox_frame->add(frame_device);
- vbox_frame->add(frame_device_line);
-
- return device_frame;
-}
-
-static QWidget *factory_irda(QWidget *parent)
-{
- QFrame *device_frame = new QFrame(parent);
- device_frame->setFrameStyle(QFrame::Panel | QFrame::Sunken);
-
- QLabel *frame_device = new QLabel(QObject::tr("Device"), device_frame);
-
- QLineEdit *frame_device_line = new QLineEdit("/dev/ircomm0", device_frame);
-
- QVBoxLayout *vbox_frame = new QVBoxLayout(device_frame, 2);
- vbox_frame->add(frame_device);
- vbox_frame->add(frame_device_line);
-
- return device_frame;
-}
-
-static QWidget *factory_modem(QWidget *parent)
-{
- QFrame *device_frame = new QFrame(parent);
- device_frame->setFrameStyle(QFrame::Panel | QFrame::Sunken);
-
- QLabel *frame_device = new QLabel(QObject::tr("Device"), device_frame);
- QLabel *frame_number = new QLabel(QObject::tr("Phone number"), device_frame);
-
- QLineEdit *frame_device_line = new QLineEdit("/dev/ttyS0", device_frame);
- QLineEdit *frame_number_line = new QLineEdit(device_frame);
-
- QVBoxLayout *vbox_frame = new QVBoxLayout(device_frame, 2);
- vbox_frame->add(frame_device);
- vbox_frame->add(frame_device_line);
- vbox_frame->add(frame_number);
- vbox_frame->add(frame_number_line);
-
- return device_frame;
-}
-
-// Something like that must be called upon plugin_plugin->save()
-//void save_modem()
-//{
-// // special settings
-// p.writeEntry("Device", dlg.conn_device());
-// p.writeEntry("Baud", dlg.conn_baud());
-// p.writeEntry("Parity", dlg.conn_parity());
-// p.writeEntry("DataBits", dlg.conn_databits());
-// p.writeEntry("StopBits", dlg.conn_stopbits());
-// p.writeEntry("Flow", dlg.conn_flow());
-//}
-
ProfileEditorDialog::ProfileEditorDialog( MetaFactory* fact,
@@ -141,4 +78,4 @@ void ProfileEditorDialog::initUI()
- plugin_plugin = m_fact->newConfigWidget("serial", plugin_base);
- plugin_layout->add(plugin_plugin);
+ plugin_plugin = m_fact->newConfigPlugin("serial", plugin_base, m_prof);
+ plugin_layout->add(plugin_plugin->widget());
@@ -259,4 +196,2 @@ void ProfileEditorDialog::initUI()
- //connect(this, SIGNAL(applyButtonPressed()), SLOT(slotOk()));
- connect(this, SIGNAL(defaultButtonPressed()), SLOT(slotOk()));
connect(this, SIGNAL(cancelButtonPressed()), SLOT(slotCancel()));
@@ -274,4 +209,4 @@ void ProfileEditorDialog::slotDevice(int id)
- plugin_plugin = m_fact->newConfigWidget(prof_type(), plugin_base);
- plugin_layout->add(plugin_plugin);
+ plugin_plugin = m_fact->newConfigPlugin(prof_type(), plugin_base, m_prof);
+ plugin_layout->add(plugin_plugin->widget());
@@ -281,4 +216,4 @@ void ProfileEditorDialog::slotDevice(int id)
- plugin_plugin->show();
- // This would be: plugin_plugin->widget()->show();
+ //plugin_plugin->show();
+ plugin_plugin->widget()->show();
}
@@ -296,3 +231,3 @@ void ProfileEditorDialog::accept()
// Save profile and plugin profile
- //if(plugin_plugin) plugin_plugin->save();
+ if(plugin_plugin) plugin_plugin->save();
diff --git a/noncore/apps/opie-console/profileeditordialog.h b/noncore/apps/opie-console/profileeditordialog.h
index 8ebfba1..faabda0 100644
--- a/noncore/apps/opie-console/profileeditordialog.h
+++ b/noncore/apps/opie-console/profileeditordialog.h
@@ -14,2 +14,3 @@ class QComboBox;
class QLabel;
+class ProfileEditorPlugin;
@@ -51,3 +52,4 @@ private:
QComboBox *terminal_box, *speed_box, *device_box;
- QWidget *plugin_base, *plugin_plugin;
+ QWidget *plugin_base;
+ ProfileEditorPlugin *plugin_plugin;
QHBoxLayout *plugin_layout;
diff --git a/noncore/apps/opie-console/profileeditorplugins.cpp b/noncore/apps/opie-console/profileeditorplugins.cpp
new file mode 100644
index 0000000..54eee3f
--- a/dev/null
+++ b/noncore/apps/opie-console/profileeditorplugins.cpp
@@ -0,0 +1,164 @@
+
+#include "profileeditorplugins.h"
+#include "profile.h"
+
+#include "qframe.h"
+#include "qlabel.h"
+#include "qlineedit.h"
+#include "qlayout.h"
+
+ProfileEditorPlugin::ProfileEditorPlugin(QWidget *parent, Profile p)
+{
+ m_parent = parent;
+ m_profile = p;
+ m_widget = NULL;
+}
+
+ProfileEditorPlugin::~ProfileEditorPlugin()
+{
+ if(m_widget) delete m_widget;
+}
+
+class ProfileEditorPluginSerial : public ProfileEditorPlugin
+{
+ public:
+
+ ProfileEditorPluginSerial(QWidget *parent, Profile p)
+ : ProfileEditorPlugin(parent, p)
+ {
+ }
+
+ ~ProfileEditorPluginSerial()
+ {
+ }
+
+ QWidget *widget()
+ {
+ if(!m_widget)
+ {
+ QFrame *device_frame = new QFrame(m_parent);
+ device_frame->setFrameStyle(QFrame::Panel | QFrame::Sunken);
+
+ QLabel *frame_device = new QLabel(QObject::tr("Device"), device_frame);
+
+ QLineEdit *frame_device_line = new QLineEdit("/dev/ttyS0", device_frame);
+
+ QVBoxLayout *vbox_frame = new QVBoxLayout(device_frame, 2);
+ vbox_frame->add(frame_device);
+ vbox_frame->add(frame_device_line);
+
+ m_widget = device_frame;
+ }
+
+ return m_widget;
+ }
+
+ void save()
+ {
+ }
+};
+
+class ProfileEditorPluginIrda : public ProfileEditorPlugin
+{
+ public:
+
+ ProfileEditorPluginIrda(QWidget *parent, Profile p)
+ : ProfileEditorPlugin(parent, p)
+ {
+ }
+
+ ~ProfileEditorPluginIrda()
+ {
+ }
+
+ QWidget *widget()
+ {
+ if(!m_widget)
+ {
+ QFrame *device_frame = new QFrame(m_parent);
+ device_frame->setFrameStyle(QFrame::Panel | QFrame::Sunken);
+
+ QLabel *frame_device = new QLabel(QObject::tr("Device"), device_frame);
+
+ QLineEdit *frame_device_line = new QLineEdit("/dev/ircomm0", device_frame);
+
+ QVBoxLayout *vbox_frame = new QVBoxLayout(device_frame, 2);
+ vbox_frame->add(frame_device);
+ vbox_frame->add(frame_device_line);
+
+ m_widget = device_frame;
+ }
+
+ return m_widget;
+ }
+
+ void save()
+ {
+ }
+};
+
+class ProfileEditorPluginModem : public ProfileEditorPlugin
+{
+ public:
+
+ ProfileEditorPluginModem(QWidget *parent, Profile p)
+ : ProfileEditorPlugin(parent, p)
+ {
+ }
+
+ ~ProfileEditorPluginModem()
+ {
+ }
+
+ QWidget *widget()
+ {
+ if(!m_widget)
+ {
+ QFrame *device_frame = new QFrame(m_parent);
+ device_frame->setFrameStyle(QFrame::Panel | QFrame::Sunken);
+
+ QLabel *frame_device = new QLabel(QObject::tr("Device"), device_frame);
+ QLabel *frame_number = new QLabel(QObject::tr("Phone number"), device_frame);
+
+ device_line = new QLineEdit("/dev/ttyS0", device_frame);
+ number_line = new QLineEdit(device_frame);
+
+ QVBoxLayout *vbox_frame = new QVBoxLayout(device_frame, 2);
+ vbox_frame->add(frame_device);
+ vbox_frame->add(device_line);
+ vbox_frame->add(frame_number);
+ vbox_frame->add(number_line);
+
+ m_widget = device_frame;
+ }
+
+ return m_widget;
+ }
+
+ void save()
+ {
+ // special settings
+ Profile p = m_profile;
+ p.writeEntry("Device", device_line->text());
+ p.writeEntry("Number", number_line->text());
+ }
+
+ private:
+ QLineEdit *device_line, *number_line;
+};
+
+ProfileEditorPlugin *factory_serial(QWidget *parent, const Profile& p)
+{
+ return new ProfileEditorPluginSerial(parent, p);
+}
+
+ProfileEditorPlugin *factory_irda(QWidget *parent, const Profile& p)
+{
+ return new ProfileEditorPluginIrda(parent, p);
+}
+
+ProfileEditorPlugin *factory_modem(QWidget *parent, const Profile& p)
+{
+ return new ProfileEditorPluginModem(parent, p);
+}
+
diff --git a/noncore/apps/opie-console/profileeditorplugins.h b/noncore/apps/opie-console/profileeditorplugins.h
new file mode 100644
index 0000000..7e0219b
--- a/dev/null
+++ b/noncore/apps/opie-console/profileeditorplugins.h
@@ -0,0 +1,37 @@
+#ifndef PROFILE_EDITOR_PLUGINS_H
+#define PROFILE_EDITOR_PLUGINS_H
+
+#include "profile.h"
+
+class QWidget;
+
+class ProfileEditorPlugin
+{
+ public:
+ ProfileEditorPlugin(QWidget *parent, Profile p);
+
+ virtual ~ProfileEditorPlugin();
+
+ virtual void save() = 0;
+
+ virtual QWidget *widget() = 0;
+
+ protected:
+ QWidget *m_parent, *m_widget;
+ Profile m_profile;
+};
+
+//#ifdef __cplusplus
+//extern "C" {
+//#endif
+
+ProfileEditorPlugin *factory_serial(QWidget *parent, const Profile& p);
+ProfileEditorPlugin *factory_irda(QWidget *parent, const Profile& p);
+ProfileEditorPlugin *factory_modem(QWidget *parent, const Profile& p);
+
+//#ifdef __cplusplus
+//}
+//#endif
+
+#endif
+