From 3f6a7e36d08ca8daecfc8fd8bbf0785899d09520 Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Fri, 1 Aug 2014 09:50:49 +0200
Subject: [PATCH] removed the (partial broken) return/enter shortcut for custom
 push buttons, since there is already a space shortcut)

---
 apps/opencs/view/widget/pushbutton.cpp | 16 +++++-----------
 apps/opencs/view/widget/pushbutton.hpp |  2 +-
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/apps/opencs/view/widget/pushbutton.cpp b/apps/opencs/view/widget/pushbutton.cpp
index ccf89e18ad..1d53d23932 100644
--- a/apps/opencs/view/widget/pushbutton.cpp
+++ b/apps/opencs/view/widget/pushbutton.cpp
@@ -4,9 +4,9 @@
 #include <QMouseEvent>
 #include <QKeyEvent>
 
-void CSVWidget::PushButton::setExtendedToolTip (const QString& text)
+void CSVWidget::PushButton::setExtendedToolTip()
 {
-    QString tooltip = text;
+    QString tooltip = mToolTip;
 
     if (tooltip.isEmpty())
         tooltip = "(Tool tip not implemented yet)";
@@ -50,15 +50,9 @@ void CSVWidget::PushButton::keyPressEvent (QKeyEvent *event)
 
 void CSVWidget::PushButton::keyReleaseEvent (QKeyEvent *event)
 {
-    if (event->key()==Qt::Key_Return || event->key()==Qt::Key_Enter)
-    {
+    if (event->key()==Qt::Key_Space)
         mKeepOpen = event->modifiers() & Qt::ShiftModifier;
 
-        setChecked (!isChecked());
-
-        emit clicked();
-    }
-
     QPushButton::keyReleaseEvent (event);
 }
 
@@ -73,14 +67,14 @@ CSVWidget::PushButton::PushButton (const QIcon& icon, Type type, const QString&
 : QPushButton (icon, "", parent), mKeepOpen (false), mType (type), mToolTip (tooltip)
 {
     setCheckable (type==Type_Mode || type==Type_Toggle);
-    setExtendedToolTip (tooltip);
+    setExtendedToolTip();
 }
 
 CSVWidget::PushButton::PushButton (Type type, const QString& tooltip, QWidget *parent)
 : QPushButton (parent), mKeepOpen (false), mType (type), mToolTip (tooltip)
 {
     setCheckable (type==Type_Mode || type==Type_Toggle);
-    setExtendedToolTip (tooltip);
+    setExtendedToolTip();
 }
 
 bool CSVWidget::PushButton::hasKeepOpen() const
diff --git a/apps/opencs/view/widget/pushbutton.hpp b/apps/opencs/view/widget/pushbutton.hpp
index eae0f0a246..64b38db2ee 100644
--- a/apps/opencs/view/widget/pushbutton.hpp
+++ b/apps/opencs/view/widget/pushbutton.hpp
@@ -26,7 +26,7 @@ namespace CSVWidget
 
         private:
 
-            void setExtendedToolTip (const QString& text);
+            void setExtendedToolTip();
 
         protected: