added esc and F12 in default configuration

1 files changed, 3 insertions, 1 deletions

diff --git a/noncore/apps/opie-console/function_keyboard.cpp b/noncore/apps/opie-console/function_keyboard.cpp
index 5f3b5ec..e7f3c21 100644
--- a/noncore/apps/opie-console/function_keyboard.cpp
+++ b/noncore/apps/opie-console/function_keyboard.cpp
@@ -1,65 +1,65 @@
 #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 <qlistbox.h>
 #include <qlabel.h>
 #include <qcombobox.h>
 #include <qdir.h>
 
 #define DEFAULT_ROWS 2
-#define DEFAULT_COLS 11
+#define DEFAULT_COLS 12
 
 /* FunctionKeyboard {{{1 */
 
 FunctionKeyboard::FunctionKeyboard(QWidget *parent) :
     QFrame(parent), numRows(DEFAULT_ROWS), numCols(DEFAULT_COLS),
     pressedRow(0), pressedCol(0) {
 
     setSizePolicy(QSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed));
 
     /*
      * 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");
     conf.setGroup("keys");
     for (uint r = 0; r < numRows; r++)
         for (uint c = 0; c < numCols; c++) {
 
             QString handle = "r" + QString::number(r) + "c" + QString::number(c);
             QStringList value_list = conf.readListEntry( handle, '|');
 
             if (value_list.isEmpty()) continue;
 
             keys.insert(
 
                  handle,
                  FKey (value_list[0], value_list[1], value_list[2].toUShort(), value_list[3].toUShort())
             );
         }
     //qWarning("loaded %d keys", keys.count());
     */
     if (keys.isEmpty()) loadDefaults();
 
 
 
 }
 
 FunctionKeyboard::~FunctionKeyboard() {}
 
 void FunctionKeyboard::changeRows(int r) {
 
     numRows = r;
 
     // have to do this so the whole thing gets redrawn
     hide(); show();
 }
 void FunctionKeyboard::changeCols(int c) {
@@ -195,108 +195,110 @@ void FunctionKeyboard::mousePressEvent(QMouseEvent *e) {
 
 }
 
 void FunctionKeyboard::mouseReleaseEvent(QMouseEvent *) {
 
     if (pressedRow != -1 && pressedRow != -1) {
 
         int row = pressedRow; pressedRow = -1;
         int col = pressedCol; pressedCol = -1;
         paintKey(row, col);
 
         FKey k = keys["r" + QString::number(row) + "c" + QString::number(col)];
         emit keyPressed(k, row, col, 0);
     }
 
 }
 
 
 void FunctionKeyboard::resizeEvent(QResizeEvent*) {
 
     /* set he default font height/width */
     QFontMetrics fm=fontMetrics();
     keyHeight = fm.lineSpacing() + 2;
     keyWidth = (double)width()/numCols;
 
 }
 
 QSize FunctionKeyboard::sizeHint() const {
 
     return QSize(width(), keyHeight * numRows + 1);
 }
 
 void FunctionKeyboard::loadDefaults() {
 
     numRows = DEFAULT_ROWS;
     numCols = DEFAULT_COLS;
     keyWidth = (double)width()/numCols; // have to reset this thing too
 
     keys.insert( "r0c0", FKey ("Enter", "enter", Qt::Key_Enter, 0));
     keys.insert( "r0c1", FKey ("Space", "space", Qt::Key_Space, Qt::Key_Space));
     keys.insert( "r0c2", FKey ("Tab", "tab", Qt::Key_Tab, 0));
     keys.insert( "r0c3", FKey ("Up", "up", Qt::Key_Up, 0));
     keys.insert( "r0c4", FKey ("Down", "down", 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( "r0c11", FKey ("esc", 0, Qt::Key_Escape, 0xfff));
 
     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));
+    keys.insert( "r1c11", FKey ("F12", 0, 4155, 0));
 
 
 }
 
 /* FunctionKeyboardConfig {{{1 */
 
 FunctionKeyboardConfig::FunctionKeyboardConfig(const QString& name, QWidget* parent, const char* na )
     : ProfileDialogKeyWidget(name, parent, na),
       selectedRow(0), selectedCol(0)
 {
     qWarning("FunctionKeyboardConfig");
 
 
     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("");
 
     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]), 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("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);