summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/opie-console/function_keyboard.cpp151
-rw-r--r--noncore/apps/opie-console/function_keyboard.h5
2 files changed, 108 insertions, 48 deletions
diff --git a/noncore/apps/opie-console/function_keyboard.cpp b/noncore/apps/opie-console/function_keyboard.cpp
index 9d58383..538bed4 100644
--- a/noncore/apps/opie-console/function_keyboard.cpp
+++ b/noncore/apps/opie-console/function_keyboard.cpp
@@ -10,2 +10,3 @@
#include <qspinbox.h>
+#include <qlistbox.h>
#include <qlabel.h>
@@ -22,2 +23,7 @@ FunctionKeyboard::FunctionKeyboard(QWidget *parent) :
+ /*
+ * all the saving/loading is now done in a profile. downside is that you cant modify
+ * the keyboard for all profiles, but must do it on a profile-basis
+ *
+
Config conf("opie-console-keys");
@@ -39,2 +45,3 @@ FunctionKeyboard::FunctionKeyboard(QWidget *parent) :
//qWarning("loaded %d keys", keys.count());
+ */
if (keys.isEmpty()) loadDefaults();
@@ -61,9 +68,2 @@ void FunctionKeyboard::changeCols(int c) {
-/*
-Key getKey(int row, int col) {
-
- return keys[ "r" + QString::number(row) + "c" + QString::number(col) ];
-}
-*/
-
void FunctionKeyboard::paintEvent(QPaintEvent *e) {
@@ -96,4 +96,4 @@ void FunctionKeyboard::paintEvent(QPaintEvent *e) {
- p.drawText(
- c * keyWidth + 1, r * keyHeight + 1,
+ if (keys[handle].pixFile.isEmpty())
+ p.drawText( c * keyWidth + 1, r * keyHeight + 1,
keyWidth, keyHeight,
@@ -101,3 +101,9 @@ void FunctionKeyboard::paintEvent(QPaintEvent *e) {
keys[handle].label
- );
+ );
+ else {
+
+ ushort centerX = c *keyWidth + (keyWidth - keys[handle].pix->width()) / 2;
+ ushort centerY = r * keyHeight + (keyHeight - keys[handle].pix->height()) / 2;
+ p.drawPixmap(centerX, centerY, *keys[handle].pix);
+ }
}
@@ -114,3 +120,6 @@ void FunctionKeyboard::paintKey(uint row, uint col) {
(pressedRow != -1 && pressedCol != -1 ) ? QColor(97,119,155) : QColor(255,255,255));
- p.drawText(
+
+ QString handle ("r" + QString::number(row) + "c" + QString::number(col));
+ if (keys[handle].pixFile.isEmpty())
+ p.drawText(
col * keyWidth + 1, row * keyHeight + 1,
@@ -118,10 +127,17 @@ void FunctionKeyboard::paintKey(uint row, uint col) {
Qt::AlignHCenter | Qt::AlignVCenter,
- keys["r" + QString::number(row) + "c" + QString::number(col)].label
- );
+ keys[handle].label
+ );
+ else {
+
+ ushort centerX = col *keyWidth + (keyWidth - keys[handle].pix->width()) / 2;
+ ushort centerY = row * keyHeight + (keyHeight - keys[handle].pix->height()) / 2;
+ p.drawPixmap(centerX, centerY, *keys[handle].pix);
+ }
- if (row == numRows) {
+ if (col == numCols - 1) {
// sometimes it doesnt draw the last line
- p.drawLine((col+1) * keyWidth -2, row * keyHeight,
- (col+1) * keyWidth -2, (row + 1) * keyHeight
+
+ p.drawLine((col+1) * keyWidth -1, row * keyHeight,
+ (col+1) * keyWidth -1, (row + 1) * keyHeight
);
@@ -175,20 +191,25 @@ void FunctionKeyboard::loadDefaults() {
- /* what keys should be default?
- keys.insert( "r0c0", FKey ("F1", 0, 4144, 0));
- keys.insert( "r0c1", FKey ("F2", 0, 4145, 0));
- keys.insert( "r0c2", FKey ("F3", 0, 4146, 0));
- keys.insert( "r0c3", FKey ("F4", 0, 4147, 0));
- keys.insert( "r0c4", FKey ("F5", 0, 4148, 0));
- keys.insert( "r0c5", FKey ("F6", 0, 4149, 0));
- keys.insert( "r0c6", FKey ("F7", 0, 4150, 0));
- keys.insert( "r0c7", FKey ("F8", 0, 4151, 0));
- keys.insert( "r0c8", FKey ("F9", 0, 4152, 0));
- keys.insert( "r0c9", FKey ("F10", 0, 4153, 0));
- keys.insert( "r0c10", FKey ("F11", 0, 4154, 0));
-
- keys.insert( "r1c7", FKey ("Ho", 0, 4112, 0));
- keys.insert( "r1c8", FKey ("End", 0, 4113, 0));
- keys.insert( "r1c9", FKey ("PU", 0, 4118, 0));
- keys.insert( "r1c10", FKey ("PD", 0, 4119, 0));
- */
+ 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( "r0c7", FKey ("Ho", 0, 4112, 0));
+ keys.insert( "r0c8", FKey ("End", 0, 4113, 0));
+ keys.insert( "r0c9", FKey ("PU", 0, 4118, 0));
+ keys.insert( "r0c10", FKey ("PD", 0, 4119, 0));
+
+ keys.insert( "r1c0", FKey ("F1", 0, 4144, 0));
+ keys.insert( "r1c1", FKey ("F2", 0, 4145, 0));
+ keys.insert( "r1c2", FKey ("F3", 0, 4146, 0));
+ keys.insert( "r1c3", FKey ("F4", 0, 4147, 0));
+ keys.insert( "r1c4", FKey ("F5", 0, 4148, 0));
+ keys.insert( "r1c5", FKey ("F6", 0, 4149, 0));
+ keys.insert( "r1c6", FKey ("F7", 0, 4150, 0));
+ keys.insert( "r1c7", FKey ("F8", 0, 4151, 0));
+ keys.insert( "r1c8", FKey ("F9", 0, 4152, 0));
+ keys.insert( "r1c9", FKey ("F10", 0, 4153, 0));
+ keys.insert( "r1c10", FKey ("F11", 0, 4154, 0));
+
@@ -199,4 +220,4 @@ void FunctionKeyboard::loadDefaults() {
FunctionKeyboardConfig::FunctionKeyboardConfig(const QString& name, QWidget* parent, const char* na )
- : ProfileDialogKeyWidget(name, parent, na),
- selectedRow(0), selectedCol(0)
+ : ProfileDialogKeyWidget(name, parent, na),
+ selectedRow(0), selectedCol(0)
{
@@ -221,3 +242,3 @@ FunctionKeyboardConfig::FunctionKeyboardConfig(const QString& name, QWidget* par
m_labels->setInsertionPolicy(QComboBox::AtCurrent);
- m_labels->insertItem("custom");
+ m_labels->insertItem("");
@@ -227,3 +248,3 @@ FunctionKeyboardConfig::FunctionKeyboardConfig(const QString& name, QWidget* par
- m_labels->insertItem(Resource::loadPixmap("console/keys/" + files[i]));
+ m_labels->insertItem(Resource::loadPixmap("console/keys/" + files[i]), files[i]);
}
@@ -232,6 +253,15 @@ FunctionKeyboardConfig::FunctionKeyboardConfig(const QString& name, QWidget* par
- l = new QLabel("KeyValue", editKey);
- m_qvalues = new QComboBox(false, editKey);
- m_qvalues->setInsertionPolicy(QComboBox::AtCurrent);
- m_qvalues->insertItem("custom");
+ l = new QLabel("Q Keycode", editKey);
+ m_qvalues = new QComboBox(true, editKey);
+ m_qvalues->setInsertionPolicy(QComboBox::AtTop);
+ m_qvalues->setDuplicatesEnabled(false);
+ m_qvalues->insertItem("");
+ connect (m_qvalues, SIGNAL(textChanged(const QString &)), this, SLOT(slotChangeQCode(const QString&)));
+
+ l = new QLabel("Unicode Value", editKey);
+ m_uniValues = new QComboBox(true, editKey);
+ m_uniValues->setInsertionPolicy(QComboBox::AtTop);
+ m_uniValues->setDuplicatesEnabled(false);
+ m_uniValues->insertItem("");
+ connect (m_uniValues, SIGNAL(textChanged(const QString &)), this, SLOT(slotChangeUnicode(const QString&)));
@@ -261,3 +291,8 @@ void FunctionKeyboardConfig::load (const Profile& prof) {
kb->keys[h] = FKey(l[0], l[1], l[2].toInt(), l[3].toInt());
- //qWarning("loading key... %s %s %s %d %d", values.ascii(), l[0].ascii(), l[1].ascii(), l[2].toInt(), l[3].toInt());
+
+ // load pixmap if used
+ if (!l[1].isEmpty()) {
+
+ kb->keys[h].pix = new QPixmap(QPEApplication::qpeDir() + "pics/console/keys/" + l[1]);
+ }
}
@@ -300,3 +335,6 @@ void FunctionKeyboardConfig::slotKeyPressed(FKey k, ushort r, ushort c, bool pre
- selectedRow = r, selectedCol = c;
+ selectedHandle = "r" + QString::number(r) +
+ "c" + QString::number(c);
+ selectedRow = r;
+ selectedCol = c;
@@ -304,8 +342,14 @@ void FunctionKeyboardConfig::slotKeyPressed(FKey k, ushort r, ushort c, bool pre
+ m_labels->setEditable(true);
m_labels->setCurrentItem(0);
m_labels->changeItem(k.label, 0);
- m_labels->setEditable(true);
+ } else {
+
+ // any better way to select the pixmap?
+ m_labels->setCurrentItem((m_labels->listBox())->index((m_labels->listBox())->findItem(kb->keys[selectedHandle].pixFile)));
+ m_labels->setEditable(false);
}
m_qvalues->changeItem(QString::number(k.qcode), 0);
+ m_uniValues->changeItem(QString::number(k.unicode), 0);
}
@@ -320,2 +364,5 @@ void FunctionKeyboardConfig::slotChangeIcon(int index) {
+ kb->keys[selectedHandle].pixFile = "";
+ delete kb->keys[selectedHandle].pix;
+
} else {
@@ -324,3 +371,6 @@ void FunctionKeyboardConfig::slotChangeIcon(int index) {
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->paintKey(selectedRow, selectedCol);
}
@@ -328,4 +378,3 @@ void FunctionKeyboardConfig::slotChangeLabelText(const QString &label) {
- kb->keys["r" + QString::number(selectedRow) +
- "c" + QString::number(selectedCol)].label = label;
+ kb->keys[selectedHandle].label = label;
@@ -333 +382,9 @@ void FunctionKeyboardConfig::slotChangeLabelText(const QString &label) {
}
+void FunctionKeyboardConfig::slotChangeQCode(const QString& qcode) {
+
+ kb->keys[selectedHandle].qcode = qcode.toUInt();
+}
+void FunctionKeyboardConfig::slotChangeUnicode(const QString& uni) {
+
+ kb->keys[selectedHandle].unicode = uni.toUInt();
+}
diff --git a/noncore/apps/opie-console/function_keyboard.h b/noncore/apps/opie-console/function_keyboard.h
index 496d932..7f313d6 100644
--- a/noncore/apps/opie-console/function_keyboard.h
+++ b/noncore/apps/opie-console/function_keyboard.h
@@ -100,2 +100,4 @@ private slots:
void slotChangeLabelText(const QString &);
+ void slotChangeQCode(const QString &);
+ void slotChangeUnicode(const QString &);
@@ -103,2 +105,3 @@ private:
+ QString selectedHandle;
ushort selectedRow, selectedCol;
@@ -107,3 +110,3 @@ private:
QSpinBox *m_rowBox, *m_colBox;
- QComboBox *m_labels, *m_qvalues;
+ QComboBox *m_labels, *m_qvalues, *m_uniValues;