author | harlekin <harlekin> | 2002-10-07 18:05:43 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2002-10-07 18:05:43 (UTC) |
commit | d55aa591770675008da9e3290617e463a77e4c98 (patch) (unidiff) | |
tree | 93d779cc85298545673f4d5f2ea0fcc7d4d301b7 /noncore/apps/opie-console | |
parent | d25a925e70982b86539b98362ab2cd75c7883110 (diff) | |
download | opie-d55aa591770675008da9e3290617e463a77e4c98.zip opie-d55aa591770675008da9e3290617e463a77e4c98.tar.gz opie-d55aa591770675008da9e3290617e463a77e4c98.tar.bz2 |
reworked config dialog gui a bit and adapted it to opie
-rw-r--r-- | noncore/apps/opie-console/mainwindow.cpp | 10 | ||||
-rw-r--r-- | noncore/apps/opie-console/profileeditordialog.cpp | 36 | ||||
-rw-r--r-- | noncore/apps/opie-console/profileeditordialog.h | 25 | ||||
-rw-r--r-- | noncore/apps/opie-console/profileeditorplugins.cpp | 139 | ||||
-rw-r--r-- | noncore/apps/opie-console/widget_layer.h | 22 |
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 | |||
@@ -17,3 +17,3 @@ MainWindow::MainWindow() { | |||
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(); |
@@ -98,4 +98,4 @@ void MainWindow::initUI() { | |||
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 | ||
@@ -170,6 +170,6 @@ void MainWindow::slotConfigure() { | |||
170 | void MainWindow::slotClose() { | 170 | void MainWindow::slotClose() { |
171 | |||
172 | } | 171 | } |
173 | 172 | ||
174 | void MainWindow::slotProfile(int) { | 173 | void MainWindow::slotProfile( int ) { |
174 | |||
175 | 175 | ||
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,2 +1,3 @@ | |||
1 | 1 | ||
2 | #include <opie/otabwidget.h> | ||
2 | #include "profileeditordialog.h" | 3 | #include "profileeditordialog.h" |
@@ -15,3 +16,3 @@ ProfileEditorDialog::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 | { |
@@ -25,3 +26,3 @@ ProfileEditorDialog::ProfileEditorDialog( MetaFactory* fact, | |||
25 | ProfileEditorDialog::ProfileEditorDialog( MetaFactory* fact ) | 26 | ProfileEditorDialog::ProfileEditorDialog( MetaFactory* fact ) |
26 | : QTabDialog(0, 0, TRUE), m_fact( fact ) | 27 | : QDialog(0, 0, TRUE), m_fact( fact ) |
27 | { | 28 | { |
@@ -43,3 +44,8 @@ void 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 | ||
@@ -50,3 +56,3 @@ void ProfileEditorDialog::initUI() | |||
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); |
@@ -100,2 +106,6 @@ void ProfileEditorDialog::initUI() | |||
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 | ||
@@ -104,11 +114,7 @@ void ProfileEditorDialog::initUI() | |||
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()); |
@@ -125,5 +131,3 @@ void ProfileEditorDialog::initUI() | |||
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 | } |
@@ -168,6 +172,2 @@ void ProfileEditorDialog::accept() | |||
168 | 172 | ||
169 | void ProfileEditorDialog::slotCancel() | ||
170 | { | ||
171 | reject(); | ||
172 | } | ||
173 | 173 | ||
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 | |||
@@ -3,3 +3,3 @@ | |||
3 | 3 | ||
4 | #include <qtabdialog.h> | 4 | #include <qdialog.h> |
5 | 5 | ||
@@ -16,3 +16,3 @@ class ProfileEditorPlugin; | |||
16 | 16 | ||
17 | class ProfileEditorDialog : public QTabDialog { | 17 | class ProfileEditorDialog : public QDialog { |
18 | Q_OBJECT | 18 | Q_OBJECT |
@@ -25,11 +25,8 @@ public: | |||
25 | 25 | ||
26 | QString prof_name(); | 26 | QString prof_name(); |
27 | QString prof_type(); | 27 | QString prof_type(); |
28 | 28 | ||
29 | public slots: | 29 | public 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 | ||
@@ -44,8 +41,8 @@ private: | |||
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 | }; |
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 | |||
@@ -12,2 +12,4 @@ | |||
12 | #include "qbuttongroup.h" | 12 | #include "qbuttongroup.h" |
13 | #include "qhgroupbox.h" | ||
14 | #include "qvbox.h" | ||
13 | 15 | ||
@@ -38,2 +40,3 @@ QWidget *ProfileEditorPlugin::connection_widget() | |||
38 | // Build GUI | 40 | // Build GUI |
41 | QLabel *speedlabel = new QLabel(QObject::tr("Speed"), root); | ||
39 | 42 | ||
@@ -46,22 +49,12 @@ QWidget *ProfileEditorPlugin::connection_widget() | |||
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); |
@@ -69,11 +62,16 @@ QWidget *ProfileEditorPlugin::connection_widget() | |||
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 |
@@ -112,2 +110,5 @@ QWidget *ProfileEditorPlugin::terminal_widget() | |||
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); |
@@ -117,8 +118,3 @@ QWidget *ProfileEditorPlugin::terminal_widget() | |||
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); |
@@ -127,24 +123,23 @@ QWidget *ProfileEditorPlugin::terminal_widget() | |||
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); |
@@ -152,12 +147,10 @@ QWidget *ProfileEditorPlugin::terminal_widget() | |||
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 | ||
@@ -320,3 +313,3 @@ class ProfileEditorPluginSerial : public ProfileEditorPlugin | |||
320 | public: | 313 | public: |
321 | 314 | ||
322 | ProfileEditorPluginSerial(QWidget *parent, Profile *p) | 315 | ProfileEditorPluginSerial(QWidget *parent, Profile *p) |
@@ -334,19 +327,18 @@ class ProfileEditorPluginSerial : public ProfileEditorPlugin | |||
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 | } |
@@ -383,4 +375,4 @@ class ProfileEditorPluginIrda : public ProfileEditorPlugin | |||
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 | ||
@@ -431,4 +423,3 @@ class ProfileEditorPluginModem : public ProfileEditorPlugin | |||
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 | ||
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 | |||
@@ -9,3 +9,3 @@ | |||
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) |
@@ -56,3 +56,3 @@ public: | |||
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 | ||
@@ -67,3 +67,3 @@ public: | |||
67 | int lines(){ return m_lines; } | 67 | int lines(){ return m_lines; } |
68 | 68 | ||
69 | /** | 69 | /** |
@@ -122,3 +122,3 @@ signals: | |||
122 | void selectionCleared(); | 122 | void selectionCleared(); |
123 | 123 | ||
124 | /** | 124 | /** |
@@ -144,3 +144,3 @@ signals: | |||
144 | protected: | 144 | protected: |
145 | 145 | ||
146 | // image operations | 146 | // image operations |
@@ -167,5 +167,5 @@ protected: | |||
167 | void clearImage(); | 167 | void clearImage(); |
168 | 168 | ||
169 | protected slots: | 169 | protected slots: |
170 | 170 | ||
171 | /** | 171 | /** |
@@ -178,3 +178,3 @@ protected slots: | |||
178 | protected: | 178 | protected: |
179 | 179 | ||
180 | /** | 180 | /** |
@@ -186,3 +186,3 @@ protected: | |||
186 | * current character image | 186 | * current character image |
187 | * | 187 | * |
188 | * a Character at loc( column, line ) | 188 | * a Character at loc( column, line ) |
@@ -190,3 +190,3 @@ protected: | |||
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. |
@@ -211,3 +211,3 @@ protected: | |||
211 | /** | 211 | /** |
212 | * whether widget is resizing | 212 | * whether widget is resizing |
213 | */ | 213 | */ |