summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/opie-console/function_keyboard.cpp22
1 files changed, 0 insertions, 22 deletions
diff --git a/noncore/apps/opie-console/function_keyboard.cpp b/noncore/apps/opie-console/function_keyboard.cpp
index 389618c..c3209f4 100644
--- a/noncore/apps/opie-console/function_keyboard.cpp
+++ b/noncore/apps/opie-console/function_keyboard.cpp
@@ -1,89 +1,67 @@
1#include "function_keyboard.h" 1#include "function_keyboard.h"
2 2
3/* QT */ 3/* QT */
4#include <qlayout.h> 4#include <qlayout.h>
5#include <qlistbox.h> 5#include <qlistbox.h>
6#include <qlabel.h> 6#include <qlabel.h>
7#include <qdir.h> 7#include <qdir.h>
8 8
9#define DEFAULT_ROWS 2 9#define DEFAULT_ROWS 2
10#define DEFAULT_COLS 12 10#define DEFAULT_COLS 12
11 11
12/* FunctionKeyboard {{{1 */ 12/* FunctionKeyboard {{{1 */
13 13
14FunctionKeyboard::FunctionKeyboard(QWidget *parent) : 14FunctionKeyboard::FunctionKeyboard(QWidget *parent) :
15 QFrame(parent), numRows(DEFAULT_ROWS), numCols(DEFAULT_COLS), 15 QFrame(parent), numRows(DEFAULT_ROWS), numCols(DEFAULT_COLS),
16 pressedRow(0), pressedCol(0) { 16 pressedRow(0), pressedCol(0) {
17 17
18 setSizePolicy(QSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed)); 18 setSizePolicy(QSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed));
19 19
20 /*
21 * all the saving/loading is now done in a profile. downside is that you cant modify
22 * the keyboard for all profiles, but must do it on a profile-basis
23 *
24
25 Config conf("opie-console-keys");
26 conf.setGroup("keys");
27 for (uint r = 0; r < numRows; r++)
28 for (uint c = 0; c < numCols; c++) {
29
30 QString handle = "r" + QString::number(r) + "c" + QString::number(c);
31 QStringList value_list = conf.readListEntry( handle, '|');
32
33 if (value_list.isEmpty()) continue;
34
35 keys.insert(
36
37 handle,
38 FKey (value_list[0], value_list[1], value_list[2].toUShort(), value_list[3].toUShort())
39 );
40 }
41 */
42 if (keys.isEmpty()) loadDefaults(); 20 if (keys.isEmpty()) loadDefaults();
43 21
44 22
45 23
46} 24}
47 25
48FunctionKeyboard::~FunctionKeyboard() {} 26FunctionKeyboard::~FunctionKeyboard() {}
49 27
50void FunctionKeyboard::changeRows(int r) { 28void FunctionKeyboard::changeRows(int r) {
51 29
52 numRows = r; 30 numRows = r;
53 31
54 // have to do this so the whole thing gets redrawn 32 // have to do this so the whole thing gets redrawn
55 hide(); show(); 33 hide(); show();
56} 34}
57void FunctionKeyboard::changeCols(int c) { 35void FunctionKeyboard::changeCols(int c) {
58 36
59 numCols = c; 37 numCols = c;
60 keyWidth = (double)width()/numCols; // have to reset this thing too 38 keyWidth = (double)width()/numCols; // have to reset this thing too
61 repaint(false); 39 repaint(false);
62} 40}
63void FunctionKeyboard::load (const Profile& prof) { 41void FunctionKeyboard::load (const Profile& prof) {
64 42
65 keys.clear(); 43 keys.clear();
66 44
67 numRows = prof.readNumEntry("keb_rows", 2); 45 numRows = prof.readNumEntry("keb_rows", 2);
68 numCols = prof.readNumEntry("keb_cols", 10); 46 numCols = prof.readNumEntry("keb_cols", 10);
69 keyWidth = (double)width()/numCols; // have to reset this thing too 47 keyWidth = (double)width()/numCols; // have to reset this thing too
70 48
71 /* load all the keys to the keyboard */ 49 /* load all the keys to the keyboard */
72 for (ushort i = 0; i <= numRows - 1; i++) 50 for (ushort i = 0; i <= numRows - 1; i++)
73 for (ushort j = 0; j <= numCols - 1; j++) { 51 for (ushort j = 0; j <= numCols - 1; j++) {
74 52
75 QString h = "r" + QString::number(i) + "c" + QString::number(j); 53 QString h = "r" + QString::number(i) + "c" + QString::number(j);
76 QString values = prof.readEntry("keb_" + h); 54 QString values = prof.readEntry("keb_" + h);
77 55
78 if (!values.isEmpty()) { 56 if (!values.isEmpty()) {
79 57
80 QStringList l = QStringList::split(QChar('|'), values, TRUE); 58 QStringList l = QStringList::split(QChar('|'), values, TRUE);
81 keys[h] = FKey(l[0], l[1], l[2].toInt(), l[3].toInt()); 59 keys[h] = FKey(l[0], l[1], l[2].toInt(), l[3].toInt());
82 60
83 // load pixmap if used 61 // load pixmap if used
84 if (!l[1].isEmpty()) { 62 if (!l[1].isEmpty()) {
85 63
86 keys[h].pix = new QPixmap( Opie::Core::OResource::loadPixmap( "console/keys/" + l[1] ) ); 64 keys[h].pix = new QPixmap( Opie::Core::OResource::loadPixmap( "console/keys/" + l[1] ) );
87 } 65 }
88 } 66 }
89 } 67 }