summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/apps/opie-console/mainwindow.cpp2
-rw-r--r--noncore/apps/opie-console/profileeditordialog.cpp30
-rw-r--r--noncore/apps/opie-console/profileeditordialog.h7
-rw-r--r--noncore/apps/opie-console/profileeditorplugins.cpp117
-rw-r--r--noncore/apps/opie-console/widget_layer.h2
5 files changed, 73 insertions, 85 deletions
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
@@ -163,14 +163,14 @@ void MainWindow::slotConfigure() {
if ( QDialog::Accepted == ret ) {
manager()->setProfiles( conf.list() );
populateProfiles();
}
}
void MainWindow::slotClose() {
-
}
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,34 +1,35 @@
+#include <opie/otabwidget.h>
#include "profileeditordialog.h"
#include "qlayout.h"
#include "qlineedit.h"
#include "qlabel.h"
#include "qmessagebox.h"
#include "qstringlist.h"
#include "qcombobox.h"
#include "profileeditorplugins.h"
#include "metafactory.h"
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();
// Apply current profile
// plugin_plugin->load(profile);
// ... (reset profile name line edit etc.)
}
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);
initUI();
// Apply current profile
// plugin_plugin->load(profile);
@@ -36,16 +37,21 @@ ProfileEditorDialog::ProfileEditorDialog( MetaFactory* fact )
Profile ProfileEditorDialog::profile() const
{
return m_prof;
}
void ProfileEditorDialog::initUI()
{
+
+ 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
@@ -93,43 +99,41 @@ void ProfileEditorDialog::initUI()
vbox3->add(name_line);
vbox3->addStretch(1);
QVBoxLayout *vbox = new QVBoxLayout(tabconn, 2);
vbox->add(device);
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++)
{
device_box->setCurrentItem(i);
if(prof_type() == m_prof.ioLayerName())
{
slotDevice(i);
break;
}
}
// signals
-
- connect(this, SIGNAL(cancelButtonPressed()), SLOT(slotCancel()));
connect(device_box, SIGNAL(activated(int)), SLOT(slotDevice(int)));
}
ProfileEditorDialog::~ProfileEditorDialog() {
}
void ProfileEditorDialog::slotDevice(int id)
@@ -161,20 +165,16 @@ void ProfileEditorDialog::accept()
// Save general values
m_prof.setName(prof_name());
m_prof.setIOLayer(prof_type());
QDialog::accept();
}
-void ProfileEditorDialog::slotCancel()
-{
- reject();
-}
QString ProfileEditorDialog::prof_name()
{
return name_line->text();
}
QString ProfileEditorDialog::prof_type()
{
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,41 +1,38 @@
#ifndef PROFILE_EDITOR_DIALOG
#define PROFILE_EDITOR_DIALOG
-#include <qtabdialog.h>
+#include <qdialog.h>
#include "profile.h"
class MetaFactory;
class EditBase;
class QTabWidget;
class QHBoxLayout;
class QLineEdit;
class QComboBox;
class QLabel;
class ProfileEditorPlugin;
-class ProfileEditorDialog : public QTabDialog {
+class ProfileEditorDialog : public QDialog {
Q_OBJECT
public:
ProfileEditorDialog(MetaFactory* fact,
const Profile& prof );
ProfileEditorDialog(MetaFactory* fact );
~ProfileEditorDialog();
Profile profile()const;
QString prof_name();
QString prof_type();
public slots:
void accept();
- //void slotOk();
- void slotCancel();
-
void slotDevice(int id);
private:
void initUI();
MetaFactory* m_fact;
EditBase* m_base;
QTabWidget* m_tab;
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
@@ -5,16 +5,18 @@
#include "qframe.h"
#include "qlabel.h"
#include "qlineedit.h"
#include "qlayout.h"
#include "qcombobox.h"
#include "qradiobutton.h"
#include "qcheckbox.h"
#include "qbuttongroup.h"
+#include "qhgroupbox.h"
+#include "qvbox.h"
#include "io_serial.h"
// Base class
ProfileEditorPlugin::ProfileEditorPlugin(QWidget *parent, Profile *p)
: QObject()
{
@@ -31,56 +33,52 @@ ProfileEditorPlugin::~ProfileEditorPlugin()
QWidget *ProfileEditorPlugin::connection_widget()
{
QWidget *root;
QVBoxLayout *lroot;
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);
speed_box->insertItem("57600 baud", id_baud_57600);
speed_box->insertItem("38400 baud", id_baud_38400);
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");
int rad_parity = m_profile->readNumEntry("Parity");
int speed = m_profile->readNumEntry("Speed");
if(rad_flow == IOSerial::FlowHW) flow_hw->setChecked(true);
else flow_sw->setChecked(true);
@@ -105,66 +103,61 @@ QWidget *ProfileEditorPlugin::terminal_widget()
{
QWidget *root;
QVBoxLayout *lroot;
root = new QWidget();
// 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);
-
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
int term = m_profile->readNumEntry("Terminal");
int colour = m_profile->readNumEntry("Colour");
int fontsize = m_profile->readNumEntry("Font");
int opt_echo = m_profile->readNumEntry("Echo");
int opt_wrap = m_profile->readNumEntry("Wrap");
@@ -327,19 +320,18 @@ class ProfileEditorPluginSerial : public ProfileEditorPlugin
~ProfileEditorPluginSerial()
{
}
QWidget *widget()
{
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);
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);
@@ -376,18 +368,18 @@ class ProfileEditorPluginIrda : public ProfileEditorPlugin
~ProfileEditorPluginIrda()
{
}
QWidget *widget()
{
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);
device_line = new QLineEdit("/dev/ircomm0", device_frame);
QVBoxLayout *vbox_frame = new QVBoxLayout(device_frame, 2);
vbox_frame->add(frame_device);
vbox_frame->add(device_line);
@@ -424,18 +416,17 @@ class ProfileEditorPluginModem : public ProfileEditorPlugin
~ProfileEditorPluginModem()
{
}
QWidget *widget()
{
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);
device_line = new QLineEdit("/dev/ttyS0", device_frame);
number_line = new QLineEdit(device_frame);
QVBoxLayout *vbox_frame = new QVBoxLayout(device_frame, 2);
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
@@ -49,17 +49,17 @@ public:
* destructor
*/
virtual ~WidgetLayer();
public:
/**
* sets the image
*/
- virtual void setImage( QArray<Character> const newimg, int lines, int colums );
+ virtual void setImage( QArray<Character> const newimg, int lines, int colums ) = 0;
/**
* annoy the user
*/
void bell();
/**
* return the lines count