Mirrors/ScreenPlay
Mirrors/ScreenPlay
1
0
Fork 0
mirror of https://gitlab.com/kelteseth/ScreenPlay.git synced 2024-09-02 08:39:49 +02:00
Code Issues Projects Releases Activity

Move all qml files from all project into qml subfolder

Browse Source 
This makes the build script easier
This commit is contained in:
Elias Steurer 2021-08-14 13:38:24 +02:00
parent 538889465d
commit bb5e753291
14 changed files with 66 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
ScreenPlay/assets.qrc → ScreenPlay/ScreenPlayAssets.qrc
View File

0
ScreenPlay/qml.qrc → ScreenPlay/ScreenPlayQML.qrc
View File

10
ScreenPlayWallpaper/SPWResources.qrc
View File

@ -1,12 +1,12 @@
<RCC>
<qresource prefix="/">
<file>Wallpaper.qml</file>
<file>Test.qml</file>
<file>dot.png</file>
<file>qtquickcontrols2.conf</file>
<file>WebView.qml</file>
<file>index.html</file>
<file>GifWallpaper.qml</file>
<file>WebsiteWallpaper.qml</file>
<file>qml/GifWallpaper.qml</file>
<file>qml/Test.qml</file>
<file>qml/Wallpaper.qml</file>
<file>qml/WebsiteWallpaper.qml</file>
<file>qml/WebView.qml</file>
</qresource>
</RCC>

0
ScreenPlayWallpaper/GifWallpaper.qml → ScreenPlayWallpaper/qml/GifWallpaper.qml
View File

0
ScreenPlayWallpaper/Test.qml → ScreenPlayWallpaper/qml/Test.qml
View File

10
ScreenPlayWallpaper/Wallpaper.qml → ScreenPlayWallpaper/qml/Wallpaper.qml
View File

