5 files changed, 73 insertions, 59 deletions

diff --git a/noncore/apps/opie-console/metafactory.cpp b/noncore/apps/opie-console/metafactory.cpp
index c5e614d..b69d6da 100644
--- a/noncore/apps/opie-console/metafactory.cpp
+++ b/noncore/apps/opie-console/metafactory.cpp
@@ -59,9 +59,9 @@ IOLayer* MetaFactory::newIOLayer( const QString& str,const Profile& prof ) {
 
     return lay;
 }
 
-ProfileEditorPlugin *MetaFactory::newConfigPlugin ( const QString& str, QWidget *parent, const Profile& prof) {
+ProfileEditorPlugin *MetaFactory::newConfigPlugin ( const QString& str, QWidget *parent, Profile *prof) {
     ProfileEditorPlugin *p = NULL;
     configWidget c;
 
     c = m_confFact[str];
diff --git a/noncore/apps/opie-console/metafactory.h b/noncore/apps/opie-console/metafactory.h
index 8c714b3..216de03 100644
--- a/noncore/apps/opie-console/metafactory.h
+++ b/noncore/apps/opie-console/metafactory.h
@@ -17,9 +17,9 @@
 #include "profileeditorplugins.h"
 
 class MetaFactory {
 public:
-    typedef ProfileEditorPlugin* (*configWidget)(QWidget* parent, const Profile&);
+    typedef ProfileEditorPlugin* (*configWidget)(QWidget* parent, Profile* prof);
     typedef IOLayer* (*iolayer)(const Profile& );
     typedef FileTransferLayer* (*filelayer)(IOLayer*);
 
     MetaFactory();
@@ -35,9 +35,9 @@ public:
     QStringList ioLayers()const;
     QStringList configWidgets()const;
     QStringList fileTransferLayers()const;
     IOLayer* newIOLayer( const QString&,const Profile& );
-    ProfileEditorPlugin *newConfigPlugin ( const QString&, QWidget*, const Profile& );
+    ProfileEditorPlugin *newConfigPlugin ( const QString&, QWidget*, Profile* );
 
     QString name( const QString& );
 
 private:
diff --git a/noncore/apps/opie-console/profileeditordialog.cpp b/noncore/apps/opie-console/profileeditordialog.cpp
index d98e589..8e63429 100644
--- a/noncore/apps/opie-console/profileeditordialog.cpp
+++ b/noncore/apps/opie-console/profileeditordialog.cpp
@@ -72,9 +72,9 @@ void ProfileEditorDialog::initUI()
         // connection tab, factory part
         plugin_base = new QWidget(tabconn);
         plugin_layout = new QHBoxLayout(plugin_base, 0);
 
-        plugin_plugin = m_fact->newConfigPlugin("serial", plugin_base, m_prof);
+        plugin_plugin = m_fact->newConfigPlugin("serial", plugin_base, &m_prof);
         plugin_layout->add(plugin_plugin->widget());
 
         // connection tab, general part
 
@@ -111,8 +111,17 @@ void ProfileEditorDialog::initUI()
 
         // load profile values
 
         name_line->setText(m_prof.name());
+        for(int i = 0; i < device_box->count(); i++)
+        {
+                device_box->setCurrentItem(i);
+                if(prof_type() == m_prof.ioLayerName())
+                {
+                        slotDevice(i);
+                        break;
+                }
+        }
 
         // signals
 
         connect(this, SIGNAL(cancelButtonPressed()), SLOT(slotCancel()));
@@ -126,9 +135,9 @@ ProfileEditorDialog::~ProfileEditorDialog() {
 void ProfileEditorDialog::slotDevice(int id)
 {
         delete plugin_plugin;
 
-        plugin_plugin = m_fact->newConfigPlugin(prof_type(), plugin_base, m_prof);
+        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()
@@ -151,8 +160,9 @@ void ProfileEditorDialog::accept()
         if(plugin_plugin) plugin_plugin->save();
 
         // Save general values
         m_prof.setName(prof_name());
+        m_prof.setIOLayer(prof_type());
 
         QDialog::accept();
 }
 
diff --git a/noncore/apps/opie-console/profileeditorplugins.cpp b/noncore/apps/opie-console/profileeditorplugins.cpp
index 32e8235..a0bcab8 100644
--- a/noncore/apps/opie-console/profileeditorplugins.cpp
+++ b/noncore/apps/opie-console/profileeditorplugins.cpp
@@ -14,9 +14,9 @@
 #include "io_serial.h"
 
 // Base class
 
-ProfileEditorPlugin::ProfileEditorPlugin(QWidget *parent, Profile p)
+ProfileEditorPlugin::ProfileEditorPlugin(QWidget *parent, Profile *p)
 {
         m_parent = parent;
         m_profile = p;
         m_widget = NULL;
@@ -75,11 +75,12 @@ QWidget *ProfileEditorPlugin::connection_widget()
         hbox2->add(parity_odd);
         hbox2->add(parity_even);
 
         // Apply profile settings
-        int rad_flow = m_profile.readNumEntry("Flow");
-        int rad_parity = m_profile.readNumEntry("Parity");
-        int speed = m_profile.readNumEntry("Speed");
+
+        int rad_flow = m_profile->readNumEntry("Flow");
+        int rad_parity = m_profile->readNumEntry("Parity");
+        int speed = m_profile->readNumEntry("Speed");
 
         if(rad_flow == IOSerial::FlowHW) flow_hw->setChecked(true);
         else flow_sw->setChecked(true);
         if(rad_parity == IOSerial::ParityEven) parity_even->setChecked(true);
@@ -159,15 +160,16 @@ QWidget *ProfileEditorPlugin::terminal_widget()
         hbox3->add(option_wrap);
         hbox3->add(option_echo);
 
         // Apply profile settings
-        int term = m_profile.readNumEntry("Terminal");
-        int colour = m_profile.readNumEntry("Colour");
-        int fontsize = m_profile.readNumEntry("Font");
-        int opt_echo = m_profile.readNumEntry("Echo");
-        int opt_wrap = m_profile.readNumEntry("Wrap");
-        int opt_inbound = m_profile.readNumEntry("Inbound");
-        int opt_outbound = m_profile.readNumEntry("Outbound");
+
+        int term = m_profile->readNumEntry("Terminal");
+        int colour = m_profile->readNumEntry("Colour");
+        int fontsize = m_profile->readNumEntry("Font");
+        int opt_echo = m_profile->readNumEntry("Echo");
+        int opt_wrap = m_profile->readNumEntry("Wrap");
+        int opt_inbound = m_profile->readNumEntry("Inbound");
+        int opt_outbound = m_profile->readNumEntry("Outbound");
 
         if(term == Profile::VT102) terminal_box->setCurrentItem(id_term_vt100);
 
         if(colour == Profile::Black) colour_box->setCurrentItem(id_term_black);
@@ -200,12 +202,12 @@ void ProfileEditorPlugin::slotConnFlow(int id)
 {
         switch(id)
         {
                 case id_flow_hw:
-                        m_profile.writeEntry("Flow", IOSerial::FlowHW);
+                        m_profile->writeEntry("Flow", IOSerial::FlowHW);
                         break;
                 case id_flow_sw:
-                        m_profile.writeEntry("Flow", IOSerial::FlowSW);
+                        m_profile->writeEntry("Flow", IOSerial::FlowSW);
                         break;
         }
 }
 
@@ -213,12 +215,12 @@ void ProfileEditorPlugin::slotConnParity(int id)
 {
         switch(id)
         {
                 case id_parity_odd:
-                        m_profile.writeEntry("Parity", IOSerial::ParityEven);
+                        m_profile->writeEntry("Parity", IOSerial::ParityEven);
                         break;
                 case id_parity_even:
-                        m_profile.writeEntry("Parity", IOSerial::ParityOdd);
+                        m_profile->writeEntry("Parity", IOSerial::ParityOdd);
                         break;
         }
 }
 
@@ -227,21 +229,21 @@ void ProfileEditorPlugin::slotConnSpeed(int id)
         switch(id)
         {
 
                 case id_baud_115200:
-                        m_profile.writeEntry("Speed", 115200);
+                        m_profile->writeEntry("Speed", 115200);
                         break;
                 case id_baud_57600:
-                        m_profile.writeEntry("Speed", 57600);
+                        m_profile->writeEntry("Speed", 57600);
                         break;
                 case id_baud_38400:
-                        m_profile.writeEntry("Speed", 38400);
+                        m_profile->writeEntry("Speed", 38400);
                         break;
                 case id_baud_19200:
-                        m_profile.writeEntry("Speed", 19200);
+                        m_profile->writeEntry("Speed", 19200);
                         break;
                 case id_baud_9600:
-                        m_profile.writeEntry("Speed", 9600);
+                        m_profile->writeEntry("Speed", 9600);
                         break;
         }
 }
 
@@ -249,15 +251,15 @@ void ProfileEditorPlugin::slotTermTerm(int id)
 {
         switch(id)
         {
                 case id_term_vt100:
-                        m_profile.writeEntry("Terminal", Profile::VT102);
+                        m_profile->writeEntry("Terminal", Profile::VT102);
                         break;
                 case id_term_vt220:
-                        m_profile.writeEntry("Terminal", Profile::VT102);
+                        m_profile->writeEntry("Terminal", Profile::VT102);
                         break;
                 case id_term_ansi:
-                        m_profile.writeEntry("Terminal", Profile::VT102);
+                        m_profile->writeEntry("Terminal", Profile::VT102);
                         break;
         }
 }
 
@@ -265,12 +267,12 @@ void ProfileEditorPlugin::slotTermColour(int id)
 {
         switch(id)
         {
                 case id_term_black:
-                        m_profile.writeEntry("Colour", Profile::Black);
+                        m_profile->writeEntry("Colour", Profile::Black);
                         break;
                 case id_term_white:
-                        m_profile.writeEntry("Colour", Profile::White);
+                        m_profile->writeEntry("Colour", Profile::White);
                         break;
         }
 }
 
@@ -278,46 +280,46 @@ void ProfileEditorPlugin::slotTermFont(int id)
 {
         switch(id)
         {
                 case id_size_small:
-                        m_profile.writeEntry("Font", Profile::Micro);
+                        m_profile->writeEntry("Font", Profile::Micro);
                         break;
                 case id_size_medium:
-                        m_profile.writeEntry("Font", Profile::Small);
+                        m_profile->writeEntry("Font", Profile::Small);
                         break;
                 case id_size_large:
-                        m_profile.writeEntry("Font", Profile::Medium);
+                        m_profile->writeEntry("Font", Profile::Medium);
                         break;
         }
 }
 
 void ProfileEditorPlugin::slotTermEcho(bool on)
 {
-        m_profile.writeEntry("Echo", on ? 1 : 0);
+        m_profile->writeEntry("Echo", on ? 1 : 0);
 }
 
 void ProfileEditorPlugin::slotTermWrap(bool on)
 {
-        m_profile.writeEntry("Wrap", on ? 1 : 0);
+        m_profile->writeEntry("Wrap", on ? 1 : 0);
 }
 
 void ProfileEditorPlugin::slotTermInbound(bool on)
 {
-        m_profile.writeEntry("Inbound", on ? 1 : 0);
+        m_profile->writeEntry("Inbound", on ? 1 : 0);
 }
 
 void ProfileEditorPlugin::slotTermOutbound(bool on)
 {
-        m_profile.writeEntry("Outbound", on ? 1 : 0);
+        m_profile->writeEntry("Outbound", on ? 1 : 0);
 }
 
 // Inherited classes
 
 class ProfileEditorPluginSerial : public ProfileEditorPlugin
 {
         public:
         
-        ProfileEditorPluginSerial(QWidget *parent, Profile p)
+        ProfileEditorPluginSerial(QWidget *parent, Profile *p)
         : ProfileEditorPlugin(parent, p)
         {
         }
 
@@ -342,19 +344,20 @@ class ProfileEditorPluginSerial : public ProfileEditorPlugin
 
                         m_widget = device_frame;
 
                         // Load special settings
-                        device_line->setText(m_profile.readEntry("Device"));
+
+                        QString dev = m_profile->readEntry("Device");
+                        if(!dev.isNull()) device_line->setText(dev);
                 }
 
                 return m_widget;
         }
 
         void save()
         {
                 // special settings
-                Profile p = m_profile;
-                p.writeEntry("Device", device_line->text());
+                m_profile->writeEntry("Device", device_line->text());
         }
 
         private:
                 QLineEdit *device_line;
@@ -363,9 +366,9 @@ class ProfileEditorPluginSerial : public ProfileEditorPlugin
 class ProfileEditorPluginIrda : public ProfileEditorPlugin
 {
         public:
 
-        ProfileEditorPluginIrda(QWidget *parent, Profile p)
+        ProfileEditorPluginIrda(QWidget *parent, Profile *p)
         : ProfileEditorPlugin(parent, p)
         {
         }
 
@@ -390,19 +393,19 @@ class ProfileEditorPluginIrda : public ProfileEditorPlugin
 
                         m_widget = device_frame;
 
                         // Load special settings
-                        device_line->setText(m_profile.readEntry("Device"));
+                        QString dev = m_profile->readEntry("Device");
+                        if(!dev.isNull()) device_line->setText(dev);
                 }
 
                 return m_widget;
         }
 
         void save()
         {
                 // special settings
-                Profile p = m_profile;
-                p.writeEntry("Device", device_line->text());
+                m_profile->writeEntry("Device", device_line->text());
         }
 
         private:
                 QLineEdit *device_line;
@@ -411,9 +414,9 @@ class ProfileEditorPluginIrda : public ProfileEditorPlugin
 class ProfileEditorPluginModem : public ProfileEditorPlugin
 {
         public:
 
-        ProfileEditorPluginModem(QWidget *parent, Profile p)
+        ProfileEditorPluginModem(QWidget *parent, Profile *p)
         : ProfileEditorPlugin(parent, p)
         {
         }
 
@@ -442,38 +445,39 @@ class ProfileEditorPluginModem : public ProfileEditorPlugin
 
                         m_widget = device_frame;
 
                         // Load special settings
-                        device_line->setText(m_profile.readEntry("Device"));
-                        number_line->setText(m_profile.readEntry("Number"));
+                        QString dev = m_profile->readEntry("Device");
+                        QString num = m_profile->readEntry("Number");
+                        if(!dev.isNull()) device_line->setText(dev);
+                        number_line->setText(num);
                 }
 
                 return m_widget;
         }
 
         void save()
         {
                 // special settings
-                Profile p = m_profile;
-                p.writeEntry("Device", device_line->text());
-                p.writeEntry("Number", number_line->text());
+                m_profile->writeEntry("Device", device_line->text());
+                m_profile->writeEntry("Number", number_line->text());
         }
 
         private:
                 QLineEdit *device_line, *number_line;
 };
 
