- when editing, replace edited profile instead of inserting new one

- now save nearly all settings (not loaded yet)

4 files changed, 117 insertions, 35 deletions

diff --git a/noncore/apps/opie-console/configdialog.cpp b/noncore/apps/opie-console/configdialog.cpp
index 655d649..ee1ffb4 100644
--- a/noncore/apps/opie-console/configdialog.cpp
+++ b/noncore/apps/opie-console/configdialog.cpp
@@ -1,109 +1,112 @@
 
 #include "profile.h"
 #include "qlistview.h"
 #include "configdialog.h"
 #include "profileeditordialog.h"
 #include "metafactory.h"
 #include "qdialog.h"
 
 class ConfigListItem : public QListViewItem {
 public:
     ConfigListItem( QListView* item, const Profile& );
     ~ConfigListItem();
     Profile profile()const;
 
 private:
     Profile m_prof;
 };
 ConfigListItem::ConfigListItem( QListView* item, const Profile& prof )
     : QListViewItem( item ), m_prof( prof )
 {
     setText(0, prof.name() );
 }
 ConfigListItem::~ConfigListItem() {
 
 }
 Profile ConfigListItem::profile()const {
     return m_prof;
 }
 
 /* Dialog */
 
 ConfigDialog::ConfigDialog( const Profile::ValueList& lis, QWidget* parent )
     : ConfigureBase( parent, 0, TRUE )
 {
     //init();
     {
         Profile::ValueList::ConstIterator it;
         for (it = lis.begin(); it != lis.end(); ++it ) {
             new ConfigListItem( lstView, (*it) );
         }
     }
 }
 ConfigDialog::~ConfigDialog() {
 
 }
 Profile::ValueList ConfigDialog::list()const {
 /* iterate over the list */
     Profile::ValueList lst;
     QListViewItemIterator it(lstView);
     for ( ; it.current(); ++it ) {
         ConfigListItem* item = (ConfigListItem*)it.current();
         lst.append( item->profile() );
     }
     return lst;
 }
 /* our slots */
 void ConfigDialog::slotRemove() {
     ConfigListItem* item = (ConfigListItem*)lstView->currentItem();
     if (!item )
         return;
 
     lstView->takeItem( item );
     delete item;
 }
 
 void ConfigDialog::slotEdit() {
         Profile p;
 
         if(!lstView->currentItem()) return;
 
         // Load profile
         p = ((ConfigListItem*)lstView->currentItem())->profile();
 
         ProfileEditorDialog dlg(new MetaFactory(), p);
 
         dlg.setCaption("Edit Connection Profile");
         dlg.showMaximized();
         int ret = dlg.exec();
 
         if(ret == QDialog::Accepted)
         {
-                // if(listView->current()) delete lstView->current(); ...
+                if(lstView->currentItem()) delete lstView->currentItem();
+
                 // use dlg.terminal()!
-                new ConfigListItem(lstView, Profile(dlg.prof_name(), dlg.prof_type(), Profile::White, Profile::Black, Profile::VT102));
+                Profile p = dlg.profile();
+
+                new ConfigListItem(lstView, p);
         }
 }
 
 
 void ConfigDialog::slotAdd() {
         ProfileEditorDialog dlg(new MetaFactory());
 
         dlg.setCaption("New Connection");
         dlg.showMaximized();
         int ret = dlg.exec();
 
         if(ret == QDialog::Accepted)
         {
                 // TODO: Move into general profile save part
                 // assignments
                 //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 fc95e56..5b7f851 100644
--- a/noncore/apps/opie-console/profileeditordialog.cpp
+++ b/noncore/apps/opie-console/profileeditordialog.cpp
@@ -1,274 +1,325 @@
 
 #include "profileeditordialog.h"
 
 #include "qlayout.h"
 #include "qlineedit.h"
 #include "qlabel.h"
 #include "qradiobutton.h"
 #include "qcombobox.h"
 #include "qcheckbox.h"
 #include "qmessagebox.h"
 #include "qbuttongroup.h"
 #include "qstringlist.h"
 
 #include "profileeditorplugins.h"
 #include "metafactory.h"
 
 ProfileEditorDialog::ProfileEditorDialog( MetaFactory* fact,
                                           const Profile& prof )
     : QTabDialog(0, 0, TRUE), m_fact( fact ), m_prof( prof )
 {
     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(QString::null, "serial", 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);
         tabterm = new QWidget(this);
         tabconn = new QWidget(this);
 
         // for the time being: fake factory
         
         m_fact->addConfigWidgetFactory("serial", QObject::tr("Serial cable"), factory_serial);
         m_fact->addConfigWidgetFactory("irda", QObject::tr("IrDA port"), factory_irda);
         m_fact->addConfigWidgetFactory("modem", QObject::tr("Serial via modem"), factory_modem);
 
         // profile tab
 
         QLabel *name = new QLabel(QObject::tr("Profile name"), tabprof);
 
         name_line = new QLineEdit(tabprof);
 
         // connection tab, fixed part
 
         QLabel *device = new QLabel(QObject::tr("Device"), tabconn);
 
         device_box = new QComboBox(tabconn);
 
         QStringList w = m_fact->configWidgets();
         for(QStringList::Iterator it = w.begin(); it != w.end(); it++)
                 device_box->insertItem(m_fact->name((*it)));
 
         // 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_layout->add(plugin_plugin->widget());
 
         // connection tab, general part
 
-        speed_box = new QComboBox(tabconn);
-        speed_box->insertItem("115200 baud");
-        speed_box->insertItem("57600 baud");
-        speed_box->insertItem("38400 baud");
-        speed_box->insertItem("19200 baud");
-        speed_box->insertItem("9600 baud");
+        QComboBox *speed_box = new QComboBox(tabconn);
+        speed_box->insertItem("115200 baud", id_baud_115200);
+        speed_box->insertItem("57600 baud", id_baud_57600);
+        speed_box->insertItem("38400 baud", id_baud_38400);
+        speed_box->insertItem("19200 baud", id_baud_19200);
+        speed_box->insertItem("9600 baud", id_baud_9600);
 
         QLabel *speed = new QLabel(QObject::tr("Speed"), tabconn);
         QLabel *flow = new QLabel(QObject::tr("Flow control"), tabconn);
         QLabel *parity = new QLabel(QObject::tr("Parity"), tabconn);
 
         QButtonGroup *group_flow = new QButtonGroup(tabconn);
         group_flow->hide();
         QRadioButton *flow_hw = new QRadioButton(QObject::tr("Hardware"), tabconn);
         QRadioButton *flow_sw = new QRadioButton(QObject::tr("Software"), tabconn);
-        group_flow->insert(flow_hw);
-        group_flow->insert(flow_sw);
+        group_flow->insert(flow_hw, id_flow_hw);
+        group_flow->insert(flow_sw, id_flow_sw);
 
         QButtonGroup *group_parity = new QButtonGroup(tabconn);
         group_parity->hide();
         QRadioButton *parity_odd = new QRadioButton(QObject::tr("Odd"), tabconn);
         QRadioButton *parity_even = new QRadioButton(QObject::tr("Even"), tabconn);
-        group_parity->insert(parity_odd);
-        group_parity->insert(parity_even);
+        group_parity->insert(parity_odd, id_parity_odd);
+        group_parity->insert(parity_even, id_parity_even);
 
         flow_sw->setChecked(true);
         parity_odd->setChecked(true);
 
         // terminal tab
 
-        terminal_box = new QComboBox(tabterm);
-        terminal_box->insertItem("VT 100");
-        terminal_box->insertItem("VT 220");
-        terminal_box->insertItem("ANSI");
+        QComboBox *terminal_box = new QComboBox(tabterm);
+        terminal_box->insertItem("VT 100", id_term_vt100);
+        terminal_box->insertItem("VT 220", id_term_vt220);
+        terminal_box->insertItem("ANSI", id_term_ansi);
 
         QLabel *terminal = new QLabel(QObject::tr("Terminal type"), tabterm);
         QLabel *colour = new QLabel(QObject::tr("Colour scheme"), tabterm);
         QLabel *size = new QLabel(QObject::tr("Font size"), tabterm);
         QLabel *options = new QLabel(QObject::tr("Options"), tabterm);
         QLabel *conversions = new QLabel(QObject::tr("Line-break conversions"), tabterm);
 
         QComboBox *colour_box = new QComboBox(tabterm);
         colour_box->insertItem(QObject::tr("black on white"));
         colour_box->insertItem(QObject::tr("white on black"));
 
         QButtonGroup *group_size = new QButtonGroup(tabterm);
         group_size->hide();
         QRadioButton *size_small = new QRadioButton(QObject::tr("small"), tabterm);
         QRadioButton *size_medium = new QRadioButton(QObject::tr("medium"), tabterm);
         QRadioButton *size_large = new QRadioButton(QObject::tr("large"), tabterm);
         group_size->insert(size_small);
         group_size->insert(size_medium);
         group_size->insert(size_large);
 
         QCheckBox *option_echo = new QCheckBox(QObject::tr("Local echo"), tabterm);
         QCheckBox *option_wrap = new QCheckBox(QObject::tr("Line wrap"), tabterm);
 
         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);
         vbox3->add(name);
         vbox3->add(name_line);
         vbox3->addStretch(1);
 
         QVBoxLayout *vbox = new QVBoxLayout(tabconn, 2);
         vbox->add(device);
         vbox->add(device_box);
         vbox->add(plugin_base);
         vbox->add(speed);
         vbox->add(speed_box);
         vbox->add(flow);
         QHBoxLayout *hbox = new QHBoxLayout(vbox, 2);
         hbox->add(flow_hw);
         hbox->add(flow_sw);
         //vbox->add(group_flow);
         vbox->add(parity);
         QHBoxLayout *hbox2 = new QHBoxLayout(vbox, 2);
         hbox2->add(parity_odd);
         hbox2->add(parity_even);
         //vbox->add(group_parity);
 
         QVBoxLayout *vbox2 = new QVBoxLayout(tabterm, 2);
         vbox2->add(terminal);
         vbox2->add(terminal_box);
         vbox2->add(size);
         QHBoxLayout *hbox3 = new QHBoxLayout(vbox2, 2);
         hbox3->add(size_small);
         hbox3->add(size_medium);
         hbox3->add(size_large);
         //vbox2->add(group_size);
         vbox2->add(colour);
         vbox2->add(colour_box);
         vbox2->add(conversions);
         QHBoxLayout *hbox5 = new QHBoxLayout(vbox2, 2);
         hbox5->add(conv_inbound);
         hbox5->add(conv_outbound);
         vbox2->add(options);
         QHBoxLayout *hbox4 = new QHBoxLayout(vbox2, 2);
         hbox4->add(option_wrap);
         hbox4->add(option_echo);
 
         addTab(tabprof, QObject::tr("Profile"));
         addTab(tabconn, QObject::tr("Connection"));
         addTab(tabterm, QObject::tr("Terminal"));
 
         setOkButton(QObject::tr("OK"));
         setCancelButton(QObject::tr("Cancel"));
 
         // load profile values
 
         name_line->setText(m_prof.name());
 
         // signals
 
         connect(this, SIGNAL(cancelButtonPressed()), SLOT(slotCancel()));
         connect(device_box, SIGNAL(activated(int)), SLOT(slotDevice(int)));
+
+        connect(group_flow, SIGNAL(clicked(int)), SLOT(slotConn(int)));
+        connect(group_parity, SIGNAL(clicked(int)), SLOT(slotConn(int)));
+        connect(speed_box, SIGNAL(clicked(int)), SLOT(slotConn(int)));
+
+        connect(terminal_box, SIGNAL(clicked(int)), SLOT(slotConn(int)));
+        connect(group_size, SIGNAL(clicked(int)), SLOT(slotConn(int)));
 }
 
 ProfileEditorDialog::~ProfileEditorDialog() {
 
 }
 
 void ProfileEditorDialog::slotDevice(int id)
 {
         delete plugin_plugin;
 
         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()
         // or, keeping the profile name: m_prof->reload(plugin_plugin->profile())
 
         //plugin_plugin->show();
         plugin_plugin->widget()->show();
 }
 
 void ProfileEditorDialog::accept()
 {
         if(prof_name().isEmpty())
         {
                 QMessageBox::information(this,
                         QObject::tr("Invalid profile"),
                         QObject::tr("Please enter a profile name."));
                 return;
         }
-
         // Save profile and plugin profile
         if(plugin_plugin) plugin_plugin->save();
 
         // Save general values
         m_prof.setName(prof_name());
 
         QDialog::accept();
 }
 
 void ProfileEditorDialog::slotCancel()
 {
         reject();
 }
 
 QString ProfileEditorDialog::prof_name()
 {
         return name_line->text();
 }
 
 QString ProfileEditorDialog::prof_type()
 {
         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;
 }
 
-QString ProfileEditorDialog::conn_device()
+void ProfileEditorDialog::slotConn(int id)
 {
-        //return frame_device_line->text();
-        return "/dev/ttyS0";
+        switch(id)
+        {
+                case id_flow_hw:
+                        m_prof.writeEntry("Flow", 0x01);
+                        break;
+                case id_flow_sw:
+                        m_prof.writeEntry("Flow", 0x02);
+                        break;
+                case id_parity_odd:
+                        m_prof.writeEntry("Parity", 2);
+                        break;
+                case id_parity_even:
+                        m_prof.writeEntry("Parity", 1);
+                        break;
+
+                case id_baud_115200:
+                        m_prof.writeEntry("Speed", 115200);
+                        break;
+                case id_baud_57600:
+                        m_prof.writeEntry("Speed", 57600);
+                        break;
+                case id_baud_38400:
+                        m_prof.writeEntry("Speed", 38400);
+                        break;
+                case id_baud_19200:
+                        m_prof.writeEntry("Speed", 19200);
+                        break;
+                case id_baud_9600:
+                        m_prof.writeEntry("Speed", 9600);
+                        break;
+
+                case id_term_vt100:
+                        m_prof.writeEntry("Terminal", 2);
+                        break;
+                case id_term_vt220:
+                        m_prof.writeEntry("Terminal", 1);
+                        break;
+                case id_term_ansi:
+                        m_prof.writeEntry("Terminal", 0);
+                        break;
+
+                case id_size_small:
+                        m_prof.writeEntry("Font", 0);
+                        break;
+                case id_size_medium:
+                        m_prof.writeEntry("Font", 1);
+                        break;
+                case id_size_large:
+                        m_prof.writeEntry("Font", 2);
+                        break;
+        }
 }
 
-QString ProfileEditorDialog::term_type()
-{
-        return terminal_box->currentText();
-}
 
diff --git a/noncore/apps/opie-console/profileeditordialog.h b/noncore/apps/opie-console/profileeditordialog.h
index faabda0..0637f44 100644
--- a/noncore/apps/opie-console/profileeditordialog.h
+++ b/noncore/apps/opie-console/profileeditordialog.h
@@ -1,58 +1,74 @@
 #ifndef PROFILE_EDITOR_DIALOG
 #define PROFILE_EDITOR_DIALOG
 
 #include <qtabdialog.h>
 
 #include "profile.h"
 
 class MetaFactory;
 class EditBase;
 class QTabWidget;
 class QHBoxLayout;
 class QLineEdit;
 class QComboBox;
 class QLabel;
 class ProfileEditorPlugin;
 
 class ProfileEditorDialog : public QTabDialog {
     Q_OBJECT
 public:
     ProfileEditorDialog(MetaFactory* fact,
                         const Profile& prof );
     ProfileEditorDialog(MetaFactory* fact );
         ~ProfileEditorDialog();
     Profile profile()const;
 
         QString prof_name();
         QString prof_type();
 
-        QString conn_device();
-
-        QString term_type();
-
 public slots:
         void accept();
         //void slotOk();
         void slotCancel();
 
         void slotDevice(int id);
 
+        void slotConn(int id);
+
 private:
     void initUI();
 
     MetaFactory* m_fact;
     EditBase* m_base;
     QTabWidget* m_tab;
     QHBoxLayout* m_lay;
     Profile m_prof;
 
-        //QLabel *frame_number;
         QLineEdit *name_line;
-        //QLineEdit *frame_device_line, *frame_number_line;
-        QComboBox *terminal_box, *speed_box, *device_box;
+        QComboBox *device_box;
+
         QWidget *plugin_base;
         ProfileEditorPlugin *plugin_plugin;
         QHBoxLayout *plugin_layout;
+
+        enum Ids
+        {
+                id_parity_odd,
+                id_parity_even,
+                id_flow_hw,
+                id_flow_sw,
+                id_baud_115200,
+                id_baud_57600,
+                id_baud_38400,
+                id_baud_19200,
+                id_baud_9600,
+                id_term_vt100,
+                id_term_vt220,
+                id_term_ansi,
+                id_size_small,
+                id_size_medium,
+                id_size_large
+        };
 };
 
 #endif
diff --git a/noncore/apps/opie-console/profileeditorplugins.cpp b/noncore/apps/opie-console/profileeditorplugins.cpp
index 54eee3f..a11d6b0 100644
--- a/noncore/apps/opie-console/profileeditorplugins.cpp
+++ b/noncore/apps/opie-console/profileeditorplugins.cpp
@@ -1,164 +1,176 @@
 
 #include "profileeditorplugins.h"
 #include "profile.h"
 
 #include "qframe.h"
 #include "qlabel.h"
 #include "qlineedit.h"
 #include "qlayout.h"
 
 ProfileEditorPlugin::ProfileEditorPlugin(QWidget *parent, Profile p)
 {
         m_parent = parent;
         m_profile = p;
         m_widget = NULL;
 }
 
 ProfileEditorPlugin::~ProfileEditorPlugin()
 {
         if(m_widget) delete m_widget;
 }
 
 class ProfileEditorPluginSerial : public ProfileEditorPlugin
 {
         public:
         
         ProfileEditorPluginSerial(QWidget *parent, Profile p)
         : ProfileEditorPlugin(parent, p)
         {
         }
 
         ~ProfileEditorPluginSerial()
         {
         }
 
         QWidget *widget()
         {
                 if(!m_widget)
                 {
                         QFrame *device_frame = new QFrame(m_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);
+                        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);
+                        vbox_frame->add(device_line);
 
                         m_widget = device_frame;
                 }
 
                 return m_widget;
         }
 
         void save()
         {
+                // special settings
+                Profile p = m_profile;
+                p.writeEntry("Device", device_line->text());
         }
+
+        private:
+                QLineEdit *device_line;
 };
 
 class ProfileEditorPluginIrda : public ProfileEditorPlugin
 {
         public:
 
         ProfileEditorPluginIrda(QWidget *parent, Profile p)
         : ProfileEditorPlugin(parent, p)
         {
         }
 
         ~ProfileEditorPluginIrda()
         {
         }
 
         QWidget *widget()
         {
                 if(!m_widget)
                 {
                         QFrame *device_frame = new QFrame(m_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);
+                        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);
+                        vbox_frame->add(device_line);
 
                         m_widget = device_frame;
                 }
 
                 return m_widget;
         }
 
         void save()
         {
+                // special settings
+                Profile p = m_profile;
+                p.writeEntry("Device", device_line->text());
         }
