summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/apps/opie-console/function_keyboard.cpp139
-rw-r--r--noncore/apps/opie-console/function_keyboard.h33
-rw-r--r--noncore/apps/opie-console/mainwindow.cpp12
-rw-r--r--noncore/apps/opie-console/mainwindow.h3
4 files changed, 136 insertions, 51 deletions
diff --git a/noncore/apps/opie-console/function_keyboard.cpp b/noncore/apps/opie-console/function_keyboard.cpp
index b2f1c78..71cdea8 100644
--- a/noncore/apps/opie-console/function_keyboard.cpp
+++ b/noncore/apps/opie-console/function_keyboard.cpp
@@ -33,7 +33,7 @@ FunctionKeyboard::FunctionKeyboard(QWidget *parent) :
keys.insert(
handle,
- FKey (value_list[0], value_list[1].toUShort(), value_list[2].toUShort())
+ FKey (value_list[0], value_list[1], value_list[2].toUShort(), value_list[3].toUShort())
);
}
//qWarning("loaded %d keys", keys.count());
@@ -59,6 +59,13 @@ void FunctionKeyboard::changeCols(int c) {
repaint(false);
}
+/*
+Key getKey(int row, int col) {
+
+ return keys[ "r" + QString::number(row) + "c" + QString::number(col) ];
+}
+*/
+
void FunctionKeyboard::paintEvent(QPaintEvent *e) {
QPainter p(this);
@@ -91,14 +98,14 @@ void FunctionKeyboard::paintEvent(QPaintEvent *e) {
c * keyWidth + 1, r * keyHeight + 1,
keyWidth, keyHeight,
Qt::AlignHCenter | Qt::AlignVCenter,
- keys[handle].getL()
+ keys[handle].label
);
}
}
}
}
-void FunctionKeyboard::paintKey(int row, int col) {
+void FunctionKeyboard::paintKey(uint row, uint col) {
QPainter p(this);
@@ -109,7 +116,7 @@ void FunctionKeyboard::paintKey(int row, int col) {
col * keyWidth + 1, row * keyHeight + 1,
keyWidth, keyHeight,
Qt::AlignHCenter | Qt::AlignVCenter,
- keys["r" + QString::number(row) + "c" + QString::number(col)].getL()
+ keys["r" + QString::number(row) + "c" + QString::number(col)].label
);
if (row == numRows) {
@@ -131,7 +138,7 @@ void FunctionKeyboard::mousePressEvent(QMouseEvent *e) {
// emit that sucker!
FKey k = keys["r" + QString::number(pressedRow) + "c" + QString::number(pressedCol)];
- emit keyPressed(k.getU(), k.getQ(), 0, 1, 0, pressedRow, pressedCol);
+ emit keyPressed(k, pressedRow, pressedCol, 1);
}
@@ -144,7 +151,7 @@ void FunctionKeyboard::mouseReleaseEvent(QMouseEvent *) {
paintKey(row, col);
FKey k = keys["r" + QString::number(row) + "c" + QString::number(col)];
- emit keyPressed(k.getU(), k.getQ(), 0, 0, 0, pressedRow, pressedCol);
+ emit keyPressed(k, row, col, 0);
}
}
@@ -166,34 +173,44 @@ QSize FunctionKeyboard::sizeHint() const {
void FunctionKeyboard::loadDefaults() {
- /* what keys should be default? */
- keys.insert( "r0c0", FKey ("F1", 4144, 0));
- keys.insert( "r0c1", FKey ("F2", 4145, 0));
- keys.insert( "r0c2", FKey ("F3", 4145, 0));
- keys.insert( "r0c3", FKey ("F4", 4146, 0));
- keys.insert( "r0c4", FKey ("F5", 4147, 0));
- keys.insert( "r0c5", FKey ("F6", 4148, 0));
- keys.insert( "r0c6", FKey ("F7", 4149, 0));
- keys.insert( "r0c7", FKey ("F8", 4150, 0));
- keys.insert( "r0c8", FKey ("F9", 4151, 0));
- keys.insert( "r0c9", FKey ("F10", 4152, 0));
- keys.insert( "r0c10", FKey ("F11", 4153, 0));
-
- keys.insert( "r1c7", FKey ("Ho", 4112, 0));
- keys.insert( "r1c8", FKey ("End", 4113, 0));
- keys.insert( "r1c9", FKey ("PU", 4118, 0));
- keys.insert( "r1c10", FKey ("PD", 4119, 0));
+ /* 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));
+ */
}
/* FunctionKeyboardConfig {{{1 */
+<<<<<<< function_keyboard.cpp
+FunctionKeyboardConfig::FunctionKeyboardConfig(const QString& name, QWidget* parent) :
+ ProfileDialogKeyWidget(name, parent),
+ selectedRow(0), selectedCol(0)
+{
+=======
FunctionKeyboardConfig::FunctionKeyboardConfig(const QString& name, QWidget* parent, const char* na )
: ProfileDialogKeyWidget(name, parent, na) {
qWarning("FunctionKeyboardConfig");
+>>>>>>> 1.11
kb = new FunctionKeyboard(this);
+ 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);
@@ -205,9 +222,9 @@ FunctionKeyboardConfig::FunctionKeyboardConfig(const QString& name, QWidget* par
QGroupBox *editKey = new QGroupBox(2, Qt::Horizontal, tr("Edit Key"), this);
l = new QLabel("Label", editKey);
- /*
- m_labels = new QComboBox(false, editKey);
- labels->insertItem("text");
+ m_labels = new QComboBox(true, editKey);
+ m_labels->setInsertionPolicy(QComboBox::AtCurrent);
+ m_labels->insertItem("custom");
QStringList files = QDir(QPEApplication::qpeDir() + "pics/console/keys/", "*.png").entryList();
@@ -216,7 +233,12 @@ FunctionKeyboardConfig::FunctionKeyboardConfig(const QString& name, QWidget* par
m_labels->insertItem(Resource::loadPixmap("console/keys/" + files[i]));
}
connect (m_labels, SIGNAL(activated(int)), this, SLOT(slotChangeIcon(int)));
- */
+ connect (m_labels, SIGNAL(textChanged(const QString &)), this, SLOT(slotChangeLabelText(const QString&)));
+
+ l = new QLabel("KeyValue", editKey);
+ m_qvalues = new QComboBox(false, editKey);
+ m_qvalues->setInsertionPolicy(QComboBox::AtCurrent);
+ m_qvalues->insertItem("custom");
QVBoxLayout *root = new QVBoxLayout(this, 2);
root->addWidget(kb);
@@ -227,12 +249,43 @@ FunctionKeyboardConfig::~FunctionKeyboardConfig() {
}
void FunctionKeyboardConfig::load (const Profile& prof) {
- //int i = prof.readNumEntry("keb_rows", 1);
- m_rowBox->setValue( 2 );
+
+ 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 j = 0; j <= m_colBox->value() -1; j++) {
+
+ QString h = "r" + QString::number(i) + "c" + QString::number(j);
+ QString values = prof.readEntry("keb_" + h);
+
+ if (!values.isEmpty()) {
+
+ QStringList l = QStringList::split(QChar('|'), values, TRUE);
+ 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());
+ }
+ }
+
}
void FunctionKeyboardConfig::save (Profile& prof) {
prof.writeEntry("keb_rows", m_rowBox->value());
+ prof.writeEntry("keb_cols", m_colBox->value());
+
+ 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::number(k.unicode);
+
+ prof.writeEntry("keb_" + it.key(), entry);
+
+ }
}
void FunctionKeyboardConfig::slotChangeRows(int r) {
@@ -246,18 +299,40 @@ void FunctionKeyboardConfig::slotChangeCols(int c) {
kb->changeCols(c);
}
-void FunctionKeyboardConfig::slotKeyPressed(ushort, ushort, bool, bool, bool, ushort row, ushort col) {
+void FunctionKeyboardConfig::slotKeyPressed(FKey k, ushort r, ushort c, bool pressed) {
+
+ if (!pressed) return;
+ selectedRow = r, selectedCol = c;
+
+ if (k.pixFile.isEmpty()) {
+
+ m_labels->setCurrentItem(0);
+ m_labels->changeItem(k.label, 0);
+ m_labels->setEditable(true);
+
+ }
+ m_qvalues->changeItem(QString::number(k.qcode), 0);
}
void FunctionKeyboardConfig::slotChangeIcon(int index) {
if (index == 0) {
// is text
- //if(!labels->editable()) labels->setEditable(true);
+ m_labels->setEditable(true);
+ // why tf does the text get erased unless i do this?
+ m_labels->changeItem(m_labels->text(0), 0);
+
} else {
// is a pixmap
- //if (labels->editable()) labels->setEditable(false);
+ m_labels->setEditable(false);
+ }
}
+void FunctionKeyboardConfig::slotChangeLabelText(const QString &label) {
+
+ kb->keys["r" + QString::number(selectedRow) +
+ "c" + QString::number(selectedCol)].label = label;
+
+ kb->paintKey(selectedRow, selectedCol);
}
diff --git a/noncore/apps/opie-console/function_keyboard.h b/noncore/apps/opie-console/function_keyboard.h
index 05b991d..496d932 100644
--- a/noncore/apps/opie-console/function_keyboard.h
+++ b/noncore/apps/opie-console/function_keyboard.h
@@ -2,6 +2,7 @@
#define OPIE_FUNCTION_KEYBOARD_H
#include <qpe/config.h>
+#include <qpe/qpeapplication.h>
#include <qframe.h>
#include <qpainter.h>
#include <qvbox.h>
@@ -12,21 +13,22 @@
#include "profiledialogwidget.h"
-class FKey {
-
-public:
+struct FKey {
FKey(): qcode(0), unicode(0) {};
- FKey(const QString &l, ushort q, ushort u): label(l), qcode(q), unicode(u) {};
+ FKey(const QString &l, const QString &f, ushort q, ushort u):
+ label(l), pixFile(f), qcode(q), unicode(u) {
- QString getL() { return label; }
- ushort getQ() { return qcode; }
- ushort getU() { return unicode; }
+ if (!f.isEmpty()) {
+ pix = new QPixmap (QPEApplication::qpeDir() + "pics/console/keys/" + f);
-private:
+ }
+ };
QString label;
+ QPixmap *pix;
+ QString pixFile;
ushort qcode;
ushort unicode;
};
@@ -38,11 +40,15 @@ public:
FunctionKeyboard(QWidget *parent = 0);
~FunctionKeyboard();
+ friend class FunctionKeyboardConfig;
+
void changeRows(int);
void changeCols(int);
+ //Key getKey(int, int);
+
void paintEvent(QPaintEvent *);
- void paintKey(int, int);
+ void paintKey(uint, uint);
void mousePressEvent(QMouseEvent*);
void mouseReleaseEvent(QMouseEvent*);
void resizeEvent(QResizeEvent*);
@@ -50,7 +56,7 @@ public:
signals:
- void keyPressed(ushort, ushort, bool, bool, bool, ushort, ushort);
+ void keyPressed(FKey, ushort, ushort, bool);
private:
@@ -87,16 +93,19 @@ public:
private slots:
- void slotKeyPressed(ushort, ushort, bool, bool, bool, ushort, ushort);
+ void slotKeyPressed(FKey, ushort, ushort, bool);
void slotChangeRows(int);
void slotChangeCols(int);
void slotChangeIcon(int);
+ void slotChangeLabelText(const QString &);
private:
+ ushort selectedRow, selectedCol;
+
FunctionKeyboard *kb;
QSpinBox *m_rowBox, *m_colBox;
- QComboBox *m_labels;
+ QComboBox *m_labels, *m_qvalues;
};
diff --git a/noncore/apps/opie-console/mainwindow.cpp b/noncore/apps/opie-console/mainwindow.cpp
index c1020fa..8e529a3 100644
--- a/noncore/apps/opie-console/mainwindow.cpp
+++ b/noncore/apps/opie-console/mainwindow.cpp
@@ -208,17 +208,19 @@ void MainWindow::initUI() {
m_keyBar->hide();
m_kb = new FunctionKeyboard(m_keyBar);
- connect(m_kb, SIGNAL(keyPressed(ushort, ushort, bool, bool, bool, ushort, ushort)),
- this, SLOT(slotKeyReceived(ushort, ushort, bool, bool, bool, ushort, ushort)));
+ connect(m_kb, SIGNAL(keyPressed(FKey, ushort, ushort, bool)),
+ this, SLOT(slotKeyReceived(FKey, ushort, ushort, bool)));
m_buttonBar = new QToolBar( this );
addToolBar( m_buttonBar, "Buttons", QMainWindow::Top, TRUE );
m_buttonBar->setHorizontalStretchable( TRUE );
m_buttonBar->hide();
+ /*
m_qb = new QuickButton( m_buttonBar );
connect( m_qb, SIGNAL( keyPressed( ushort, ushort, bool, bool, bool) ),
this, SLOT( slotKeyReceived( ushort, ushort, bool, bool, bool) ) );
+ */
m_connect->setEnabled( false );
@@ -520,9 +522,7 @@ void MainWindow::slotFullscreen() {
}
-void MainWindow::slotKeyReceived(ushort u, ushort q, bool, bool pressed, bool, ushort, ushort) {
-
- //qWarning("unicode: %x, qkey: %x, %s", u, q, pressed ? "pressed" : "released");
+void MainWindow::slotKeyReceived(FKey k, ushort, ushort, bool pressed) {
if ( m_curSession ) {
@@ -531,7 +531,7 @@ void MainWindow::slotKeyReceived(ushort u, ushort q, bool, bool pressed, bool, u
if (pressed) state = QEvent::KeyPress;
else state = QEvent::KeyRelease;
- QKeyEvent ke(state, q, u, 0, QString(QChar(u)));
+ QKeyEvent ke(state, k.qcode, k.unicode, 0, QString(QChar(k.unicode)));
// where should i send this event? doesnt work sending it here
QApplication::sendEvent((QObject *)m_curSession->widget(), &ke);
diff --git a/noncore/apps/opie-console/mainwindow.h b/noncore/apps/opie-console/mainwindow.h
index 68f6fa8..0f52e76 100644
--- a/noncore/apps/opie-console/mainwindow.h
+++ b/noncore/apps/opie-console/mainwindow.h
@@ -20,6 +20,7 @@ class TabWidget;
class ProfileManager;
class Profile;
class FunctionKeyboard;
+class FKey;
class QuickButton;
class MainWindow : public QMainWindow {
@@ -67,7 +68,7 @@ private slots:
void slotRunScript();
void slotFullscreen();
void slotSessionChanged( Session* );
- void slotKeyReceived(ushort, ushort, bool, bool, bool, ushort, ushort);
+ void slotKeyReceived(FKey, ushort, ushort, bool);
private:
void initUI();