-rw-r--r-- | noncore/apps/opie-console/io_serial.cpp | 4 | ||||
-rw-r--r-- | noncore/apps/opie-console/mainwindow.cpp | 10 | ||||
-rw-r--r-- | noncore/apps/opie-console/mainwindow.h | 5 | ||||
-rw-r--r-- | noncore/apps/opie-console/metafactory.h | 9 |
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 @@ -120,2 +120,6 @@ void IOSerial::reload(const Config &config) { m_baud = config.readNumEntry("Baud", SERIAL_DEFAULT_BAUD); + m_parity = config.readNumEntry("Parity", SERIAL_DEFAULT_PARITY); + m_dbits = config.readNumEntry("DataBits", SERIAL_DEFAULT_DBITS); + m_sbits = config.readNumEntry("StopBits", SERIAL_DEFAULT_SBITS); + m_flow = config.readNumEntry("Flow", SERIAL_DEFAULT_FLOW); } 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 @@ -10,11 +10,8 @@ -MainWindow::MainWindow() -{ - qWarning("c'tor"); +MainWindow::MainWindow() { m_factory = new MetaFactory(); m_sessions.setAutoDelete( TRUE ); - m_curSession = 0l; + m_curSession = -1; initUI(); - } @@ -53,2 +50,3 @@ MainWindow::~MainWindow() { } + MetaFactory* MainWindow::factory() { @@ -56,2 +54,3 @@ MetaFactory* MainWindow::factory() { } + Session* MainWindow::currentSession() { @@ -59,2 +58,3 @@ Session* MainWindow::currentSession() { } + QList<Session> MainWindow::sessions() { 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 @@ -17,2 +17,3 @@ class QAction; class MetaFactory; + class MainWindow : public QMainWindow { @@ -39,3 +40,5 @@ public: QList<Session> sessions(); - +protected slots: + void slotNew(); + void slotConnect(); private: 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 @@ -4,3 +4,4 @@ /** - * meta factory is our factory servie + * The MetaFactory is used to keep track of all IOLayers, FileTransferLayers and ConfigWidgets + * and to instantiate these implementations on demand */ @@ -21,2 +22,3 @@ public: typedef FileTransferLayer* (*filelayer)(IOLayer*); + MetaFactory(); @@ -33,4 +35,2 @@ public: QStringList fileTransferLayers()const; - - private: @@ -39,5 +39,2 @@ private: QMap<QString, filelayer> m_fileFact; - - - }; |