-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 | |||
@@ -10,6 +10,4 @@ Send/receive: lrzsz behaves strange when trying to use | |||
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 |
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 | |||
@@ -51,7 +51,5 @@ FunctionKeyboard::FunctionKeyboard(QWidget *parent) : | |||
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) { |
@@ -190,9 +188,9 @@ QSize FunctionKeyboard::sizeHint() const { | |||
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)); |
@@ -226,5 +224,5 @@ FunctionKeyboardConfig::FunctionKeyboardConfig(const QString& name, QWidget* par | |||
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 | ||
@@ -243,9 +241,9 @@ FunctionKeyboardConfig::FunctionKeyboardConfig(const QString& name, QWidget* par | |||
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))); |
@@ -280,5 +278,5 @@ void FunctionKeyboardConfig::load (const Profile& prof) { | |||
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 | ||
@@ -294,5 +292,5 @@ void FunctionKeyboardConfig::load (const Profile& prof) { | |||
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 | } |
@@ -309,7 +307,7 @@ void FunctionKeyboardConfig::save (Profile& prof) { | |||
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 | ||
@@ -334,5 +332,5 @@ void FunctionKeyboardConfig::slotKeyPressed(FKey k, ushort r, ushort c, bool pre | |||
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; |
@@ -361,5 +359,5 @@ void FunctionKeyboardConfig::slotChangeIcon(int index) { | |||
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 = ""; |
@@ -371,5 +369,5 @@ void FunctionKeyboardConfig::slotChangeIcon(int index) { | |||
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); |
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 | |||
@@ -3,4 +3,5 @@ | |||
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> |
@@ -17,11 +18,10 @@ 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 | }; |