// This is designed to work both with the main enter key
// and the one on the numeric keypad.
if (keyPressed == Qt::Key_Enter || keyPressed == Qt::Key_Return) {
- if (addPB->isEnabled()) {
- if (!keyModifiers) {
+ if (!keyModifiers ||
+ keyModifiers == Qt::ControlModifier ||
+ keyModifiers == Qt::KeypadModifier ||
+ keyModifiers == (Qt::ControlModifier
+ | Qt::KeypadModifier)) {
+ if (addPB->isEnabled()) {
addPB_clicked();
- } else if (keyModifiers == Qt::ControlModifier ||
- keyModifiers == Qt::KeypadModifier ||
- keyModifiers == (Qt::ControlModifier | Qt::KeypadModifier)) {
- addPB_clicked();
- okHook(); //signal
}
+ if (keyModifiers)
+ okHook(); //signal
}
event->accept();
return true;
selectedHasFocus_ = false;
updateHook();
}
- event->accept();
- return true;
- }
+ return false;
+ }
} else if (obj == selectedLV) {
if (etype == QEvent::KeyPress) {
QKeyEvent * keyEvent = static_cast<QKeyEvent *>(event);
updateHook();
} else
return QObject::eventFilter(obj, event);
- }
+ }
// Ctrl-Up activates upPB
else if (keyPressed == Qt::Key_Up) {
if (keyModifiers == Qt::ControlModifier) {
event->accept();
return true;
}
- }
+ }
// Ctrl-Down activates downPB
else if (keyPressed == Qt::Key_Down) {
if (keyModifiers == Qt::ControlModifier) {
selectedHasFocus_ = true;
updateHook();
}
- event->accept();
- return true;
+ return false;
}
}
return QObject::eventFilter(obj, event);