- restructure menu to use metafactory

- this is work in progress

4 files changed, 95 insertions, 52 deletions

diff --git a/noncore/apps/opie-console/metafactory.cpp b/noncore/apps/opie-console/metafactory.cpp
index 754f34c..04f1cbe 100644
--- a/noncore/apps/opie-console/metafactory.cpp
+++ b/noncore/apps/opie-console/metafactory.cpp
@@ -6,9 +6,11 @@ MetaFactory::MetaFactory() {
 MetaFactory::~MetaFactory() {
 
 }
 void MetaFactory::addConfigWidgetFactory( const QString& str,
+                                          const QString& name,
                                           configWidget wid) {
+    m_namemap.insert ( str, name );
     m_confFact.insert( str, wid );
 }
 void MetaFactory::addIOLayerFactory( const QString& str,
                                      iolayer lay) {
@@ -55,4 +57,9 @@ IOLayer* MetaFactory::newIOLayer( const QString& str,const Profile& prof ) {
     }
 
     return lay;
 }
+
+QString MetaFactory::name( const QString& str ) {
+    return m_namemap[str];
+}
+
diff --git a/noncore/apps/opie-console/metafactory.h b/noncore/apps/opie-console/metafactory.h
index bdd2ad2..7fa53c6 100644
--- a/noncore/apps/opie-console/metafactory.h
+++ b/noncore/apps/opie-console/metafactory.h
@@ -24,8 +24,9 @@ public:
     MetaFactory();
     ~MetaFactory();
 
     void addConfigWidgetFactory( const QString&,
+                                 const QString&,
                                  configWidget );
     void addIOLayerFactory(const QString&,
                            iolayer );
     void addFileTransferLayer( const QString&,
@@ -34,12 +35,15 @@ public:
     QStringList configWidgets()const;
     QStringList fileTransferLayers()const;
     IOLayer* newIOLayer( const QString&,const Profile& );
 
+    QString name( const QString& );
+
 private:
     QMap<QString, configWidget> m_confFact;
     QMap<QString, iolayer> m_layerFact;
     QMap<QString, filelayer> m_fileFact;
+	QMap<QString, QString> m_namemap;
 };
 
 
 #endif
diff --git a/noncore/apps/opie-console/profileeditordialog.cpp b/noncore/apps/opie-console/profileeditordialog.cpp
index 849439d..859abdd 100644
--- a/noncore/apps/opie-console/profileeditordialog.cpp
+++ b/noncore/apps/opie-console/profileeditordialog.cpp
@@ -7,8 +7,44 @@
 #include "qradiobutton.h"
 #include "qcombobox.h"
 #include "qcheckbox.h"
 #include "qmessagebox.h"
+#include "qbuttongroup.h"
+#include "qstringlist.h"
+
+#include "metafactory.h"
+
+static QWidget *factory_serial(QWidget *parent)
+{
+	QFrame *device_frame = new QFrame(parent);
+	device_frame->setFrameStyle(QFrame::Panel | QFrame::Sunken);
+
+	QLabel *frame_device = new QLabel(QObject::tr("Device"), device_frame);
+	QLabel *frame_number = new QLabel(QObject::tr("Phone number"), device_frame);
+	frame_number->hide();
+
+	QLineEdit *frame_device_line = new QLineEdit("/dev/ttyS0", device_frame);
+	QLineEdit *frame_number_line = new QLineEdit(device_frame);
+	frame_number_line->hide();
+
+	QVBoxLayout *vbox_frame = new QVBoxLayout(device_frame, 2);
+	vbox_frame->add(frame_device);
+	vbox_frame->add(frame_device_line);
+	vbox_frame->add(frame_number);
+	vbox_frame->add(frame_number_line);
+
+	return device_frame;
+}
+
+static QWidget *factory_irda(QWidget *parent)
+{
+	return NULL;
+}
+
+static QWidget *factory_modem(QWidget *parent)
+{
+	return NULL;
+}
 
 ProfileEditorDialog::ProfileEditorDialog( MetaFactory* fact,
                                           const Profile& prof )
     : QTabDialog(0, 0, TRUE), m_fact( fact ), m_prof( prof )
@@ -26,70 +62,69 @@ ProfileEditorDialog::ProfileEditorDialog( MetaFactory* fact )
 	tabprof = new QWidget(this);
 	tabterm = new QWidget(this);
 	tabconn = new QWidget(this);
 
+	// for the time being: fake factory
+	
+	m_fact->addConfigWidgetFactory("serial", QObject::tr("Serial cable"), factory_serial);
+	m_fact->addConfigWidgetFactory("irda", QObject::tr("IrDA port"), factory_irda);
+	m_fact->addConfigWidgetFactory("modem", QObject::tr("Serial via modem"), factory_modem);
+
 	// profile tab
 
 	QLabel *name = new QLabel(QObject::tr("Profile name"), tabprof);
-	QLabel *device = new QLabel(QObject::tr("Device"), tabprof);
 
 	name_line = new QLineEdit(tabprof);
 
-	device_box = new QComboBox(tabprof);
-	device_box->insertItem(QObject::tr("Serial cable"));
-	device_box->insertItem(QObject::tr("IrDA port"));
-	device_box->insertItem(QObject::tr("Serial via modem"));
+	// connection tab, fixed part
 
-	QFrame *device_frame = new QFrame(tabprof);
-	device_frame->setFrameStyle(QFrame::Panel | QFrame::Sunken);
+	QLabel *device = new QLabel(QObject::tr("Device"), tabconn);
 
-	QLabel *frame_device = new QLabel(QObject::tr("Device"), device_frame);
-	frame_number = new QLabel(QObject::tr("Phone number"), device_frame);
-	frame_number->hide();
+	device_box = new QComboBox(tabconn);
 
-	frame_device_line = new QLineEdit("/dev/ttyS0", device_frame);
-	frame_number_line = new QLineEdit(device_frame);
-	frame_number_line->hide();
+	QStringList w = m_fact->configWidgets();
+	for(QStringList::Iterator it = w.begin(); it != w.end(); it++)
+		device_box->insertItem(m_fact->name((*it)));
 
-	QVBoxLayout *vbox_frame = new QVBoxLayout(device_frame, 2);
-	vbox_frame->add(frame_device);
-	vbox_frame->add(frame_device_line);
-	vbox_frame->add(frame_number);
-	vbox_frame->add(frame_number_line);
+	// connection tab, factory part
+	QFrame *device_frame = static_cast<QFrame*>(factory_serial(tabconn));
 
-	// connection tab
+	// 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");
 
-	QLabel *protocol = new QLabel(QObject::tr("Protocol"), tabconn);
 	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);
 
