-rw-r--r-- | noncore/apps/opie-console/function_keyboard.cpp | 92 | ||||
-rw-r--r-- | noncore/apps/opie-console/function_keyboard.h | 19 | ||||
-rw-r--r-- | noncore/apps/opie-console/mainwindow.cpp | 6 | ||||
-rw-r--r-- | noncore/apps/opie-console/mainwindow.h | 2 |
4 files changed, 108 insertions, 11 deletions
diff --git a/noncore/apps/opie-console/function_keyboard.cpp b/noncore/apps/opie-console/function_keyboard.cpp index 100fdfc..977a384 100644 --- a/noncore/apps/opie-console/function_keyboard.cpp +++ b/noncore/apps/opie-console/function_keyboard.cpp @@ -1,3 +1,6 @@ #include "function_keyboard.h" + +#include <qpe/resource.h> +#include <qpe/qpeapplication.h> #include <qsizepolicy.h> #include <qevent.h> @@ -5,4 +8,10 @@ #include <qapplication.h> #include <qlayout.h> +#include <qspinbox.h> +#include <qlabel.h> +#include <qcombobox.h> +#include <qdir.h> + +/* FunctionKeyboard {{{1 */ FunctionKeyboard::FunctionKeyboard(QWidget *parent) : @@ -39,4 +48,16 @@ FunctionKeyboard::~FunctionKeyboard() { } +void FunctionKeyboard::changeRows(int r) { + + numRows = r; + repaint(false); +} +void FunctionKeyboard::changeCols(int c) { + + numCols = c; + keyWidth = (double)width()/numCols; // have to reset this thing too + repaint(false); +} + void FunctionKeyboard::paintEvent(QPaintEvent *e) { @@ -92,4 +113,12 @@ void FunctionKeyboard::paintKey(int row, int col) { ); + if (row == numRows) { + + // sometimes it doesnt draw the last line + p.drawLine((col+1) * keyWidth -2, row * keyHeight, + (col+1) * keyWidth -2, (row + 1) * keyHeight + ); + } + } @@ -103,5 +132,5 @@ 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); + emit keyPressed(k.getU(), k.getQ(), 0, 1, 0, pressedRow, pressedCol); } @@ -116,5 +145,5 @@ void FunctionKeyboard::mouseReleaseEvent(QMouseEvent *) { FKey k = keys["r" + QString::number(row) + "c" + QString::number(col)]; - emit keyPressed(k.getU(), k.getQ(), 0, 0, 0); + emit keyPressed(k.getU(), k.getQ(), 0, 0, 0, pressedRow, pressedCol); } @@ -158,4 +187,5 @@ void FunctionKeyboard::loadDefaults() { } +/* FunctionKeyboardConfig {{{1 */ FunctionKeyboardConfig::FunctionKeyboardConfig(const QString& name, QWidget* parent) : @@ -163,7 +193,28 @@ FunctionKeyboardConfig::FunctionKeyboardConfig(const QString& name, QWidget* par - FunctionKeyboard *kb = new FunctionKeyboard(this); + kb = new FunctionKeyboard(this); + QGroupBox *dimentions = new QGroupBox(2, Qt::Horizontal, tr("Dimentions"), this); - QGroupBox *editKey = new QGroupBox(2, Qt::Horizontal, tr("Edit"), this); + QLabel *l = new QLabel("Rows", dimentions); + QSpinBox *m_rowBox = new QSpinBox(1, 15, 1, dimentions); + connect (m_rowBox, SIGNAL(valueChanged(int)), this, SLOT(slotChangeRows(int))); + l = new QLabel("Columns", dimentions); + m_colBox = new QSpinBox(1, 15, 1, dimentions); + connect (m_colBox, SIGNAL(valueChanged(int)), this, SLOT(slotChangeCols(int))); + + 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"); + + 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])); + } + connect (m_labels, SIGNAL(activated(int)), this, SLOT(slotChangeIcon(int))); + */ QVBoxLayout *root = new QVBoxLayout(this, 2); @@ -175,8 +226,37 @@ FunctionKeyboardConfig::~FunctionKeyboardConfig() { } -void FunctionKeyboardConfig::load (const Profile& ) { +void FunctionKeyboardConfig::load (const Profile& prof) { + int i = prof.readNumEntry("keb_rows", 1); + //m_rowBox->setValue(i); +} +void FunctionKeyboardConfig::save (Profile& prof) { + + //prof.writeEntry("keb_rows", m_rowBox->value()); + +} +void FunctionKeyboardConfig::slotChangeRows(int r) { + + kb->changeRows(r); + + // have to do this so the whole thing gets redrawn + kb->hide(); kb->show(); +} +void FunctionKeyboardConfig::slotChangeCols(int c) { + + kb->changeCols(c); +} +void FunctionKeyboardConfig::slotKeyPressed(ushort, ushort, bool, bool, bool, ushort row, ushort col) { } -void FunctionKeyboardConfig::save (Profile& ) { +void FunctionKeyboardConfig::slotChangeIcon(int index) { + if (index == 0) { + + // is text + //if(!labels->editable()) labels->setEditable(true); + } else { + + // is a pixmap + //if (labels->editable()) labels->setEditable(false); + } } diff --git a/noncore/apps/opie-console/function_keyboard.h b/noncore/apps/opie-console/function_keyboard.h index 2be74b4..efeff6d 100644 --- a/noncore/apps/opie-console/function_keyboard.h +++ b/noncore/apps/opie-console/function_keyboard.h @@ -8,6 +8,9 @@ #include <qgroupbox.h> #include <qmap.h> +#include <qspinbox.h> +#include <qcombobox.h> #include "profiledialogwidget.h" + class FKey { @@ -36,4 +39,7 @@ public: ~FunctionKeyboard(); + void changeRows(int); + void changeCols(int); + void paintEvent(QPaintEvent *); void paintKey(int, int); @@ -45,5 +51,5 @@ public: signals: - void keyPressed(ushort, ushort, bool, bool, bool); + void keyPressed(ushort, ushort, bool, bool, bool, ushort, ushort); private: @@ -77,6 +83,17 @@ public: void save(Profile&); +private slots: + + void slotKeyPressed(ushort, ushort, bool, bool, bool, ushort, ushort); + void slotChangeRows(int); + void slotChangeCols(int); + void slotChangeIcon(int); + private: + FunctionKeyboard *kb; + QSpinBox *m_rowBox, *m_colBox; + QComboBox *m_labels; + }; diff --git a/noncore/apps/opie-console/mainwindow.cpp b/noncore/apps/opie-console/mainwindow.cpp index 89f3516..30dd21c 100644 --- a/noncore/apps/opie-console/mainwindow.cpp +++ b/noncore/apps/opie-console/mainwindow.cpp @@ -209,6 +209,6 @@ void MainWindow::initUI() { m_kb = new FunctionKeyboard(m_keyBar); - connect(m_kb, SIGNAL(keyPressed(ushort, ushort, bool, bool, bool)), - this, SLOT(slotKeyReceived(ushort, ushort, bool, bool, bool))); + connect(m_kb, SIGNAL(keyPressed(ushort, ushort, bool, bool, bool, ushort, ushort)), + this, SLOT(slotKeyReceived(ushort, ushort, bool, bool, bool, ushort, ushort))); m_buttonBar = new QToolBar( this ); @@ -524,5 +524,5 @@ void MainWindow::slotFullscreen() { -void MainWindow::slotKeyReceived(ushort u, ushort q, bool, bool pressed, bool) { +void MainWindow::slotKeyReceived(ushort u, ushort q, bool, bool pressed, bool, ushort, ushort) { //qWarning("unicode: %x, qkey: %x, %s", u, q, pressed ? "pressed" : "released"); diff --git a/noncore/apps/opie-console/mainwindow.h b/noncore/apps/opie-console/mainwindow.h index cc4ef76..68f6fa8 100644 --- a/noncore/apps/opie-console/mainwindow.h +++ b/noncore/apps/opie-console/mainwindow.h @@ -68,5 +68,5 @@ private slots: void slotFullscreen(); void slotSessionChanged( Session* ); - void slotKeyReceived(ushort, ushort, bool, bool, bool); + void slotKeyReceived(ushort, ushort, bool, bool, bool, ushort, ushort); private: |