@ -14,10 +14,10 @@ Rectangle {
function init() {
switch (Wallpaper.type) {
case InstalledType.VideoWallpaper:
loader.source = "qrc:/WebView.qml";
loader.source = "qrc:/qml/WebView.qml";
break;
case InstalledType.HTMLWallpaper:
loader.setSource("qrc:/WebView.qml", {
loader.setSource("qrc:/qml/WebView.qml", {
"url": Qt.resolvedUrl(Wallpaper.projectSourceFileAbsolute)
});
break;
@ -26,13 +26,13 @@ Rectangle {
fadeIn();
break;
case InstalledType.WebsiteWallpaper:
loader.setSource("qrc:/WebsiteWallpaper.qml", {
loader.setSource("qrc:/qml/WebsiteWallpaper.qml", {
"url": Wallpaper.projectSourceFileAbsolute
});
fadeIn();
break;
case InstalledType.GifWallpaper:
loader.setSource("qrc:/GifWallpaper.qml", {
loader.setSource("qrc:/qml/GifWallpaper.qml", {
"source": Qt.resolvedUrl(Wallpaper.projectSourceFileAbsolute)
});
fadeIn();
@ -96,7 +96,7 @@ Rectangle {
return ;
imgCover.state = "showDefaultBackgroundImage";
loader.source = "qrc:/WebView.qml";
loader.source = "qrc:/qml/WebView.qml";
}
target: Wallpaper

95
ScreenPlayWallpaper/WebView.qml → ScreenPlayWallpaper/qml/WebView.qml
View File

@ -8,31 +8,31 @@ Item {
property alias url: webView.url
signal requestFadeIn()
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;
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;
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 {
@ -45,18 +45,18 @@ Item {
onLoadProgressChanged: {
if ((loadProgress === 100)) {
if (Wallpaper.type === InstalledType.VideoWallpaper)
webView.runJavaScript(root.getSetVideoCommand(), function(result) {
requestFadeIn();
});
webView.runJavaScript(root.getSetVideoCommand(),
function (result) {
requestFadeIn()
})
else
requestFadeIn();
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
@ -73,77 +73,82 @@ Item {
interval: 300
onTriggered: {
webView.visible = !Wallpaper.visualsPaused;
txtVisualsPaused.visible = Wallpaper.visualsPaused;
webView.visible = !Wallpaper.visualsPaused
txtVisualsPaused.visible = Wallpaper.visualsPaused
}
}
Connections {
function onReloadVideo(oldType) {
webView.runJavaScript(root.getSetVideoCommand());
webView.runJavaScript(root.getSetVideoCommand())
}
function onQmlExit() {
webView.runJavaScript("var videoPlayer = document.getElementById('videoPlayer'); videoPlayer.volume = 0;");
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;");
webView.runJavaScript(
"var videoPlayer = document.getElementById('videoPlayer'); videoPlayer.volume = 0;")
else
webView.runJavaScript("var videoPlayer = document.getElementById('videoPlayer'); videoPlayer.volume = " + Wallpaper.volume + ";");
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 + ";');");
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 + ";");
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 + ";");
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;");
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 + ";");
webView.runJavaScript(
"var videoPlayer = document.getElementById('videoPlayer'); videoPlayer.playbackRate = " + playbackRate + ";")
}
function onVisualsPausedChanged(visualsPaused) {
if (visualsPaused) {
// Wait until Wallpaper animation is finsihed
timerCover.restart();
timerCover.restart()
} else {
webView.visible = true;
txtVisualsPaused.visible = false;
webView.visible = true
txtVisualsPaused.visible = false
}
}
function onIsPlayingChanged(isPlaying) {
if (webView.loadProgress === 100) {
if (isPlaying)
webView.runJavaScript("var videoPlayer = document.getElementById('videoPlayer'); videoPlayer.play();");
webView.runJavaScript(
"var videoPlayer = document.getElementById('videoPlayer'); videoPlayer.play();")
else
webView.runJavaScript("var videoPlayer = document.getElementById('videoPlayer'); videoPlayer.pause();");
webView.runJavaScript(
"var videoPlayer = document.getElementById('videoPlayer'); videoPlayer.pause();")
}
}
target: Wallpaper
}
}

0
ScreenPlayWallpaper/WebsiteWallpaper.qml → ScreenPlayWallpaper/qml/WebsiteWallpaper.qml
View File

2
ScreenPlayWallpaper/src/basewindow.cpp
View File

@ -55,7 +55,7 @@ BaseWindow::BaseWindow(
if (projectFilePath == "test") {
setType(ScreenPlay::InstalledType::InstalledType::QMLWallpaper);
setProjectSourceFileAbsolute({ "qrc:/Test.qml" });
setProjectSourceFileAbsolute({ "qrc:/qml/Test.qml" });
setupLiveReloading();
return;
}

2
ScreenPlayWallpaper/src/winwindow.cpp
View File

@ -483,7 +483,7 @@ void WinWindow::configureWindowGeometry()
// we can set it here once :)
m_window.setTextRenderType(QQuickWindow::TextRenderType::NativeTextRendering);
m_window.setResizeMode(QQuickView::ResizeMode::SizeRootObjectToView);
m_window.setSource(QUrl("qrc:/Wallpaper.qml"));
m_window.setSource(QUrl("qrc:/qml/Wallpaper.qml"));
m_window.hide();
}

4
ScreenPlayWidget/SPWidgetResources.qrc
View File

@ -1,10 +1,10 @@
<RCC>
<qresource prefix="/">
<file>assets/image/noisy-texture-3.png</file>
<file>test.qml</file>
<file>Widget.qml</file>
<file>assets/icons/baseline-close-24px.svg</file>
<file>assets/icons/baseline-opacity-24px.svg</file>
<file>assets/icons/baseline-settings-20px.svg</file>
<file>qml/Test.qml</file>
<file>qml/Widget.qml</file>
</qresource>
</RCC>

0
ScreenPlayWidget/test.qml → ScreenPlayWidget/qml/Test.qml
View File

0
ScreenPlayWidget/Widget.qml → ScreenPlayWidget/qml/Widget.qml
View File

4
ScreenPlayWidget/src/widgetwindow.cpp
View File

@ -49,7 +49,7 @@ WidgetWindow::WidgetWindow(
#endif
if (projectPath == "test") {
setProjectSourceFileAbsolute({ "qrc:/test.qml" });
setProjectSourceFileAbsolute({ "qrc:/qml/Test.qml" });
setType(ScreenPlay::InstalledType::InstalledType::QMLWidget);
} else {
setProjectPath(projectPath);
@ -71,7 +71,7 @@ WidgetWindow::WidgetWindow(
m_window.setTextRenderType(QQuickWindow::TextRenderType::NativeTextRendering);
m_window.setResizeMode(QQuickView::ResizeMode::SizeViewToRootObject);
m_window.setSource(QUrl("qrc:/Widget.qml"));
m_window.setSource(QUrl("qrc:/qml/Widget.qml"));
m_window.setPosition(m_position);
m_window.show();