summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/opie-console/io_serial.cpp4
-rw-r--r--noncore/apps/opie-console/mainwindow.cpp10
-rw-r--r--noncore/apps/opie-console/mainwindow.h5
-rw-r--r--noncore/apps/opie-console/metafactory.h9
4 files changed, 16 insertions, 12 deletions
diff --git a/noncore/apps/opie-console/io_serial.cpp b/noncore/apps/opie-console/io_serial.cpp
index 9a81de9..c9155d1 100644
--- a/noncore/apps/opie-console/io_serial.cpp
+++ b/noncore/apps/opie-console/io_serial.cpp
@@ -115,12 +115,16 @@ bool IOSerial::open() {
115 } 115 }
116} 116}
117 117
118void IOSerial::reload(const Config &config) { 118void IOSerial::reload(const Config &config) {
119 m_device = config.readEntry("Device", SERIAL_DEFAULT_DEVICE); 119 m_device = config.readEntry("Device", SERIAL_DEFAULT_DEVICE);
120 m_baud = config.readNumEntry("Baud", SERIAL_DEFAULT_BAUD); 120 m_baud = config.readNumEntry("Baud", SERIAL_DEFAULT_BAUD);
121 m_parity = config.readNumEntry("Parity", SERIAL_DEFAULT_PARITY);
122 m_dbits = config.readNumEntry("DataBits", SERIAL_DEFAULT_DBITS);
123 m_sbits = config.readNumEntry("StopBits", SERIAL_DEFAULT_SBITS);
124 m_flow = config.readNumEntry("Flow", SERIAL_DEFAULT_FLOW);
121} 125}
122 126
123int IOSerial::getBaud(int baud) const { 127int IOSerial::getBaud(int baud) const {
124 switch (baud) { 128 switch (baud) {
125 case 300: return B300; break; 129 case 300: return B300; break;
126 case 600: return B600; break; 130 case 600: return B600; break;
diff --git a/noncore/apps/opie-console/mainwindow.cpp b/noncore/apps/opie-console/mainwindow.cpp
index b6b2a2e..e9b5eda 100644
--- a/noncore/apps/opie-console/mainwindow.cpp
+++ b/noncore/apps/opie-console/mainwindow.cpp
@@ -5,21 +5,18 @@
5#include <qpopupmenu.h> 5#include <qpopupmenu.h>
6#include <qtoolbar.h> 6#include <qtoolbar.h>
7 7
8#include "metafactory.h" 8#include "metafactory.h"
9#include "mainwindow.h" 9#include "mainwindow.h"
10 10
11MainWindow::MainWindow() 11MainWindow::MainWindow() {
12{
13 qWarning("c'tor");
14 m_factory = new MetaFactory(); 12 m_factory = new MetaFactory();
15 m_sessions.setAutoDelete( TRUE ); 13 m_sessions.setAutoDelete( TRUE );
16 m_curSession = 0l; 14 m_curSession = -1;
17 15
18 initUI(); 16 initUI();
19
20} 17}
21void MainWindow::initUI() { 18void MainWindow::initUI() {
22 setToolBarsMovable( FALSE ); 19 setToolBarsMovable( FALSE );
23 20
24 m_tool = new QToolBar( this ); 21 m_tool = new QToolBar( this );
25 m_tool->setHorizontalStretchable( TRUE ); 22 m_tool->setHorizontalStretchable( TRUE );
@@ -48,15 +45,18 @@ void MainWindow::initUI() {
48 m_bar->insertItem( tr("Connection"), m_console ); 45 m_bar->insertItem( tr("Connection"), m_console );
49 46
50} 47}
51MainWindow::~MainWindow() { 48MainWindow::~MainWindow() {
52 delete m_factory; 49 delete m_factory;
53} 50}
51
54MetaFactory* MainWindow::factory() { 52MetaFactory* MainWindow::factory() {
55 return m_factory; 53 return m_factory;
56} 54}
55
57Session* MainWindow::currentSession() { 56Session* MainWindow::currentSession() {
58 return m_curSession; 57 return m_curSession;
59} 58}
59
60QList<Session> MainWindow::sessions() { 60QList<Session> MainWindow::sessions() {
61 return m_sessions; 61 return m_sessions;
62} 62}
diff --git a/noncore/apps/opie-console/mainwindow.h b/noncore/apps/opie-console/mainwindow.h
index 3d1e1c8..db3a653 100644
--- a/noncore/apps/opie-console/mainwindow.h
+++ b/noncore/apps/opie-console/mainwindow.h
@@ -12,12 +12,13 @@
12 * actions supported by the gui 12 * actions supported by the gui
13 */ 13 */
14class QToolBar; 14class QToolBar;
15class QMenuBar; 15class QMenuBar;
16class QAction; 16class QAction;
17class MetaFactory; 17class MetaFactory;
18
18class MainWindow : public QMainWindow { 19class MainWindow : public QMainWindow {
19 Q_OBJECT 20 Q_OBJECT
20public: 21public:
21 MainWindow( ); 22 MainWindow( );
22 ~MainWindow(); 23 ~MainWindow();
23 24
@@ -34,13 +35,15 @@ public:
34 Session* currentSession(); 35 Session* currentSession();
35 36
36 /** 37 /**
37 * the session list 38 * the session list
38 */ 39 */
39 QList<Session> sessions(); 40 QList<Session> sessions();
40 41protected slots:
42 void slotNew();
43 void slotConnect();
41private: 44private:
42 void initUI(); 45 void initUI();
43 /** 46 /**
44 * the current session 47 * the current session
45 */ 48 */
46 Session* m_curSession; 49 Session* m_curSession;
diff --git a/noncore/apps/opie-console/metafactory.h b/noncore/apps/opie-console/metafactory.h
index 9c0f0a1..aae9391 100644
--- a/noncore/apps/opie-console/metafactory.h
+++ b/noncore/apps/opie-console/metafactory.h
@@ -1,11 +1,12 @@
1#ifndef OPIE_META_FACTORY_H 1#ifndef OPIE_META_FACTORY_H
2#define OPIE_META_FACTORY_H 2#define OPIE_META_FACTORY_H
3 3
4/** 4/**
5 * meta factory is our factory servie 5 * The MetaFactory is used to keep track of all IOLayers, FileTransferLayers and ConfigWidgets
6 * and to instantiate these implementations on demand
6 */ 7 */
7 8
8#include <qwidget.h> 9#include <qwidget.h>
9#include <qmap.h> 10#include <qmap.h>
10 11
11#include <qpe/config.h> 12#include <qpe/config.h>
@@ -16,31 +17,27 @@
16 17
17class MetaFactory { 18class MetaFactory {
18public: 19public:
19 typedef QWidget* (*configWidget)(QWidget* parent); 20 typedef QWidget* (*configWidget)(QWidget* parent);
20 typedef IOLayer* (*iolayer)(const Config& ); 21 typedef IOLayer* (*iolayer)(const Config& );
21 typedef FileTransferLayer* (*filelayer)(IOLayer*); 22 typedef FileTransferLayer* (*filelayer)(IOLayer*);
23
22 MetaFactory(); 24 MetaFactory();
23 ~MetaFactory(); 25 ~MetaFactory();
24 26
25 void addConfigWidgetFactory( const QString&, 27 void addConfigWidgetFactory( const QString&,
26 configWidget ); 28 configWidget );
27 void addIOLayerFactory(const QString&, 29 void addIOLayerFactory(const QString&,
28 iolayer ); 30 iolayer );
29 void addFileTransferLayer( const QString&, 31 void addFileTransferLayer( const QString&,
30 filelayer ); 32 filelayer );
31 QStringList ioLayers()const; 33 QStringList ioLayers()const;
32 QStringList configWidgets()const; 34 QStringList configWidgets()const;
33 QStringList fileTransferLayers()const; 35 QStringList fileTransferLayers()const;
34
35
36private: 36private:
37 QMap<QString, configWidget> m_confFact; 37 QMap<QString, configWidget> m_confFact;
38 QMap<QString, iolayer> m_layerFact; 38 QMap<QString, iolayer> m_layerFact;
39 QMap<QString, filelayer> m_fileFact; 39 QMap<QString, filelayer> m_fileFact;
40
41
42
43}; 40};
44 41
45 42
46#endif 43#endif