Skip to content

Commit 0b0daf9

Browse files
committed
Enabled help and keyboard shortcut dialogs with Space pressable push buttons
1 parent b4ac39b commit 0b0daf9

4 files changed

Lines changed: 22 additions & 12 deletions

File tree

src/gui/SpacePushButton.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@ SpacePushButton::SpacePushButton(QWidget* parent)
2525
{
2626
}
2727

28-
void SpacePushButton::keyPressEvent(QKeyEvent *e)
28+
void SpacePushButton::keyReleaseEvent(QKeyEvent *e)
2929
{
3030
switch (e->key()) {
3131
case Qt::Key_Space:
32-
animateClick();
32+
click();
3333
break;
3434
default:
35-
QPushButton::keyPressEvent(e);
35+
QPushButton::keyReleaseEvent(e);
3636
}
3737
}

src/gui/SpacePushButton.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
#include <QPushButton>
2424

2525
//! @class SpacePushButton
26-
//! A QPushButton which can be triggered by pressing Space when it has focus.
26+
//! A QPushButton which can be triggered by pressing (actually: releasing) Space when it has focus.
2727
//! To use this class in the QtCreator UI designer, add a regular QPushButton to the UI,
2828
//! then right-click on it and change its type to SpacePushButton.
2929
//! Then it makes sense to put this button into a useful GUI tab order.
@@ -36,7 +36,7 @@ class SpacePushButton : public QPushButton
3636

3737
protected:
3838
//! This triggers the button on pressing the Space bar.
39-
virtual void keyPressEvent(QKeyEvent *e) Q_DECL_OVERRIDE;
39+
virtual void keyReleaseEvent(QKeyEvent *e) Q_DECL_OVERRIDE;
4040
};
4141

4242
#endif // SPACEPUSHBUTTON_HPP

src/gui/helpDialogGui.ui

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,7 @@
300300
</widget>
301301
</item>
302302
<item>
303-
<widget class="QPushButton" name="editShortcutsButton">
303+
<widget class="SpacePushButton" name="editShortcutsButton">
304304
<property name="text">
305305
<string extracomment="Same text as in the Configuration window!">Edit keyboard shortcuts...</string>
306306
</property>
@@ -454,6 +454,11 @@
454454
<extends>QPushButton</extends>
455455
<header>gui/StelCloseButton.hpp</header>
456456
</customwidget>
457+
<customwidget>
458+
<class>SpacePushButton</class>
459+
<extends>QPushButton</extends>
460+
<header>SpacePushButton.hpp</header>
461+
</customwidget>
457462
</customwidgets>
458463
<resources/>
459464
<connections/>

src/gui/shortcutsDialog.ui

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<rect>
77
<x>0</x>
88
<y>0</y>
9-
<width>737</width>
9+
<width>654</width>
1010
<height>436</height>
1111
</rect>
1212
</property>
@@ -209,7 +209,7 @@
209209
</widget>
210210
</item>
211211
<item row="1" column="2">
212-
<widget class="QPushButton" name="primaryBackspaceButton">
212+
<widget class="SpacePushButton" name="primaryBackspaceButton">
213213
<property name="enabled">
214214
<bool>false</bool>
215215
</property>
@@ -224,7 +224,7 @@
224224
</widget>
225225
</item>
226226
<item row="2" column="3">
227-
<widget class="QPushButton" name="restoreDefaultsButton">
227+
<widget class="SpacePushButton" name="restoreDefaultsButton">
228228
<property name="enabled">
229229
<bool>false</bool>
230230
</property>
@@ -237,7 +237,7 @@
237237
</widget>
238238
</item>
239239
<item row="1" column="3">
240-
<widget class="QPushButton" name="applyButton">
240+
<widget class="SpacePushButton" name="applyButton">
241241
<property name="enabled">
242242
<bool>false</bool>
243243
</property>
@@ -250,7 +250,7 @@
250250
</widget>
251251
</item>
252252
<item row="2" column="2">
253-
<widget class="QPushButton" name="altBackspaceButton">
253+
<widget class="SpacePushButton" name="altBackspaceButton">
254254
<property name="enabled">
255255
<bool>false</bool>
256256
</property>
@@ -279,7 +279,7 @@
279279
</widget>
280280
</item>
281281
<item row="1" column="4" rowspan="2">
282-
<widget class="QPushButton" name="restoreAllDefaultsButton">
282+
<widget class="SpacePushButton" name="restoreAllDefaultsButton">
283283
<property name="sizePolicy">
284284
<sizepolicy hsizetype="Minimum" vsizetype="MinimumExpanding">
285285
<horstretch>0</horstretch>
@@ -322,6 +322,11 @@
322322
<extends>QPushButton</extends>
323323
<header>gui/StelCloseButton.hpp</header>
324324
</customwidget>
325+
<customwidget>
326+
<class>SpacePushButton</class>
327+
<extends>QPushButton</extends>
328+
<header>SpacePushButton.hpp</header>
329+
</customwidget>
325330
</customwidgets>
326331
<tabstops>
327332
<tabstop>shortcutsTreeView</tabstop>

0 commit comments

Comments
 (0)