summaryrefslogtreecommitdiff
authorhash <hash>2002-10-22 16:01:27 (UTC)
committer hash <hash>2002-10-22 16:01:27 (UTC)
commit6843a1bd8f8e679c220431f8377abcd2ffd2019b (patch) (side-by-side diff)
treecec84037b60d0ae1e69c69a21e6da2dea3aaf5b6
parentdca783a6564d7d0d8c857cef8586167bc0609647 (diff)
downloadopie-6843a1bd8f8e679c220431f8377abcd2ffd2019b.zip
opie-6843a1bd8f8e679c220431f8377abcd2ffd2019b.tar.gz
opie-6843a1bd8f8e679c220431f8377abcd2ffd2019b.tar.bz2
cant figure out why modifying a private var in FunctionKeyboardConfig causes it to segfault.
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/apps/opie-console/function_keyboard.cpp92
-rw-r--r--noncore/apps/opie-console/function_keyboard.h19
-rw-r--r--noncore/apps/opie-console/mainwindow.cpp6
-rw-r--r--noncore/apps/opie-console/mainwindow.h2
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,9 +1,18 @@
#include "function_keyboard.h"
+
+#include <qpe/resource.h>
+#include <qpe/qpeapplication.h>
#include <qsizepolicy.h>
#include <qevent.h>
#include <qwindowsystem_qws.h>
#include <qapplication.h>
#include <qlayout.h>
+#include <qspinbox.h>
+#include <qlabel.h>
+#include <qcombobox.h>
+#include <qdir.h>
+
+/* FunctionKeyboard {{{1 */
FunctionKeyboard::FunctionKeyboard(QWidget *parent) :
QFrame(parent), numRows(2), numCols(11),
@@ -38,6 +47,18 @@ 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) {
QPainter p(this);
@@ -91,6 +112,14 @@ void FunctionKeyboard::paintKey(int row, int col) {
keys["r" + QString::number(row) + "c" + QString::number(col)].getL()
);
+ 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
+ );
+ }
+
}
void FunctionKeyboard::mousePressEvent(QMouseEvent *e) {
@@ -102,7 +131,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);
+ emit keyPressed(k.getU(), k.getQ(), 0, 1, 0, pressedRow, pressedCol);
}
@@ -115,7 +144,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);
+ emit keyPressed(k.getU(), k.getQ(), 0, 0, 0, pressedRow, pressedCol);
}
}
@@ -157,14 +186,36 @@ void FunctionKeyboard::loadDefaults() {
}
+/* FunctionKeyboardConfig {{{1 */
FunctionKeyboardConfig::FunctionKeyboardConfig(const QString& name, QWidget* parent) :
ProfileDialogKeyWidget(name, parent) {
- 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);
root->addWidget(kb);
@@ -174,9 +225,38 @@ FunctionKeyboardConfig::FunctionKeyboardConfig(const QString& name, QWidget* par
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
@@ -7,8 +7,11 @@
#include <qvbox.h>
#include <qgroupbox.h>
#include <qmap.h>
+#include <qspinbox.h>
+#include <qcombobox.h>
#include "profiledialogwidget.h"
+
class FKey {
public:
@@ -35,6 +38,9 @@ public:
FunctionKeyboard(QWidget *parent = 0);
~FunctionKeyboard();
+ void changeRows(int);
+ void changeCols(int);
+
void paintEvent(QPaintEvent *);
void paintKey(int, int);
void mousePressEvent(QMouseEvent*);
@@ -44,7 +50,7 @@ public:
signals:
- void keyPressed(ushort, ushort, bool, bool, bool);
+ void keyPressed(ushort, ushort, bool, bool, bool, ushort, ushort);
private:
@@ -76,8 +82,19 @@ public:
void load(const Profile&);
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;
+
};
#endif
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
@@ -208,8 +208,8 @@ void MainWindow::initUI() {
m_keyBar->hide();
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 );
addToolBar( m_buttonBar, "Buttons", QMainWindow::Top, TRUE );
@@ -523,7 +523,7 @@ 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
@@ -67,7 +67,7 @@ private slots:
void slotRunScript();
void slotFullscreen();
void slotSessionChanged( Session* );
- void slotKeyReceived(ushort, ushort, bool, bool, bool);
+ void slotKeyReceived(ushort, ushort, bool, bool, bool, ushort, ushort);
private:
void initUI();