summaryrefslogtreecommitdiff
authorharlekin <harlekin>2002-10-07 18:05:43 (UTC)
committer harlekin <harlekin>2002-10-07 18:05:43 (UTC)
commitd55aa591770675008da9e3290617e463a77e4c98 (patch) (unidiff)
tree93d779cc85298545673f4d5f2ea0fcc7d4d301b7
parentd25a925e70982b86539b98362ab2cd75c7883110 (diff)
downloadopie-d55aa591770675008da9e3290617e463a77e4c98.zip
opie-d55aa591770675008da9e3290617e463a77e4c98.tar.gz
opie-d55aa591770675008da9e3290617e463a77e4c98.tar.bz2
reworked config dialog gui a bit and adapted it to opie
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/opie-console/mainwindow.cpp10
-rw-r--r--noncore/apps/opie-console/profileeditordialog.cpp36
-rw-r--r--noncore/apps/opie-console/profileeditordialog.h25
-rw-r--r--noncore/apps/opie-console/profileeditorplugins.cpp139
-rw-r--r--noncore/apps/opie-console/widget_layer.h22
5 files changed, 110 insertions, 122 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
@@ -14,9 +14,9 @@
14MainWindow::MainWindow() { 14MainWindow::MainWindow() {
15 m_factory = new MetaFactory(); 15 m_factory = new MetaFactory();
16 m_sessions.setAutoDelete( TRUE ); 16 m_sessions.setAutoDelete( TRUE );
17 m_curSession = 0; 17 m_curSession = 0;
18 m_manager = new ProfileManager(m_factory); 18 m_manager = new ProfileManager( m_factory );
19 m_manager->load(); 19 m_manager->load();
20 20
21 initUI(); 21 initUI();
22 populateProfiles(); 22 populateProfiles();
@@ -95,10 +95,10 @@ void MainWindow::initUI() {
95 95
96 /* 96 /*
97 * connect to the menu activation 97 * connect to the menu activation
98 */ 98 */
99 connect( m_sessionsPop, SIGNAL(activated(int) ), 99 connect( m_sessionsPop, SIGNAL(activated( int ) ),
100 this, SLOT(slotProfile(int) ) ); 100 this, SLOT(slotProfile( int ) ) );
101 101
102 m_consoleWindow = new TabWidget( this, "blah"); 102 m_consoleWindow = new TabWidget( this, "blah");
103 setCentralWidget( m_consoleWindow ); 103 setCentralWidget( m_consoleWindow );
104 104
@@ -167,10 +167,10 @@ void MainWindow::slotConfigure() {
167 } 167 }
168} 168}
169 169
170void MainWindow::slotClose() { 170void MainWindow::slotClose() {
171
172} 171}
173 172
174void MainWindow::slotProfile(int) { 173void MainWindow::slotProfile( int ) {
174
175 175
176} 176}
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,5 +1,6 @@
1 1
2#include <opie/otabwidget.h>
2#include "profileeditordialog.h" 3#include "profileeditordialog.h"
3 4
4#include "qlayout.h" 5#include "qlayout.h"
5#include "qlineedit.h" 6#include "qlineedit.h"
@@ -12,9 +13,9 @@
12#include "metafactory.h" 13#include "metafactory.h"
13 14
14ProfileEditorDialog::ProfileEditorDialog( MetaFactory* fact, 15ProfileEditorDialog::ProfileEditorDialog( MetaFactory* fact,
15 const Profile& prof ) 16 const Profile& prof )
16 : QTabDialog(0, 0, TRUE), m_fact( fact ), m_prof( prof ) 17 : QDialog(0, 0, TRUE), m_fact( fact ), m_prof( prof )
17{ 18{
18 initUI(); 19 initUI();
19 20
20 // Apply current profile 21 // Apply current profile
@@ -22,9 +23,9 @@ ProfileEditorDialog::ProfileEditorDialog( MetaFactory* fact,
22 // ... (reset profile name line edit etc.) 23 // ... (reset profile name line edit etc.)
23} 24}
24 25
25ProfileEditorDialog::ProfileEditorDialog( MetaFactory* fact ) 26ProfileEditorDialog::ProfileEditorDialog( MetaFactory* fact )
26 : QTabDialog(0, 0, TRUE), m_fact( fact ) 27 : QDialog(0, 0, TRUE), m_fact( fact )
27{ 28{
28 // Default profile 29 // Default profile
29 m_prof = Profile(QString::null, "serial", Profile::Black, Profile::White, Profile::VT102); 30 m_prof = Profile(QString::null, "serial", Profile::Black, Profile::White, Profile::VT102);
30 31
@@ -40,16 +41,21 @@ Profile ProfileEditorDialog::profile() const
40} 41}
41 42
42void ProfileEditorDialog::initUI() 43void ProfileEditorDialog::initUI()
43{ 44{
44 QWidget *tabterm, *tabconn, *tabprof; 45
46 QVBoxLayout *mainLayout = new QVBoxLayout( this );
47 OTabWidget *tabWidget = new OTabWidget( this );
48 mainLayout->add(tabWidget);
49
50 QWidget *tabterm, *tabconn, *tabprof;
45 51
46 tabprof = new QWidget(this); 52 tabprof = new QWidget(this);
47 tabterm = new QWidget(this); 53 tabterm = new QWidget(this);
48 tabconn = new QWidget(this); 54 tabconn = new QWidget(this);
49 55
50 // for the time being: fake factory 56 // for the time being: fake factory
51 57
52 m_fact->addConfigWidgetFactory("serial", QObject::tr("Serial cable"), factory_serial); 58 m_fact->addConfigWidgetFactory("serial", QObject::tr("Serial cable"), factory_serial);
53 m_fact->addConfigWidgetFactory("irda", QObject::tr("IrDA port"), factory_irda); 59 m_fact->addConfigWidgetFactory("irda", QObject::tr("IrDA port"), factory_irda);
54 m_fact->addConfigWidgetFactory("modem", QObject::tr("Serial via modem"), factory_modem); 60 m_fact->addConfigWidgetFactory("modem", QObject::tr("Serial via modem"), factory_modem);
55 61
@@ -97,21 +103,21 @@ void ProfileEditorDialog::initUI()
97 vbox->add(device); 103 vbox->add(device);
98 vbox->add(device_box); 104 vbox->add(device_box);
99 vbox->add(plugin_base); 105 vbox->add(plugin_base);
100 vbox->add(conn_widget); 106 vbox->add(conn_widget);
107 vbox->setStretchFactor(device, 1);
108 vbox->setStretchFactor(device_box, 1);
109 vbox->setStretchFactor(plugin_base, 1);
110 vbox->setStretchFactor(conn_widget, 7);
101 111
102 QVBoxLayout *vbox2 = new QVBoxLayout(tabterm, 2); 112 QVBoxLayout *vbox2 = new QVBoxLayout(tabterm, 2);
103 vbox2->add(term_widget); 113 vbox2->add(term_widget);
104 114
105 addTab(tabprof, QObject::tr("Profile")); 115 tabWidget->addTab(tabprof, "", QObject::tr("Profile"));
106 addTab(tabconn, QObject::tr("Connection")); 116 tabWidget->addTab(tabconn, "", QObject::tr("Connection"));
107 addTab(tabterm, QObject::tr("Terminal")); 117 tabWidget->addTab(tabterm, "", QObject::tr("Terminal"));
108
109 setOkButton(QObject::tr("OK"));
110 setCancelButton(QObject::tr("Cancel"));
111 118
112 // load profile values 119 // load profile values
113
114 name_line->setText(m_prof.name()); 120 name_line->setText(m_prof.name());
115 for(int i = 0; i < device_box->count(); i++) 121 for(int i = 0; i < device_box->count(); i++)
116 { 122 {
117 device_box->setCurrentItem(i); 123 device_box->setCurrentItem(i);
@@ -122,11 +128,9 @@ void ProfileEditorDialog::initUI()
122 } 128 }
123 } 129 }
124 130
125 // signals 131 // signals
126 132 connect(device_box, SIGNAL(activated(int)), SLOT(slotDevice(int)));
127 connect(this, SIGNAL(cancelButtonPressed()), SLOT(slotCancel()));
128 connect(device_box, SIGNAL(activated(int)), SLOT(slotDevice(int)));
129} 133}
130 134
131ProfileEditorDialog::~ProfileEditorDialog() { 135ProfileEditorDialog::~ProfileEditorDialog() {
132 136
@@ -165,12 +169,8 @@ void ProfileEditorDialog::accept()
165 169
166 QDialog::accept(); 170 QDialog::accept();
167} 171}
168 172
169void ProfileEditorDialog::slotCancel()
170{
171 reject();
172}
173 173
174QString ProfileEditorDialog::prof_name() 174QString ProfileEditorDialog::prof_name()
175{ 175{
176 return name_line->text(); 176 return name_line->text();
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,8 +1,8 @@
1#ifndef PROFILE_EDITOR_DIALOG 1#ifndef PROFILE_EDITOR_DIALOG
2#define PROFILE_EDITOR_DIALOG 2#define PROFILE_EDITOR_DIALOG
3 3
4#include <qtabdialog.h> 4#include <qdialog.h>
5 5
6#include "profile.h" 6#include "profile.h"
7 7
8class MetaFactory; 8class MetaFactory;
@@ -13,26 +13,23 @@ class QLineEdit;
13class QComboBox; 13class QComboBox;
14class QLabel; 14class QLabel;
15class ProfileEditorPlugin; 15class ProfileEditorPlugin;
16 16
17class ProfileEditorDialog : public QTabDialog { 17class ProfileEditorDialog : public QDialog {
18 Q_OBJECT 18 Q_OBJECT
19public: 19public:
20 ProfileEditorDialog(MetaFactory* fact, 20 ProfileEditorDialog(MetaFactory* fact,
21 const Profile& prof ); 21 const Profile& prof );
22 ProfileEditorDialog(MetaFactory* fact ); 22 ProfileEditorDialog(MetaFactory* fact );
23 ~ProfileEditorDialog(); 23 ~ProfileEditorDialog();
24 Profile profile()const; 24 Profile profile()const;
25 25
26 QString prof_name(); 26 QString prof_name();
27 QString prof_type(); 27 QString prof_type();
28 28
29public slots: 29public slots:
30 void accept(); 30 void accept();
31 //void slotOk(); 31 void slotDevice(int id);
32 void slotCancel();
33
34 void slotDevice(int id);
35 32
36private: 33private:
37 void initUI(); 34 void initUI();
38 35
@@ -41,13 +38,13 @@ private:
41 QTabWidget* m_tab; 38 QTabWidget* m_tab;
42 QHBoxLayout* m_lay; 39 QHBoxLayout* m_lay;
43 Profile m_prof; 40 Profile m_prof;
44 41
45 QLineEdit *name_line; 42 QLineEdit *name_line;
46 QComboBox *device_box; 43 QComboBox *device_box;
47 44
48 QWidget *plugin_base; 45 QWidget *plugin_base;
49 ProfileEditorPlugin *plugin_plugin; 46 ProfileEditorPlugin *plugin_plugin;
50 QHBoxLayout *plugin_layout; 47 QHBoxLayout *plugin_layout;
51}; 48};
52 49
53#endif 50#endif
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
@@ -9,8 +9,10 @@
9#include "qcombobox.h" 9#include "qcombobox.h"
10#include "qradiobutton.h" 10#include "qradiobutton.h"
11#include "qcheckbox.h" 11#include "qcheckbox.h"
12#include "qbuttongroup.h" 12#include "qbuttongroup.h"
13#include "qhgroupbox.h"
14#include "qvbox.h"
13 15
14#include "io_serial.h" 16#include "io_serial.h"
15 17
16// Base class 18// Base class
@@ -35,48 +37,44 @@ QWidget *ProfileEditorPlugin::connection_widget()
35 37
36 root = new QWidget(); 38 root = new QWidget();
37 39
38 // Build GUI 40 // Build GUI
41 QLabel *speedlabel = new QLabel(QObject::tr("Speed"), root);
39 42
40 QComboBox *speed_box = new QComboBox(root); 43 QComboBox *speed_box = new QComboBox(root);
41 speed_box->insertItem("115200 baud", id_baud_115200); 44 speed_box->insertItem("115200 baud", id_baud_115200);
42 speed_box->insertItem("57600 baud", id_baud_57600); 45 speed_box->insertItem("57600 baud", id_baud_57600);
43 speed_box->insertItem("38400 baud", id_baud_38400); 46 speed_box->insertItem("38400 baud", id_baud_38400);
44 speed_box->insertItem("19200 baud", id_baud_19200); 47 speed_box->insertItem("19200 baud", id_baud_19200);
45 speed_box->insertItem("9600 baud", id_baud_9600); 48 speed_box->insertItem("9600 baud", id_baud_9600);
46 49
47 QLabel *speedlabel = new QLabel(QObject::tr("Speed"), root); 50 QButtonGroup *group_flow = new QButtonGroup(QObject::tr("Flow control"), root);
48 QLabel *flow = new QLabel(QObject::tr("Flow control"), root);
49 QLabel *parity = new QLabel(QObject::tr("Parity"), root);
50
51 QButtonGroup *group_flow = new QButtonGroup(root);
52 group_flow->hide();
53 QRadioButton *flow_hw = new QRadioButton(QObject::tr("Hardware"), root);
54 QRadioButton *flow_sw = new QRadioButton(QObject::tr("Software"), root);
55 group_flow->insert(flow_hw, id_flow_hw);
56 group_flow->insert(flow_sw, id_flow_sw);
57
58 QButtonGroup *group_parity = new QButtonGroup(root);
59 group_parity->hide();
60 QRadioButton *parity_odd = new QRadioButton(QObject::tr("Odd"), root);
61 QRadioButton *parity_even = new QRadioButton(QObject::tr("Even"), root);
62 group_parity->insert(parity_odd, id_parity_odd);
63 group_parity->insert(parity_even, id_parity_even);
64 51
65 // Build Layout 52 QRadioButton *flow_hw = new QRadioButton(QObject::tr("Hardware"), group_flow);
53 QRadioButton *flow_sw = new QRadioButton(QObject::tr("Software"), group_flow);
54
55 QButtonGroup *group_parity = new QButtonGroup(QObject::tr("Parity"), root);
56 QRadioButton *parity_odd = new QRadioButton(QObject::tr("Odd"), group_parity);
57 QRadioButton *parity_even = new QRadioButton(QObject::tr("Even"), group_parity);
66 58
59 // Build Layout
67 lroot = new QVBoxLayout(root); 60 lroot = new QVBoxLayout(root);
68 lroot->add(speedlabel); 61 lroot->add(speedlabel);
69 lroot->add(speed_box); 62 lroot->add(speed_box);
70 lroot->add(flow); 63 lroot->setStretchFactor(speedlabel, 1);
71 QHBoxLayout *hbox = new QHBoxLayout(lroot, 2); 64 lroot->setStretchFactor(speed_box, 1);
65
66 QHBoxLayout *hbox = new QHBoxLayout(group_flow, 2);
72 hbox->add(flow_hw); 67 hbox->add(flow_hw);
73 hbox->add(flow_sw); 68 hbox->add(flow_sw);
74 lroot->add(parity); 69 lroot->add(group_flow);
75 QHBoxLayout *hbox2 = new QHBoxLayout(lroot, 2); 70 lroot->setStretchFactor(group_flow, 2);
76 hbox2->add(parity_odd); 71
77 hbox2->add(parity_even); 72 QHBoxLayout *hboxPar = new QHBoxLayout( group_parity, 2);
78 73 hboxPar->add(parity_odd);
74 hboxPar->add(parity_even);
75 lroot->add(group_parity);
76 lroot->setStretchFactor(group_parity, 2);
79 // Apply profile settings 77 // Apply profile settings
80 78
81 int rad_flow = m_profile->readNumEntry("Flow"); 79 int rad_flow = m_profile->readNumEntry("Flow");
82 int rad_parity = m_profile->readNumEntry("Parity"); 80 int rad_parity = m_profile->readNumEntry("Parity");
@@ -109,58 +107,53 @@ QWidget *ProfileEditorPlugin::terminal_widget()
109 root = new QWidget(); 107 root = new QWidget();
110 108
111 // Build GUI 109 // Build GUI
112 110
111
112 QLabel *terminal = new QLabel(QObject::tr("Terminal type"), root);
113
113 QComboBox *terminal_box = new QComboBox(root); 114 QComboBox *terminal_box = new QComboBox(root);
114 terminal_box->insertItem("VT 100", id_term_vt100); 115 terminal_box->insertItem("VT 100", id_term_vt100);
115 terminal_box->insertItem("VT 220", id_term_vt220); 116 terminal_box->insertItem("VT 220", id_term_vt220);
116 terminal_box->insertItem("ANSI", id_term_ansi); 117 terminal_box->insertItem("ANSI", id_term_ansi);
117 118
118 QLabel *terminal = new QLabel(QObject::tr("Terminal type"), root); 119 QLabel *colourlabel = new QLabel(QObject::tr("Colour scheme"), root);
119 QLabel *colourlabel = new QLabel(QObject::tr("Colour scheme"), root);
120 QLabel *sizelabel = new QLabel(QObject::tr("Font size"), root);
121 QLabel *options = new QLabel(QObject::tr("Options"), root);
122 QLabel *conversions = new QLabel(QObject::tr("Line-break conversions"), root);
123
124 QComboBox *colour_box = new QComboBox(root); 120 QComboBox *colour_box = new QComboBox(root);
125 colour_box->insertItem(QObject::tr("black on white"), id_term_black); 121 colour_box->insertItem(QObject::tr("black on white"), id_term_black);
126 colour_box->insertItem(QObject::tr("white on black"), id_term_white); 122 colour_box->insertItem(QObject::tr("white on black"), id_term_white);
127 123
128 QButtonGroup *group_size = new QButtonGroup(root); 124 QButtonGroup *group_size = new QButtonGroup( QObject::tr("Font size"), root );
129 group_size->hide(); 125 QRadioButton *size_small = new QRadioButton(QObject::tr("small"), group_size );
130 QRadioButton *size_small = new QRadioButton(QObject::tr("small"), root); 126 QRadioButton *size_medium = new QRadioButton(QObject::tr("medium"), group_size );
131 QRadioButton *size_medium = new QRadioButton(QObject::tr("medium"), root); 127 QRadioButton *size_large = new QRadioButton(QObject::tr("large"), group_size );
132 QRadioButton *size_large = new QRadioButton(QObject::tr("large"), root);
133 group_size->insert(size_small);
134 group_size->insert(size_medium);
135 group_size->insert(size_large);
136 128
137 QCheckBox *option_echo = new QCheckBox(QObject::tr("Local echo"), root); 129 QHGroupBox *group_conv = new QHGroupBox( QObject::tr("Line-break conversions"), root );
138 QCheckBox *option_wrap = new QCheckBox(QObject::tr("Line wrap"), root); 130 QCheckBox *conv_inbound = new QCheckBox(QObject::tr("Inbound"), group_conv);
131 QCheckBox *conv_outbound = new QCheckBox(QObject::tr("Outbound"), group_conv);
139 132
140 QCheckBox *conv_inbound = new QCheckBox(QObject::tr("Inbound"), root); 133 QHGroupBox *group_options = new QHGroupBox( QObject::tr("Options"), root );
141 QCheckBox *conv_outbound = new QCheckBox(QObject::tr("Outbound"), root); 134 QCheckBox *option_echo = new QCheckBox(QObject::tr("Local echo"), group_options);
135 QCheckBox *option_wrap = new QCheckBox(QObject::tr("Line wrap"), group_options);
142 136
143 // Build Layout 137 // Build Layout
144
145 lroot = new QVBoxLayout(root, 2); 138 lroot = new QVBoxLayout(root, 2);
146 lroot->add(terminal); 139
147 lroot->add(terminal_box); 140 QVBoxLayout *typeBox = new QVBoxLayout( lroot );
148 lroot->add(sizelabel); 141 typeBox->add(terminal);
149 QHBoxLayout *hbox = new QHBoxLayout(lroot, 2); 142 typeBox->add(terminal_box);
143
144 QHBoxLayout *hbox = new QHBoxLayout( group_size, 2);
150 hbox->add(size_small); 145 hbox->add(size_small);
151 hbox->add(size_medium); 146 hbox->add(size_medium);
152 hbox->add(size_large); 147 hbox->add(size_large);
153 lroot->add(colourlabel); 148 lroot->add( group_size );
154 lroot->add(colour_box); 149
155 lroot->add(conversions); 150 QVBoxLayout *colourBox = new QVBoxLayout( lroot );
156 QHBoxLayout *hbox2 = new QHBoxLayout(lroot, 2); 151 colourBox->add(colourlabel);
157 hbox2->add(conv_inbound); 152 colourBox->add(colour_box);
158 hbox2->add(conv_outbound); 153
159 lroot->add(options); 154 lroot->add(group_conv);
160 QHBoxLayout *hbox3 = new QHBoxLayout(lroot, 2); 155 lroot->add(group_options);
161 hbox3->add(option_wrap);
162 hbox3->add(option_echo);
163 156
164 // Apply profile settings 157 // Apply profile settings
165 158
166 int term = m_profile->readNumEntry("Terminal"); 159 int term = m_profile->readNumEntry("Terminal");
@@ -317,9 +310,9 @@ void ProfileEditorPlugin::slotTermOutbound(bool on)
317 310
318class ProfileEditorPluginSerial : public ProfileEditorPlugin 311class ProfileEditorPluginSerial : public ProfileEditorPlugin
319{ 312{
320 public: 313 public:
321 314
322 ProfileEditorPluginSerial(QWidget *parent, Profile *p) 315 ProfileEditorPluginSerial(QWidget *parent, Profile *p)
323 : ProfileEditorPlugin(parent, p) 316 : ProfileEditorPlugin(parent, p)
324 { 317 {
325 } 318 }
@@ -331,25 +324,24 @@ class ProfileEditorPluginSerial : public ProfileEditorPlugin
331 QWidget *widget() 324 QWidget *widget()
332 { 325 {
333 if(!m_widget) 326 if(!m_widget)
334 { 327 {
335 QFrame *device_frame = new QFrame(m_parent);
336 device_frame->setFrameStyle(QFrame::Panel | QFrame::Sunken);
337 328
338 QLabel *frame_device = new QLabel(QObject::tr("Device"), device_frame); 329 QWidget *device_frame = new QWidget( m_parent );
330 QLabel *frame_device = new QLabel(QObject::tr("Device"), device_frame);
339 331
340 device_line = new QLineEdit("/dev/ttyS0", device_frame); 332 device_line = new QLineEdit("/dev/ttyS0", device_frame);
341 333
342 QVBoxLayout *vbox_frame = new QVBoxLayout(device_frame, 2); 334 QVBoxLayout *vbox_frame = new QVBoxLayout(device_frame, 2);
343 vbox_frame->add(frame_device); 335 vbox_frame->add(frame_device);
344 vbox_frame->add(device_line); 336 vbox_frame->add(device_line);
345 337
346 m_widget = device_frame; 338 m_widget = device_frame;
347 339
348 // Load special settings 340 // Load special settings
349 341
350 QString dev = m_profile->readEntry("Device"); 342 QString dev = m_profile->readEntry("Device");
351 if(!dev.isNull()) device_line->setText(dev); 343 if(!dev.isNull()) device_line->setText(dev);
352 } 344 }
353 345
354 return m_widget; 346 return m_widget;
355 } 347 }
@@ -380,10 +372,10 @@ class ProfileEditorPluginIrda : public ProfileEditorPlugin
380 QWidget *widget() 372 QWidget *widget()
381 { 373 {
382 if(!m_widget) 374 if(!m_widget)
383 { 375 {
384 QFrame *device_frame = new QFrame(m_parent); 376 QWidget *device_frame = new QWidget(m_parent);
385 device_frame->setFrameStyle(QFrame::Panel | QFrame::Sunken); 377
386 378
387 QLabel *frame_device = new QLabel(QObject::tr("Device"), device_frame); 379 QLabel *frame_device = new QLabel(QObject::tr("Device"), device_frame);
388 380
389 device_line = new QLineEdit("/dev/ircomm0", device_frame); 381 device_line = new QLineEdit("/dev/ircomm0", device_frame);
@@ -428,10 +420,9 @@ class ProfileEditorPluginModem : public ProfileEditorPlugin
428 QWidget *widget() 420 QWidget *widget()
429 { 421 {
430 if(!m_widget) 422 if(!m_widget)
431 { 423 {
432 QFrame *device_frame = new QFrame(m_parent); 424 QWidget *device_frame = new QWidget(m_parent);
433 device_frame->setFrameStyle(QFrame::Panel | QFrame::Sunken);
434 425
435 QLabel *frame_device = new QLabel(QObject::tr("Device"), device_frame); 426 QLabel *frame_device = new QLabel(QObject::tr("Device"), device_frame);
436 QLabel *frame_number = new QLabel(QObject::tr("Phone number"), device_frame); 427 QLabel *frame_number = new QLabel(QObject::tr("Phone number"), device_frame);
437 428
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
@@ -6,9 +6,9 @@
6 6
7// proposal of a widget Layer in opie-console 7// proposal of a widget Layer in opie-console
8// 8//
9// fellow devels: 9// fellow devels:
10// just mail me (ibotty@web.de), what you additionally need from the main widget 10// just mail me (ibotty@web.de), what you additionally need from the main widget
11// (or say in chat) 11// (or say in chat)
12 12
13#ifndef WIDGET_LAYER_H 13#ifndef WIDGET_LAYER_H
14#define WIDGET_LAYER_H 14#define WIDGET_LAYER_H
@@ -53,9 +53,9 @@ public:
53public: 53public:
54 /** 54 /**
55 * sets the image 55 * sets the image
56 */ 56 */
57 virtual void setImage( QArray<Character> const newimg, int lines, int colums ); 57 virtual void setImage( QArray<Character> const newimg, int lines, int colums ) = 0;
58 58
59 /** 59 /**
60 * annoy the user 60 * annoy the user
61 */ 61 */
@@ -64,9 +64,9 @@ public:
64 /** 64 /**
65 * return the lines count 65 * return the lines count
66 */ 66 */
67 int lines(){ return m_lines; } 67 int lines(){ return m_lines; }
68 68
69 /** 69 /**
70 * return the columns count 70 * return the columns count
71 */ 71 */
72 int columns(){ return m_columns; } 72 int columns(){ return m_columns; }
@@ -119,9 +119,9 @@ signals:
119 /** 119 /**
120 * selection should be cleared 120 * selection should be cleared
121 */ 121 */
122 void selectionCleared(); 122 void selectionCleared();
123 123
124 /** 124 /**
125 * selection begin 125 * selection begin
126 */ 126 */
127 void selectionBegin( const int x, const int y ); 127 void selectionBegin( const int x, const int y );
@@ -141,9 +141,9 @@ signals:
141 141
142 142
143// protected methods 143// protected methods
144protected: 144protected:
145 145
146 // image operations 146 // image operations
147 147
148 /** 148 /**
149 * changes image, to suit new size 149 * changes image, to suit new size
@@ -164,32 +164,32 @@ protected:
164 /** 164 /**
165 * clears the image 165 * clears the image
166 */ 166 */
167 void clearImage(); 167 void clearImage();
168 168
169protected slots: 169protected slots:
170 170
171 /** 171 /**
172 * clear selection 172 * clear selection
173 */ 173 */
174 void onClearSelection(); 174 void onClearSelection();
175 175
176 176
177// protected vars 177// protected vars
178protected: 178protected:
179 179
180 /** 180 /**
181 * current Session 181 * current Session
182 */ 182 */
183 Session *m_session; 183 Session *m_session;
184 184
185 /** 185 /**
186 * current character image 186 * current character image
187 * 187 *
188 * a Character at loc( column, line ) 188 * a Character at loc( column, line )
189 * has the actual index: 189 * has the actual index:
190 * ix = line * m_columns + column; 190 * ix = line * m_columns + column;
191 * 191 *
192 * use loc( x, y ) macro to access. 192 * use loc( x, y ) macro to access.
193 */ 193 */
194 QArray<Character> m_image; 194 QArray<Character> m_image;
195 195
@@ -208,9 +208,9 @@ protected:
208 */ 208 */
209 QClipboard* m_clipboard; 209 QClipboard* m_clipboard;
210 210
211 /** 211 /**
212 * whether widget is resizing 212 * whether widget is resizing
213 */ 213 */
214 bool m_resizing; 214 bool m_resizing;
215}; 215};
216 216