| -rw-r--r-- | noncore/apps/opie-console/function_keyboard.cpp | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/noncore/apps/opie-console/function_keyboard.cpp b/noncore/apps/opie-console/function_keyboard.cpp index 71cdea8..9d58383 100644 --- a/noncore/apps/opie-console/function_keyboard.cpp +++ b/noncore/apps/opie-console/function_keyboard.cpp @@ -175,58 +175,53 @@ 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)); */ } /* FunctionKeyboardConfig {{{1 */ -<<<<<<< function_keyboard.cpp -FunctionKeyboardConfig::FunctionKeyboardConfig(const QString& name, QWidget* parent) : - ProfileDialogKeyWidget(name, parent), +FunctionKeyboardConfig::FunctionKeyboardConfig(const QString& name, QWidget* parent, const char* na ) + : ProfileDialogKeyWidget(name, parent, na), 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); 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(true, editKey); m_labels->setInsertionPolicy(QComboBox::AtCurrent); m_labels->insertItem("custom"); QStringList files = QDir(QPEApplication::qpeDir() + "pics/console/keys/", "*.png").entryList(); for (uint i = 0; i < files.count(); i++) { |