summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/opie-console/configdialog.cpp46
-rw-r--r--noncore/apps/opie-console/main.cpp5
-rw-r--r--noncore/apps/opie-console/opie-console.pro6
-rw-r--r--noncore/apps/opie-console/profileeditordialog.cpp256
-rw-r--r--noncore/apps/opie-console/profileeditordialog.h34
5 files changed, 335 insertions, 12 deletions
diff --git a/noncore/apps/opie-console/configdialog.cpp b/noncore/apps/opie-console/configdialog.cpp
index ba3cd31..d09cec3 100644
--- a/noncore/apps/opie-console/configdialog.cpp
+++ b/noncore/apps/opie-console/configdialog.cpp
@@ -1,8 +1,11 @@
#include "profile.h"
#include "qlistview.h"
#include "configdialog.h"
+#include "profileeditordialog.h"
+#include "metafactory.h"
+#include "qdialog.h"
class ConfigListItem : public QListViewItem {
public:
ConfigListItem( QListView* item, const Profile& );
@@ -58,11 +61,54 @@ void ConfigDialog::slotRemove() {
lstView->takeItem( item );
delete item;
}
+
void ConfigDialog::slotEdit() {
+ ProfileEditorDialog dlg(new MetaFactory());
+
+ dlg.setCaption("Edit Connection Profile");
+ dlg.showMaximized();
+ int ret = dlg.exec();
+ if(ret == QDialog::Accepted)
+ {
+ // if(listView->current()) delete lstView->current(); ...
+ // use dlg.terminal()!
+ new ConfigListItem(lstView, Profile(dlg.prof_name(), dlg.prof_type(), Profile::White, Profile::Black, Profile::VT102));
+ }
}
+
+
void ConfigDialog::slotAdd() {
+ qWarning("ConfigDialog::slotAdd");
+
+ ProfileEditorDialog dlg(new MetaFactory());
+
+ dlg.setCaption("New Connection");
+ dlg.showMaximized();
+ int ret = dlg.exec();
+
+ if(ret == QDialog::Accepted)
+ {
+ // defaults
+ int profile = Profile::VT102;
+
+ // assignments
+ QString type = dlg.term_type();
+ if(type == "VT102") profile = Profile::VT102;
+
+ // new profile
+ Profile p(dlg.prof_name(), dlg.prof_type(), Profile::White, Profile::Black, profile);
+
+ // special settings
+ p.writeEntry("Device", dlg.conn_device());
+ p.writeEntry("Baud", dlg.conn_baud());
+ p.writeEntry("Parity", dlg.conn_parity());
+ p.writeEntry("DataBits", dlg.conn_databits());
+ p.writeEntry("StopBits", dlg.conn_stopbits());
+ p.writeEntry("Flow", dlg.conn_flow());
+ new ConfigListItem(lstView, p);
+ }
}
diff --git a/noncore/apps/opie-console/main.cpp b/noncore/apps/opie-console/main.cpp
index 4b5107e..350bb3e 100644
--- a/noncore/apps/opie-console/main.cpp
+++ b/noncore/apps/opie-console/main.cpp
@@ -8,9 +8,6 @@ int main(int argc, char **argv) {
MainWindow mw;
mw.setCaption(QObject::tr("Opie console") );
app.showMainWidget( &mw );
- app.exec();
-
-
- return 0;
+ return app.exec();
}
diff --git a/noncore/apps/opie-console/opie-console.pro b/noncore/apps/opie-console/opie-console.pro
index 9e44ab0..5a352e0 100644
--- a/noncore/apps/opie-console/opie-console.pro
+++ b/noncore/apps/opie-console/opie-console.pro
@@ -10,9 +10,10 @@ HEADERS = io_layer.h io_serial.h \
profileconfig.h \
profilemanager.h \
configwidget.h \
tabwidget.h \
- configdialog.h
+ configdialog.h \
+ profileeditordialog.h
SOURCES = io_layer.cpp io_serial.cpp \
file_layer.cpp main.cpp \
metafactory.cpp \
session.cpp \
@@ -20,9 +21,10 @@ SOURCES = io_layer.cpp io_serial.cpp \
profile.cpp \
profileconfig.cpp \
profilemanager.cpp \
tabwidget.cpp \
- configdialog.cpp
+ configdialog.cpp \
+ profileeditordialog.cpp
INTERFACES = configurebase.ui editbase.ui
INCLUDEPATH += $(OPIEDIR)/include
DEPENDPATH += $(OPIEDIR)/include
LIBS += -lqpe -lopie
diff --git a/noncore/apps/opie-console/profileeditordialog.cpp b/noncore/apps/opie-console/profileeditordialog.cpp
index a4246e1..849439d 100644
--- a/noncore/apps/opie-console/profileeditordialog.cpp
+++ b/noncore/apps/opie-console/profileeditordialog.cpp
@@ -1,20 +1,270 @@
#include "profileeditordialog.h"
+#include "qlayout.h"
+#include "qlineedit.h"
+#include "qlabel.h"
+#include "qradiobutton.h"
+#include "qcombobox.h"
+#include "qcheckbox.h"
+#include "qmessagebox.h"
ProfileEditorDialog::ProfileEditorDialog( MetaFactory* fact,
const Profile& prof )
- : QDialog(0, 0, TRUE), m_fact( fact ), m_prof( prof )
+ : QTabDialog(0, 0, TRUE), m_fact( fact ), m_prof( prof )
{
- initUI();
+// initUI();
/* now set the widgets */
+
}
+
ProfileEditorDialog::ProfileEditorDialog( MetaFactory* fact )
- : QDialog(0, 0, TRUE), m_fact( fact )
+ : QTabDialog(0, 0, TRUE), m_fact( fact )
{
+ QWidget *tabterm, *tabconn, *tabprof;
+
+ tabprof = new QWidget(this);
+ tabterm = new QWidget(this);
+ tabconn = new QWidget(this);
+
+ // 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"));
+
+ QFrame *device_frame = new QFrame(tabprof);
+ device_frame->setFrameStyle(QFrame::Panel | QFrame::Sunken);
+
+ QLabel *frame_device = new QLabel(QObject::tr("Device"), device_frame);
+ frame_number = new QLabel(QObject::tr("Phone number"), device_frame);
+ frame_number->hide();
+
+ frame_device_line = new QLineEdit("/dev/ttyS0", device_frame);
+ 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);
+
+ // connection tab
+
+ 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"));
+
+ QRadioButton *flow_hw = new QRadioButton(QObject::tr("Hardware"), tabconn);
+ QRadioButton *flow_sw = new QRadioButton(QObject::tr("Software"), tabconn);
+
+ QRadioButton *parity_odd = new QRadioButton(QObject::tr("Odd"), tabconn);
+ QRadioButton *parity_even = new QRadioButton(QObject::tr("Even"), tabconn);
+
+ 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");
+
+ 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);
+ QLabel *options = new QLabel(QObject::tr("Options"), tabterm);
+ QLabel *conversions = new QLabel(QObject::tr("Line-break conversions"), tabterm);
+
+ QComboBox *colour_box = new QComboBox(tabterm);
+ colour_box->insertItem(QObject::tr("black on white"));
+ colour_box->insertItem(QObject::tr("white on black"));
+
+ 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);
+
+ QCheckBox *option_echo = new QCheckBox(QObject::tr("Local echo"), tabterm);
+ QCheckBox *option_wrap = new QCheckBox(QObject::tr("Line wrap"), tabterm);
+
+ QCheckBox *conv_inbound = new QCheckBox(QObject::tr("Inbound"), tabterm);
+ QCheckBox *conv_outbound = new QCheckBox(QObject::tr("Outbound"), tabterm);
+
+ // layouting
+
+ QVBoxLayout *vbox3 = new QVBoxLayout(tabprof, 2);
+ vbox3->add(name);
+ vbox3->add(name_line);
+ vbox3->add(device);
+ vbox3->add(device_box);
+ vbox3->add(device_frame);
+
+ QVBoxLayout *vbox = new QVBoxLayout(tabconn, 2);
+ vbox->add(protocol);
+ vbox->add(protocol_box);
+ 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(parity);
+ QHBoxLayout *hbox2 = new QHBoxLayout(vbox, 2);
+ hbox2->add(parity_odd);
+ hbox2->add(parity_even);
+
+ QVBoxLayout *vbox2 = new QVBoxLayout(tabterm, 2);
+ vbox2->add(terminal);
+ vbox2->add(terminal_box);
+ vbox2->add(size);
+ QHBoxLayout *hbox3 = new QHBoxLayout(vbox2, 2);
+ hbox3->add(size_small);
+ hbox3->add(size_medium);
+ hbox3->add(size_large);
+ vbox2->add(colour);
+ vbox2->add(colour_box);
+ vbox2->add(conversions);
+ QHBoxLayout *hbox5 = new QHBoxLayout(vbox2, 2);
+ hbox5->add(conv_inbound);
+ hbox5->add(conv_outbound);
+ vbox2->add(options);
+ QHBoxLayout *hbox4 = new QHBoxLayout(vbox2, 2);
+ hbox4->add(option_wrap);
+ hbox4->add(option_echo);
+
+ addTab(tabprof, QObject::tr("Profile"));
+ addTab(tabconn, QObject::tr("Connection"));
+ addTab(tabterm, QObject::tr("Terminal"));
+
+ setOkButton(QObject::tr("OK"));
+ setCancelButton(QObject::tr("Cancel"));
+
+ connect(this, SIGNAL(applyButtonPressed()), SLOT(slotOk()));
+ connect(this, SIGNAL(defaultButtonPressed()), SLOT(slotOk()));
+ connect(this, SIGNAL(cancelButtonPressed()), SLOT(slotCancel()));
+
+ connect(device_box, SIGNAL(activated(int)), SLOT(slotDevice(int)));
}
+
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;
+ }
+}
+
+void ProfileEditorDialog::slotOk()
+{
+ if(prof_name().isEmpty())
+ {
+ QMessageBox::information(this,
+ QObject::tr("Invalid profile"),
+ QObject::tr("Please enter a profile name."));
+ return;
+ }
+
+ accept();
+}
+
+void ProfileEditorDialog::slotCancel()
+{
+ reject();
+}
+
+QString ProfileEditorDialog::prof_name()
+{
+ return name_line->text();
+}
+
+QString ProfileEditorDialog::prof_type()
+{
+ switch(device_box->currentItem())
+ {
+ case 0:
+ return "serial";
+ break;
+ case 1:
+ return "irda";
+ break;
+ case 2:
+ return "modem";
+ break;
+ }
+
+ return QString::null;
+}
+
+QString ProfileEditorDialog::conn_device()
+{
+ return frame_device_line->text();
+}
+
+int ProfileEditorDialog::conn_baud()
+{
+ return speed_box->currentText().toInt();
+}
+
+int ProfileEditorDialog::conn_parity()
+{
+ return 0;
+}
+
+int ProfileEditorDialog::conn_databits()
+{
+ return 0;
+}
+
+int ProfileEditorDialog::conn_stopbits()
+{
+ return 0;
+}
+
+int ProfileEditorDialog::conn_flow()
+{
+ return 0;
+}
+
+QString ProfileEditorDialog::term_type()
+{
+ return terminal_box->currentText();
+}
+
diff --git a/noncore/apps/opie-console/profileeditordialog.h b/noncore/apps/opie-console/profileeditordialog.h
index 5ccc691..f81354c 100644
--- a/noncore/apps/opie-console/profileeditordialog.h
+++ b/noncore/apps/opie-console/profileeditordialog.h
@@ -1,28 +1,56 @@
#ifndef PROFILE_EDITOR_DIALOG
#define PROFILE_EDITOR_DIALOG
-#include <qdialog.h>
+#include <qtabdialog.h>
#include "profile.h"
class MetaFactory;
class EditBase;
class QTabWidget;
class QHBoxLayout;
-class ProfileEditorDialog : public QDialog {
+class QLineEdit;
+class QComboBox;
+class QLabel;
+
+class ProfileEditorDialog : public QTabDialog {
Q_OBJECT
public:
ProfileEditorDialog(MetaFactory* fact,
const Profile& prof );
ProfileEditorDialog(MetaFactory* fact );
+ ~ProfileEditorDialog();
Profile profile()const;
+
+ QString prof_name();
+ QString prof_type();
+
+ QString conn_device();
+ int conn_baud();
+ int conn_parity();
+ int conn_databits();
+ int conn_stopbits();
+ int conn_flow();
+
+ QString term_type();
+
+public slots:
+ void slotOk();
+ void slotCancel();
+
+ void slotDevice(int id);
+
private:
- void initUI();
+ //void initUI();
MetaFactory* m_fact;
EditBase* m_base;
QTabWidget* m_tab;
QHBoxLayout* m_lay;
Profile m_prof;
+
+ QLabel *frame_number;
+ QLineEdit *name_line, *frame_device_line, *frame_number_line;
+ QComboBox *terminal_box, *speed_box, *device_box;
};
#endif