- more factorization

- use QDialog::accept() instead of applyButtonPressed()
- prepare plugin-specific load/save of data

3 files changed, 65 insertions, 69 deletions

diff --git a/noncore/apps/opie-console/configdialog.cpp b/noncore/apps/opie-console/configdialog.cpp
index d09cec3..23e94b1 100644
--- a/noncore/apps/opie-console/configdialog.cpp
+++ b/noncore/apps/opie-console/configdialog.cpp
@@ -64,7 +64,12 @@ void ConfigDialog::slotRemove() {
 }
 
 void ConfigDialog::slotEdit() {
-        ProfileEditorDialog dlg(new MetaFactory());
+        Profile p;
+
+        // Load profile
+        // p = currentItem()->profile();
+
+        ProfileEditorDialog dlg(new MetaFactory(), p);
 
         dlg.setCaption("Edit Connection Profile");
         dlg.showMaximized();
@@ -80,8 +85,6 @@ void ConfigDialog::slotEdit() {
 
 
 void ConfigDialog::slotAdd() {
-        qWarning("ConfigDialog::slotAdd");
-
         ProfileEditorDialog dlg(new MetaFactory());
 
         dlg.setCaption("New Connection");
@@ -90,23 +93,13 @@ void ConfigDialog::slotAdd() {
 
         if(ret == QDialog::Accepted)
         {
-                // defaults
-                int profile = Profile::VT102;
-
+                // TODO: Move into general profile save part
                 // assignments
-                QString type = dlg.term_type();
-                if(type == "VT102") profile = Profile::VT102;
-
-                // new profile
-                Profile p(dlg.prof_name(), dlg.prof_type(), Profile::White, Profile::Black, profile);
-
-                // 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());
+                //QString type = dlg.term_type();
+                //if(type == "VT102") profile = Profile::VT102;
+
+                // get profile from editor
+                Profile p = dlg.profile();
 
                 new ConfigListItem(lstView, p);
         }
diff --git a/noncore/apps/opie-console/profileeditordialog.cpp b/noncore/apps/opie-console/profileeditordialog.cpp
index 374844e..aee4051 100644
--- a/noncore/apps/opie-console/profileeditordialog.cpp
+++ b/noncore/apps/opie-console/profileeditordialog.cpp
@@ -65,18 +65,48 @@ static QWidget *factory_modem(QWidget *parent)
         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();
-    /* now set the widgets */
+    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);
@@ -174,6 +204,8 @@ ProfileEditorDialog::ProfileEditorDialog( MetaFactory* fact )
         QCheckBox *conv_inbound = new QCheckBox(QObject::tr("Inbound"), tabterm);
         QCheckBox *conv_outbound = new QCheckBox(QObject::tr("Outbound"), tabterm);
 
+        size_small->setChecked(true);
+
         // layouting
 
         QVBoxLayout *vbox3 = new QVBoxLayout(tabprof, 2);
@@ -225,7 +257,7 @@ ProfileEditorDialog::ProfileEditorDialog( MetaFactory* fact )
         setOkButton(QObject::tr("OK"));
         setCancelButton(QObject::tr("Cancel"));
 
-        connect(this, SIGNAL(applyButtonPressed()), SLOT(slotOk()));
+        //connect(this, SIGNAL(applyButtonPressed()), SLOT(slotOk()));
         connect(this, SIGNAL(defaultButtonPressed()), SLOT(slotOk()));
         connect(this, SIGNAL(cancelButtonPressed()), SLOT(slotCancel()));
 
@@ -243,10 +275,15 @@ void ProfileEditorDialog::slotDevice(int id)
         plugin_plugin = m_fact->newConfigWidget(prof_type(), plugin_base);
         plugin_layout->add(plugin_plugin);
 
+        // 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();
 }
 
-void ProfileEditorDialog::slotOk()
+void ProfileEditorDialog::accept()
 {
         if(prof_name().isEmpty())
         {
@@ -256,7 +293,10 @@ void ProfileEditorDialog::slotOk()
                 return;
         }
 
-        accept();
+        // Save profile and plugin profile
+        //if(plugin_plugin) plugin_plugin->save();
+
+        QDialog::accept();
 }
 
 void ProfileEditorDialog::slotCancel()
@@ -271,18 +311,9 @@ QString ProfileEditorDialog::prof_name()
 
 QString ProfileEditorDialog::prof_type()
 {
-        switch(device_box->currentItem())
-        {
-                case 0:
-                        return "serial";
-                        break;
-                case 1:
-                        return "irda";
-                        break;
-                case 2:
-                        return "modem";
-                        break;
-        }
+        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;
 }
@@ -290,32 +321,7 @@ QString ProfileEditorDialog::prof_type()
 QString ProfileEditorDialog::conn_device()
 {
         //return frame_device_line->text();
-        return "serial";
-}
-
-int ProfileEditorDialog::conn_baud()
-{
-        return speed_box->currentText().toInt();
-}
-
-int ProfileEditorDialog::conn_parity()
-{
-        return 0;
-}
-
-int ProfileEditorDialog::conn_databits()
-{
-        return 0;
-}
-
-int ProfileEditorDialog::conn_stopbits()
-{
-        return 0;
-}
-
-int ProfileEditorDialog::conn_flow()
-{
-        return 0;
+        return "/dev/ttyS0";
 }
 
 QString ProfileEditorDialog::term_type()
diff --git a/noncore/apps/opie-console/profileeditordialog.h b/noncore/apps/opie-console/profileeditordialog.h
index 00f3c99..8ebfba1 100644
--- a/noncore/apps/opie-console/profileeditordialog.h
+++ b/noncore/apps/opie-console/profileeditordialog.h
@@ -26,22 +26,19 @@ public:
         QString prof_type();
 
         QString conn_device();
-        int conn_baud();
-        int conn_parity();
-        int conn_databits();
-        int conn_stopbits();
-        int conn_flow();
 
         QString term_type();
 
 public slots:
-        void slotOk();
+        void accept();
+        //void slotOk();
         void slotCancel();
 
         void slotDevice(int id);
 
 private:
-    //void initUI();
+    void initUI();
+
     MetaFactory* m_fact;
     EditBase* m_base;
     QTabWidget* m_tab;