Mirrors/ScreenPlay
Mirrors/ScreenPlay
1
0
Fork 0
mirror of https://gitlab.com/kelteseth/ScreenPlay.git synced 2024-09-18 16:32:33 +02:00
Code Issues Projects Releases Activity

Fix next btn logic

Browse Source 
Add better text hint for gif and video
This commit is contained in:
kelteseth 2018-10-14 17:29:19 +02:00
parent 7c7b614d2a
commit 989dc77046
3 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ScreenPlay/qml/Create/Wizards/CreateWallpaper/CreateWallpaperWizard.qml
View File

@ -205,7 +205,7 @@ Item {
state: "diabledPage0" state: "diabledPage0"
onClicked: { onClicked: {
if (!page_0.canNext && !page_0.gifCreated ) if (!page_0.canNext || !page_0.gifCreated )
return return
if (view.currentIndex < view.count - 1) if (view.currentIndex < view.count - 1)

23
ScreenPlay/qml/Create/Wizards/CreateWallpaper/NextButton.qml
View File

@ -48,15 +48,16 @@ Button {
} }
} }
] ]
transitions: [ // TODO find a way to smoothly change with on text change
Transition { // transitions: [
from: "*" // Transition {
to: "*" // from: "*"
NumberAnimation { // to: "*"
property: "width" // NumberAnimation {
easing.type: Easing.InOutQuad // property: "width"
duration: 2000 // easing.type: Easing.InOutQuad
} // duration: 2000
} // }
] // }
// ]
} }

8
ScreenPlay/qml/Create/Wizards/CreateWallpaper/Page_0.qml
View File

@ -56,9 +56,9 @@ Rectangle {
} }
Text { Text {
id: text1 id: txtConvert
color: "white" color: "white"
text: qsTr("Generating preview...") text: qsTr("Generating preview video...")
font.pixelSize: 14 font.pixelSize: 14
anchors { anchors {
horizontalCenter: parent.horizontalCenter horizontalCenter: parent.horizontalCenter
@ -71,6 +71,10 @@ Rectangle {
target: screenPlayCreate target: screenPlayCreate
onCreateWallpaperStateChanged: { onCreateWallpaperStateChanged: {
if (state === Create.State.ConvertingPreviewGif) {
txtConvert.text = qsTr("Generating preview gif...")
}
if (state === Create.State.ConvertingPreviewGifFinished) { if (state === Create.State.ConvertingPreviewGifFinished) {
imgPreview.source = "file:///" imgPreview.source = "file:///"
+ screenPlayCreate.workingDir + "/preview.gif" + screenPlayCreate.workingDir + "/preview.gif"