| -rw-r--r-- | noncore/apps/opie-console/metafactory.cpp | 8 | ||||
| -rw-r--r-- | noncore/apps/opie-console/metafactory.h | 5 | ||||
| -rw-r--r-- | noncore/apps/opie-console/opie-console.pro | 2 | ||||
| -rw-r--r-- | noncore/apps/opie-console/profileeditordialog.cpp | 81 | ||||
| -rw-r--r-- | noncore/apps/opie-console/profileeditordialog.h | 4 | ||||
| -rw-r--r-- | noncore/apps/opie-console/profileeditorplugins.cpp | 164 | ||||
| -rw-r--r-- | noncore/apps/opie-console/profileeditorplugins.h | 37 |
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 @@ -15,62 +15,62 @@ void MetaFactory::addConfigWidgetFactory( const QString& str, void MetaFactory::addIOLayerFactory( const QString& str, iolayer lay) { m_layerFact.insert( str, lay ); } void MetaFactory::addFileTransferLayer( const QString& str, filelayer lay) { m_fileFact.insert( str, lay ); } QStringList MetaFactory::ioLayers()const { QStringList list; QMap<QString, iolayer>::ConstIterator it; for (it = m_layerFact.begin(); it != m_layerFact.end(); ++it ) { list << it.key(); } return list; } QStringList MetaFactory::configWidgets()const { QStringList list; QMap<QString, configWidget>::ConstIterator it; for ( it = m_confFact.begin(); it != m_confFact.end(); ++it ) { list << it.key(); } return list; } QStringList MetaFactory::fileTransferLayers()const { QStringList list; QMap<QString, filelayer>::ConstIterator it; for ( it = m_fileFact.begin(); it != m_fileFact.end(); ++it ) { list << it.key(); } return list; } IOLayer* MetaFactory::newIOLayer( const QString& str,const Profile& prof ) { IOLayer* lay = 0l; QMap<QString, iolayer>::Iterator it; it = m_layerFact.find( str ); if ( it != m_layerFact.end() ) { lay = (*(it.data()))(prof); /* iolayer laye = it.data(); lay = (*laye )(conf);*/ } 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 ) { return m_namemap[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 @@ -1,50 +1,51 @@ #ifndef OPIE_META_FACTORY_H #define OPIE_META_FACTORY_H /** * The MetaFactory is used to keep track of all IOLayers, FileTransferLayers and ConfigWidgets * and to instantiate these implementations on demand */ #include <qwidget.h> #include <qmap.h> #include <qpe/config.h> #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*); MetaFactory(); ~MetaFactory(); void addConfigWidgetFactory( const QString&, const QString&, configWidget ); void addIOLayerFactory(const QString&, iolayer ); void addFileTransferLayer( const QString&, filelayer ); QStringList ioLayers()const; 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& ); private: QMap<QString, configWidget> m_confFact; QMap<QString, iolayer> m_layerFact; QMap<QString, filelayer> m_fileFact; QMap<QString, QString> m_namemap; }; #endif 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 @@ -1,48 +1,50 @@ TEMPLATE = app #CONFIG = qt warn_on release CONFIG = qt debug DESTDIR = $(OPIEDIR)/bin HEADERS = io_layer.h io_serial.h \ file_layer.h \ metafactory.h \ session.h \ mainwindow.h \ profile.h \ profileconfig.h \ profilemanager.h \ configwidget.h \ tabwidget.h \ configdialog.h \ profileeditordialog.h \ + profileeditorplugins.h \ emulation_layer.h \ widget.h \ vt102emulation.h \ common.h \ history.h \ screen.h \ keytrans.h SOURCES = io_layer.cpp io_serial.cpp \ file_layer.cpp main.cpp \ metafactory.cpp \ session.cpp \ mainwindow.cpp \ profile.cpp \ profileconfig.cpp \ profilemanager.cpp \ tabwidget.cpp \ configdialog.cpp \ profileeditordialog.cpp \ + profileeditorplugins.cpp \ emulation_layer.cpp \ widget.cpp \ vt102emulation.cpp \ history.cpp \ screen.cpp \ keytrans.cpp INTERFACES = configurebase.ui editbase.ui INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += $(OPIEDIR)/include LIBS += -lqpe -lopie TARGET = opie-console 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 @@ -1,191 +1,128 @@ #include "profileeditordialog.h" #include "qlayout.h" #include "qlineedit.h" #include "qlabel.h" #include "qradiobutton.h" #include "qcombobox.h" #include "qcheckbox.h" #include "qmessagebox.h" #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 ) { initUI(); // Apply current profile // plugin_plugin->load(profile); // ... (reset profile name line edit etc.) } ProfileEditorDialog::ProfileEditorDialog( MetaFactory* fact ) : QTabDialog(0, 0, TRUE), m_fact( fact ) { // Default profile m_prof = Profile("serial", QString::null, Profile::Black, Profile::White, Profile::VT102); initUI(); // Apply current profile // plugin_plugin->load(profile); } Profile ProfileEditorDialog::profile() const { return m_prof; } void ProfileEditorDialog::initUI() { QWidget *tabterm, *tabconn, *tabprof; tabprof = new QWidget(this); tabterm = new QWidget(this); tabconn = new QWidget(this); // for the time being: fake factory m_fact->addConfigWidgetFactory("serial", QObject::tr("Serial cable"), factory_serial); m_fact->addConfigWidgetFactory("irda", QObject::tr("IrDA port"), factory_irda); m_fact->addConfigWidgetFactory("modem", QObject::tr("Serial via modem"), factory_modem); // profile tab QLabel *name = new QLabel(QObject::tr("Profile name"), tabprof); name_line = new QLineEdit(tabprof); // connection tab, fixed part QLabel *device = new QLabel(QObject::tr("Device"), tabconn); device_box = new QComboBox(tabconn); QStringList w = m_fact->configWidgets(); for(QStringList::Iterator it = w.begin(); it != w.end(); it++) device_box->insertItem(m_fact->name((*it))); // connection tab, factory part 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 speed_box = new QComboBox(tabconn); speed_box->insertItem("115200 baud"); speed_box->insertItem("57600 baud"); speed_box->insertItem("38400 baud"); speed_box->insertItem("19200 baud"); speed_box->insertItem("9600 baud"); QLabel *speed = new QLabel(QObject::tr("Speed"), tabconn); QLabel *flow = new QLabel(QObject::tr("Flow control"), tabconn); QLabel *parity = new QLabel(QObject::tr("Parity"), tabconn); QButtonGroup *group_flow = new QButtonGroup(tabconn); group_flow->hide(); QRadioButton *flow_hw = new QRadioButton(QObject::tr("Hardware"), tabconn); QRadioButton *flow_sw = new QRadioButton(QObject::tr("Software"), tabconn); group_flow->insert(flow_hw); group_flow->insert(flow_sw); QButtonGroup *group_parity = new QButtonGroup(tabconn); group_parity->hide(); QRadioButton *parity_odd = new QRadioButton(QObject::tr("Odd"), tabconn); QRadioButton *parity_even = new QRadioButton(QObject::tr("Even"), tabconn); group_parity->insert(parity_odd); group_parity->insert(parity_even); flow_sw->setChecked(true); parity_odd->setChecked(true); // terminal tab terminal_box = new QComboBox(tabterm); terminal_box->insertItem("VT 100"); terminal_box->insertItem("VT 220"); terminal_box->insertItem("ANSI"); QLabel *terminal = new QLabel(QObject::tr("Terminal type"), tabterm); QLabel *colour = new QLabel(QObject::tr("Colour scheme"), tabterm); QLabel *size = new QLabel(QObject::tr("Font size"), tabterm); QLabel *options = new QLabel(QObject::tr("Options"), tabterm); QLabel *conversions = new QLabel(QObject::tr("Line-break conversions"), tabterm); QComboBox *colour_box = new QComboBox(tabterm); colour_box->insertItem(QObject::tr("black on white")); colour_box->insertItem(QObject::tr("white on black")); @@ -212,120 +149,118 @@ void ProfileEditorDialog::initUI() vbox3->add(name); vbox3->add(name_line); vbox3->addStretch(1); QVBoxLayout *vbox = new QVBoxLayout(tabconn, 2); vbox->add(device); vbox->add(device_box); vbox->add(plugin_base); vbox->add(speed); vbox->add(speed_box); vbox->add(flow); QHBoxLayout *hbox = new QHBoxLayout(vbox, 2); hbox->add(flow_hw); hbox->add(flow_sw); //vbox->add(group_flow); vbox->add(parity); QHBoxLayout *hbox2 = new QHBoxLayout(vbox, 2); hbox2->add(parity_odd); hbox2->add(parity_even); //vbox->add(group_parity); QVBoxLayout *vbox2 = new QVBoxLayout(tabterm, 2); vbox2->add(terminal); vbox2->add(terminal_box); vbox2->add(size); QHBoxLayout *hbox3 = new QHBoxLayout(vbox2, 2); hbox3->add(size_small); hbox3->add(size_medium); hbox3->add(size_large); //vbox2->add(group_size); vbox2->add(colour); vbox2->add(colour_box); vbox2->add(conversions); QHBoxLayout *hbox5 = new QHBoxLayout(vbox2, 2); hbox5->add(conv_inbound); hbox5->add(conv_outbound); vbox2->add(options); QHBoxLayout *hbox4 = new QHBoxLayout(vbox2, 2); hbox4->add(option_wrap); hbox4->add(option_echo); addTab(tabprof, QObject::tr("Profile")); addTab(tabconn, QObject::tr("Connection")); addTab(tabterm, QObject::tr("Terminal")); 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))); } ProfileEditorDialog::~ProfileEditorDialog() { } 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() { if(prof_name().isEmpty()) { QMessageBox::information(this, QObject::tr("Invalid profile"), QObject::tr("Please enter a profile name.")); return; } // Save profile and plugin profile - //if(plugin_plugin) plugin_plugin->save(); + if(plugin_plugin) plugin_plugin->save(); QDialog::accept(); } void ProfileEditorDialog::slotCancel() { reject(); } QString ProfileEditorDialog::prof_name() { return name_line->text(); } QString ProfileEditorDialog::prof_type() { QStringList w = m_fact->configWidgets(); for(QStringList::Iterator it = w.begin(); it != w.end(); it++) if(device_box->currentText() == m_fact->name((*it))) return (*it); return QString::null; } QString ProfileEditorDialog::conn_device() { //return frame_device_line->text(); return "/dev/ttyS0"; } QString ProfileEditorDialog::term_type() { return terminal_box->currentText(); } 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 @@ -1,56 +1,58 @@ #ifndef PROFILE_EDITOR_DIALOG #define PROFILE_EDITOR_DIALOG #include <qtabdialog.h> #include "profile.h" class MetaFactory; class EditBase; class QTabWidget; class QHBoxLayout; class QLineEdit; class QComboBox; class QLabel; +class ProfileEditorPlugin; class ProfileEditorDialog : public QTabDialog { Q_OBJECT public: ProfileEditorDialog(MetaFactory* fact, const Profile& prof ); ProfileEditorDialog(MetaFactory* fact ); ~ProfileEditorDialog(); Profile profile()const; QString prof_name(); QString prof_type(); QString conn_device(); QString term_type(); public slots: void accept(); //void slotOk(); void slotCancel(); void slotDevice(int id); private: void initUI(); MetaFactory* m_fact; EditBase* m_base; QTabWidget* m_tab; QHBoxLayout* m_lay; Profile m_prof; //QLabel *frame_number; 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; }; #endif 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 + |