-ProfileEditorPlugin *factory_serial(QWidget *parent, const Profile& p)
+ProfileEditorPlugin *factory_serial(QWidget *parent, Profile *p)
 {
         return new ProfileEditorPluginSerial(parent, p);
 }
 
-ProfileEditorPlugin *factory_irda(QWidget *parent, const Profile& p)
+ProfileEditorPlugin *factory_irda(QWidget *parent, Profile *p)
 {
         return new ProfileEditorPluginIrda(parent, p);
 }
 
-ProfileEditorPlugin *factory_modem(QWidget *parent, const Profile& p)
+ProfileEditorPlugin *factory_modem(QWidget *parent, Profile *p)
 {
         return new ProfileEditorPluginModem(parent, p);
 }
 
diff --git a/noncore/apps/opie-console/profileeditorplugins.h b/noncore/apps/opie-console/profileeditorplugins.h
index caec7ba..591163a 100644
--- a/noncore/apps/opie-console/profileeditorplugins.h
+++ b/noncore/apps/opie-console/profileeditorplugins.h
@@ -10,9 +10,9 @@ class QWidget;
 class ProfileEditorPlugin : public QObject
 {
         Q_OBJECT
         public:
-                ProfileEditorPlugin(QWidget *parent, Profile p);
+                ProfileEditorPlugin(QWidget *parent, Profile *p);
 
                 virtual ~ProfileEditorPlugin();
 
                 virtual void save() = 0;
@@ -35,9 +35,9 @@ class ProfileEditorPlugin : public QObject
                 void slotTermOutbound(bool on);
 
         protected:
                 QWidget *m_parent, *m_widget;
-                Profile m_profile;
+                Profile *m_profile;
 
         private:
                 enum ParityIds
                 {
@@ -84,11 +84,11 @@ class ProfileEditorPlugin : public QObject
 //#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);
+ProfileEditorPlugin *factory_serial(QWidget *parent, Profile *p);
+ProfileEditorPlugin *factory_irda(QWidget *parent, Profile *p);
+ProfileEditorPlugin *factory_modem(QWidget *parent, Profile *p);
 
 //#ifdef __cplusplus
 //}
 //#endif