Mirrors/ScreenPlay
Mirrors/ScreenPlay
1
0
Fork 0
mirror of https://gitlab.com/kelteseth/ScreenPlay.git synced 2024-10-06 09:17:07 +02:00
Code Issues Projects Releases Activity

Cleanup unused files

Browse Source
This commit is contained in:
Elias Steurer 2023-11-23 12:22:58 +01:00
parent ce397137c9
commit 2f7719d056
10 changed files with 4 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ScreenPlay/CMakeLists.txt
View File

@ -207,9 +207,6 @@ set(RESOURCES
assets/licenses/Apache2.txt
assets/licenses/OFL.txt
assets/macos/app.screenplay.plist
assets/particle/backgroundGlow.png
assets/particle/dot.png
assets/shader/movingcolorramp.fsh
assets/startinfo/blender.png
assets/startinfo/flaticon.png
assets/startinfo/forums.png
@ -238,7 +235,6 @@ set(RESOURCES
assets/wizards/License_CC_Attribution-ShareAlike_4.0.txt
assets/wizards/License_CC_Attribution_4.0.txt
assets/wizards/License_GPL_3.0.txt
assets/wizards/QmlProject.qmlproject
assets/WorkshopPreview.html
legal/DataProtection.txt
legal/gpl-3.0.txt
@ -247,6 +243,7 @@ set(RESOURCES
legal/OpenSSL.txt
profiles.json
qml/Create/WizardsFiles/HTMLWallpaperMain.html
qml/Create/WizardsFiles/QmlProject.qmlproject
qml/Create/WizardsFiles/HTMLWidgetMain.html
qml/Create/WizardsFiles/QMLWallpaperMain.qml
qml/Create/WizardsFiles/QMLWidgetMain.qml

BIN
ScreenPlay/assets/particle/backgroundGlow.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 115 KiB

BIN
ScreenPlay/assets/particle/dot.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 3.2 KiB

18
ScreenPlay/assets/shader/movingcolorramp.fsh
View File

@ -1,18 +0,0 @@
uniform float time;
uniform float shaderOpacity;
uniform vec2 resolution;
void main( void ) {
vec2 position = ( gl_FragCoord.xy / resolution.xy );
vec3 color1 = vec3(1.0, 0.6, 0.01);
vec3 color2 = vec3(0.97, 0.24, 0.24);
float mixValue = distance(position,vec2(0,1));
vec3 color = mix( color1, color2, mixValue);
gl_FragColor = vec4(color,mixValue) * shaderOpacity;
}

BIN
ScreenPlay/assets/tests/video_import.mp4
View File

Binary file not shown.

0
ScreenPlay/assets/wizards/QmlProject.qmlproject → ScreenPlay/qml/Create/WizardsFiles/QmlProject.qmlproject
View File

2
ScreenPlay/src/wizards.cpp
View File

@ -273,7 +273,7 @@ void Wizards::createQMLWallpaper(
}
const QString qmlproject = workingPath + "/" + title + ".qmlproject";
if (!Util::writeFileFromQrc(":/qml/ScreenPlayApp/assets/wizards/" + QString("QmlProject.qmlproject"), qmlproject)) {
if (!Util::writeFileFromQrc(":/qml/ScreenPlayApp/qml/Create/WizardsFiles/" + QString("QmlProject.qmlproject"), qmlproject)) {
qWarning() << "Could not write " << qmlproject;
emit widgetCreationFinished(WizardResult::WriteLicenseFileError);
return;

2
ScreenPlay/tests/tst_main.cpp
View File

@ -102,7 +102,7 @@ void ScreenPlayTest::import_convert_video()
auto* createWallpaperInit = m_window->findChild<QQuickItem*>("createWallpaperInit");
QVERIFY(createWallpaperInit);
const QString originalVideoPath = QString(SCREENPLAY_SOURCE_DIR) + "/ScreenPlay/assets/tests/video_import.mp4";
const QString originalVideoPath = QString(SCREENPLAY_SOURCE_DIR) + "/Content/wallpaper_video_nebula_h264/mantissa.xyz_loop_072.mp4";
qInfo() << originalVideoPath;
QVERIFY(QMetaObject::invokeMethod(createWallpaperInit,

2
ScreenPlayWallpaper/CMakeLists.txt
View File

@ -46,7 +46,7 @@ set(QML
qml/Wallpaper.qml
qml/WebsiteWallpaper.qml)
set(RESOURCES dot.png qtquickcontrols2.conf index.html)
set(RESOURCES qtquickcontrols2.conf index.html)
set(LIB_SOURCES)
set(LIB_HEADER)

8
ScreenPlayWallpaper/qml/Test.qml
View File

@ -104,14 +104,6 @@ Rectangle {
}
}
ImageParticle {
height: 16
width: 16
source: "dot.png"
system: particleSystem
opacity: root.imgOpacity
}
Text {
id: txtMousePos