diff --git a/app/mainwindow.cpp b/app/mainwindow.cpp
--- a/app/mainwindow.cpp
+++ b/app/mainwindow.cpp
@@ -1324,7 +1324,7 @@
qApp->setProperty("KDE_COLOR_SCHEME_PATH", QVariant());
QApplication::setPalette(d->mGvCore->palette(GvCore::NormalPalette));
- d->mSlideShow->stop();
+ d->mSlideShow->pause();
KToggleFullScreenAction::setFullScreen(this, false);
menuBar()->setVisible(d->mShowMenuBarAction->isChecked());
toolBar()->setVisible(d->mStateBeforeFullScreen.mToolBarVisible);
@@ -1402,7 +1402,7 @@
void MainWindow::toggleSlideShow()
{
if (d->mSlideShow->isRunning()) {
- d->mSlideShow->stop();
+ d->mSlideShow->pause();
} else {
if (!d->mViewAction->isChecked()) {
d->mViewAction->trigger();
@@ -1433,10 +1433,11 @@
void MainWindow::updateSlideShowAction()
{
if (d->mSlideShow->isRunning()) {
- d->mToggleSlideShowAction->setText(i18n("Stop Slideshow"));
+ d->mToggleSlideShowAction->setText(i18n("Pause Slideshow"));
d->mToggleSlideShowAction->setIcon(QIcon::fromTheme("media-playback-pause"));
} else {
- d->mToggleSlideShowAction->setText(i18n("Start Slideshow"));
+ d->mToggleSlideShowAction->setText(d->mFullScreenAction->isChecked() ? i18n("Resume Slideshow")
+ : i18n("Start Slideshow"));
d->mToggleSlideShowAction->setIcon(QIcon::fromTheme("media-playback-start"));
}
}
diff --git a/doc/index.docbook b/doc/index.docbook
--- a/doc/index.docbook
+++ b/doc/index.docbook
@@ -376,7 +376,7 @@
will not autohide. Most of the buttons on the bar are the same as the ones on
the toolbar in Browse or View Modes, except for the Exit Full
Screen Mode button which returns you to the &gwenview; window, the
-Start/Stop Slideshow button, and the
+Pause/Resume Slideshow button, and the
Configure Full Screen Mode button which shows a
small settings dialog that allows you to easily and quickly configure the
slideshow. The slideshow controls there are:
diff --git a/lib/mpris2/mprismediaplayer2player.cpp b/lib/mpris2/mprismediaplayer2player.cpp
--- a/lib/mpris2/mprismediaplayer2player.cpp
+++ b/lib/mpris2/mprismediaplayer2player.cpp
@@ -136,7 +136,7 @@
void MprisMediaPlayer2Player::Pause()
{
- mSlideShow->stop();
+ mSlideShow->pause();
}
void MprisMediaPlayer2Player::PlayPause()
diff --git a/lib/slideshow.h b/lib/slideshow.h
--- a/lib/slideshow.h
+++ b/lib/slideshow.h
@@ -43,7 +43,7 @@
virtual ~SlideShow();
void start(const QList& urls);
- void stop();
+ void pause();
QAction* loopAction() const;
QAction* randomAction() const;
@@ -72,7 +72,7 @@
Q_SIGNALS:
void goToUrl(const QUrl&);
/**
- * Slideshow has been started or stopped
+ * Slideshow has been started or paused
*/
void stateChanged(bool running);
/**
diff --git a/lib/slideshow.cpp b/lib/slideshow.cpp
--- a/lib/slideshow.cpp
+++ b/lib/slideshow.cpp
@@ -50,7 +50,7 @@
#endif
enum State {
- Stopped,
+ Paused,
Started,
WaitForEndOfUrl
};
@@ -177,7 +177,7 @@
: QObject(parent)
, d(new SlideShowPrivate)
{
- d->mState = Stopped;
+ d->mState = Paused;
d->mTimer = new QTimer(this);
connect(d->mTimer, &QTimer::timeout, this, &SlideShow::goToNextUrl);
@@ -264,11 +264,11 @@
return 0;
}
-void SlideShow::stop()
+void SlideShow::pause()
{
LOG("Stopping timer");
d->mTimer->stop();
- d->mState = Stopped;
+ d->mState = Paused;
stateChanged(false);
}
@@ -286,7 +286,7 @@
QUrl url = d->findNextUrl();
LOG("url:" << url);
if (!url.isValid()) {
- stop();
+ pause();
return;
}
goToUrl(url);
@@ -301,14 +301,14 @@
d->mCurrentUrl = url;
// Restart timer to avoid showing new url for the remaining time of the old
// url
- if (d->mState != Stopped) {
+ if (d->mState != Paused) {
d->doStart();
}
}
bool SlideShow::isRunning() const
{
- return d->mState != Stopped;
+ return d->mState != Paused;
}
void SlideShow::updateConfig()
@@ -319,7 +319,7 @@
void SlideShow::slotRandomActionToggled(bool on)
{
- if (on && d->mState != Stopped) {
+ if (on && d->mState != Paused) {
d->initShuffledUrls();
}
}