From 767c2c5e7371b1f8843efcd0a0d235c0b4e7eb5c Mon Sep 17 00:00:00 2001
From: Ivailo Monev <xakepa10@gmail.com>
Date: Tue, 29 Nov 2022 07:09:40 +0200
Subject: [PATCH] kmediaplayer: adjust to KMediaWidget changes

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
---
 kmediaplayer/kmediaplayerui.rc |  4 ----
 kmediaplayer/kmediawindow.cpp  | 13 +------------
 kmediaplayer/kmediawindow.h    |  1 -
 3 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/kmediaplayer/kmediaplayerui.rc b/kmediaplayer/kmediaplayerui.rc
index 3c49495a..70bca24e 100644
--- a/kmediaplayer/kmediaplayerui.rc
+++ b/kmediaplayer/kmediaplayerui.rc
@@ -10,10 +10,6 @@
             <Separator/>
             <Action name="file_quit"/>
         </Menu>
-        <Menu name="player"><text>&amp;Player</text>
-            <Action name="player_fullscreen"/>
-            <Separator/>
-        </Menu>
         <Menu name="settings"><text>&amp;Settings</text>
             <Action name="settings_player"/>
         </Menu>
diff --git a/kmediaplayer/kmediawindow.cpp b/kmediaplayer/kmediawindow.cpp
index 58b4f37b..675f4a6d 100644
--- a/kmediaplayer/kmediawindow.cpp
+++ b/kmediaplayer/kmediawindow.cpp
@@ -74,12 +74,6 @@ KMediaWindow::KMediaWindow(QWidget *parent, Qt::WindowFlags flags)
     action->setShortcut(KStandardShortcut::quit());
     action->setWhatsThis(i18n("Close the application."));
 
-    action = actionCollection()->addAction("player_fullscreen", this, SLOT(slotFullscreen()));
-    action->setText(i18n("Fullscreen"));
-    action->setIcon(KIcon("view-fullscreen"));
-    action->setShortcut(KStandardShortcut::fullScreen());
-    action->setWhatsThis(i18n("Set the player view to fullscreen/non-fullscreen"));
-
     action = actionCollection()->addAction("settings_player", this, SLOT(slotConfigure()));
     action->setText(i18n("Configure KMediaPlayer"));
     action->setIcon(KIcon("preferences-desktop-sound"));
@@ -172,11 +166,6 @@ void KMediaWindow::slotClosePath()
     statusBar()->showMessage("");
 }
 
-void KMediaWindow::slotFullscreen()
-{
-    m_player->setFullscreen();
-}
-
 void KMediaWindow::slotConfigure()
 {
     KCMultiDialog kcmdialg(this);
@@ -205,8 +194,8 @@ void KMediaWindow::slotQuit()
 void KMediaWindow::slotDelayedRestore()
 {
     disconnect(m_player->player(), SIGNAL(loaded()), this, SLOT(slotDelayedRestore()));
+    m_player->setPlay(int(m_playing));
     m_player->setPosition(m_currenttime);
-    m_player->setPlay(int(!m_playing));
 }
 
 void KMediaWindow::saveProperties(KConfigGroup &configgroup)
diff --git a/kmediaplayer/kmediawindow.h b/kmediaplayer/kmediawindow.h
index 6387555f..563e133c 100644
--- a/kmediaplayer/kmediawindow.h
+++ b/kmediaplayer/kmediawindow.h
@@ -37,7 +37,6 @@ public slots:
     void slotOpenURL();
     void slotOpenURL(KUrl url);
     void slotClosePath();
-    void slotFullscreen();
     void slotConfigure();
     void slotMenubar();
     void slotMenu(QPoint position);