Diffstat (limited to 'noncore/apps/opie-console/mainwindow.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/apps/opie-console/mainwindow.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/noncore/apps/opie-console/mainwindow.cpp b/noncore/apps/opie-console/mainwindow.cpp index 89f3516..30dd21c 100644 --- a/noncore/apps/opie-console/mainwindow.cpp +++ b/noncore/apps/opie-console/mainwindow.cpp | |||
@@ -199,26 +199,26 @@ void MainWindow::initUI() { | |||
199 | m_bar->insertItem( tr("Scripts"), m_scripts ); | 199 | m_bar->insertItem( tr("Scripts"), m_scripts ); |
200 | 200 | ||
201 | /* the settings menu */ | 201 | /* the settings menu */ |
202 | // m_bar->insertItem( tr("Settings"), m_settings ); | 202 | // m_bar->insertItem( tr("Settings"), m_settings ); |
203 | 203 | ||
204 | /* and the keyboard */ | 204 | /* and the keyboard */ |
205 | m_keyBar = new QToolBar(this); | 205 | m_keyBar = new QToolBar(this); |
206 | addToolBar( m_keyBar, "Keyboard", QMainWindow::Top, TRUE ); | 206 | addToolBar( m_keyBar, "Keyboard", QMainWindow::Top, TRUE ); |
207 | m_keyBar->setHorizontalStretchable( TRUE ); | 207 | m_keyBar->setHorizontalStretchable( TRUE ); |
208 | m_keyBar->hide(); | 208 | m_keyBar->hide(); |
209 | 209 | ||
210 | m_kb = new FunctionKeyboard(m_keyBar); | 210 | m_kb = new FunctionKeyboard(m_keyBar); |
211 | connect(m_kb, SIGNAL(keyPressed(ushort, ushort, bool, bool, bool)), | 211 | connect(m_kb, SIGNAL(keyPressed(ushort, ushort, bool, bool, bool, ushort, ushort)), |
212 | this, SLOT(slotKeyReceived(ushort, ushort, bool, bool, bool))); | 212 | this, SLOT(slotKeyReceived(ushort, ushort, bool, bool, bool, ushort, ushort))); |
213 | 213 | ||
214 | m_buttonBar = new QToolBar( this ); | 214 | m_buttonBar = new QToolBar( this ); |
215 | addToolBar( m_buttonBar, "Buttons", QMainWindow::Top, TRUE ); | 215 | addToolBar( m_buttonBar, "Buttons", QMainWindow::Top, TRUE ); |
216 | m_buttonBar->setHorizontalStretchable( TRUE ); | 216 | m_buttonBar->setHorizontalStretchable( TRUE ); |
217 | m_buttonBar->hide(); | 217 | m_buttonBar->hide(); |
218 | 218 | ||
219 | m_qb = new QuickButton( m_buttonBar ); | 219 | m_qb = new QuickButton( m_buttonBar ); |
220 | connect( m_qb, SIGNAL( keyPressed( ushort, ushort, bool, bool, bool) ), | 220 | connect( m_qb, SIGNAL( keyPressed( ushort, ushort, bool, bool, bool) ), |
221 | this, SLOT( slotKeyReceived( ushort, ushort, bool, bool, bool) ) ); | 221 | this, SLOT( slotKeyReceived( ushort, ushort, bool, bool, bool) ) ); |
222 | 222 | ||
223 | 223 | ||
224 | m_connect->setEnabled( false ); | 224 | m_connect->setEnabled( false ); |
@@ -514,25 +514,25 @@ void MainWindow::slotFullscreen() { | |||
514 | ( m_curSession->widgetStack() )->setFocus(); | 514 | ( m_curSession->widgetStack() )->setFocus(); |
515 | ( m_curSession->widgetStack() )->show(); | 515 | ( m_curSession->widgetStack() )->show(); |
516 | 516 | ||
517 | ( ( m_curSession->emulationHandler() )->cornerButton() )->show(); | 517 | ( ( m_curSession->emulationHandler() )->cornerButton() )->show(); |
518 | 518 | ||
519 | connect( ( m_curSession->emulationHandler() )->cornerButton(), SIGNAL( pressed() ), this, SLOT( slotFullscreen() ) ); | 519 | connect( ( m_curSession->emulationHandler() )->cornerButton(), SIGNAL( pressed() ), this, SLOT( slotFullscreen() ) ); |
520 | } | 520 | } |
521 | 521 | ||
522 | m_isFullscreen = !m_isFullscreen; | 522 | m_isFullscreen = !m_isFullscreen; |
523 | } | 523 | } |
524 | 524 | ||
525 | 525 | ||
526 | void MainWindow::slotKeyReceived(ushort u, ushort q, bool, bool pressed, bool) { | 526 | void MainWindow::slotKeyReceived(ushort u, ushort q, bool, bool pressed, bool, ushort, ushort) { |
527 | 527 | ||
528 | //qWarning("unicode: %x, qkey: %x, %s", u, q, pressed ? "pressed" : "released"); | 528 | //qWarning("unicode: %x, qkey: %x, %s", u, q, pressed ? "pressed" : "released"); |
529 | 529 | ||
530 | if ( m_curSession ) { | 530 | if ( m_curSession ) { |
531 | 531 | ||
532 | QEvent::Type state; | 532 | QEvent::Type state; |
533 | 533 | ||
534 | if (pressed) state = QEvent::KeyPress; | 534 | if (pressed) state = QEvent::KeyPress; |
535 | else state = QEvent::KeyRelease; | 535 | else state = QEvent::KeyRelease; |
536 | 536 | ||
537 | QKeyEvent ke(state, q, u, 0, QString(QChar(u))); | 537 | QKeyEvent ke(state, q, u, 0, QString(QChar(u))); |
538 | 538 | ||