summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/opie-console/configdialog.cpp7
-rw-r--r--noncore/apps/opie-console/file_layer.cpp3
-rw-r--r--noncore/apps/opie-console/profileeditorplugins.cpp25
-rw-r--r--noncore/apps/opie-console/profileeditorplugins.h3
4 files changed, 19 insertions, 19 deletions
diff --git a/noncore/apps/opie-console/configdialog.cpp b/noncore/apps/opie-console/configdialog.cpp
index 50512b6..8745305 100644
--- a/noncore/apps/opie-console/configdialog.cpp
+++ b/noncore/apps/opie-console/configdialog.cpp
@@ -1,39 +1,40 @@
1#include <qdialog.h>
2#include <qlistview.h>
3
1 4
2#include "profile.h" 5#include "profile.h"
3#include "qlistview.h"
4#include "configdialog.h" 6#include "configdialog.h"
5#include "profileeditordialog.h"
6#include "metafactory.h" 7#include "metafactory.h"
7#include "qdialog.h" 8#include "profileeditordialog.h"
8 9
9class ConfigListItem : public QListViewItem { 10class ConfigListItem : public QListViewItem {
10public: 11public:
11 ConfigListItem( QListView* item, const Profile& ); 12 ConfigListItem( QListView* item, const Profile& );
12 ~ConfigListItem(); 13 ~ConfigListItem();
13 Profile profile()const; 14 Profile profile()const;
14 15
15private: 16private:
16 Profile m_prof; 17 Profile m_prof;
17}; 18};
18ConfigListItem::ConfigListItem( QListView* item, const Profile& prof ) 19ConfigListItem::ConfigListItem( QListView* item, const Profile& prof )
19 : QListViewItem( item ), m_prof( prof ) 20 : QListViewItem( item ), m_prof( prof )
20{ 21{
21 setText(0, prof.name() ); 22 setText(0, prof.name() );
22} 23}
23ConfigListItem::~ConfigListItem() { 24ConfigListItem::~ConfigListItem() {
24 25
25} 26}
26Profile ConfigListItem::profile()const { 27Profile ConfigListItem::profile()const {
27 return m_prof; 28 return m_prof;
28} 29}
29 30
30/* Dialog */ 31/* Dialog */
31 32
32ConfigDialog::ConfigDialog( const Profile::ValueList& lis, MetaFactory* fa, 33ConfigDialog::ConfigDialog( const Profile::ValueList& lis, MetaFactory* fa,
33 QWidget* parent ) 34 QWidget* parent )
34 : ConfigureBase( parent, 0, TRUE ), m_fact( fa ) 35 : ConfigureBase( parent, 0, TRUE ), m_fact( fa )
35{ 36{
36 //init(); 37 //init();
37 { 38 {
38 Profile::ValueList::ConstIterator it; 39 Profile::ValueList::ConstIterator it;
39 for (it = lis.begin(); it != lis.end(); ++it ) { 40 for (it = lis.begin(); it != lis.end(); ++it ) {
diff --git a/noncore/apps/opie-console/file_layer.cpp b/noncore/apps/opie-console/file_layer.cpp
index 79caa8a..43e9c8f 100644
--- a/noncore/apps/opie-console/file_layer.cpp
+++ b/noncore/apps/opie-console/file_layer.cpp
@@ -1,22 +1,23 @@
1#include "file_layer.h"
2#include <qfile.h> 1#include <qfile.h>
3#include <opie/oprocess.h> 2#include <opie/oprocess.h>
4 3
4#include "file_layer.h"
5
5FileTransferLayer::FileTransferLayer(IOLayer *layer) 6FileTransferLayer::FileTransferLayer(IOLayer *layer)
6 : QObject(), m_layer( layer ) 7 : QObject(), m_layer( layer )
7{ 8{
8} 9}
9 10
10FileTransferLayer::~FileTransferLayer() { 11FileTransferLayer::~FileTransferLayer() {
11} 12}
12 13
13void FileTransferLayer::sendFile(const QFile& file) { 14void FileTransferLayer::sendFile(const QFile& file) {
14 15
15} 16}
16 17
17void FileTransferLayer::sendFile(const QString& file) { 18void FileTransferLayer::sendFile(const QString& file) {
18} 19}
19 20
20IOLayer* FileTransferLayer::layer() { 21IOLayer* FileTransferLayer::layer() {
21 return m_layer; 22 return m_layer;
22} 23}
diff --git a/noncore/apps/opie-console/profileeditorplugins.cpp b/noncore/apps/opie-console/profileeditorplugins.cpp
index 937516c..45b2148 100644
--- a/noncore/apps/opie-console/profileeditorplugins.cpp
+++ b/noncore/apps/opie-console/profileeditorplugins.cpp
@@ -1,48 +1,47 @@
1 1
2#include "profileeditorplugins.h" 2#include <qframe.h>
3#include "profile.h" 3#include <qlabel.h>
4 4#include <qlineedit.h>
5#include "qframe.h" 5#include <qlayout.h>
6#include "qlabel.h" 6#include <qcombobox.h>
7#include "qlineedit.h" 7#include <qradiobutton.h>
8#include "qlayout.h" 8#include <qcheckbox.h>
9#include "qcombobox.h" 9#include <qbuttongroup.h>
10#include "qradiobutton.h" 10#include <qhgroupbox.h>
11#include "qcheckbox.h" 11#include <qvbox.h>
12#include "qbuttongroup.h"
13#include "qhgroupbox.h"
14#include "qvbox.h"
15 12
16#include "io_serial.h" 13#include "io_serial.h"
14#include "profile.h"
15#include "profileeditorplugins.h"
17 16
18// Base class 17// Base class
19 18
20ProfileEditorPlugin::ProfileEditorPlugin(QWidget *parent, Profile *p) 19ProfileEditorPlugin::ProfileEditorPlugin(QWidget *parent, Profile *p)
21: QObject() 20: QObject()
22{ 21{
23 m_parent = parent; 22 m_parent = parent;
24 m_profile = p; 23 m_profile = p;
25 m_widget = NULL; 24 m_widget = NULL;
26} 25}
27 26
28ProfileEditorPlugin::~ProfileEditorPlugin() 27ProfileEditorPlugin::~ProfileEditorPlugin()
29{ 28{
30 if(m_widget) delete m_widget; 29 if(m_widget) delete m_widget;
31} 30}
32 31
33QWidget *ProfileEditorPlugin::connection_widget() 32QWidget *ProfileEditorPlugin::connection_widget()
34{ 33{
35 QWidget *root; 34 QWidget *root;
36 QVBoxLayout *lroot; 35 QVBoxLayout *lroot;
37 36
38 root = new QWidget(); 37 root = new QWidget();
39 38
40 // Build GUI 39 // Build GUI
41 QLabel *speedlabel = new QLabel(QObject::tr("Speed"), root); 40 QLabel *speedlabel = new QLabel(QObject::tr("Speed"), root);
42 41
43 QComboBox *speed_box = new QComboBox(root); 42 QComboBox *speed_box = new QComboBox(root);
44 speed_box->insertItem("115200 baud", id_baud_115200); 43 speed_box->insertItem("115200 baud", id_baud_115200);
45 speed_box->insertItem("57600 baud", id_baud_57600); 44 speed_box->insertItem("57600 baud", id_baud_57600);
46 speed_box->insertItem("38400 baud", id_baud_38400); 45 speed_box->insertItem("38400 baud", id_baud_38400);
47 speed_box->insertItem("19200 baud", id_baud_19200); 46 speed_box->insertItem("19200 baud", id_baud_19200);
48 speed_box->insertItem("9600 baud", id_baud_9600); 47 speed_box->insertItem("9600 baud", id_baud_9600);
diff --git a/noncore/apps/opie-console/profileeditorplugins.h b/noncore/apps/opie-console/profileeditorplugins.h
index 4ca780e..f576143 100644
--- a/noncore/apps/opie-console/profileeditorplugins.h
+++ b/noncore/apps/opie-console/profileeditorplugins.h
@@ -1,41 +1,40 @@
1#ifndef PROFILE_EDITOR_PLUGINS_H 1#ifndef PROFILE_EDITOR_PLUGINS_H
2#define PROFILE_EDITOR_PLUGINS_H 2#define PROFILE_EDITOR_PLUGINS_H
3 3
4#include "profile.h"
5 4
6#include <qobject.h> 5#include <qobject.h>
7 6
8class QWidget; 7class QWidget;
9 8class Profile;
10class ProfileEditorPlugin : public QObject 9class ProfileEditorPlugin : public QObject
11{ 10{
12 Q_OBJECT 11 Q_OBJECT
13public: 12public:
14 ProfileEditorPlugin(QWidget *parent); 13 ProfileEditorPlugin(QWidget *parent);
15 14
16 virtual ~ProfileEditorPlugin(); 15 virtual ~ProfileEditorPlugin();
17 16
18 virtual void save() = 0; 17 virtual void save() = 0;
19 18
20 virtual QWidget *widget() = 0; 19 virtual QWidget *widget() = 0;
21 20
22 QWidget *connection_widget(); 21 QWidget *connection_widget();
23 QWidget *terminal_widget(); 22 QWidget *terminal_widget();
24 23
25public slots: 24public slots:
26 void slotConnFlow(int id); 25 void slotConnFlow(int id);
27 void slotConnParity(int id); 26 void slotConnParity(int id);
28 void slotConnSpeed(int id); 27 void slotConnSpeed(int id);
29 void slotTermTerm(int id); 28 void slotTermTerm(int id);
30 void slotTermColour(int id); 29 void slotTermColour(int id);
31 void slotTermFont(int id); 30 void slotTermFont(int id);
32 void slotTermEcho(bool on); 31 void slotTermEcho(bool on);
33 void slotTermWrap(bool on); 32 void slotTermWrap(bool on);
34 void slotTermInbound(bool on); 33 void slotTermInbound(bool on);
35 void slotTermOutbound(bool on); 34 void slotTermOutbound(bool on);
36 35
37protected: 36protected:
38 QWidget *m_parent, *m_widget; 37 QWidget *m_parent, *m_widget;
39 Profile *m_profile; 38 Profile *m_profile;
40 39
41private: 40private: