Author: vfr
Date: Sat Mar 3 13:39:19 2012
New Revision: 40835
URL: http://www.lyx.org/trac/changeset/40835
Log:
GuiCitation: Do not allow to add entries by pressing Enter when the Add button
is disabled.
Modified:
lyx-devel/trunk/src/frontends/qt4/GuiSelectionManager.cpp
Modified: lyx-devel/trunk/src/frontends/qt4/GuiSelectionManager.cpp
==============================================================================
--- lyx-devel/trunk/src/frontends/qt4/GuiSelectionManager.cpp Sat Mar 3
12:43:14 2012 (r40834)
+++ lyx-devel/trunk/src/frontends/qt4/GuiSelectionManager.cpp Sat Mar 3
13:39:19 2012 (r40835)
@@ -355,12 +355,12 @@
// 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 (!keyModifiers)
- addPB_clicked();
- else if (keyModifiers == Qt::ControlModifier ||
- keyModifiers ==
Qt::KeypadModifier ||
- keyModifiers ==
(Qt::ControlModifier | Qt::KeypadModifier)) {
- if (addPB->isEnabled()) {
+ if (addPB->isEnabled()) {
+ if (!keyModifiers) {
+ addPB_clicked();
+ } else if (keyModifiers ==
Qt::ControlModifier ||
+ keyModifiers ==
Qt::KeypadModifier ||
+ keyModifiers ==
(Qt::ControlModifier | Qt::KeypadModifier)) {
addPB_clicked();
okHook(); //signal
}
