Mirrors/ScreenPlay
Mirrors/ScreenPlay
1
0
Fork 0
mirror of https://gitlab.com/kelteseth/ScreenPlay.git synced 2024-11-26 04:33:06 +01:00
Code Issues Projects Releases Activity

Merge branch 'master' into 107-refactor-create-screen

Browse Source
This commit is contained in:
Elias Steurer 2020-10-17 18:39:53 +02:00
commit 0ffb8837f1
4 changed files with 80 additions and 129 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
.gitlab-ci.yml
View File

@ -26,25 +26,7 @@ build:windows:
paths:
- Common\vcpkg\
script:
- git submodule update --init
- git submodule update --recursive
- cd Common
- if (!(Test-Path "vcpkg")){git clone https://github.com/microsoft/vcpkg.git}
- cd vcpkg
- git remote set-url origin https://github.com/microsoft/vcpkg.git
- git pull origin master
- git checkout 18ab4b72a26284f0df28295ce7bf9b21c96f20f4
- cmd /c bootstrap-vcpkg.bat
- ls
- cmd /c vcpkg.exe install openssl --triplet x64-windows --recurse
- cd ..
- cd ..
- curl.exe -L https://www.gyan.dev/ffmpeg/builds/packages/ffmpeg-4.3.1-2020-09-16-full_build.zip --output ffmpeg.zip
- tar -xvf ffmpeg.zip --strip-components 2 ffmpeg-4.3.1-full_build/bin
- if (!(Test-Path "Common/ffmpeg")){ mkdir Common/ffmpeg }
- cmd /c DEL ffplay.exe
- cmd /c move /Y ffmpeg.exe Common/ffmpeg
- cmd /c move /Y ffprobe.exe Common/ffmpeg
- cmd /c install_dependencies_windows.bat
- mkdir BUILD_WINDOWS
- cd BUILD_WINDOWS
- cmake.exe ../ -DCMAKE_PREFIX_PATH=c:/Qt/5.15.1/msvc2019 -DCMAKE_IGNORE_PATH=C:/Strawberry/c/bin -DCMAKE_BUILD_TYPE=MinSizeRel -DCMAKE_TOOLCHAIN_FILE="$(Get-Location)/../Common/vcpkg/scripts/buildsystems/vcpkg.cmake" -DVCPKG_TARGET_TRIPLET=x64-windows "-GCodeBlocks - Ninja" -B.

128
ScreenPlay/qml/Installed/ScreenPlayItem.qml
View File

@ -9,7 +9,6 @@ Item {
id: root
width: 320
height: 180
opacity: 0
property string customTitle: "name here"
property url absoluteStoragePath
@ -44,69 +43,36 @@ Item {
if (itemIndex > 30)
itemIndexMax = 3
10 * itemIndexMax * Math.random()
5 * itemIndexMax * Math.random()
}
running: true
onTriggered: showAnim.start()
}
transform: [
Rotation {
id: rt
origin.x: width * .5
origin.y: height * .5
axis {
x: -.5
y: 0
z: 0
}
angle: 0
},
Translate {
id: tr
},
Scale {
id: sc
origin.x: width * .5
origin.y: height * .5
}
]
ParallelAnimation {
id: showAnim
running: false
RotationAnimation {
target: rt
from: 60
to: 0
duration: 500
easing.type: Easing.OutCirc
property: "angle"
}
PropertyAnimation {
target: root
OpacityAnimator {
target: screenPlayItemWrapper
from: 0
to: 1
duration: 800
easing.type: Easing.OutCirc
property: "opacity"
}
PropertyAnimation {
target: tr
YAnimator {
target: screenPlayItemWrapper
from: 80
to: 0
duration: 500
easing.type: Easing.OutCirc
property: "y"
}
PropertyAnimation {
target: sc
ScaleAnimator {
target: screenPlayItemWrapper
from: .5
to: 1
duration: 200
easing.type: Easing.OutCirc
properties: "xScale,yScale"
}
}
@ -130,9 +96,9 @@ Item {
Item {
id: screenPlayItemWrapper
anchors.centerIn: parent
height: 180
width: 320
height: 180
opacity: 0
Image {
id: mask
@ -214,51 +180,63 @@ Item {
}
}
states: [
State {
name: "hover"
PropertyChanges {
target: screenPlayItemWrapper
width: 325
height: 185
}
PropertyChanges {
target: effect
opacity: 0.6
width: 325
height: 185
}
PropertyChanges {
target: screenPlayItemWrapper
opacity: 1
}
PropertyChanges {
target: icnType
opacity: .5
}
}
]
transitions: [
Transition {
from: ""
to: "hover"
reversible: true
PropertyAnimation {
ScaleAnimator {
target: screenPlayItemWrapper
properties: "width,height"
duration: 80
from: 1
to: 1.05
}
PropertyAnimation {
ScaleAnimator {
target: effect
properties: "width,height,opacity"
duration: 80
from: 1
to: 1.05
}
PropertyAnimation {
OpacityAnimator {
target: icnType
property: "opacity"
duration: 80
from: 0.5
to: 1
}
OpacityAnimator {
target: effect
duration: 80
from: 0.6
to: 1
}
},
Transition {
from: "hover"
to: ""
ScaleAnimator {
target: screenPlayItemWrapper
duration: 80
from: 1.05
to: 1
}
ScaleAnimator {
target: effect
duration: 80
from: 1.05
to: 1
}
OpacityAnimator {
target: icnType
duration: 80
from: 1
to: 0.5
}
OpacityAnimator {
target: effect
duration: 80
from: 1
to: 0.5
}
}
]

59
ScreenPlay/qml/Installed/ScreenPlayItemImage.qml
View File

@ -27,9 +27,13 @@ Item {
asynchronous: true
cache: true
fillMode: Image.PreserveAspectCrop
source: root.screenPreview
=== "" ? "qrc:/assets/images/missingPreview.png" : Qt.resolvedUrl(
absoluteStoragePath + "/" + root.sourceImage)
source: {
if (root.sourceImage === "")
return "qrc:/assets/images/missingPreview.png"
return root.screenPreview === "" ? "qrc:/assets/images/missingPreview.png" : Qt.resolvedUrl(
absoluteStoragePath + "/" + root.sourceImage)
}
onStatusChanged: {
if (image.status === Image.Ready) {
@ -59,42 +63,28 @@ Item {
opacity: 0
}
states: [
State {
name: "loading"
PropertyChanges {
target: image
opacity: 0
}
},
State {
name: "loaded"
PropertyChanges {
target: image
opacity: 1
}
},
State {
name: "hover"
PropertyChanges {
target: loader_imgGIFPreview
opacity: 1
}
}
]
transitions: [
Transition {
from: "loading"
to: "loaded"
NumberAnimation {
OpacityAnimator {
target: image
property: "opacity"
duration: 300
from: 0
to: 1
easing.type: Easing.OutQuart
}
},
Transition {
from: "hover"
to: "loaded"
OpacityAnimator {
target: loader_imgGIFPreview
duration: 300
from: 1
to: 0
easing.type: Easing.OutQuart
}
},
@ -103,10 +93,11 @@ Item {
to: "hover"
reversible: true
PropertyAnimation {
OpacityAnimator {
target: loader_imgGIFPreview
property: "opacity"
duration: 400
from: 0
to: 1
easing.type: Easing.OutQuart
}
}

2
install_dependencies_windows.bat
View File

@ -31,4 +31,4 @@ rem Deleting FFmpeg temp
DEL ffmpeg.7z
DEL 7z.msi
rmdir 7z /s /q
pause
timeout 5 > NUL