+
+        private:
+                QLineEdit *device_line;
 };
 
 class ProfileEditorPluginModem : public ProfileEditorPlugin
 {
         public:
 
         ProfileEditorPluginModem(QWidget *parent, Profile p)
         : ProfileEditorPlugin(parent, p)
         {
         }
 
         ~ProfileEditorPluginModem()
         {
         }
 
         QWidget *widget()
         {
                 if(!m_widget)
                 {
                         QFrame *device_frame = new QFrame(m_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);
 
                         device_line = new QLineEdit("/dev/ttyS0", device_frame);
                         number_line = new QLineEdit(device_frame);
 
                         QVBoxLayout *vbox_frame = new QVBoxLayout(device_frame, 2);
                         vbox_frame->add(frame_device);
                         vbox_frame->add(device_line);
                         vbox_frame->add(frame_number);
                         vbox_frame->add(number_line);
 
                         m_widget = device_frame;
                 }
 
                 return m_widget;
         }
 
         void save()
         {
                 // special settings
                 Profile p = m_profile;
                 p.writeEntry("Device", device_line->text());
                 p.writeEntry("Number", number_line->text());
         }
 
         private:
                 QLineEdit *device_line, *number_line;
 };
 
 ProfileEditorPlugin *factory_serial(QWidget *parent, const Profile& p)
 {
         return new ProfileEditorPluginSerial(parent, p);
 }
 
 ProfileEditorPlugin *factory_irda(QWidget *parent, const Profile& p)
 {
         return new ProfileEditorPluginIrda(parent, p);
 }
 
 ProfileEditorPlugin *factory_modem(QWidget *parent, const Profile& p)
 {
         return new ProfileEditorPluginModem(parent, p);
 }