-rw-r--r-- | noncore/apps/opie-console/BUGS | 2 | ||||
-rw-r--r-- | noncore/apps/opie-console/function_keyboard.cpp | 36 | ||||
-rw-r--r-- | noncore/apps/opie-console/function_keyboard.h | 8 |
3 files changed, 21 insertions, 25 deletions
diff --git a/noncore/apps/opie-console/BUGS b/noncore/apps/opie-console/BUGS index 8195dc5..ac2ce03 100644 --- a/noncore/apps/opie-console/BUGS +++ b/noncore/apps/opie-console/BUGS | |||
@@ -8,10 +8,8 @@ Send/receive: lrzsz behaves strange when trying to use | |||
8 | 8 | ||
9 | - transfer dialog is still a top dialog instead on the widgetstack of of the | 9 | - transfer dialog is still a top dialog instead on the widgetstack of of the |
10 | connection its used on | 10 | connection its used on |
11 | 11 | ||
12 | - keys and buttonbar merge | ||
13 | |||
14 | - keys really working | 12 | - keys really working |
15 | mc is working | 13 | mc is working |
16 | but F11 on bar seems to be the F10 key and so on | 14 | but F11 on bar seems to be the F10 key and so on |
17 | F9 is F8... -zecke | 15 | F9 is F8... -zecke |
diff --git a/noncore/apps/opie-console/function_keyboard.cpp b/noncore/apps/opie-console/function_keyboard.cpp index 538bed4..fa11701 100644 --- a/noncore/apps/opie-console/function_keyboard.cpp +++ b/noncore/apps/opie-console/function_keyboard.cpp | |||
@@ -49,11 +49,9 @@ FunctionKeyboard::FunctionKeyboard(QWidget *parent) : | |||
49 | 49 | ||
50 | 50 | ||
51 | } | 51 | } |
52 | 52 | ||
53 | FunctionKeyboard::~FunctionKeyboard() { | 53 | FunctionKeyboard::~FunctionKeyboard() {} |
54 | |||
55 | } | ||
56 | 54 | ||
57 | void FunctionKeyboard::changeRows(int r) { | 55 | void FunctionKeyboard::changeRows(int r) { |
58 | 56 | ||
59 | numRows = r; | 57 | numRows = r; |
@@ -188,13 +186,13 @@ QSize FunctionKeyboard::sizeHint() const { | |||
188 | } | 186 | } |
189 | 187 | ||
190 | void FunctionKeyboard::loadDefaults() { | 188 | void FunctionKeyboard::loadDefaults() { |
191 | 189 | ||
192 | keys.insert( "r0c0", FKey ("Enter", "enter.png", Qt::Key_Enter, 0)); | 190 | keys.insert( "r0c0", FKey ("Enter", "enter", Qt::Key_Enter, 0)); |
193 | keys.insert( "r0c1", FKey ("Space", "space.png", Qt::Key_Space, Qt::Key_Space)); | 191 | keys.insert( "r0c1", FKey ("Space", "space", Qt::Key_Space, Qt::Key_Space)); |
194 | keys.insert( "r0c2", FKey ("Tab", "tab.png", Qt::Key_Tab, 0)); | 192 | keys.insert( "r0c2", FKey ("Tab", "tab", Qt::Key_Tab, 0)); |
195 | keys.insert( "r0c3", FKey ("Up", "up.png", Qt::Key_Up, 0)); | 193 | keys.insert( "r0c3", FKey ("Up", "up", Qt::Key_Up, 0)); |
196 | keys.insert( "r0c4", FKey ("Down", "down.png", Qt::Key_Down, 0)); | 194 | keys.insert( "r0c4", FKey ("Down", "down", Qt::Key_Down, 0)); |
197 | 195 | ||
198 | keys.insert( "r0c7", FKey ("Ho", 0, 4112, 0)); | 196 | keys.insert( "r0c7", FKey ("Ho", 0, 4112, 0)); |
199 | keys.insert( "r0c8", FKey ("End", 0, 4113, 0)); | 197 | keys.insert( "r0c8", FKey ("End", 0, 4113, 0)); |
200 | keys.insert( "r0c9", FKey ("PU", 0, 4118, 0)); | 198 | keys.insert( "r0c9", FKey ("PU", 0, 4118, 0)); |
@@ -224,9 +222,9 @@ FunctionKeyboardConfig::FunctionKeyboardConfig(const QString& name, QWidget* par | |||
224 | qWarning("FunctionKeyboardConfig"); | 222 | qWarning("FunctionKeyboardConfig"); |
225 | 223 | ||
226 | 224 | ||
227 | kb = new FunctionKeyboard(this); | 225 | kb = new FunctionKeyboard(this); |
228 | connect (kb, SIGNAL(keyPressed(FKey, ushort, ushort, bool)), | 226 | connect (kb, SIGNAL(keyPressed(FKey, ushort, ushort, bool)), |
229 | this, SLOT(slotKeyPressed(FKey, ushort, ushort, bool))); | 227 | this, SLOT(slotKeyPressed(FKey, ushort, ushort, bool))); |
230 | 228 | ||
231 | QGroupBox *dimentions = new QGroupBox(2, Qt::Horizontal, tr("Dimentions"), this); | 229 | QGroupBox *dimentions = new QGroupBox(2, Qt::Horizontal, tr("Dimentions"), this); |
232 | QLabel *l = new QLabel("Rows", dimentions); | 230 | QLabel *l = new QLabel("Rows", dimentions); |
@@ -241,13 +239,13 @@ FunctionKeyboardConfig::FunctionKeyboardConfig(const QString& name, QWidget* par | |||
241 | m_labels = new QComboBox(true, editKey); | 239 | m_labels = new QComboBox(true, editKey); |
242 | m_labels->setInsertionPolicy(QComboBox::AtCurrent); | 240 | m_labels->setInsertionPolicy(QComboBox::AtCurrent); |
243 | m_labels->insertItem(""); | 241 | m_labels->insertItem(""); |
244 | 242 | ||
245 | QStringList files = QDir(QPEApplication::qpeDir() + "pics/console/keys/", "*.png").entryList(); | 243 | QStringList files = QDir( QPEApplication::qpeDir() + "pics/console/keys/", "*.png").entryList(); |
246 | 244 | ||
247 | for (uint i = 0; i < files.count(); i++) { | 245 | for (uint i = 0; i < files.count(); i++) { |
248 | 246 | ||
249 | m_labels->insertItem(Resource::loadPixmap("console/keys/" + files[i]), files[i]); | 247 | m_labels->insertItem( Resource::loadPixmap("console/keys/" + files[i]), files[i]); |
250 | } | 248 | } |
251 | connect (m_labels, SIGNAL(activated(int)), this, SLOT(slotChangeIcon(int))); | 249 | connect (m_labels, SIGNAL(activated(int)), this, SLOT(slotChangeIcon(int))); |
252 | connect (m_labels, SIGNAL(textChanged(const QString &)), this, SLOT(slotChangeLabelText(const QString&))); | 250 | connect (m_labels, SIGNAL(textChanged(const QString &)), this, SLOT(slotChangeLabelText(const QString&))); |
253 | 251 | ||
@@ -278,9 +276,9 @@ void FunctionKeyboardConfig::load (const Profile& prof) { | |||
278 | m_rowBox->setValue(prof.readNumEntry("keb_rows", 2)); | 276 | m_rowBox->setValue(prof.readNumEntry("keb_rows", 2)); |
279 | m_colBox->setValue(prof.readNumEntry("keb_cols", 10)); | 277 | m_colBox->setValue(prof.readNumEntry("keb_cols", 10)); |
280 | 278 | ||
281 | /* load all the keys to the keyboard */ | 279 | /* load all the keys to the keyboard */ |
282 | for (int i = 0; i <= m_rowBox->value() -1; i++) | 280 | for (int i = 0; i <= m_rowBox->value() -1; i++) |
283 | for (int j = 0; j <= m_colBox->value() -1; j++) { | 281 | for (int j = 0; j <= m_colBox->value() -1; j++) { |
284 | 282 | ||
285 | QString h = "r" + QString::number(i) + "c" + QString::number(j); | 283 | QString h = "r" + QString::number(i) + "c" + QString::number(j); |
286 | QString values = prof.readEntry("keb_" + h); | 284 | QString values = prof.readEntry("keb_" + h); |
@@ -292,9 +290,9 @@ void FunctionKeyboardConfig::load (const Profile& prof) { | |||
292 | 290 | ||
293 | // load pixmap if used | 291 | // load pixmap if used |
294 | if (!l[1].isEmpty()) { | 292 | if (!l[1].isEmpty()) { |
295 | 293 | ||
296 | kb->keys[h].pix = new QPixmap(QPEApplication::qpeDir() + "pics/console/keys/" + l[1]); | 294 | kb->keys[h].pix = new QPixmap( Resource::loadPixmap( "console/keys/" + l[1] ) ); |
297 | } | 295 | } |
298 | } | 296 | } |
299 | } | 297 | } |
300 | 298 | ||
@@ -307,11 +305,11 @@ void FunctionKeyboardConfig::save (Profile& prof) { | |||
307 | QMap<QString, FKey>::Iterator it; | 305 | QMap<QString, FKey>::Iterator it; |
308 | for ( it = kb->keys.begin(); it != kb->keys.end(); it++) { | 306 | for ( it = kb->keys.begin(); it != kb->keys.end(); it++) { |
309 | 307 | ||
310 | FKey k = it.data(); | 308 | FKey k = it.data(); |
311 | QString entry = k.label + "|" | 309 | QString entry = k.label + "|" |
312 | + k.pixFile + "|" | 310 | + k.pixFile + "|" |
313 | + QString::number(k.qcode) + "|" | 311 | + QString::number(k.qcode) + "|" |
314 | + QString::number(k.unicode); | 312 | + QString::number(k.unicode); |
315 | 313 | ||
316 | prof.writeEntry("keb_" + it.key(), entry); | 314 | prof.writeEntry("keb_" + it.key(), entry); |
317 | 315 | ||
@@ -332,9 +330,9 @@ void FunctionKeyboardConfig::slotChangeCols(int c) { | |||
332 | void FunctionKeyboardConfig::slotKeyPressed(FKey k, ushort r, ushort c, bool pressed) { | 330 | void FunctionKeyboardConfig::slotKeyPressed(FKey k, ushort r, ushort c, bool pressed) { |
333 | 331 | ||
334 | if (!pressed) return; | 332 | if (!pressed) return; |
335 | 333 | ||
336 | selectedHandle = "r" + QString::number(r) + | 334 | selectedHandle = "r" + QString::number(r) + |
337 | "c" + QString::number(c); | 335 | "c" + QString::number(c); |
338 | selectedRow = r; | 336 | selectedRow = r; |
339 | selectedCol = c; | 337 | selectedCol = c; |
340 | 338 | ||
@@ -359,9 +357,9 @@ void FunctionKeyboardConfig::slotChangeIcon(int index) { | |||
359 | 357 | ||
360 | // is text | 358 | // is text |
361 | m_labels->setEditable(true); | 359 | m_labels->setEditable(true); |
362 | // why tf does the text get erased unless i do this? | 360 | // why tf does the text get erased unless i do this? |
363 | m_labels->changeItem(m_labels->text(0), 0); | 361 | m_labels->changeItem(m_labels->text(0), 0); |
364 | 362 | ||
365 | kb->keys[selectedHandle].pixFile = ""; | 363 | kb->keys[selectedHandle].pixFile = ""; |
366 | delete kb->keys[selectedHandle].pix; | 364 | delete kb->keys[selectedHandle].pix; |
367 | 365 | ||
@@ -369,9 +367,9 @@ void FunctionKeyboardConfig::slotChangeIcon(int index) { | |||
369 | 367 | ||
370 | // is a pixmap | 368 | // is a pixmap |
371 | m_labels->setEditable(false); | 369 | m_labels->setEditable(false); |
372 | kb->keys[selectedHandle].pixFile = m_labels->currentText(); | 370 | kb->keys[selectedHandle].pixFile = m_labels->currentText(); |
373 | kb->keys[selectedHandle].pix = new QPixmap(QPEApplication::qpeDir() + "pics/console/keys/" + m_labels->currentText()); | 371 | kb->keys[selectedHandle].pix = new QPixmap( Resource::loadPixmap( "console/keys/" + m_labels->currentText() ) ); |
374 | } | 372 | } |
375 | kb->paintKey(selectedRow, selectedCol); | 373 | kb->paintKey(selectedRow, selectedCol); |
376 | } | 374 | } |
377 | void FunctionKeyboardConfig::slotChangeLabelText(const QString &label) { | 375 | void FunctionKeyboardConfig::slotChangeLabelText(const QString &label) { |
diff --git a/noncore/apps/opie-console/function_keyboard.h b/noncore/apps/opie-console/function_keyboard.h index 7f313d6..80d9f29 100644 --- a/noncore/apps/opie-console/function_keyboard.h +++ b/noncore/apps/opie-console/function_keyboard.h | |||
@@ -1,8 +1,9 @@ | |||
1 | #ifndef OPIE_FUNCTION_KEYBOARD_H | 1 | #ifndef OPIE_FUNCTION_KEYBOARD_H |
2 | #define OPIE_FUNCTION_KEYBOARD_H | 2 | #define OPIE_FUNCTION_KEYBOARD_H |
3 | 3 | ||
4 | #include <qpe/config.h> | 4 | #include <qpe/config.h> |
5 | #include <qpe/resource.h> | ||
5 | #include <qpe/qpeapplication.h> | 6 | #include <qpe/qpeapplication.h> |
6 | #include <qframe.h> | 7 | #include <qframe.h> |
7 | #include <qpainter.h> | 8 | #include <qpainter.h> |
8 | #include <qvbox.h> | 9 | #include <qvbox.h> |
@@ -15,15 +16,14 @@ | |||
15 | 16 | ||
16 | struct FKey { | 17 | struct FKey { |
17 | 18 | ||
18 | FKey(): qcode(0), unicode(0) {}; | 19 | FKey(): qcode(0), unicode(0) {}; |
19 | FKey(const QString &l, const QString &f, ushort q, ushort u): | 20 | FKey(const QString &l, const QString &f, ushort q, ushort u): |
20 | label(l), pixFile(f), qcode(q), unicode(u) { | 21 | label(l), pixFile(f), qcode(q), unicode(u) { |
21 | |||
22 | if (!f.isEmpty()) { | ||
23 | 22 | ||
24 | pix = new QPixmap (QPEApplication::qpeDir() + "pics/console/keys/" + f); | 23 | if (!f.isEmpty()) { |
25 | 24 | ||
25 | pix = new QPixmap ( Resource::loadPixmap("console/keys/" + f ) ); | ||
26 | } | 26 | } |
27 | }; | 27 | }; |
28 | 28 | ||
29 | QString label; | 29 | QString label; |