summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/opie-console/BUGS2
-rw-r--r--noncore/apps/opie-console/function_keyboard.cpp36
-rw-r--r--noncore/apps/opie-console/function_keyboard.h8
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
@@ -11,4 +11,2 @@ connection its used on
-- keys and buttonbar merge
-
- keys really 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
@@ -52,5 +52,3 @@ FunctionKeyboard::FunctionKeyboard(QWidget *parent) :
-FunctionKeyboard::~FunctionKeyboard() {
-
-}
+FunctionKeyboard::~FunctionKeyboard() {}
@@ -191,7 +189,7 @@ void FunctionKeyboard::loadDefaults() {
- keys.insert( "r0c0", FKey ("Enter", "enter.png", Qt::Key_Enter, 0));
- keys.insert( "r0c1", FKey ("Space", "space.png", Qt::Key_Space, Qt::Key_Space));
- keys.insert( "r0c2", FKey ("Tab", "tab.png", Qt::Key_Tab, 0));
- keys.insert( "r0c3", FKey ("Up", "up.png", Qt::Key_Up, 0));
- keys.insert( "r0c4", FKey ("Down", "down.png", Qt::Key_Down, 0));
+ keys.insert( "r0c0", FKey ("Enter", "enter", Qt::Key_Enter, 0));
+ keys.insert( "r0c1", FKey ("Space", "space", Qt::Key_Space, Qt::Key_Space));
+ keys.insert( "r0c2", FKey ("Tab", "tab", Qt::Key_Tab, 0));
+ keys.insert( "r0c3", FKey ("Up", "up", Qt::Key_Up, 0));
+ keys.insert( "r0c4", FKey ("Down", "down", Qt::Key_Down, 0));
@@ -227,3 +225,3 @@ FunctionKeyboardConfig::FunctionKeyboardConfig(const QString& name, QWidget* par
kb = new FunctionKeyboard(this);
- connect (kb, SIGNAL(keyPressed(FKey, ushort, ushort, bool)),
+ connect (kb, SIGNAL(keyPressed(FKey, ushort, ushort, bool)),
this, SLOT(slotKeyPressed(FKey, ushort, ushort, bool)));
@@ -244,3 +242,3 @@ FunctionKeyboardConfig::FunctionKeyboardConfig(const QString& name, QWidget* par
- QStringList files = QDir(QPEApplication::qpeDir() + "pics/console/keys/", "*.png").entryList();
+ QStringList files = QDir( QPEApplication::qpeDir() + "pics/console/keys/", "*.png").entryList();
@@ -248,3 +246,3 @@ FunctionKeyboardConfig::FunctionKeyboardConfig(const QString& name, QWidget* par
- m_labels->insertItem(Resource::loadPixmap("console/keys/" + files[i]), files[i]);
+ m_labels->insertItem( Resource::loadPixmap("console/keys/" + files[i]), files[i]);
}
@@ -281,3 +279,3 @@ void FunctionKeyboardConfig::load (const Profile& prof) {
/* load all the keys to the keyboard */
- for (int i = 0; i <= m_rowBox->value() -1; i++)
+ for (int i = 0; i <= m_rowBox->value() -1; i++)
for (int j = 0; j <= m_colBox->value() -1; j++) {
@@ -295,3 +293,3 @@ void FunctionKeyboardConfig::load (const Profile& prof) {
- kb->keys[h].pix = new QPixmap(QPEApplication::qpeDir() + "pics/console/keys/" + l[1]);
+ kb->keys[h].pix = new QPixmap( Resource::loadPixmap( "console/keys/" + l[1] ) );
}
@@ -310,5 +308,5 @@ void FunctionKeyboardConfig::save (Profile& prof) {
FKey k = it.data();
- QString entry = k.label + "|"
- + k.pixFile + "|"
- + QString::number(k.qcode) + "|"
+ QString entry = k.label + "|"
+ + k.pixFile + "|"
+ + QString::number(k.qcode) + "|"
+ QString::number(k.unicode);
@@ -335,3 +333,3 @@ void FunctionKeyboardConfig::slotKeyPressed(FKey k, ushort r, ushort c, bool pre
- selectedHandle = "r" + QString::number(r) +
+ selectedHandle = "r" + QString::number(r) +
"c" + QString::number(c);
@@ -362,3 +360,3 @@ void FunctionKeyboardConfig::slotChangeIcon(int index) {
// why tf does the text get erased unless i do this?
- m_labels->changeItem(m_labels->text(0), 0);
+ m_labels->changeItem(m_labels->text(0), 0);
@@ -372,3 +370,3 @@ void FunctionKeyboardConfig::slotChangeIcon(int index) {
kb->keys[selectedHandle].pixFile = m_labels->currentText();
- kb->keys[selectedHandle].pix = new QPixmap(QPEApplication::qpeDir() + "pics/console/keys/" + m_labels->currentText());
+ kb->keys[selectedHandle].pix = new QPixmap( Resource::loadPixmap( "console/keys/" + m_labels->currentText() ) );
}
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
@@ -4,2 +4,3 @@
#include <qpe/config.h>
+#include <qpe/resource.h>
#include <qpe/qpeapplication.h>
@@ -18,9 +19,8 @@ struct FKey {
FKey(): qcode(0), unicode(0) {};
- FKey(const QString &l, const QString &f, ushort q, ushort u):
+ FKey(const QString &l, const QString &f, ushort q, ushort u):
label(l), pixFile(f), qcode(q), unicode(u) {
-
- if (!f.isEmpty()) {
- pix = new QPixmap (QPEApplication::qpeDir() + "pics/console/keys/" + f);
+ if (!f.isEmpty()) {
+ pix = new QPixmap ( Resource::loadPixmap("console/keys/" + f ) );
}