- oops... QComboBox doesn't handle non-consecutive values

2 files changed, 59 insertions, 12 deletions

diff --git a/noncore/apps/opie-console/profileeditordialog.cpp b/noncore/apps/opie-console/profileeditordialog.cpp
index 5b7f851..78885e1 100644
--- a/noncore/apps/opie-console/profileeditordialog.cpp
+++ b/noncore/apps/opie-console/profileeditordialog.cpp
@@ -200,18 +200,18 @@ void ProfileEditorDialog::initUI()
 
 	// 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(group_flow, SIGNAL(clicked(int)), SLOT(slotConnFlow(int)));
+	connect(group_parity, SIGNAL(clicked(int)), SLOT(slotConnParity(int)));
+	connect(speed_box, SIGNAL(activated(int)), SLOT(slotConnSpeed(int)));
 
-	connect(terminal_box, SIGNAL(clicked(int)), SLOT(slotConn(int)));
-	connect(group_size, SIGNAL(clicked(int)), SLOT(slotConn(int)));
+	connect(terminal_box, SIGNAL(activated(int)), SLOT(slotTermTerm(int)));
+	connect(group_size, SIGNAL(clicked(int)), SLOT(slotTermFont(int)));
 }
 
 ProfileEditorDialog::~ProfileEditorDialog() {
 
 }
 
@@ -264,28 +264,42 @@ 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;
 }
 
-void ProfileEditorDialog::slotConn(int id)
+void ProfileEditorDialog::slotConnFlow(int id)
 {
 	switch(id)
 	{
 		case id_flow_hw:
 			m_prof.writeEntry("Flow", 0x01);
 			break;
 		case id_flow_sw:
 			m_prof.writeEntry("Flow", 0x02);
 			break;
+	}
+}
+
+void ProfileEditorDialog::slotConnParity(int id)
+{
+	switch(id)
+	{
 		case id_parity_odd:
 			m_prof.writeEntry("Parity", 2);
 			break;
 		case id_parity_even:
 			m_prof.writeEntry("Parity", 1);
 			break;
+	}
+}
+
+void ProfileEditorDialog::slotConnSpeed(int id)
+{
+	switch(id)
+	{
 
 		case id_baud_115200:
 			m_prof.writeEntry("Speed", 115200);
 			break;
 		case id_baud_57600:
 			m_prof.writeEntry("Speed", 57600);
@@ -296,23 +310,36 @@ void ProfileEditorDialog::slotConn(int id)
 		case id_baud_19200:
 			m_prof.writeEntry("Speed", 19200);
 			break;
 		case id_baud_9600:
 			m_prof.writeEntry("Speed", 9600);
 			break;
+	}
+}
+
+void ProfileEditorDialog::slotTermTerm(int id)
+{
+	switch(id)
+	{
 
 		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;
+	}
+}
 
+void ProfileEditorDialog::slotTermFont(int id)
+{
+	switch(id)
+	{
 		case id_size_small:
 			m_prof.writeEntry("Font", 0);
 			break;
 		case id_size_medium:
 			m_prof.writeEntry("Font", 1);
 			break;
diff --git a/noncore/apps/opie-console/profileeditordialog.h b/noncore/apps/opie-console/profileeditordialog.h
index 0637f44..a6808d0 100644
--- a/noncore/apps/opie-console/profileeditordialog.h
+++ b/noncore/apps/opie-console/profileeditordialog.h
@@ -30,13 +30,17 @@ public slots:
 	void accept();
 	//void slotOk();
 	void slotCancel();
 
 	void slotDevice(int id);
 
-	void slotConn(int id);
+	void slotConnFlow(int id);
+	void slotConnParity(int id);
+	void slotConnSpeed(int id);
+	void slotTermTerm(int id);
+	void slotTermFont(int id);
 
 private:
     void initUI();
 
     MetaFactory* m_fact;
     EditBase* m_base;
@@ -48,26 +52,42 @@ private:
 	QComboBox *device_box;
 
 	QWidget *plugin_base;
 	ProfileEditorPlugin *plugin_plugin;
 	QHBoxLayout *plugin_layout;
 
-	enum Ids
+	enum ParityIds
 	{
 		id_parity_odd,
-		id_parity_even,
+		id_parity_even
+	};
+
+	enum FlowIds
+	{
 		id_flow_hw,
-		id_flow_sw,
+		id_flow_sw
+	};
+
+	enum SpeedIds
+	{
 		id_baud_115200,
 		id_baud_57600,
 		id_baud_38400,
 		id_baud_19200,
-		id_baud_9600,
+		id_baud_9600
+	};
+
+	enum TermIds
+	{
 		id_term_vt100,
 		id_term_vt220,
-		id_term_ansi,
+		id_term_ansi
+	};
+
+	enum FontIds
+	{
 		id_size_small,
 		id_size_medium,
 		id_size_large
 	};
 };