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
@@ -8,10 +8,8 @@ Send/receive: lrzsz behaves strange when trying to use
- transfer dialog is still a top dialog instead on the widgetstack of of the
connection its used on
-- keys and buttonbar merge
-
- keys really working
mc is working
but F11 on bar seems to be the F10 key and so on
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) :
}
-FunctionKeyboard::~FunctionKeyboard() {
-
-}
+FunctionKeyboard::~FunctionKeyboard() {}
void FunctionKeyboard::changeRows(int r) {
numRows = r;
@@ -188,13 +186,13 @@ QSize FunctionKeyboard::sizeHint() const {
}
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));
keys.insert( "r0c7", FKey ("Ho", 0, 4112, 0));
keys.insert( "r0c8", FKey ("End", 0, 4113, 0));
keys.insert( "r0c9", FKey ("PU", 0, 4118, 0));
@@ -224,9 +222,9 @@ FunctionKeyboardConfig::FunctionKeyboardConfig(const QString& name, QWidget* par
qWarning("FunctionKeyboardConfig");
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)));
QGroupBox *dimentions = new QGroupBox(2, Qt::Horizontal, tr("Dimentions"), this);
QLabel *l = new QLabel("Rows", dimentions);
@@ -241,13 +239,13 @@ FunctionKeyboardConfig::FunctionKeyboardConfig(const QString& name, QWidget* par
m_labels = new QComboBox(true, editKey);
m_labels->setInsertionPolicy(QComboBox::AtCurrent);
m_labels->insertItem("");
- QStringList files = QDir(QPEApplication::qpeDir() + "pics/console/keys/", "*.png").entryList();
+ QStringList files = QDir( QPEApplication::qpeDir() + "pics/console/keys/", "*.png").entryList();
for (uint i = 0; i < files.count(); i++) {
- m_labels->insertItem(Resource::loadPixmap("console/keys/" + files[i]), files[i]);
+ m_labels->insertItem( Resource::loadPixmap("console/keys/" + files[i]), files[i]);
}
connect (m_labels, SIGNAL(activated(int)), this, SLOT(slotChangeIcon(int)));
connect (m_labels, SIGNAL(textChanged(const QString &)), this, SLOT(slotChangeLabelText(const QString&)));
@@ -278,9 +276,9 @@ void FunctionKeyboardConfig::load (const Profile& prof) {
m_rowBox->setValue(prof.readNumEntry("keb_rows", 2));
m_colBox->setValue(prof.readNumEntry("keb_cols", 10));
/* 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++) {
QString h = "r" + QString::number(i) + "c" + QString::number(j);
QString values = prof.readEntry("keb_" + h);
@@ -292,9 +290,9 @@ void FunctionKeyboardConfig::load (const Profile& prof) {
// load pixmap if used
if (!l[1].isEmpty()) {
- 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] ) );
}
}
}
@@ -307,11 +305,11 @@ void FunctionKeyboardConfig::save (Profile& prof) {
QMap<QString, FKey>::Iterator it;
for ( it = kb->keys.begin(); it != kb->keys.end(); it++) {
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);
prof.writeEntry("keb_" + it.key(), entry);
@@ -332,9 +330,9 @@ void FunctionKeyboardConfig::slotChangeCols(int c) {
void FunctionKeyboardConfig::slotKeyPressed(FKey k, ushort r, ushort c, bool pressed) {
if (!pressed) return;
- selectedHandle = "r" + QString::number(r) +
+ selectedHandle = "r" + QString::number(r) +
"c" + QString::number(c);
selectedRow = r;
selectedCol = c;
@@ -359,9 +357,9 @@ void FunctionKeyboardConfig::slotChangeIcon(int index) {
// is text
m_labels->setEditable(true);
// 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);
kb->keys[selectedHandle].pixFile = "";
delete kb->keys[selectedHandle].pix;
@@ -369,9 +367,9 @@ void FunctionKeyboardConfig::slotChangeIcon(int index) {
// is a pixmap
m_labels->setEditable(false);
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() ) );
}
kb->paintKey(selectedRow, selectedCol);
}
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 @@
#ifndef OPIE_FUNCTION_KEYBOARD_H
#define OPIE_FUNCTION_KEYBOARD_H
#include <qpe/config.h>
+#include <qpe/resource.h>
#include <qpe/qpeapplication.h>
#include <qframe.h>
#include <qpainter.h>
#include <qvbox.h>
@@ -15,15 +16,14 @@
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 ) );
}
};
QString label;