Skip to content

Make Pause hotkey Shift+Space #5554

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Spekular merged 19 commits into from
Jul 6, 2020
Merged

Make Pause hotkey Shift+Space #5554

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
f909a21
src/gui/editors/SongEditor.cpp
ryuukumar Jun 22, 2020
c5dc75d
Gradient can be toggled and color can be changed.
ryuukumar Jun 23, 2020
d724335
Made playback line (and tail) transparent to mouse clicks
ryuukumar Jun 23, 2020
94d865b
Gradient disappears when paused/stopped; tail length depends on zoom
ryuukumar Jun 24, 2020
1fa643d
Fixes bug where gradient appears when a pattern is played; style corr…
ryuukumar Jun 25, 2020
9a7a1e1
Cleaned up code
ryuukumar Jun 26, 2020
db3ee77
Rename m_zoomLevels to s_zoomLevels
ryuukumar Jun 26, 2020
7bc8a77
Finalising code
ryuukumar Jun 27, 2020
a34f48f
Make positionLine class independent of parent zooming model
ryuukumar Jul 1, 2020
e6a1793
Edit a bug fix to make it more efficient
ryuukumar Jul 1, 2020
6fa3fa7
Rename m_x and finalise positionLine code
ryuukumar Jul 2, 2020
c18baa9
Rename m_x and finalise positionLine changes
ryuukumar Jul 2, 2020
da2727d
Rename X to playHeadPos
ryuukumar Jul 2, 2020
98d034a
Hotkey Shift+Space for pausing
ryuukumar Jul 3, 2020
e3ca7f2
Merge branch 'master' of https://github.com/LMMS/lmms
ryuukumar Jul 3, 2020
84ad24d
Fix git inconsistensies
ryuukumar Jul 3, 2020
ac19355
Blank commit to fix changes
ryuukumar Jul 3, 2020
035c1c2
Changed to use Song::togglePause()
ryuukumar Jul 3, 2020
edeba4f
Move shortucut to Editor.cpp to make it work across editors
ryuukumar Jul 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions include/Editor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,9 @@ protected slots:
private slots:
/// Called by pressing the space key. Plays or stops.
void togglePlayStop();

/// Called by pressing shift+space. Toggles pause state.
void togglePause();

signals:

Expand Down
6 changes: 6 additions & 0 deletions src/gui/editors/Editor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,11 @@ void Editor::togglePlayStop()
play();
}

void Editor::togglePause()
{
Engine::getSong()->togglePause();
}

Editor::Editor(bool record, bool stepRecord) :
m_toolBar(new DropToolBar(this)),
m_playAction(nullptr),
Expand Down Expand Up @@ -104,6 +109,7 @@ Editor::Editor(bool record, bool stepRecord) :
connect(m_toggleStepRecordingAction, SIGNAL(triggered()), this, SLOT(toggleStepRecording()));
connect(m_stopAction, SIGNAL(triggered()), this, SLOT(stop()));
new QShortcut(Qt::Key_Space, this, SLOT(togglePlayStop()));
new QShortcut(QKeySequence(Qt::SHIFT + Qt::Key_Space), this, SLOT(togglePause()));

// Add actions to toolbar
addButton(m_playAction, "playButton");
Expand Down