Commit c20f8375 authored by Elias Steurer's avatar Elias Steurer 🇩🇪

Fix website Wallpaper

Add https:// to wizard.
parent 44f31a1f
Pipeline #245836107 failed with stages
in 7 seconds
......@@ -64,7 +64,7 @@ WizardPage {
id: tfUrl
Layout.fillWidth: true
required: true
placeholderText: qsTr("Website URL")
text: "https://"
}
Item {
......
......@@ -81,8 +81,7 @@ Rectangle {
break
case Wallpaper.WallpaperType.Website:
loader.setSource("qrc:/WebsiteWallpaper.qml", {
"source": Qt.resolvedUrl(
Wallpaper.fullContentPath)
"url": Wallpaper.fullContentPath
})
fadeIn()
break
......
......@@ -6,7 +6,7 @@ import ScreenPlayWallpaper 1.0
Item {
id: root
property alias url: webView.url
property string url
signal requestFadeIn
......@@ -24,6 +24,7 @@ Item {
WebEngineView {
id: webView
anchors.fill: parent
url: root.url
onJavaScriptConsoleMessage: print(lineNumber, message)
onLoadProgressChanged: {
if ((loadProgress === 100)) {
......
......@@ -65,7 +65,7 @@ BaseWindow::BaseWindow(
QApplication::exit(-3);
}
if (!project.contains("file")) {
if (!project.contains("file") && !project.contains("url")) {
qFatal("No file was specified inside the json object!");
QApplication::exit(-4);
}
......@@ -159,7 +159,11 @@ void BaseWindow::replaceWallpaper(
setVolume(volume);
setFillMode(fillMode);
setType(parseWallpaperType(type));
setFullContentPath("file:///" + absolutePath + "/" + file);
if (type.contains("websiteWallpaper", Qt::CaseInsensitive)) {
setFullContentPath(file);
} else {
setFullContentPath("file:///" + absolutePath + "/" + file);
}
qInfo() << file;
if (m_type == WallpaperType::Qml || m_type == WallpaperType::Html)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment