summaryrefslogtreecommitdiff
authorjosef <josef>2002-10-07 11:19:00 (UTC)
committer josef <josef>2002-10-07 11:19:00 (UTC)
commit4fad0b73ae2940099bbb6f20bb94ed1f29e6d05b (patch) (unidiff)
tree892db7b819261208d0bc288d88b5d1c4a58ec486
parent198ccce69447b515876e68cf7067e70da88cfb70 (diff)
downloadopie-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)
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/opie-console/configdialog.cpp7
-rw-r--r--noncore/apps/opie-console/profileeditordialog.cpp95
-rw-r--r--noncore/apps/opie-console/profileeditordialog.h30
-rw-r--r--noncore/apps/opie-console/profileeditorplugins.cpp20
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() {
81 { 81 {
82 // if(listView->current()) delete lstView->current(); ... 82 if(lstView->currentItem()) delete lstView->currentItem();
83
83 // use dlg.terminal()! 84 // use dlg.terminal()!
84 new ConfigListItem(lstView, Profile(dlg.prof_name(), dlg.prof_type(), Profile::White, Profile::Black, Profile::VT102)); 85 Profile p = dlg.profile();
86
87 new ConfigListItem(lstView, p);
85 } 88 }
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()
83 83
84 speed_box = new QComboBox(tabconn); 84 QComboBox *speed_box = new QComboBox(tabconn);
85 speed_box->insertItem("115200 baud"); 85 speed_box->insertItem("115200 baud", id_baud_115200);
86 speed_box->insertItem("57600 baud"); 86 speed_box->insertItem("57600 baud", id_baud_57600);
87 speed_box->insertItem("38400 baud"); 87 speed_box->insertItem("38400 baud", id_baud_38400);
88 speed_box->insertItem("19200 baud"); 88 speed_box->insertItem("19200 baud", id_baud_19200);
89 speed_box->insertItem("9600 baud"); 89 speed_box->insertItem("9600 baud", id_baud_9600);
90 90
@@ -98,4 +98,4 @@ void ProfileEditorDialog::initUI()
98 QRadioButton *flow_sw = new QRadioButton(QObject::tr("Software"), tabconn); 98 QRadioButton *flow_sw = new QRadioButton(QObject::tr("Software"), tabconn);
99 group_flow->insert(flow_hw); 99 group_flow->insert(flow_hw, id_flow_hw);
100 group_flow->insert(flow_sw); 100 group_flow->insert(flow_sw, id_flow_sw);
101 101
@@ -105,4 +105,4 @@ void ProfileEditorDialog::initUI()
105 QRadioButton *parity_even = new QRadioButton(QObject::tr("Even"), tabconn); 105 QRadioButton *parity_even = new QRadioButton(QObject::tr("Even"), tabconn);
106 group_parity->insert(parity_odd); 106 group_parity->insert(parity_odd, id_parity_odd);
107 group_parity->insert(parity_even); 107 group_parity->insert(parity_even, id_parity_even);
108 108
@@ -113,6 +113,6 @@ void ProfileEditorDialog::initUI()
113 113
114 terminal_box = new QComboBox(tabterm); 114 QComboBox *terminal_box = new QComboBox(tabterm);
115 terminal_box->insertItem("VT 100"); 115 terminal_box->insertItem("VT 100", id_term_vt100);
116 terminal_box->insertItem("VT 220"); 116 terminal_box->insertItem("VT 220", id_term_vt220);
117 terminal_box->insertItem("ANSI"); 117 terminal_box->insertItem("ANSI", id_term_ansi);
118 118
@@ -204,2 +204,9 @@ void ProfileEditorDialog::initUI()
204 connect(device_box, SIGNAL(activated(int)), SLOT(slotDevice(int))); 204 connect(device_box, SIGNAL(activated(int)), SLOT(slotDevice(int)));
205
206 connect(group_flow, SIGNAL(clicked(int)), SLOT(slotConn(int)));
207 connect(group_parity, SIGNAL(clicked(int)), SLOT(slotConn(int)));
208 connect(speed_box, SIGNAL(clicked(int)), SLOT(slotConn(int)));
209
210 connect(terminal_box, SIGNAL(clicked(int)), SLOT(slotConn(int)));
211 connect(group_size, SIGNAL(clicked(int)), SLOT(slotConn(int)));
205} 212}
@@ -234,3 +241,2 @@ void ProfileEditorDialog::accept()
234 } 241 }
235
236 // Save profile and plugin profile 242 // Save profile and plugin profile
@@ -263,12 +269,57 @@ QString ProfileEditorDialog::prof_type()
263 269
264QString ProfileEditorDialog::conn_device() 270void ProfileEditorDialog::slotConn(int id)
265{ 271{
266 //return frame_device_line->text(); 272 switch(id)
267 return "/dev/ttyS0"; 273 {
274 case id_flow_hw:
275 m_prof.writeEntry("Flow", 0x01);
276 break;
277 case id_flow_sw:
278 m_prof.writeEntry("Flow", 0x02);
279 break;
280 case id_parity_odd:
281 m_prof.writeEntry("Parity", 2);
282 break;
283 case id_parity_even:
284 m_prof.writeEntry("Parity", 1);
285 break;
286
287 case id_baud_115200:
288 m_prof.writeEntry("Speed", 115200);
289 break;
290 case id_baud_57600:
291 m_prof.writeEntry("Speed", 57600);
292 break;
293 case id_baud_38400:
294 m_prof.writeEntry("Speed", 38400);
295 break;
296 case id_baud_19200:
297 m_prof.writeEntry("Speed", 19200);
298 break;
299 case id_baud_9600:
300 m_prof.writeEntry("Speed", 9600);
301 break;
302
303 case id_term_vt100:
304 m_prof.writeEntry("Terminal", 2);
305 break;
306 case id_term_vt220:
307 m_prof.writeEntry("Terminal", 1);
308 break;
309 case id_term_ansi:
310 m_prof.writeEntry("Terminal", 0);
311 break;
312
313 case id_size_small:
314 m_prof.writeEntry("Font", 0);
315 break;
316 case id_size_medium:
317 m_prof.writeEntry("Font", 1);
318 break;
319 case id_size_large:
320 m_prof.writeEntry("Font", 2);
321 break;
322 }
268} 323}
269 324
270QString ProfileEditorDialog::term_type()
271{
272 return terminal_box->currentText();
273}
274 325
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:
28 28
29 QString conn_device();
30
31 QString term_type();
32
33public slots: 29public slots:
@@ -39,2 +35,4 @@ public slots:
39 35
36 void slotConn(int id);
37
40private: 38private:
@@ -48,6 +46,5 @@ private:
48 46
49 //QLabel *frame_number;
50 QLineEdit *name_line; 47 QLineEdit *name_line;
51 //QLineEdit *frame_device_line, *frame_number_line; 48 QComboBox *device_box;
52 QComboBox *terminal_box, *speed_box, *device_box; 49
53 QWidget *plugin_base; 50 QWidget *plugin_base;
@@ -55,2 +52,21 @@ private:
55 QHBoxLayout *plugin_layout; 52 QHBoxLayout *plugin_layout;
53
54 enum Ids
55 {
56 id_parity_odd,
57 id_parity_even,
58 id_flow_hw,
59 id_flow_sw,
60 id_baud_115200,
61 id_baud_57600,
62 id_baud_38400,
63 id_baud_19200,
64 id_baud_9600,
65 id_term_vt100,
66 id_term_vt220,
67 id_term_ansi,
68 id_size_small,
69 id_size_medium,
70 id_size_large
71 };
56}; 72};
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
43 43
44 QLineEdit *frame_device_line = new QLineEdit("/dev/ttyS0", device_frame); 44 device_line = new QLineEdit("/dev/ttyS0", device_frame);
45 45
@@ -47,3 +47,3 @@ class ProfileEditorPluginSerial : public ProfileEditorPlugin
47 vbox_frame->add(frame_device); 47 vbox_frame->add(frame_device);
48 vbox_frame->add(frame_device_line); 48 vbox_frame->add(device_line);
49 49
@@ -57,3 +57,9 @@ class ProfileEditorPluginSerial : public ProfileEditorPlugin
57 { 57 {
58 // special settings
59 Profile p = m_profile;
60 p.writeEntry("Device", device_line->text());
58 } 61 }
62
63 private:
64 QLineEdit *device_line;
59}; 65};
@@ -82,3 +88,3 @@ class ProfileEditorPluginIrda : public ProfileEditorPlugin
82 88
83 QLineEdit *frame_device_line = new QLineEdit("/dev/ircomm0", device_frame); 89 device_line = new QLineEdit("/dev/ircomm0", device_frame);
84 90
@@ -86,3 +92,3 @@ class ProfileEditorPluginIrda : public ProfileEditorPlugin
86 vbox_frame->add(frame_device); 92 vbox_frame->add(frame_device);
87 vbox_frame->add(frame_device_line); 93 vbox_frame->add(device_line);
88 94
@@ -96,3 +102,9 @@ class ProfileEditorPluginIrda : public ProfileEditorPlugin
96 { 102 {
103 // special settings
104 Profile p = m_profile;
105 p.writeEntry("Device", device_line->text());
97 } 106 }
107
108 private:
109 QLineEdit *device_line;
98}; 110};