author | hash <hash> | 2002-10-24 17:39:47 (UTC) |
---|---|---|
committer | hash <hash> | 2002-10-24 17:39:47 (UTC) |
commit | b01703c4b1de7006c88aa814ca00472b966b2464 (patch) (unidiff) | |
tree | 9d0f4e708646ddbf1a0198f1ac2dd4b67e2c45fa /noncore/apps/opie-console | |
parent | 1364899f2b250d1605e1a49cb7c65ce950c57fda (diff) | |
download | opie-b01703c4b1de7006c88aa814ca00472b966b2464.zip opie-b01703c4b1de7006c88aa814ca00472b966b2464.tar.gz opie-b01703c4b1de7006c88aa814ca00472b966b2464.tar.bz2 |
i think it loads according to the session properly now
-rw-r--r-- | noncore/apps/opie-console/function_keyboard.cpp | 43 | ||||
-rw-r--r-- | noncore/apps/opie-console/function_keyboard.h | 7 | ||||
-rw-r--r-- | noncore/apps/opie-console/mainwindow.cpp | 6 |
3 files changed, 48 insertions, 8 deletions
diff --git a/noncore/apps/opie-console/function_keyboard.cpp b/noncore/apps/opie-console/function_keyboard.cpp index 3da8d61..ce65052 100644 --- a/noncore/apps/opie-console/function_keyboard.cpp +++ b/noncore/apps/opie-console/function_keyboard.cpp | |||
@@ -54,16 +54,52 @@ FunctionKeyboard::~FunctionKeyboard() {} | |||
54 | 54 | ||
55 | void FunctionKeyboard::changeRows(int r) { | 55 | void FunctionKeyboard::changeRows(int r) { |
56 | 56 | ||
57 | numRows = r; | 57 | numRows = r; |
58 | repaint(false); | 58 | |
59 | // have to do this so the whole thing gets redrawn | ||
60 | hide(); show(); | ||
59 | } | 61 | } |
60 | void FunctionKeyboard::changeCols(int c) { | 62 | void FunctionKeyboard::changeCols(int c) { |
61 | 63 | ||
62 | numCols = c; | 64 | numCols = c; |
63 | keyWidth = (double)width()/numCols; // have to reset this thing too | 65 | keyWidth = (double)width()/numCols; // have to reset this thing too |
64 | repaint(false); | 66 | repaint(false); |
65 | } | 67 | } |
68 | void FunctionKeyboard::load (const Profile& prof) { | ||
69 | |||
70 | keys.clear(); | ||
71 | |||
72 | numRows = prof.readNumEntry("keb_rows", 2); | ||
73 | numCols = prof.readNumEntry("keb_cols", 10); | ||
74 | keyWidth = (double)width()/numCols; // have to reset this thing too | ||
75 | |||
76 | /* load all the keys to the keyboard */ | ||
77 | for (ushort i = 0; i <= numRows - 1; i++) | ||
78 | for (ushort j = 0; j <= numCols - 1; j++) { | ||
79 | |||
80 | QString h = "r" + QString::number(i) + "c" + QString::number(j); | ||
81 | QString values = prof.readEntry("keb_" + h); | ||
82 | |||
83 | if (!values.isEmpty()) { | ||
84 | |||
85 | QStringList l = QStringList::split(QChar('|'), values, TRUE); | ||
86 | keys[h] = FKey(l[0], l[1], l[2].toInt(), l[3].toInt()); | ||
87 | |||
88 | // load pixmap if used | ||
89 | if (!l[1].isEmpty()) { | ||
90 | |||
91 | keys[h].pix = new QPixmap( Resource::loadPixmap( "console/keys/" + l[1] ) ); | ||
92 | } | ||
93 | } | ||
94 | } | ||
95 | |||
96 | if (keys.isEmpty()) loadDefaults(); | ||
97 | |||
98 | hide(); | ||
99 | show(); | ||
100 | |||
101 | } | ||
66 | 102 | ||
67 | void FunctionKeyboard::paintEvent(QPaintEvent *e) { | 103 | void FunctionKeyboard::paintEvent(QPaintEvent *e) { |
68 | 104 | ||
69 | QPainter p(this); | 105 | QPainter p(this); |
@@ -272,8 +308,11 @@ FunctionKeyboardConfig::~FunctionKeyboardConfig() { | |||
272 | 308 | ||
273 | } | 309 | } |
274 | void FunctionKeyboardConfig::load (const Profile& prof) { | 310 | void FunctionKeyboardConfig::load (const Profile& prof) { |
275 | 311 | ||
312 | kb->keys.clear(); | ||
313 | kb->loadDefaults(); | ||
314 | |||
276 | m_rowBox->setValue(prof.readNumEntry("keb_rows", 2)); | 315 | m_rowBox->setValue(prof.readNumEntry("keb_rows", 2)); |
277 | m_colBox->setValue(prof.readNumEntry("keb_cols", 10)); | 316 | m_colBox->setValue(prof.readNumEntry("keb_cols", 10)); |
278 | 317 | ||
279 | /* load all the keys to the keyboard */ | 318 | /* load all the keys to the keyboard */ |
@@ -319,10 +358,8 @@ void FunctionKeyboardConfig::save (Profile& prof) { | |||
319 | void FunctionKeyboardConfig::slotChangeRows(int r) { | 358 | void FunctionKeyboardConfig::slotChangeRows(int r) { |
320 | 359 | ||
321 | kb->changeRows(r); | 360 | kb->changeRows(r); |
322 | 361 | ||
323 | // have to do this so the whole thing gets redrawn | ||
324 | kb->hide(); kb->show(); | ||
325 | } | 362 | } |
326 | void FunctionKeyboardConfig::slotChangeCols(int c) { | 363 | void FunctionKeyboardConfig::slotChangeCols(int c) { |
327 | 364 | ||
328 | kb->changeCols(c); | 365 | kb->changeCols(c); |
diff --git a/noncore/apps/opie-console/function_keyboard.h b/noncore/apps/opie-console/function_keyboard.h index 80d9f29..a60ff4b 100644 --- a/noncore/apps/opie-console/function_keyboard.h +++ b/noncore/apps/opie-console/function_keyboard.h | |||
@@ -44,9 +44,10 @@ public: | |||
44 | 44 | ||
45 | void changeRows(int); | 45 | void changeRows(int); |
46 | void changeCols(int); | 46 | void changeCols(int); |
47 | 47 | ||
48 | //Key getKey(int, int); | 48 | void load(const Profile &); |
49 | void loadDefaults(); | ||
49 | 50 | ||
50 | void paintEvent(QPaintEvent *); | 51 | void paintEvent(QPaintEvent *); |
51 | void paintKey(uint, uint); | 52 | void paintKey(uint, uint); |
52 | void mousePressEvent(QMouseEvent*); | 53 | void mousePressEvent(QMouseEvent*); |
@@ -57,12 +58,8 @@ public: | |||
57 | signals: | 58 | signals: |
58 | 59 | ||
59 | void keyPressed(FKey, ushort, ushort, bool); | 60 | void keyPressed(FKey, ushort, ushort, bool); |
60 | 61 | ||
61 | private: | ||
62 | |||
63 | void loadDefaults(); | ||
64 | |||
65 | 62 | ||
66 | private: | 63 | private: |
67 | 64 | ||
68 | // thie key for the map is the row/col | 65 | // thie key for the map is the row/col |
diff --git a/noncore/apps/opie-console/mainwindow.cpp b/noncore/apps/opie-console/mainwindow.cpp index b177fa5..745efaf 100644 --- a/noncore/apps/opie-console/mainwindow.cpp +++ b/noncore/apps/opie-console/mainwindow.cpp | |||
@@ -406,8 +406,10 @@ void MainWindow::slotClose() { | |||
406 | m_runScript->setEnabled( false ); | 406 | m_runScript->setEnabled( false ); |
407 | m_fullscreen->setEnabled( false ); | 407 | m_fullscreen->setEnabled( false ); |
408 | m_closewindow->setEnabled( false ); | 408 | m_closewindow->setEnabled( false ); |
409 | } | 409 | } |
410 | |||
411 | m_kb->loadDefaults(); | ||
410 | } | 412 | } |
411 | 413 | ||
412 | /* | 414 | /* |
413 | * We will get the name | 415 | * We will get the name |
@@ -455,8 +457,10 @@ void MainWindow::create( const Profile& prof ) { | |||
455 | 457 | ||
456 | 458 | ||
457 | QWidget *w = currentSession()->widget(); | 459 | QWidget *w = currentSession()->widget(); |
458 | if(w) w->setFocus(); | 460 | if(w) w->setFocus(); |
461 | |||
462 | m_kb->load(currentSession()->profile()); | ||
459 | } | 463 | } |
460 | 464 | ||
461 | void MainWindow::slotTransfer() | 465 | void MainWindow::slotTransfer() |
462 | { | 466 | { |
@@ -518,8 +522,10 @@ void MainWindow::slotSessionChanged( Session* ses ) { | |||
518 | 522 | ||
519 | 523 | ||
520 | QWidget *w = m_curSession->widget(); | 524 | QWidget *w = m_curSession->widget(); |
521 | if(w) w->setFocus(); | 525 | if(w) w->setFocus(); |
526 | |||
527 | m_kb->load(currentSession()->profile()); | ||
522 | } | 528 | } |
523 | } | 529 | } |
524 | 530 | ||
525 | void MainWindow::slotFullscreen() { | 531 | void MainWindow::slotFullscreen() { |