Fix HTML Wallpaper

Remove old WebView that is now MultimediaWebView

ScreenPlayWallpaper/CMakeLists.txt

@@ -39,7 +39,7 @@ set(SOURCES ${SOURCES} main.cpp src/basewindow.cpp)
 set(HEADER ${HEADER} src/basewindow.h)
 
 set(QML # cmake-format: sortable
-        qml/GifWallpaper.qml qml/Test.qml qml/Wallpaper.qml qml/WebsiteWallpaper.qml qml/WebView.qml qml/MultimediaView.qml qml/MultimediaWebView.qml)
+        qml/GifWallpaper.qml qml/Test.qml qml/Wallpaper.qml qml/WebsiteWallpaper.qml qml/MultimediaView.qml qml/MultimediaWebView.qml)
 
 qt_add_resources(RESOURCES Resources.qrc)
 

ScreenPlayWallpaper/qml/Wallpaper.qml

@@ -27,7 +27,7 @@ Rectangle {
             fadeIn()
             break
         case InstalledType.HTMLWallpaper:
-            loader.setSource("qrc:/ScreenPlayWallpaper/qml/WebView.qml", {
+            loader.setSource("qrc:/ScreenPlayWallpaper/qml/WebsiteWallpaper.qml", {
                                  "url": Qt.resolvedUrl(
                                             Wallpaper.projectSourceFileAbsolute)
                              })
@@ -100,7 +100,7 @@ Rectangle {
         }
 
         // This function only gets called here (the same function
-        // is inside the WebView.qml) when the previous Wallpaper type
+        // is inside the MultimediaWebView.qml) when the previous Wallpaper type
         // was not a video
         function onReloadVideo(oldType) {
             // We need to check if the old type

ScreenPlayWallpaper/qml/WebView.qml

@@ -1,152 +0,0 @@
-import QtQuick
-import QtWebEngine
-import ScreenPlay.Enums.InstalledType 1.0
-import ScreenPlayWallpaper 1.0
-
-Item {
-    id: root
-
-    property alias url: webView.url
-
-    signal requestFadeIn
-
-    function getSetVideoCommand() {
-        // TODO 30:
-        // Currently wont work. Commit anyways til QtCreator and Qt work with js template literals
-        var src = ""
-        src += "var videoPlayer = document.getElementById('videoPlayer');"
-        src += "var videoSource = document.getElementById('videoSource');"
-        src += "videoSource.src = '" + Wallpaper.projectSourceFileAbsolute + "';"
-        src += "videoPlayer.load();"
-        src += "videoPlayer.volume = " + Wallpaper.volume + ";"
-        src += "videoPlayer.setAttribute('style', 'object-fit :" + Wallpaper.fillMode + ";');"
-        src += "videoPlayer.play();"
-        return src
-    }
-
-    Component.onCompleted: {
-        WebEngine.settings.localContentCanAccessFileUrls = true
-        WebEngine.settings.localContentCanAccessRemoteUrls = true
-        WebEngine.settings.allowRunningInsecureContent = true
-        WebEngine.settings.accelerated2dCanvasEnabled = true
-        WebEngine.settings.javascriptCanOpenWindows = false
-        WebEngine.settings.showScrollBars = false
-        WebEngine.settings.playbackRequiresUserGesture = false
-        WebEngine.settings.focusOnNavigationEnabled = true
-    }
-
-    WebEngineView {
-        id: webView
-
-        anchors.fill: parent
-        onJavaScriptConsoleMessage:(lineNumber, message)=> print(lineNumber, message)
-        onLoadProgressChanged: {
-            if ((loadProgress === 100)) {
-                if (Wallpaper.type === InstalledType.VideoWallpaper)
-                    webView.runJavaScript(root.getSetVideoCommand(),
-                                          function (result) {
-                                              requestFadeIn()
-                                          })
-                else
-                    requestFadeIn()
-            }
-        }
-    }
-
-    Text {
-        id: txtVisualsPaused
-        text: qsTr("If you can read this, then the VisualsPaused optimization does not work on your system. You can fix this by disable this in: \n Settings -> Perfromance -> Pause wallpaper video rendering while another app is in the foreground ")
-        font.pointSize: 32
-        visible: false
-        horizontalAlignment: Text.AlignHCenter
-        verticalAlignment: Text.AlignVCenter
-        wrapMode: Text.WrapAtWordBoundaryOrAnywhere
-        anchors.centerIn: parent
-        width: parent.width * 0.8
-        color: "white"
-    }
-
-    Timer {
-        id: timerCover
-
-        interval: 300
-        onTriggered: {
-            webView.visible = !Wallpaper.visualsPaused
-            txtVisualsPaused.visible = Wallpaper.visualsPaused
-        }
-    }
-
-    Connections {
-        function onReloadVideo(oldType) {
-            webView.runJavaScript(root.getSetVideoCommand())
-        }
-
-        function onQmlExit() {
-            webView.runJavaScript(
-                        "var videoPlayer = document.getElementById('videoPlayer'); videoPlayer.volume = 0;")
-        }
-
-        function onMutedChanged(muted) {
-            if (muted)
-                webView.runJavaScript(
-                            "var videoPlayer = document.getElementById('videoPlayer'); videoPlayer.volume = 0;")
-            else
-                webView.runJavaScript(
-                            "var videoPlayer = document.getElementById('videoPlayer'); videoPlayer.volume = " + Wallpaper.volume + ";")
-        }
-
-        function onFillModeChanged(fillMode) {
-            if (webView.loadProgress === 100)
-                webView.runJavaScript(
-                            "var videoPlayer = document.getElementById('videoPlayer'); videoPlayer.setAttribute('style', 'object-fit :" + fillMode + ";');")
-        }
-
-        function onLoopsChanged(loops) {
-            if (webView.loadProgress === 100)
-                webView.runJavaScript(
-                            "var videoPlayer = document.getElementById('videoPlayer'); videoPlayer.loop = " + loops + ";")
-        }
-
-        function onVolumeChanged(volume) {
-            if (webView.loadProgress === 100)
-                webView.runJavaScript(
-                            "var videoPlayer = document.getElementById('videoPlayer'); videoPlayer.volume = " + volume + ";")
-        }
-
-        function onCurrentTimeChanged(currentTime) {
-            if (webView.loadProgress === 100)
-                webView.runJavaScript(
-                            "var videoPlayer = document.getElementById('videoPlayer'); videoPlayer.currentTime  = "
-                            + currentTime + " * videoPlayer.duration;")
-        }
-
-        function onPlaybackRateChanged(playbackRate) {
-            if (webView.loadProgress === 100)
-                webView.runJavaScript(
-                            "var videoPlayer = document.getElementById('videoPlayer'); videoPlayer.playbackRate  = " + playbackRate + ";")
-        }
-
-        function onVisualsPausedChanged(visualsPaused) {
-            if (visualsPaused) {
-                // Wait until Wallpaper animation is finsihed
-                timerCover.restart()
-            } else {
-                webView.visible = true
-                txtVisualsPaused.visible = false
-            }
-        }
-
-        function onIsPlayingChanged(isPlaying) {
-            if (webView.loadProgress === 100) {
-                if (isPlaying)
-                    webView.runJavaScript(
-                                "var videoPlayer = document.getElementById('videoPlayer'); videoPlayer.play();")
-                else
-                    webView.runJavaScript(
-                                "var videoPlayer = document.getElementById('videoPlayer'); videoPlayer.pause();")
-            }
-        }
-
-        target: Wallpaper
-    }
-}

ScreenPlayWallpaper/qml/WebsiteWallpaper.qml

@@ -24,7 +24,7 @@ Item {
         id: webView
 
         anchors.fill: parent
-        url: root.url
+        url: Qt.resolvedUrl(root.url)
         onJavaScriptConsoleMessage: print(lineNumber, message)
         onLoadProgressChanged: {
             if ((loadProgress === 100))