-	QComboBox *protocol_box = new QComboBox(tabconn);
-	protocol_box->insertItem(QObject::tr("XModem"));
-	protocol_box->insertItem(QObject::tr("YModem"));
-	protocol_box->insertItem(QObject::tr("ZModem"));
-
+	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);
 
+	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);
 
 	flow_sw->setChecked(true);
 	parity_odd->setChecked(true);
 
 	// terminal tab
 
 	terminal_box = new QComboBox(tabterm);
 	terminal_box->insertItem("VT 100");
-	terminal_box->insertItem("VT 102");
+	terminal_box->insertItem("VT 220");
+	terminal_box->insertItem("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);
@@ -99,11 +134,16 @@ ProfileEditorDialog::ProfileEditorDialog( MetaFactory* fact )
 	QComboBox *colour_box = new QComboBox(tabterm);
 	colour_box->insertItem(QObject::tr("black on white"));
 	colour_box->insertItem(QObject::tr("white on black"));
 
+	QButtonGroup *group_size = new QButtonGroup(tabterm);
+	group_size->hide();
 	QRadioButton *size_small = new QRadioButton(QObject::tr("small"), tabterm);
 	QRadioButton *size_medium = new QRadioButton(QObject::tr("medium"), tabterm);
 	QRadioButton *size_large = new QRadioButton(QObject::tr("large"), tabterm);
+	group_size->insert(size_small);
+	group_size->insert(size_medium);
+	group_size->insert(size_large);
 
 	QCheckBox *option_echo = new QCheckBox(QObject::tr("Local echo"), tabterm);
 	QCheckBox *option_wrap = new QCheckBox(QObject::tr("Line wrap"), tabterm);
 
@@ -114,25 +154,26 @@ ProfileEditorDialog::ProfileEditorDialog( MetaFactory* fact )
 
 	QVBoxLayout *vbox3 = new QVBoxLayout(tabprof, 2);
 	vbox3->add(name);
 	vbox3->add(name_line);
-	vbox3->add(device);
-	vbox3->add(device_box);
-	vbox3->add(device_frame);
+	vbox3->addStretch(1);
 
 	QVBoxLayout *vbox = new QVBoxLayout(tabconn, 2);
-	vbox->add(protocol);
-	vbox->add(protocol_box);
+	vbox->add(device);
+	vbox->add(device_box);
+	vbox->add(device_frame);
 	vbox->add(speed);
 	vbox->add(speed_box);
 	vbox->add(flow);
 	QHBoxLayout *hbox = new QHBoxLayout(vbox, 2);
 	hbox->add(flow_hw);
 	hbox->add(flow_sw);
+	//vbox->add(group_flow);
 	vbox->add(parity);
 	QHBoxLayout *hbox2 = new QHBoxLayout(vbox, 2);
 	hbox2->add(parity_odd);
 	hbox2->add(parity_even);
+	//vbox->add(group_parity);
 
 	QVBoxLayout *vbox2 = new QVBoxLayout(tabterm, 2);
 	vbox2->add(terminal);
 	vbox2->add(terminal_box);
@@ -140,8 +181,9 @@ ProfileEditorDialog::ProfileEditorDialog( MetaFactory* fact )
 	QHBoxLayout *hbox3 = new QHBoxLayout(vbox2, 2);
 	hbox3->add(size_small);
 	hbox3->add(size_medium);
 	hbox3->add(size_large);
+	//vbox2->add(group_size);
 	vbox2->add(colour);
 	vbox2->add(colour_box);
 	vbox2->add(conversions);
 	QHBoxLayout *hbox5 = new QHBoxLayout(vbox2, 2);
@@ -171,26 +213,14 @@ ProfileEditorDialog::~ProfileEditorDialog() {
 }
 
 void ProfileEditorDialog::slotDevice(int id)
 {
-	switch(id)
-	{
-		case 0:
-			frame_device_line->setText("/dev/ttyS0");
-			frame_number->hide();
-			frame_number_line->hide();
-			break;
-		case 1:
-			frame_device_line->setText("/dev/ircomm0");
-			frame_number->hide();
-			frame_number_line->hide();
-			break;
-		case 2:
-			frame_device_line->setText("/dev/ttyS0");
-			frame_number->show();
-			frame_number_line->show();
-			break;
-	}
+	MetaFactory::configWidget c;
+
+	//c = m_fact->;
+	c = factory_serial;
+
+	QFrame *device_frame = static_cast<QFrame*>(c(NULL));
 }
 
 void ProfileEditorDialog::slotOk()
 {
@@ -234,9 +264,10 @@ QString ProfileEditorDialog::prof_type()
 }
 
 QString ProfileEditorDialog::conn_device()
 {
-	return frame_device_line->text();
+	//return frame_device_line->text();
+	return "serial";
 }
 
 int ProfileEditorDialog::conn_baud()
 {
diff --git a/noncore/apps/opie-console/profileeditordialog.h b/noncore/apps/opie-console/profileeditordialog.h
index f81354c..dfe4490 100644
--- a/noncore/apps/opie-console/profileeditordialog.h
+++ b/noncore/apps/opie-console/profileeditordialog.h
@@ -47,10 +47,11 @@ private:
     QTabWidget* m_tab;
     QHBoxLayout* m_lay;
     Profile m_prof;
 
-	QLabel *frame_number;
-	QLineEdit *name_line, *frame_device_line, *frame_number_line;
+	//QLabel *frame_number;
+	QLineEdit *name_line;
+	//QLineEdit *frame_device_line, *frame_number_line;
 	QComboBox *terminal_box, *speed_box, *device_box;
 };
 
 #endif