4 files changed, 52 insertions, 14 deletions

diff --git a/noncore/apps/opie-console/metafactory.cpp b/noncore/apps/opie-console/metafactory.cpp
index 04f1cbe..ea7f739 100644
--- a/noncore/apps/opie-console/metafactory.cpp
+++ b/noncore/apps/opie-console/metafactory.cpp
@@ -45,4 +45,5 @@ QStringList MetaFactory::fileTransferLayers()const {
     return list;
 }
+
 IOLayer* MetaFactory::newIOLayer( const QString& str,const Profile& prof ) {
     IOLayer* lay = 0l;
@@ -60,4 +61,14 @@ IOLayer* MetaFactory::newIOLayer( const QString& str,const Profile& prof ) {
 }
 
+QWidget *MetaFactory::newConfigWidget ( const QString& str, QWidget* parent) {
+    QWidget *w = NULL;
+    configWidget c;
+
+    c = m_confFact[str];
+    if(c) w = c(parent);
+
+    return w;
+}
+
 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 7fa53c6..2245231 100644
--- a/noncore/apps/opie-console/metafactory.h
+++ b/noncore/apps/opie-console/metafactory.h
@@ -36,4 +36,5 @@ public:
     QStringList fileTransferLayers()const;
     IOLayer* newIOLayer( const QString&,const Profile& );
+    QWidget *newConfigWidget ( const QString&, QWidget* );
 
     QString name( const QString& );
diff --git a/noncore/apps/opie-console/profileeditordialog.cpp b/noncore/apps/opie-console/profileeditordialog.cpp
index 859abdd..374844e 100644
--- a/noncore/apps/opie-console/profileeditordialog.cpp
+++ b/noncore/apps/opie-console/profileeditordialog.cpp
@@ -20,16 +20,10 @@ static QWidget *factory_serial(QWidget *parent)
 
         QLabel *frame_device = new QLabel(QObject::tr("Device"), device_frame);
-        QLabel *frame_number = new QLabel(QObject::tr("Phone number"), device_frame);
-        frame_number->hide();
 
         QLineEdit *frame_device_line = new QLineEdit("/dev/ttyS0", device_frame);
-        QLineEdit *frame_number_line = new QLineEdit(device_frame);
-        frame_number_line->hide();
 
         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;
@@ -38,10 +32,36 @@ static QWidget *factory_serial(QWidget *parent)
 static QWidget *factory_irda(QWidget *parent)
 {
-        return NULL;
+        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)
 {
-        return NULL;
+        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;
 }
 
@@ -87,5 +107,9 @@ ProfileEditorDialog::ProfileEditorDialog( MetaFactory* fact )
 
         // connection tab, factory part
-        QFrame *device_frame = static_cast<QFrame*>(factory_serial(tabconn));
+        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);
 
         // connection tab, general part
@@ -161,5 +185,5 @@ ProfileEditorDialog::ProfileEditorDialog( MetaFactory* fact )
         vbox->add(device);
         vbox->add(device_box);
-        vbox->add(device_frame);
+        vbox->add(plugin_base);
         vbox->add(speed);
         vbox->add(speed_box);
@@ -215,10 +239,10 @@ ProfileEditorDialog::~ProfileEditorDialog() {
 void ProfileEditorDialog::slotDevice(int id)
 {
-        MetaFactory::configWidget c;
+        delete plugin_plugin;
 
-        //c = m_fact->;
-        c = factory_serial;
+        plugin_plugin = m_fact->newConfigWidget(prof_type(), plugin_base);
+        plugin_layout->add(plugin_plugin);
 
-        QFrame *device_frame = static_cast<QFrame*>(c(NULL));
+        plugin_plugin->show();
 }
 
diff --git a/noncore/apps/opie-console/profileeditordialog.h b/noncore/apps/opie-console/profileeditordialog.h
index dfe4490..00f3c99 100644
--- a/noncore/apps/opie-console/profileeditordialog.h
+++ b/noncore/apps/opie-console/profileeditordialog.h
@@ -53,4 +53,6 @@ private:
         //QLineEdit *frame_device_line, *frame_number_line;
         QComboBox *terminal_box, *speed_box, *device_box;
+        QWidget *plugin_base, *plugin_plugin;
+        QHBoxLayout *plugin_layout;
 };