1 files changed, 8 insertions, 73 deletions

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();