From d55aa591770675008da9e3290617e463a77e4c98 Mon Sep 17 00:00:00 2001 From: harlekin Date: Mon, 07 Oct 2002 18:05:43 +0000 Subject: reworked config dialog gui a bit and adapted it to opie --- (limited to 'noncore') diff --git a/noncore/apps/opie-console/mainwindow.cpp b/noncore/apps/opie-console/mainwindow.cpp index dce08ca..31f1138 100644 --- a/noncore/apps/opie-console/mainwindow.cpp +++ b/noncore/apps/opie-console/mainwindow.cpp @@ -15,7 +15,7 @@ MainWindow::MainWindow() { m_factory = new MetaFactory(); m_sessions.setAutoDelete( TRUE ); m_curSession = 0; - m_manager = new ProfileManager(m_factory); + m_manager = new ProfileManager( m_factory ); m_manager->load(); initUI(); @@ -96,8 +96,8 @@ void MainWindow::initUI() { /* * connect to the menu activation */ - connect( m_sessionsPop, SIGNAL(activated(int) ), - this, SLOT(slotProfile(int) ) ); + connect( m_sessionsPop, SIGNAL(activated( int ) ), + this, SLOT(slotProfile( int ) ) ); m_consoleWindow = new TabWidget( this, "blah"); setCentralWidget( m_consoleWindow ); @@ -168,9 +168,9 @@ void MainWindow::slotConfigure() { } void MainWindow::slotClose() { - } -void MainWindow::slotProfile(int) { +void MainWindow::slotProfile( int ) { + } diff --git a/noncore/apps/opie-console/profileeditordialog.cpp b/noncore/apps/opie-console/profileeditordialog.cpp index 8e63429..be23eff 100644 --- a/noncore/apps/opie-console/profileeditordialog.cpp +++ b/noncore/apps/opie-console/profileeditordialog.cpp @@ -1,4 +1,5 @@ +#include #include "profileeditordialog.h" #include "qlayout.h" @@ -13,7 +14,7 @@ ProfileEditorDialog::ProfileEditorDialog( MetaFactory* fact, const Profile& prof ) - : QTabDialog(0, 0, TRUE), m_fact( fact ), m_prof( prof ) + : QDialog(0, 0, TRUE), m_fact( fact ), m_prof( prof ) { initUI(); @@ -23,7 +24,7 @@ ProfileEditorDialog::ProfileEditorDialog( MetaFactory* fact, } ProfileEditorDialog::ProfileEditorDialog( MetaFactory* fact ) - : QTabDialog(0, 0, TRUE), m_fact( fact ) + : QDialog(0, 0, TRUE), m_fact( fact ) { // Default profile m_prof = Profile(QString::null, "serial", Profile::Black, Profile::White, Profile::VT102); @@ -41,14 +42,19 @@ Profile ProfileEditorDialog::profile() const void ProfileEditorDialog::initUI() { - QWidget *tabterm, *tabconn, *tabprof; + + QVBoxLayout *mainLayout = new QVBoxLayout( this ); + OTabWidget *tabWidget = new OTabWidget( this ); + mainLayout->add(tabWidget); + + QWidget *tabterm, *tabconn, *tabprof; 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); @@ -98,19 +104,19 @@ void ProfileEditorDialog::initUI() vbox->add(device_box); vbox->add(plugin_base); vbox->add(conn_widget); + vbox->setStretchFactor(device, 1); + vbox->setStretchFactor(device_box, 1); + vbox->setStretchFactor(plugin_base, 1); + vbox->setStretchFactor(conn_widget, 7); QVBoxLayout *vbox2 = new QVBoxLayout(tabterm, 2); vbox2->add(term_widget); - addTab(tabprof, QObject::tr("Profile")); - addTab(tabconn, QObject::tr("Connection")); - addTab(tabterm, QObject::tr("Terminal")); - - setOkButton(QObject::tr("OK")); - setCancelButton(QObject::tr("Cancel")); + tabWidget->addTab(tabprof, "", QObject::tr("Profile")); + tabWidget->addTab(tabconn, "", QObject::tr("Connection")); + tabWidget->addTab(tabterm, "", QObject::tr("Terminal")); // load profile values - name_line->setText(m_prof.name()); for(int i = 0; i < device_box->count(); i++) { @@ -123,9 +129,7 @@ void ProfileEditorDialog::initUI() } // signals - - connect(this, SIGNAL(cancelButtonPressed()), SLOT(slotCancel())); - connect(device_box, SIGNAL(activated(int)), SLOT(slotDevice(int))); + connect(device_box, SIGNAL(activated(int)), SLOT(slotDevice(int))); } ProfileEditorDialog::~ProfileEditorDialog() { @@ -166,10 +170,6 @@ void ProfileEditorDialog::accept() QDialog::accept(); } -void ProfileEditorDialog::slotCancel() -{ - reject(); -} QString ProfileEditorDialog::prof_name() { diff --git a/noncore/apps/opie-console/profileeditordialog.h b/noncore/apps/opie-console/profileeditordialog.h index 18e2ec0..8e830f1 100644 --- a/noncore/apps/opie-console/profileeditordialog.h +++ b/noncore/apps/opie-console/profileeditordialog.h @@ -1,7 +1,7 @@ #ifndef PROFILE_EDITOR_DIALOG #define PROFILE_EDITOR_DIALOG -#include +#include #include "profile.h" @@ -14,7 +14,7 @@ class QComboBox; class QLabel; class ProfileEditorPlugin; -class ProfileEditorDialog : public QTabDialog { +class ProfileEditorDialog : public QDialog { Q_OBJECT public: ProfileEditorDialog(MetaFactory* fact, @@ -23,15 +23,12 @@ public: ~ProfileEditorDialog(); Profile profile()const; - QString prof_name(); - QString prof_type(); + QString prof_name(); + QString prof_type(); public slots: - void accept(); - //void slotOk(); - void slotCancel(); - - void slotDevice(int id); + void accept(); + void slotDevice(int id); private: void initUI(); @@ -42,12 +39,12 @@ private: QHBoxLayout* m_lay; Profile m_prof; - QLineEdit *name_line; - QComboBox *device_box; + QLineEdit *name_line; + QComboBox *device_box; - QWidget *plugin_base; - ProfileEditorPlugin *plugin_plugin; - QHBoxLayout *plugin_layout; + QWidget *plugin_base; + ProfileEditorPlugin *plugin_plugin; + QHBoxLayout *plugin_layout; }; #endif diff --git a/noncore/apps/opie-console/profileeditorplugins.cpp b/noncore/apps/opie-console/profileeditorplugins.cpp index b63fa1c..c11c854 100644 --- a/noncore/apps/opie-console/profileeditorplugins.cpp +++ b/noncore/apps/opie-console/profileeditorplugins.cpp @@ -10,6 +10,8 @@ #include "qradiobutton.h" #include "qcheckbox.h" #include "qbuttongroup.h" +#include "qhgroupbox.h" +#include "qvbox.h" #include "io_serial.h" @@ -36,6 +38,7 @@ QWidget *ProfileEditorPlugin::connection_widget() root = new QWidget(); // Build GUI + QLabel *speedlabel = new QLabel(QObject::tr("Speed"), root); QComboBox *speed_box = new QComboBox(root); speed_box->insertItem("115200 baud", id_baud_115200); @@ -44,38 +47,33 @@ QWidget *ProfileEditorPlugin::connection_widget() speed_box->insertItem("19200 baud", id_baud_19200); speed_box->insertItem("9600 baud", id_baud_9600); - QLabel *speedlabel = new QLabel(QObject::tr("Speed"), root); - QLabel *flow = new QLabel(QObject::tr("Flow control"), root); - QLabel *parity = new QLabel(QObject::tr("Parity"), root); - - QButtonGroup *group_flow = new QButtonGroup(root); - group_flow->hide(); - QRadioButton *flow_hw = new QRadioButton(QObject::tr("Hardware"), root); - QRadioButton *flow_sw = new QRadioButton(QObject::tr("Software"), root); - group_flow->insert(flow_hw, id_flow_hw); - group_flow->insert(flow_sw, id_flow_sw); - - QButtonGroup *group_parity = new QButtonGroup(root); - group_parity->hide(); - QRadioButton *parity_odd = new QRadioButton(QObject::tr("Odd"), root); - QRadioButton *parity_even = new QRadioButton(QObject::tr("Even"), root); - group_parity->insert(parity_odd, id_parity_odd); - group_parity->insert(parity_even, id_parity_even); + QButtonGroup *group_flow = new QButtonGroup(QObject::tr("Flow control"), root); - // Build Layout + QRadioButton *flow_hw = new QRadioButton(QObject::tr("Hardware"), group_flow); + QRadioButton *flow_sw = new QRadioButton(QObject::tr("Software"), group_flow); + + QButtonGroup *group_parity = new QButtonGroup(QObject::tr("Parity"), root); + QRadioButton *parity_odd = new QRadioButton(QObject::tr("Odd"), group_parity); + QRadioButton *parity_even = new QRadioButton(QObject::tr("Even"), group_parity); + // Build Layout lroot = new QVBoxLayout(root); lroot->add(speedlabel); lroot->add(speed_box); - lroot->add(flow); - QHBoxLayout *hbox = new QHBoxLayout(lroot, 2); + lroot->setStretchFactor(speedlabel, 1); + lroot->setStretchFactor(speed_box, 1); + + QHBoxLayout *hbox = new QHBoxLayout(group_flow, 2); hbox->add(flow_hw); hbox->add(flow_sw); - lroot->add(parity); - QHBoxLayout *hbox2 = new QHBoxLayout(lroot, 2); - hbox2->add(parity_odd); - hbox2->add(parity_even); - + lroot->add(group_flow); + lroot->setStretchFactor(group_flow, 2); + + QHBoxLayout *hboxPar = new QHBoxLayout( group_parity, 2); + hboxPar->add(parity_odd); + hboxPar->add(parity_even); + lroot->add(group_parity); + lroot->setStretchFactor(group_parity, 2); // Apply profile settings int rad_flow = m_profile->readNumEntry("Flow"); @@ -110,56 +108,51 @@ QWidget *ProfileEditorPlugin::terminal_widget() // Build GUI + + QLabel *terminal = new QLabel(QObject::tr("Terminal type"), root); + QComboBox *terminal_box = new QComboBox(root); terminal_box->insertItem("VT 100", id_term_vt100); terminal_box->insertItem("VT 220", id_term_vt220); terminal_box->insertItem("ANSI", id_term_ansi); - QLabel *terminal = new QLabel(QObject::tr("Terminal type"), root); - QLabel *colourlabel = new QLabel(QObject::tr("Colour scheme"), root); - QLabel *sizelabel = new QLabel(QObject::tr("Font size"), root); - QLabel *options = new QLabel(QObject::tr("Options"), root); - QLabel *conversions = new QLabel(QObject::tr("Line-break conversions"), root); - + QLabel *colourlabel = new QLabel(QObject::tr("Colour scheme"), root); QComboBox *colour_box = new QComboBox(root); colour_box->insertItem(QObject::tr("black on white"), id_term_black); colour_box->insertItem(QObject::tr("white on black"), id_term_white); - QButtonGroup *group_size = new QButtonGroup(root); - group_size->hide(); - QRadioButton *size_small = new QRadioButton(QObject::tr("small"), root); - QRadioButton *size_medium = new QRadioButton(QObject::tr("medium"), root); - QRadioButton *size_large = new QRadioButton(QObject::tr("large"), root); - group_size->insert(size_small); - group_size->insert(size_medium); - group_size->insert(size_large); + QButtonGroup *group_size = new QButtonGroup( QObject::tr("Font size"), root ); + QRadioButton *size_small = new QRadioButton(QObject::tr("small"), group_size ); + QRadioButton *size_medium = new QRadioButton(QObject::tr("medium"), group_size ); + QRadioButton *size_large = new QRadioButton(QObject::tr("large"), group_size ); - QCheckBox *option_echo = new QCheckBox(QObject::tr("Local echo"), root); - QCheckBox *option_wrap = new QCheckBox(QObject::tr("Line wrap"), root); + QHGroupBox *group_conv = new QHGroupBox( QObject::tr("Line-break conversions"), root ); + QCheckBox *conv_inbound = new QCheckBox(QObject::tr("Inbound"), group_conv); + QCheckBox *conv_outbound = new QCheckBox(QObject::tr("Outbound"), group_conv); - QCheckBox *conv_inbound = new QCheckBox(QObject::tr("Inbound"), root); - QCheckBox *conv_outbound = new QCheckBox(QObject::tr("Outbound"), root); + QHGroupBox *group_options = new QHGroupBox( QObject::tr("Options"), root ); + QCheckBox *option_echo = new QCheckBox(QObject::tr("Local echo"), group_options); + QCheckBox *option_wrap = new QCheckBox(QObject::tr("Line wrap"), group_options); // Build Layout - lroot = new QVBoxLayout(root, 2); - lroot->add(terminal); - lroot->add(terminal_box); - lroot->add(sizelabel); - QHBoxLayout *hbox = new QHBoxLayout(lroot, 2); + + QVBoxLayout *typeBox = new QVBoxLayout( lroot ); + typeBox->add(terminal); + typeBox->add(terminal_box); + + QHBoxLayout *hbox = new QHBoxLayout( group_size, 2); hbox->add(size_small); hbox->add(size_medium); hbox->add(size_large); - lroot->add(colourlabel); - lroot->add(colour_box); - lroot->add(conversions); - QHBoxLayout *hbox2 = new QHBoxLayout(lroot, 2); - hbox2->add(conv_inbound); - hbox2->add(conv_outbound); - lroot->add(options); - QHBoxLayout *hbox3 = new QHBoxLayout(lroot, 2); - hbox3->add(option_wrap); - hbox3->add(option_echo); + lroot->add( group_size ); + + QVBoxLayout *colourBox = new QVBoxLayout( lroot ); + colourBox->add(colourlabel); + colourBox->add(colour_box); + + lroot->add(group_conv); + lroot->add(group_options); // Apply profile settings @@ -318,7 +311,7 @@ void ProfileEditorPlugin::slotTermOutbound(bool on) class ProfileEditorPluginSerial : public ProfileEditorPlugin { public: - + ProfileEditorPluginSerial(QWidget *parent, Profile *p) : ProfileEditorPlugin(parent, p) { @@ -332,23 +325,22 @@ class ProfileEditorPluginSerial : public ProfileEditorPlugin { if(!m_widget) { - QFrame *device_frame = new QFrame(m_parent); - device_frame->setFrameStyle(QFrame::Panel | QFrame::Sunken); - QLabel *frame_device = new QLabel(QObject::tr("Device"), device_frame); + QWidget *device_frame = new QWidget( m_parent ); + QLabel *frame_device = new QLabel(QObject::tr("Device"), device_frame); - device_line = new QLineEdit("/dev/ttyS0", device_frame); + device_line = new QLineEdit("/dev/ttyS0", device_frame); - QVBoxLayout *vbox_frame = new QVBoxLayout(device_frame, 2); - vbox_frame->add(frame_device); - vbox_frame->add(device_line); + QVBoxLayout *vbox_frame = new QVBoxLayout(device_frame, 2); + vbox_frame->add(frame_device); + vbox_frame->add(device_line); - m_widget = device_frame; + m_widget = device_frame; - // Load special settings + // Load special settings - QString dev = m_profile->readEntry("Device"); - if(!dev.isNull()) device_line->setText(dev); + QString dev = m_profile->readEntry("Device"); + if(!dev.isNull()) device_line->setText(dev); } return m_widget; @@ -381,8 +373,8 @@ class ProfileEditorPluginIrda : public ProfileEditorPlugin { if(!m_widget) { - QFrame *device_frame = new QFrame(m_parent); - device_frame->setFrameStyle(QFrame::Panel | QFrame::Sunken); + QWidget *device_frame = new QWidget(m_parent); + QLabel *frame_device = new QLabel(QObject::tr("Device"), device_frame); @@ -429,8 +421,7 @@ class ProfileEditorPluginModem : public ProfileEditorPlugin { if(!m_widget) { - QFrame *device_frame = new QFrame(m_parent); - device_frame->setFrameStyle(QFrame::Panel | QFrame::Sunken); + QWidget *device_frame = new QWidget(m_parent); QLabel *frame_device = new QLabel(QObject::tr("Device"), device_frame); QLabel *frame_number = new QLabel(QObject::tr("Phone number"), device_frame); diff --git a/noncore/apps/opie-console/widget_layer.h b/noncore/apps/opie-console/widget_layer.h index 99d248e..adf2038 100644 --- a/noncore/apps/opie-console/widget_layer.h +++ b/noncore/apps/opie-console/widget_layer.h @@ -7,7 +7,7 @@ // proposal of a widget Layer in opie-console // // fellow devels: -// just mail me (ibotty@web.de), what you additionally need from the main widget +// just mail me (ibotty@web.de), what you additionally need from the main widget // (or say in chat) #ifndef WIDGET_LAYER_H @@ -54,7 +54,7 @@ public: /** * sets the image */ - virtual void setImage( QArray const newimg, int lines, int colums ); + virtual void setImage( QArray const newimg, int lines, int colums ) = 0; /** * annoy the user @@ -65,7 +65,7 @@ public: * return the lines count */ int lines() { return m_lines; } - + /** * return the columns count */ @@ -120,7 +120,7 @@ signals: * selection should be cleared */ void selectionCleared(); - + /** * selection begin */ @@ -142,7 +142,7 @@ signals: // protected methods protected: - + // image operations /** @@ -165,9 +165,9 @@ protected: * clears the image */ void clearImage(); - + protected slots: - + /** * clear selection */ @@ -176,7 +176,7 @@ protected slots: // protected vars protected: - + /** * current Session */ @@ -184,11 +184,11 @@ protected: /** * current character image - * + * * a Character at loc( column, line ) * has the actual index: * ix = line * m_columns + column; - * + * * use loc( x, y ) macro to access. */ QArray m_image; @@ -209,7 +209,7 @@ protected: QClipboard* m_clipboard; /** - * whether widget is resizing + * whether widget is resizing */ bool m_resizing; }; -- cgit v0.9.0.2