- 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
@@ -203,12 +203,12 @@ void ProfileEditorDialog::initUI()
         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() {
@@ -267,7 +267,7 @@ QString ProfileEditorDialog::prof_type()
         return QString::null;
 }
 
-void ProfileEditorDialog::slotConn(int id)
+void ProfileEditorDialog::slotConnFlow(int id)
 {
         switch(id)
         {
@@ -277,12 +277,26 @@ void ProfileEditorDialog::slotConn(int id)
                 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);
@@ -299,6 +313,13 @@ void ProfileEditorDialog::slotConn(int id)
                 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);
@@ -309,7 +330,13 @@ void ProfileEditorDialog::slotConn(int id)
                 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;
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
@@ -33,7 +33,11 @@ public slots:
 
         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();
@@ -51,20 +55,36 @@ private:
         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