Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Switch to GitLab Next
Sign in / Register
Toggle navigation
Menu
Open sidebar
Elias Steurer
ScreenPlay
Commits
c20f8375
Commit
c20f8375
authored
Jan 23, 2021
by
Elias Steurer
🇪🇺
Browse files
Fix website Wallpaper
Add https:// to wizard.
parent
44f31a1f
Pipeline
#245836107
failed with stages
in 7 seconds
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
ScreenPlay/qml/Create/Wizards/WebsiteWallpaper.qml
View file @
c20f8375
...
...
@@ -64,7 +64,7 @@ WizardPage {
id
:
tfUrl
Layout.fillWidth
:
true
required
:
true
placeholderText
:
qsTr
(
"
Website URL
"
)
text
:
"
https://
"
}
Item
{
...
...
ScreenPlayWallpaper/Wallpaper.qml
View file @
c20f8375
...
...
@@ -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
...
...
ScreenPlayWallpaper/WebsiteWallpaper.qml
View file @
c20f8375
...
...
@@ -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
))
{
...
...
ScreenPlayWallpaper/src/basewindow.cpp
View file @
c20f8375
...
...
@@ -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
)
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment