author | hash <hash> | 2002-10-22 16:01:27 (UTC) |
---|---|---|
committer | hash <hash> | 2002-10-22 16:01:27 (UTC) |
commit | 6843a1bd8f8e679c220431f8377abcd2ffd2019b (patch) (unidiff) | |
tree | cec84037b60d0ae1e69c69a21e6da2dea3aaf5b6 /noncore/apps/opie-console/function_keyboard.cpp | |
parent | dca783a6564d7d0d8c857cef8586167bc0609647 (diff) | |
download | opie-6843a1bd8f8e679c220431f8377abcd2ffd2019b.zip opie-6843a1bd8f8e679c220431f8377abcd2ffd2019b.tar.gz opie-6843a1bd8f8e679c220431f8377abcd2ffd2019b.tar.bz2 |
cant figure out why modifying a private var in FunctionKeyboardConfig causes it to segfault.
Diffstat (limited to 'noncore/apps/opie-console/function_keyboard.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/apps/opie-console/function_keyboard.cpp | 92 |
1 files changed, 86 insertions, 6 deletions
diff --git a/noncore/apps/opie-console/function_keyboard.cpp b/noncore/apps/opie-console/function_keyboard.cpp index 100fdfc..977a384 100644 --- a/noncore/apps/opie-console/function_keyboard.cpp +++ b/noncore/apps/opie-console/function_keyboard.cpp | |||
@@ -1,9 +1,18 @@ | |||
1 | #include "function_keyboard.h" | 1 | #include "function_keyboard.h" |
2 | |||
3 | #include <qpe/resource.h> | ||
4 | #include <qpe/qpeapplication.h> | ||
2 | #include <qsizepolicy.h> | 5 | #include <qsizepolicy.h> |
3 | #include <qevent.h> | 6 | #include <qevent.h> |
4 | #include <qwindowsystem_qws.h> | 7 | #include <qwindowsystem_qws.h> |
5 | #include <qapplication.h> | 8 | #include <qapplication.h> |
6 | #include <qlayout.h> | 9 | #include <qlayout.h> |
10 | #include <qspinbox.h> | ||
11 | #include <qlabel.h> | ||
12 | #include <qcombobox.h> | ||
13 | #include <qdir.h> | ||
14 | |||
15 | /* FunctionKeyboard {{{1 */ | ||
7 | 16 | ||
8 | FunctionKeyboard::FunctionKeyboard(QWidget *parent) : | 17 | FunctionKeyboard::FunctionKeyboard(QWidget *parent) : |
9 | QFrame(parent), numRows(2), numCols(11), | 18 | QFrame(parent), numRows(2), numCols(11), |
@@ -38,6 +47,18 @@ FunctionKeyboard::~FunctionKeyboard() { | |||
38 | 47 | ||
39 | } | 48 | } |
40 | 49 | ||
50 | void FunctionKeyboard::changeRows(int r) { | ||
51 | |||
52 | numRows = r; | ||
53 | repaint(false); | ||
54 | } | ||
55 | void FunctionKeyboard::changeCols(int c) { | ||
56 | |||
57 | numCols = c; | ||
58 | keyWidth = (double)width()/numCols; // have to reset this thing too | ||
59 | repaint(false); | ||
60 | } | ||
61 | |||
41 | void FunctionKeyboard::paintEvent(QPaintEvent *e) { | 62 | void FunctionKeyboard::paintEvent(QPaintEvent *e) { |
42 | 63 | ||
43 | QPainter p(this); | 64 | QPainter p(this); |
@@ -91,6 +112,14 @@ void FunctionKeyboard::paintKey(int row, int col) { | |||
91 | keys["r" + QString::number(row) + "c" + QString::number(col)].getL() | 112 | keys["r" + QString::number(row) + "c" + QString::number(col)].getL() |
92 | ); | 113 | ); |
93 | 114 | ||
115 | if (row == numRows) { | ||
116 | |||
117 | // sometimes it doesnt draw the last line | ||
118 | p.drawLine((col+1) * keyWidth -2, row * keyHeight, | ||
119 | (col+1) * keyWidth -2, (row + 1) * keyHeight | ||
120 | ); | ||
121 | } | ||
122 | |||
94 | } | 123 | } |
95 | 124 | ||
96 | void FunctionKeyboard::mousePressEvent(QMouseEvent *e) { | 125 | void FunctionKeyboard::mousePressEvent(QMouseEvent *e) { |
@@ -102,7 +131,7 @@ void FunctionKeyboard::mousePressEvent(QMouseEvent *e) { | |||
102 | 131 | ||
103 | // emit that sucker! | 132 | // emit that sucker! |
104 | FKey k = keys["r" + QString::number(pressedRow) + "c" + QString::number(pressedCol)]; | 133 | FKey k = keys["r" + QString::number(pressedRow) + "c" + QString::number(pressedCol)]; |
105 | emit keyPressed(k.getU(), k.getQ(), 0, 1, 0); | 134 | emit keyPressed(k.getU(), k.getQ(), 0, 1, 0, pressedRow, pressedCol); |
106 | 135 | ||
107 | } | 136 | } |
108 | 137 | ||
@@ -115,7 +144,7 @@ void FunctionKeyboard::mouseReleaseEvent(QMouseEvent *) { | |||
115 | paintKey(row, col); | 144 | paintKey(row, col); |
116 | 145 | ||
117 | FKey k = keys["r" + QString::number(row) + "c" + QString::number(col)]; | 146 | FKey k = keys["r" + QString::number(row) + "c" + QString::number(col)]; |
118 | emit keyPressed(k.getU(), k.getQ(), 0, 0, 0); | 147 | emit keyPressed(k.getU(), k.getQ(), 0, 0, 0, pressedRow, pressedCol); |
119 | } | 148 | } |
120 | 149 | ||
121 | } | 150 | } |
@@ -157,14 +186,36 @@ void FunctionKeyboard::loadDefaults() { | |||
157 | 186 | ||
158 | } | 187 | } |
159 | 188 | ||
189 | /* FunctionKeyboardConfig {{{1 */ | ||
160 | 190 | ||
161 | FunctionKeyboardConfig::FunctionKeyboardConfig(const QString& name, QWidget* parent) : | 191 | FunctionKeyboardConfig::FunctionKeyboardConfig(const QString& name, QWidget* parent) : |
162 | ProfileDialogKeyWidget(name, parent) { | 192 | ProfileDialogKeyWidget(name, parent) { |
163 | 193 | ||
164 | 194 | ||
165 | FunctionKeyboard *kb = new FunctionKeyboard(this); | 195 | kb = new FunctionKeyboard(this); |
196 | |||
166 | QGroupBox *dimentions = new QGroupBox(2, Qt::Horizontal, tr("Dimentions"), this); | 197 | QGroupBox *dimentions = new QGroupBox(2, Qt::Horizontal, tr("Dimentions"), this); |
167 | QGroupBox *editKey = new QGroupBox(2, Qt::Horizontal, tr("Edit"), this); | 198 | QLabel *l = new QLabel("Rows", dimentions); |
199 | QSpinBox *m_rowBox = new QSpinBox(1, 15, 1, dimentions); | ||
200 | connect (m_rowBox, SIGNAL(valueChanged(int)), this, SLOT(slotChangeRows(int))); | ||
201 | l = new QLabel("Columns", dimentions); | ||
202 | m_colBox = new QSpinBox(1, 15, 1, dimentions); | ||
203 | connect (m_colBox, SIGNAL(valueChanged(int)), this, SLOT(slotChangeCols(int))); | ||
204 | |||
205 | QGroupBox *editKey = new QGroupBox(2, Qt::Horizontal, tr("Edit Key"), this); | ||
206 | l = new QLabel("Label", editKey); | ||
207 | /* | ||
208 | m_labels = new QComboBox(false, editKey); | ||
209 | labels->insertItem("text"); | ||
210 | |||
211 | QStringList files = QDir(QPEApplication::qpeDir() + "pics/console/keys/", "*.png").entryList(); | ||
212 | |||
213 | for (uint i = 0; i < files.count(); i++) { | ||
214 | |||
215 | m_labels->insertItem(Resource::loadPixmap("console/keys/" + files[i])); | ||
216 | } | ||
217 | connect (m_labels, SIGNAL(activated(int)), this, SLOT(slotChangeIcon(int))); | ||
218 | */ | ||
168 | 219 | ||
169 | QVBoxLayout *root = new QVBoxLayout(this, 2); | 220 | QVBoxLayout *root = new QVBoxLayout(this, 2); |
170 | root->addWidget(kb); | 221 | root->addWidget(kb); |
@@ -174,9 +225,38 @@ FunctionKeyboardConfig::FunctionKeyboardConfig(const QString& name, QWidget* par | |||
174 | FunctionKeyboardConfig::~FunctionKeyboardConfig() { | 225 | FunctionKeyboardConfig::~FunctionKeyboardConfig() { |
175 | 226 | ||
176 | } | 227 | } |
177 | void FunctionKeyboardConfig::load (const Profile& ) { | 228 | void FunctionKeyboardConfig::load (const Profile& prof) { |
229 | int i = prof.readNumEntry("keb_rows", 1); | ||
230 | //m_rowBox->setValue(i); | ||
231 | } | ||
232 | void FunctionKeyboardConfig::save (Profile& prof) { | ||
233 | |||
234 | //prof.writeEntry("keb_rows", m_rowBox->value()); | ||
235 | |||
236 | } | ||
237 | void FunctionKeyboardConfig::slotChangeRows(int r) { | ||
238 | |||
239 | kb->changeRows(r); | ||
240 | |||
241 | // have to do this so the whole thing gets redrawn | ||
242 | kb->hide(); kb->show(); | ||
243 | } | ||
244 | void FunctionKeyboardConfig::slotChangeCols(int c) { | ||
245 | |||
246 | kb->changeCols(c); | ||
247 | } | ||
248 | void FunctionKeyboardConfig::slotKeyPressed(ushort, ushort, bool, bool, bool, ushort row, ushort col) { | ||
178 | 249 | ||
179 | } | 250 | } |
180 | void FunctionKeyboardConfig::save (Profile& ) { | 251 | void FunctionKeyboardConfig::slotChangeIcon(int index) { |
181 | 252 | ||
253 | if (index == 0) { | ||
254 | |||
255 | // is text | ||
256 | //if(!labels->editable()) labels->setEditable(true); | ||
257 | } else { | ||
258 | |||
259 | // is a pixmap | ||
260 | //if (labels->editable()) labels->setEditable(false); | ||
261 | } | ||
182 | } | 262 | } |