From 0b7136e077b0ec2767722c38ee0939b53a95fe6a Mon Sep 17 00:00:00 2001 From: josef Date: Sun, 06 Oct 2002 11:38:51 +0000 Subject: - restructure menu to use metafactory - this is work in progress --- (limited to 'noncore/apps/opie-console/profileeditordialog.cpp') 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 @@ -8,6 +8,42 @@ #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 ) @@ -27,36 +63,32 @@ ProfileEditorDialog::ProfileEditorDialog( MetaFactory* fact ) 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(factory_serial(tabconn)); - // connection tab + // connection tab, general part speed_box = new QComboBox(tabconn); speed_box->insertItem("115200 baud"); @@ -65,21 +97,23 @@ ProfileEditorDialog::ProfileEditorDialog( MetaFactory* fact ) 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); @@ -88,7 +122,8 @@ ProfileEditorDialog::ProfileEditorDialog( MetaFactory* fact ) 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); @@ -100,9 +135,14 @@ ProfileEditorDialog::ProfileEditorDialog( MetaFactory* fact ) 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); @@ -115,23 +155,24 @@ 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); @@ -141,6 +182,7 @@ ProfileEditorDialog::ProfileEditorDialog( MetaFactory* fact ) 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); @@ -172,24 +214,12 @@ 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(c(NULL)); } void ProfileEditorDialog::slotOk() @@ -235,7 +265,8 @@ QString ProfileEditorDialog::prof_type() QString ProfileEditorDialog::conn_device() { - return frame_device_line->text(); + //return frame_device_line->text(); + return "serial"; } int ProfileEditorDialog::conn_baud() -- cgit v0.9.0.2