Enabled help and keyboard shortcut dialogs with Space pressable push buttonsgui-show-focus

4 files changed, 22 insertions, 12 deletions

diff --git a/src/gui/SpacePushButton.cpp b/src/gui/SpacePushButton.cpp
index 5c9d39e206..cdb1acaefb 100644
--- a/src/gui/SpacePushButton.cpp
+++ b/src/gui/SpacePushButton.cpp
@@ -25,13 +25,13 @@ SpacePushButton::SpacePushButton(QWidget* parent)
 {
 }
 
-void SpacePushButton::keyPressEvent(QKeyEvent *e)
+void SpacePushButton::keyReleaseEvent(QKeyEvent *e)
 {
 	switch (e->key()) {
 	case Qt::Key_Space:
-		animateClick();
+		click();
 		break;
 	default:
-		QPushButton::keyPressEvent(e);
+		QPushButton::keyReleaseEvent(e);
     }
 }
diff --git a/src/gui/SpacePushButton.hpp b/src/gui/SpacePushButton.hpp
index 5a25b83c79..4adf9181c3 100644
--- a/src/gui/SpacePushButton.hpp
+++ b/src/gui/SpacePushButton.hpp
@@ -23,7 +23,7 @@
 #include <QPushButton>
 
 //! @class SpacePushButton
-//! A QPushButton which can be triggered by pressing Space when it has focus.
+//! A QPushButton which can be triggered by pressing (actually: releasing) Space when it has focus.
 //! To use this class in the QtCreator UI designer, add a regular QPushButton to the UI,
 //! then right-click on it and change its type to SpacePushButton.
 //! Then it makes sense to put this button into a useful GUI tab order.
@@ -36,7 +36,7 @@ public:
 	
 protected:
     //! This triggers the button on pressing the Space bar.
-    virtual void keyPressEvent(QKeyEvent *e) Q_DECL_OVERRIDE;
+    virtual void keyReleaseEvent(QKeyEvent *e) Q_DECL_OVERRIDE;
 };
 
 #endif // SPACEPUSHBUTTON_HPP
diff --git a/src/gui/helpDialogGui.ui b/src/gui/helpDialogGui.ui
index 2bd114e21b..7acd28e64b 100644
--- a/src/gui/helpDialogGui.ui
+++ b/src/gui/helpDialogGui.ui
@@ -300,7 +300,7 @@
            </widget>
           </item>
           <item>
-           <widget class="QPushButton" name="editShortcutsButton">
+           <widget class="SpacePushButton" name="editShortcutsButton">
             <property name="text">
              <string extracomment="Same text as in the Configuration window!">Edit keyboard shortcuts...</string>
             </property>
@@ -454,6 +454,11 @@
    <extends>QPushButton</extends>
    <header>gui/StelCloseButton.hpp</header>
   </customwidget>
+  <customwidget>
+   <class>SpacePushButton</class>
+   <extends>QPushButton</extends>
+   <header>SpacePushButton.hpp</header>
+  </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
diff --git a/src/gui/shortcutsDialog.ui b/src/gui/shortcutsDialog.ui
index 4490b725e8..c428e58d37 100644
--- a/src/gui/shortcutsDialog.ui
+++ b/src/gui/shortcutsDialog.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>737</width>
+    <width>654</width>
     <height>436</height>
    </rect>
   </property>
@@ -209,7 +209,7 @@
           </widget>
          </item>
          <item row="1" column="2">
-          <widget class="QPushButton" name="primaryBackspaceButton">
+          <widget class="SpacePushButton" name="primaryBackspaceButton">
            <property name="enabled">
             <bool>false</bool>
            </property>
@@ -224,7 +224,7 @@
           </widget>
          </item>
          <item row="2" column="3">
-          <widget class="QPushButton" name="restoreDefaultsButton">
+          <widget class="SpacePushButton" name="restoreDefaultsButton">
            <property name="enabled">
             <bool>false</bool>
            </property>
@@ -237,7 +237,7 @@
           </widget>
          </item>
          <item row="1" column="3">
-          <widget class="QPushButton" name="applyButton">
+          <widget class="SpacePushButton" name="applyButton">
            <property name="enabled">
             <bool>false</bool>
            </property>
@@ -250,7 +250,7 @@
           </widget>
          </item>
          <item row="2" column="2">
-          <widget class="QPushButton" name="altBackspaceButton">
+          <widget class="SpacePushButton" name="altBackspaceButton">
            <property name="enabled">
             <bool>false</bool>
            </property>
@@ -279,7 +279,7 @@
           </widget>
          </item>
          <item row="1" column="4" rowspan="2">
-          <widget class="QPushButton" name="restoreAllDefaultsButton">
+          <widget class="SpacePushButton" name="restoreAllDefaultsButton">
            <property name="sizePolicy">
             <sizepolicy hsizetype="Minimum" vsizetype="MinimumExpanding">
              <horstretch>0</horstretch>
@@ -322,6 +322,11 @@
    <extends>QPushButton</extends>
    <header>gui/StelCloseButton.hpp</header>
   </customwidget>
+  <customwidget>
+   <class>SpacePushButton</class>
+   <extends>QPushButton</extends>
+   <header>SpacePushButton.hpp</header>
+  </customwidget>
  </customwidgets>
  <tabstops>
   <tabstop>shortcutsTreeView</tabstop>