summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/apps/opie-console/metafactory.cpp2
-rw-r--r--noncore/apps/opie-console/metafactory.h4
-rw-r--r--noncore/apps/opie-console/profileeditordialog.cpp14
-rw-r--r--noncore/apps/opie-console/profileeditorplugins.cpp102
-rw-r--r--noncore/apps/opie-console/profileeditorplugins.h10
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
@@ -61,5 +61,5 @@ IOLayer* MetaFactory::newIOLayer( const QString& str,const Profile& prof ) {
}
-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;
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
@@ -19,5 +19,5 @@
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*);
@@ -37,5 +37,5 @@ public:
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& );
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
@@ -74,5 +74,5 @@ void ProfileEditorDialog::initUI()
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());
@@ -113,4 +113,13 @@ void ProfileEditorDialog::initUI()
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
@@ -128,5 +137,5 @@ 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());
@@ -153,4 +162,5 @@ void ProfileEditorDialog::accept()
// 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
@@ -16,5 +16,5 @@
// Base class
-ProfileEditorPlugin::ProfileEditorPlugin(QWidget *parent, Profile p)
+ProfileEditorPlugin::ProfileEditorPlugin(QWidget *parent, Profile *p)
{
m_parent = parent;
@@ -77,7 +77,8 @@ QWidget *ProfileEditorPlugin::connection_widget()
// 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);
@@ -161,11 +162,12 @@ QWidget *ProfileEditorPlugin::terminal_widget()
// 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);
@@ -202,8 +204,8 @@ void ProfileEditorPlugin::slotConnFlow(int 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;
}
@@ -215,8 +217,8 @@ void ProfileEditorPlugin::slotConnParity(int 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;
}
@@ -229,17 +231,17 @@ void ProfileEditorPlugin::slotConnSpeed(int 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;
}
@@ -251,11 +253,11 @@ void ProfileEditorPlugin::slotTermTerm(int 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;
}
@@ -267,8 +269,8 @@ void ProfileEditorPlugin::slotTermColour(int 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;
}
@@ -280,11 +282,11 @@ void ProfileEditorPlugin::slotTermFont(int 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;
}
@@ -293,20 +295,20 @@ void ProfileEditorPlugin::slotTermFont(int id)
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);
}
@@ -317,5 +319,5 @@ class ProfileEditorPluginSerial : public ProfileEditorPlugin
public:
- ProfileEditorPluginSerial(QWidget *parent, Profile p)
+ ProfileEditorPluginSerial(QWidget *parent, Profile *p)
: ProfileEditorPlugin(parent, p)
{
@@ -344,5 +346,7 @@ class ProfileEditorPluginSerial : public ProfileEditorPlugin
// Load special settings
- device_line->setText(m_profile.readEntry("Device"));
+
+ QString dev = m_profile->readEntry("Device");
+ if(!dev.isNull()) device_line->setText(dev);
}
@@ -353,6 +357,5 @@ class ProfileEditorPluginSerial : public ProfileEditorPlugin
{
// special settings
- Profile p = m_profile;
- p.writeEntry("Device", device_line->text());
+ m_profile->writeEntry("Device", device_line->text());
}
@@ -365,5 +368,5 @@ class ProfileEditorPluginIrda : public ProfileEditorPlugin
public:
- ProfileEditorPluginIrda(QWidget *parent, Profile p)
+ ProfileEditorPluginIrda(QWidget *parent, Profile *p)
: ProfileEditorPlugin(parent, p)
{
@@ -392,5 +395,6 @@ class ProfileEditorPluginIrda : public ProfileEditorPlugin
// Load special settings
- device_line->setText(m_profile.readEntry("Device"));
+ QString dev = m_profile->readEntry("Device");
+ if(!dev.isNull()) device_line->setText(dev);
}
@@ -401,6 +405,5 @@ class ProfileEditorPluginIrda : public ProfileEditorPlugin
{
// special settings
- Profile p = m_profile;
- p.writeEntry("Device", device_line->text());
+ m_profile->writeEntry("Device", device_line->text());
}
@@ -413,5 +416,5 @@ class ProfileEditorPluginModem : public ProfileEditorPlugin
public:
- ProfileEditorPluginModem(QWidget *parent, Profile p)
+ ProfileEditorPluginModem(QWidget *parent, Profile *p)
: ProfileEditorPlugin(parent, p)
{
@@ -444,6 +447,8 @@ class ProfileEditorPluginModem : public ProfileEditorPlugin
// 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);
}
@@ -454,7 +459,6 @@ class ProfileEditorPluginModem : public ProfileEditorPlugin
{
// 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());
}
@@ -463,15 +467,15 @@ class ProfileEditorPluginModem : public ProfileEditorPlugin
};
-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
@@ -12,5 +12,5 @@ class ProfileEditorPlugin : public QObject
Q_OBJECT
public:
- ProfileEditorPlugin(QWidget *parent, Profile p);
+ ProfileEditorPlugin(QWidget *parent, Profile *p);
virtual ~ProfileEditorPlugin();
@@ -37,5 +37,5 @@ class ProfileEditorPlugin : public QObject
protected:
QWidget *m_parent, *m_widget;
- Profile m_profile;
+ Profile *m_profile;
private:
@@ -86,7 +86,7 @@ class ProfileEditorPlugin : public QObject
//#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