Fix stupid shortcut that accidentally stole keypresses

diff --git a/src/effectslistwidget.cpp b/src/effectslistwidget.cpp
index 7d75ac888b722f3e112be20d3293f15bc67831a7..96ab4c1507377e6672a032b61562a7d5777e8cc6 100644 (file)
--- a/src/effectslistwidget.cpp
+++ b/src/effectslistwidget.cpp
@@ -324,6 +324,8 @@ void EffectsListWidget::keyPressEvent(QKeyEvent *e)
 {
     if (e->key() == Qt::Key_Enter || e->key() == Qt::Key_Return) {
        emit applyEffect(currentEffect());
+       e->accept();
+       return;
     }
     QTreeWidget::keyPressEvent(e);
 }

diff --git a/src/effectstack/collapsibleeffect.cpp b/src/effectstack/collapsibleeffect.cpp
index 71ed8e44e346814a82a2685231ff0fab36dd85a9..96c34e87f20b051f5fe04777d994dda0fda16077 100644 (file)
--- a/src/effectstack/collapsibleeffect.cpp
+++ b/src/effectstack/collapsibleeffect.cpp
@@ -107,14 +107,16 @@ MySpinBox::MySpinBox(QWidget * parent):
     setFocusPolicy(Qt::StrongFocus);
 }
 
-void MySpinBox::focusInEvent(QFocusEvent*)
+void MySpinBox::focusInEvent(QFocusEvent *e)
 {
      setFocusPolicy(Qt::WheelFocus);
+     e->accept();
 }
 
-void MySpinBox::focusOutEvent(QFocusEvent*)
+void MySpinBox::focusOutEvent(QFocusEvent *e)
 {
      setFocusPolicy(Qt::StrongFocus);
+     e->accept();
 }
 
 
@@ -164,7 +166,6 @@ CollapsibleEffect::CollapsibleEffect(QDomElement effect, QDomElement original_ef
     effecticon->setPixmap(icon.pixmap(16,16));
     m_menu->addAction(KIcon("folder-new"), i18n("Create Group"), this, SLOT(slotCreateGroup()));
     setupWidget(info, metaInfo);
-    
     setAcceptDrops(true);
     menuButton->setIcon(KIcon("kdenlive-menu"));
     menuButton->setMenu(m_menu);

diff --git a/src/widgets/collapsiblewidget_ui.ui b/src/widgets/collapsiblewidget_ui.ui
index d5177c2e71f31024cad6efcfc690ccb442c074b0..658d0b5cfd77b90434b49c45be7e74b615706009 100644 (file)
--- a/src/widgets/collapsiblewidget_ui.ui
+++ b/src/widgets/collapsiblewidget_ui.ui
@@ -90,9 +90,6 @@
            <property name="text">
             <string/>
            </property>
-           <property name="shortcut">
-            <string>Return</string>
-           </property>
           </widget>
          </item>
          <item>