| -rw-r--r-- | noncore/apps/opie-console/configdialog.cpp | 7 | ||||
| -rw-r--r-- | noncore/apps/opie-console/profileeditordialog.cpp | 95 | ||||
| -rw-r--r-- | noncore/apps/opie-console/profileeditordialog.h | 30 | ||||
| -rw-r--r-- | noncore/apps/opie-console/profileeditorplugins.cpp | 20 |
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 @@ -76,15 +76,18 @@ void ConfigDialog::slotEdit() { 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()); 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 @@ -78,46 +78,46 @@ void ProfileEditorDialog::initUI() 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); @@ -199,12 +199,19 @@ void ProfileEditorDialog::initUI() 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() { } @@ -229,13 +236,12 @@ void ProfileEditorDialog::accept() { 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()); @@ -258,17 +264,62 @@ QString ProfileEditorDialog::prof_type() 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 @@ -23,36 +23,52 @@ public: ~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 @@ -38,27 +38,33 @@ class ProfileEditorPluginSerial : public ProfileEditorPlugin { 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: @@ -77,27 +83,33 @@ class ProfileEditorPluginIrda : public ProfileEditorPlugin { 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: |