From aa8332baeebf7056d81fc245399477c7feaa1235 Mon Sep 17 00:00:00 2001 From: josef Date: Sun, 06 Oct 2002 18:34:28 +0000 Subject: - more factorization (is nearly complete now ;) - move config plugins into separate file (3 classes and virtual superclass) - first stub for save function --- 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 @@ -60,14 +60,14 @@ IOLayer* MetaFactory::newIOLayer( const QString& str,const Profile& prof ) { return lay; } -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; c = m_confFact[str]; - if(c) w = c(parent); + if(c) p = c(parent, prof); - return w; + return p; } QString MetaFactory::name( const QString& str ) { 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 @@ -14,10 +14,11 @@ #include "io_layer.h" #include "file_layer.h" #include "profile.h" +#include "profileeditorplugins.h" class MetaFactory { public: - typedef QWidget* (*configWidget)(QWidget* parent); + typedef ProfileEditorPlugin* (*configWidget)(QWidget* parent, const Profile&); typedef IOLayer* (*iolayer)(const Profile& ); typedef FileTransferLayer* (*filelayer)(IOLayer*); @@ -35,7 +36,7 @@ public: QStringList configWidgets()const; QStringList fileTransferLayers()const; IOLayer* newIOLayer( const QString&,const Profile& ); - QWidget *newConfigWidget ( const QString&, QWidget* ); + ProfileEditorPlugin *newConfigPlugin ( const QString&, QWidget*, const Profile& ); QString name( const QString& ); 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 @@ -14,6 +14,7 @@ HEADERS = io_layer.h io_serial.h \ tabwidget.h \ configdialog.h \ profileeditordialog.h \ + profileeditorplugins.h \ emulation_layer.h \ widget.h \ vt102emulation.h \ @@ -33,6 +34,7 @@ SOURCES = io_layer.cpp io_serial.cpp \ tabwidget.cpp \ configdialog.cpp \ profileeditordialog.cpp \ + profileeditorplugins.cpp \ emulation_layer.cpp \ widget.cpp \ vt102emulation.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 @@ -11,72 +11,9 @@ #include "qbuttongroup.h" #include "qstringlist.h" +#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, const Profile& prof ) : QTabDialog(0, 0, TRUE), m_fact( fact ), m_prof( prof ) @@ -139,8 +76,8 @@ void ProfileEditorDialog::initUI() plugin_base = new QWidget(tabconn); plugin_layout = new QHBoxLayout(plugin_base, 0); - 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()); // connection tab, general part @@ -257,8 +194,6 @@ void ProfileEditorDialog::initUI() setOkButton(QObject::tr("OK")); setCancelButton(QObject::tr("Cancel")); - //connect(this, SIGNAL(applyButtonPressed()), SLOT(slotOk())); - connect(this, SIGNAL(defaultButtonPressed()), SLOT(slotOk())); connect(this, SIGNAL(cancelButtonPressed()), SLOT(slotCancel())); connect(device_box, SIGNAL(activated(int)), SLOT(slotDevice(int))); @@ -272,15 +207,15 @@ void ProfileEditorDialog::slotDevice(int id) { delete plugin_plugin; - 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()); // Reload profile associated to device, including e.g. conn_device() // m_prof = plugin_plugin->profile() // or, keeping the profile name: m_prof->reload(plugin_plugin->profile()) - plugin_plugin->show(); - // This would be: plugin_plugin->widget()->show(); + //plugin_plugin->show(); + plugin_plugin->widget()->show(); } void ProfileEditorDialog::accept() @@ -294,7 +229,7 @@ void ProfileEditorDialog::accept() } // Save profile and plugin profile - //if(plugin_plugin) plugin_plugin->save(); + if(plugin_plugin) plugin_plugin->save(); QDialog::accept(); } 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 @@ -12,6 +12,7 @@ class QHBoxLayout; class QLineEdit; class QComboBox; class QLabel; +class ProfileEditorPlugin; class ProfileEditorDialog : public QTabDialog { Q_OBJECT @@ -49,7 +50,8 @@ private: QLineEdit *name_line; //QLineEdit *frame_device_line, *frame_number_line; 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 + -- cgit v0.9.0.2