summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/opie-console/function_keyboard.cpp4
-rw-r--r--noncore/apps/opie-console/mainwindow.cpp2
2 files changed, 3 insertions, 3 deletions
diff --git a/noncore/apps/opie-console/function_keyboard.cpp b/noncore/apps/opie-console/function_keyboard.cpp
index fa11701..3da8d61 100644
--- a/noncore/apps/opie-console/function_keyboard.cpp
+++ b/noncore/apps/opie-console/function_keyboard.cpp
@@ -87,60 +87,60 @@ void FunctionKeyboard::paintEvent(QPaintEvent *e) {
87 } 87 }
88 88
89 for (uint r = 0; r < numRows; r++) { 89 for (uint r = 0; r < numRows; r++) {
90 for (uint c = 0; c < numCols; c++) { 90 for (uint c = 0; c < numCols; c++) {
91 91
92 QString handle = "r" + QString::number(r) + "c" + QString::number(c); 92 QString handle = "r" + QString::number(r) + "c" + QString::number(c);
93 if (keys.contains(handle)) { 93 if (keys.contains(handle)) {
94 94
95 if (keys[handle].pixFile.isEmpty()) 95 if (keys[handle].pixFile.isEmpty())
96 p.drawText( c * keyWidth + 1, r * keyHeight + 1, 96 p.drawText( c * keyWidth + 1, r * keyHeight + 1,
97 keyWidth, keyHeight, 97 keyWidth, keyHeight,
98 Qt::AlignHCenter | Qt::AlignVCenter, 98 Qt::AlignHCenter | Qt::AlignVCenter,
99 keys[handle].label 99 keys[handle].label
100 ); 100 );
101 else { 101 else {
102 102
103 ushort centerX = c *keyWidth + (keyWidth - keys[handle].pix->width()) / 2; 103 ushort centerX = (ushort)(c *keyWidth) + (ushort)(keyWidth - keys[handle].pix->width()) / 2;
104 ushort centerY = r * keyHeight + (keyHeight - keys[handle].pix->height()) / 2; 104 ushort centerY = r * keyHeight + (keyHeight - keys[handle].pix->height()) / 2;
105 p.drawPixmap(centerX, centerY, *keys[handle].pix); 105 p.drawPixmap(centerX, centerY, *keys[handle].pix);
106 } 106 }
107 } 107 }
108 } 108 }
109 } 109 }
110} 110}
111 111
112void FunctionKeyboard::paintKey(uint row, uint col) { 112void FunctionKeyboard::paintKey(uint row, uint col) {
113 113
114 QPainter p(this); 114 QPainter p(this);
115 115
116 p.fillRect(QRect(QPoint(col * keyWidth + 1, row * keyHeight + 1), 116 p.fillRect(QRect(QPoint(col * keyWidth + 1, row * keyHeight + 1),
117 QPoint((col + 1) * keyWidth - 1, row * keyHeight + keyHeight- 1)), 117 QPoint((col + 1) * keyWidth - 1, row * keyHeight + keyHeight- 1)),
118 (pressedRow != -1 && pressedCol != -1 ) ? QColor(97,119,155) : QColor(255,255,255)); 118 (pressedRow != -1 && pressedCol != -1 ) ? QColor(97,119,155) : QColor(255,255,255));
119 119
120 QString handle ("r" + QString::number(row) + "c" + QString::number(col)); 120 QString handle ("r" + QString::number(row) + "c" + QString::number(col));
121 if (keys[handle].pixFile.isEmpty()) 121 if (keys[handle].pixFile.isEmpty())
122 p.drawText( 122 p.drawText(
123 col * keyWidth + 1, row * keyHeight + 1, 123 col * keyWidth + 1, row * keyHeight + 1,
124 keyWidth, keyHeight, 124 keyWidth, keyHeight,
125 Qt::AlignHCenter | Qt::AlignVCenter, 125 Qt::AlignHCenter | Qt::AlignVCenter,
126 keys[handle].label 126 keys[handle].label
127 ); 127 );
128 else { 128 else {
129 129
130 ushort centerX = col *keyWidth + (keyWidth - keys[handle].pix->width()) / 2; 130 ushort centerX = (ushort)(col *keyWidth) + (ushort)(keyWidth - keys[handle].pix->width()) / 2;
131 ushort centerY = row * keyHeight + (keyHeight - keys[handle].pix->height()) / 2; 131 ushort centerY = row * keyHeight + (keyHeight - keys[handle].pix->height()) / 2;
132 p.drawPixmap(centerX, centerY, *keys[handle].pix); 132 p.drawPixmap(centerX, centerY, *keys[handle].pix);
133 } 133 }
134 134
135 if (col == numCols - 1) { 135 if (col == numCols - 1) {
136 136
137 // sometimes it doesnt draw the last line 137 // sometimes it doesnt draw the last line
138 138
139 p.drawLine((col+1) * keyWidth -1, row * keyHeight, 139 p.drawLine((col+1) * keyWidth -1, row * keyHeight,
140 (col+1) * keyWidth -1, (row + 1) * keyHeight 140 (col+1) * keyWidth -1, (row + 1) * keyHeight
141 ); 141 );
142 } 142 }
143 143
144} 144}
145 145
146void FunctionKeyboard::mousePressEvent(QMouseEvent *e) { 146void FunctionKeyboard::mousePressEvent(QMouseEvent *e) {
diff --git a/noncore/apps/opie-console/mainwindow.cpp b/noncore/apps/opie-console/mainwindow.cpp
index 406586c..b177fa5 100644
--- a/noncore/apps/opie-console/mainwindow.cpp
+++ b/noncore/apps/opie-console/mainwindow.cpp
@@ -548,33 +548,33 @@ void MainWindow::slotFullscreen() {
548 548
549 m_isFullscreen = !m_isFullscreen; 549 m_isFullscreen = !m_isFullscreen;
550} 550}
551 551
552 552
553void MainWindow::slotKeyReceived(FKey k, ushort, ushort, bool pressed) { 553void MainWindow::slotKeyReceived(FKey k, ushort, ushort, bool pressed) {
554 554
555 if ( m_curSession ) { 555 if ( m_curSession ) {
556 556
557 QEvent::Type state; 557 QEvent::Type state;
558 558
559 if (pressed) state = QEvent::KeyPress; 559 if (pressed) state = QEvent::KeyPress;
560 else state = QEvent::KeyRelease; 560 else state = QEvent::KeyRelease;
561 561
562 QKeyEvent ke(state, k.qcode, k.unicode, 0, QString(QChar(k.unicode))); 562 QKeyEvent ke(state, k.qcode, k.unicode, 0, QString(QChar(k.unicode)));
563 563
564 // where should i send this event? doesnt work sending it here 564 // is this the best way to do this? cant figure out any other way to work
565 QApplication::sendEvent((QObject *)m_curSession->widget(), &ke); 565 QApplication::sendEvent((QObject *)m_curSession->widget(), &ke);
566 ke.ignore(); 566 ke.ignore();
567 } 567 }
568} 568}
569void MainWindow::slotCopy() { 569void MainWindow::slotCopy() {
570 if (!currentSession() ) return; 570 if (!currentSession() ) return;
571 currentSession()->emulationHandler()->copy(); 571 currentSession()->emulationHandler()->copy();
572} 572}
573void MainWindow::slotPaste() { 573void MainWindow::slotPaste() {
574 if (!currentSession() ) return; 574 if (!currentSession() ) return;
575 currentSession()->emulationHandler()->paste(); 575 currentSession()->emulationHandler()->paste();
576} 576}
577 577
578/* 578/*
579 * Save the session 579 * Save the session
580 */ 580 */