From ce606a336cb09e55ed9cdc32cc5b7d17ccaaef63 Mon Sep 17 00:00:00 2001 From: sgakerru Date: Fri, 27 Dec 2024 18:26:40 +0400 Subject: [PATCH 1/2] Add pause button to playlist --- src/basegui.cpp | 2 ++ src/playlist.cpp | 11 +++++++++++ src/playlist.h | 3 +++ 3 files changed, 16 insertions(+) diff --git a/src/basegui.cpp b/src/basegui.cpp index 56e33022d..dd06a48d1 100644 --- a/src/basegui.cpp +++ b/src/basegui.cpp @@ -2527,6 +2527,8 @@ void BaseGui::createPlaylist() { connect(playlist, SIGNAL(requestToPlayStream(const QString &, QStringList)), core, SLOT(openStream(const QString &, QStringList))); + connect(playlist, SIGNAL(requestToPause()), core, SLOT(pause())); + connect(playlist, SIGNAL(requestToAddCurrentFile()), this, SLOT(addToPlaylistCurrentFile())); connect( core, SIGNAL(mediaFinished()), playlist, SLOT(playNextAuto()), Qt::QueuedConnection ); diff --git a/src/playlist.cpp b/src/playlist.cpp index fcdcb6ef4..6a2284dc2 100644 --- a/src/playlist.cpp +++ b/src/playlist.cpp @@ -520,6 +520,9 @@ void Playlist::createActions() { playAct = new MyAction(this, "pl_play", false); connect( playAct, SIGNAL(triggered()), this, SLOT(playCurrent()) ); + pauseAct = new MyAction(this, "pl_pause", false); + connect( pauseAct, SIGNAL(triggered()), this, SLOT(pause()) ); + nextAct = new MyAction(Qt::Key_N /*Qt::Key_Greater*/, this, "pl_next", false); connect( nextAct, SIGNAL(triggered()), this, SLOT(playNext()) ); @@ -671,6 +674,7 @@ void Playlist::createToolbar() { toolbar->addSeparator(); toolbar->addAction(playAct); + toolbar->addAction(pauseAct); toolbar->addAction(prevAct); toolbar->addAction(nextAct); #ifdef PLAYLIST_DOUBLE_TOOLBAR @@ -740,11 +744,13 @@ void Playlist::retranslateStrings() { saveAsAct->change( Images::icon("save"), tr("Save &as...") ); playAct->change( tr("&Play") ); + pauseAct->change( tr("&Pause") ); nextAct->change( tr("&Next") ); prevAct->change( tr("Pre&vious") ); playAct->setIcon( Images::icon("play") ); + pauseAct->setIcon( Images::icon("pause") ); nextAct->setIcon( Images::icon("next") ); prevAct->setIcon( Images::icon("previous") ); @@ -1507,6 +1513,11 @@ void Playlist::playCurrent() { } } +void Playlist::pause() { + qDebug("Playlist::pause"); + emit requestToPause(); +} + void Playlist::itemActivated(const QModelIndex & index ) { qDebug() << "Playlist::itemActivated: row:" << index.row(); playItem(index.row()); diff --git a/src/playlist.h b/src/playlist.h index f45c8ea13..abcf81843 100644 --- a/src/playlist.h +++ b/src/playlist.h @@ -245,6 +245,7 @@ public slots: signals: void requestToPlayFile(const QString & filename, int seek = -1); void requestToPlayStream(const QString & filename, QStringList params = QStringList()); + void requestToPause(); void requestToAddCurrentFile(); void playlistEnded(); @@ -265,6 +266,7 @@ public slots: protected slots: void playCurrent(); + void pause(); void itemActivated(const QModelIndex & index ); void headerClicked(int index); void showPopup(const QPoint & pos); @@ -351,6 +353,7 @@ protected slots: MyAction * saveAct; MyAction * saveAsAct; MyAction * playAct; + MyAction * pauseAct; MyAction * prevAct; MyAction * nextAct; MyAction * repeatAct; From 25e4bf0e899047794b4fcd21a43994a85a0674f9 Mon Sep 17 00:00:00 2001 From: sgakerru Date: Fri, 27 Dec 2024 18:26:57 +0400 Subject: [PATCH 2/2] Add new `pl_pause` key to shortcuts --- src/shortcuts/default.keys | 1 + src/shortcuts/euskara.keys | 1 + src/shortcuts/vlc.keys | 1 + 3 files changed, 3 insertions(+) diff --git a/src/shortcuts/default.keys b/src/shortcuts/default.keys index 0634f99e9..a0e5cf119 100644 --- a/src/shortcuts/default.keys +++ b/src/shortcuts/default.keys @@ -257,6 +257,7 @@ pl_open_url pl_save pl_save_as pl_play +pl_pause pl_next N pl_prev P pl_move_up diff --git a/src/shortcuts/euskara.keys b/src/shortcuts/euskara.keys index 9c1c1aa57..f2db8b44c 100644 --- a/src/shortcuts/euskara.keys +++ b/src/shortcuts/euskara.keys @@ -224,6 +224,7 @@ restore/hide pl_open pl_save pl_play +pl_pause pl_next pl_prev pl_move_up diff --git a/src/shortcuts/vlc.keys b/src/shortcuts/vlc.keys index ccf95a027..91d6dd7c8 100644 --- a/src/shortcuts/vlc.keys +++ b/src/shortcuts/vlc.keys @@ -232,6 +232,7 @@ restore/hide pl_open pl_save pl_play +pl_pause pl_next pl_prev pl_move_up