author | josef <josef> | 2002-10-07 11:19:00 (UTC) |
---|---|---|
committer | josef <josef> | 2002-10-07 11:19:00 (UTC) |
commit | 4fad0b73ae2940099bbb6f20bb94ed1f29e6d05b (patch) (side-by-side diff) | |
tree | 892db7b819261208d0bc288d88b5d1c4a58ec486 /noncore/apps | |
parent | 198ccce69447b515876e68cf7067e70da88cfb70 (diff) | |
download | opie-4fad0b73ae2940099bbb6f20bb94ed1f29e6d05b.zip opie-4fad0b73ae2940099bbb6f20bb94ed1f29e6d05b.tar.gz opie-4fad0b73ae2940099bbb6f20bb94ed1f29e6d05b.tar.bz2 |
- when editing, replace edited profile instead of inserting new one
- now save nearly all settings (not loaded yet)
-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 @@ -81,5 +81,8 @@ void ConfigDialog::slotEdit() { { - // 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); } 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 @@ -83,8 +83,8 @@ void ProfileEditorDialog::initUI() - 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); @@ -98,4 +98,4 @@ void ProfileEditorDialog::initUI() 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); @@ -105,4 +105,4 @@ void ProfileEditorDialog::initUI() 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); @@ -113,6 +113,6 @@ void ProfileEditorDialog::initUI() - 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); @@ -204,2 +204,9 @@ void ProfileEditorDialog::initUI() 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))); } @@ -234,3 +241,2 @@ void ProfileEditorDialog::accept() } - // Save profile and plugin profile @@ -263,12 +269,57 @@ QString ProfileEditorDialog::prof_type() -QString ProfileEditorDialog::conn_device() +void ProfileEditorDialog::slotConn(int id) { - //return frame_device_line->text(); - return "/dev/ttyS0"; -} - -QString ProfileEditorDialog::term_type() + switch(id) { - return terminal_box->currentText(); + 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; + } } + 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 @@ -28,6 +28,2 @@ public: - QString conn_device(); - - QString term_type(); - public slots: @@ -39,2 +35,4 @@ public slots: + void slotConn(int id); + private: @@ -48,6 +46,5 @@ private: - //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; @@ -55,2 +52,21 @@ private: 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 + }; }; 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 @@ -43,3 +43,3 @@ class ProfileEditorPluginSerial : public ProfileEditorPlugin - QLineEdit *frame_device_line = new QLineEdit("/dev/ttyS0", device_frame); + device_line = new QLineEdit("/dev/ttyS0", device_frame); @@ -47,3 +47,3 @@ class ProfileEditorPluginSerial : public ProfileEditorPlugin vbox_frame->add(frame_device); - vbox_frame->add(frame_device_line); + vbox_frame->add(device_line); @@ -57,3 +57,9 @@ class ProfileEditorPluginSerial : public ProfileEditorPlugin { + // special settings + Profile p = m_profile; + p.writeEntry("Device", device_line->text()); } + + private: + QLineEdit *device_line; }; @@ -82,3 +88,3 @@ class ProfileEditorPluginIrda : public ProfileEditorPlugin - QLineEdit *frame_device_line = new QLineEdit("/dev/ircomm0", device_frame); + device_line = new QLineEdit("/dev/ircomm0", device_frame); @@ -86,3 +92,3 @@ class ProfileEditorPluginIrda : public ProfileEditorPlugin vbox_frame->add(frame_device); - vbox_frame->add(frame_device_line); + vbox_frame->add(device_line); @@ -96,3 +102,9 @@ class ProfileEditorPluginIrda : public ProfileEditorPlugin { + // special settings + Profile p = m_profile; + p.writeEntry("Device", device_line->text()); } + + private: + QLineEdit *device_line; }; |