diff --git a/ScreenPlay/Resources.qrc b/ScreenPlay/Resources.qrc
index 679974f3bb99dfd204edc8d81317500e7c542c5e..94d2969cae3658c82835c87691f216894846cd16 100644
--- a/ScreenPlay/Resources.qrc
+++ b/ScreenPlay/Resources.qrc
@@ -74,25 +74,15 @@
assets/icons/icon_widgets.svg
assets/icons/icon_window.svg
assets/icons/monitor_setup.svg
- assets/images/FFmpeg_Logo_new.svg
assets/images/Intro.png
assets/images/Intro_PC.png
- assets/images/Intro_PC.svg
assets/images/Intro_shine.png
- assets/images/ScreenPlayIconStomt.png
- assets/images/Stomt_Logo+Wordmark_Mono_BLK.svg
- assets/images/Untitled.png
assets/images/Window.svg
- assets/images/ava.png
- assets/images/hand_give.png
- assets/images/mask.svg
assets/images/mask_round.svg
assets/images/mask_workshop.png
assets/images/missingPreview.png
- assets/images/noisy-texture-2.png
assets/images/noisy-texture-3.png
assets/images/noisy-texture.png
- assets/images/undraw_static_website_0107.svg
assets/licenses/Apache2.txt
assets/licenses/OFL.txt
assets/particle/backgroundGlow.png
@@ -143,5 +133,6 @@
translations/ScreenPlay_ru.qm
translations/ScreenPlay_vi.qm
translations/ScreenPlay_zh_cn.qm
+ assets/images/Early_Access.png
diff --git a/ScreenPlay/assets/images/Early_Access.png b/ScreenPlay/assets/images/Early_Access.png
new file mode 100644
index 0000000000000000000000000000000000000000..5bb576e8cacce32f1b11de2cb27f4baf2397ab3b
Binary files /dev/null and b/ScreenPlay/assets/images/Early_Access.png differ
diff --git a/ScreenPlay/assets/images/FFmpeg_Logo_new.svg b/ScreenPlay/assets/images/FFmpeg_Logo_new.svg
deleted file mode 100644
index 7f40e3ec03ee0ecc7b6c4518a09ebc66e10f0da9..0000000000000000000000000000000000000000
--- a/ScreenPlay/assets/images/FFmpeg_Logo_new.svg
+++ /dev/null
@@ -1,38 +0,0 @@
-
-
diff --git a/ScreenPlay/assets/images/Intro.png b/ScreenPlay/assets/images/Intro.png
index a03e79cf394e46fa91f8058dd422df79606f4101..e4e516005df9f265b4ca26202221c23a1d692eab 100644
Binary files a/ScreenPlay/assets/images/Intro.png and b/ScreenPlay/assets/images/Intro.png differ
diff --git a/ScreenPlay/assets/images/Intro_PC.svg b/ScreenPlay/assets/images/Intro_PC.svg
deleted file mode 100644
index 981e57a6aeb661a8e9c9976f27ea38a19952bc33..0000000000000000000000000000000000000000
--- a/ScreenPlay/assets/images/Intro_PC.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/ScreenPlay/assets/images/Intro_shine.png b/ScreenPlay/assets/images/Intro_shine.png
index 6cf53a79e6fcae19d12165bb8e42a3c7a26b7d4e..b40bbd0645f2d283989d002732993bc9342dcdca 100644
Binary files a/ScreenPlay/assets/images/Intro_shine.png and b/ScreenPlay/assets/images/Intro_shine.png differ
diff --git a/ScreenPlay/assets/images/ScreenPlayIconStomt.png b/ScreenPlay/assets/images/ScreenPlayIconStomt.png
deleted file mode 100644
index ac6482837c10a97c42ccba0e42473d8abf41aa33..0000000000000000000000000000000000000000
Binary files a/ScreenPlay/assets/images/ScreenPlayIconStomt.png and /dev/null differ
diff --git a/ScreenPlay/assets/images/Stomt_Logo+Wordmark_Mono_BLK.svg b/ScreenPlay/assets/images/Stomt_Logo+Wordmark_Mono_BLK.svg
deleted file mode 100644
index 44c2090d32fa7bbfb2f5bf61e5e19b31051fb65a..0000000000000000000000000000000000000000
--- a/ScreenPlay/assets/images/Stomt_Logo+Wordmark_Mono_BLK.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/ScreenPlay/assets/images/Untitled.png b/ScreenPlay/assets/images/Untitled.png
deleted file mode 100644
index e1a31bddf9bc8de8c720a85a9c3c5cffff493997..0000000000000000000000000000000000000000
Binary files a/ScreenPlay/assets/images/Untitled.png and /dev/null differ
diff --git a/ScreenPlay/assets/images/ava.png b/ScreenPlay/assets/images/ava.png
deleted file mode 100644
index 0cdbe59c6a279aba70bab5f9958193f837835e86..0000000000000000000000000000000000000000
Binary files a/ScreenPlay/assets/images/ava.png and /dev/null differ
diff --git a/ScreenPlay/assets/images/hand_give.png b/ScreenPlay/assets/images/hand_give.png
deleted file mode 100644
index 67d555d360797ff210c969721e0dd2f755498d3e..0000000000000000000000000000000000000000
Binary files a/ScreenPlay/assets/images/hand_give.png and /dev/null differ
diff --git a/ScreenPlay/assets/images/mask.svg b/ScreenPlay/assets/images/mask.svg
deleted file mode 100644
index 1d49042033d4931324dbbda8f2bde8268c746ecc..0000000000000000000000000000000000000000
--- a/ScreenPlay/assets/images/mask.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/ScreenPlay/assets/images/noisy-texture-2.png b/ScreenPlay/assets/images/noisy-texture-2.png
deleted file mode 100644
index 5e555d3ad320b406e615324fb43fe31cfd494647..0000000000000000000000000000000000000000
Binary files a/ScreenPlay/assets/images/noisy-texture-2.png and /dev/null differ
diff --git a/ScreenPlay/assets/images/undraw_static_website_0107.svg b/ScreenPlay/assets/images/undraw_static_website_0107.svg
deleted file mode 100644
index 2cc52f9944127d1b07de9d53236703a2e7e7bc39..0000000000000000000000000000000000000000
--- a/ScreenPlay/assets/images/undraw_static_website_0107.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/ScreenPlay/qml/Installed/InstalledWelcomeScreen.qml b/ScreenPlay/qml/Installed/InstalledWelcomeScreen.qml
index 7a7a62c8817aba9cc0c7ad3d70c14ef38dc8212c..96dce9346565e357cc98a991831c7875f31796ca 100644
--- a/ScreenPlay/qml/Installed/InstalledWelcomeScreen.qml
+++ b/ScreenPlay/qml/Installed/InstalledWelcomeScreen.qml
@@ -35,6 +35,7 @@ Item {
source: "qrc:/assets/images/Intro_shine.png"
height: 1753
width: 1753
+ opacity: 0
anchors.centerIn: parent
RotationAnimator {
target: imgShine
@@ -47,17 +48,29 @@ Item {
}
}
+ Image {
+ id: imgLogo
+ source: "qrc:/assets/images/Early_Access.png"
+ anchors {
+ top: parent.top
+ topMargin: -200
+ horizontalCenter: parent.horizontalCenter
+ }
+ width: 539
+ height: 148
+ sourceSize: Qt.size(width, height)
+ }
+
Text {
- id: txtHeadline2
- x: 20
+ id: txtHeadline
y: 80
text: qsTr("Get free Widgets and Wallpaper via the Steam Workshop")
font.family: ScreenPlay.settings.font
-
+ font.capitalization: Font.Capitalize
wrapMode: Text.WordWrap
color: "white"
font.weight: Font.Thin
- font.pointSize: 32
+ font.pointSize: 28
horizontalAlignment: Text.AlignHCenter
anchors {
right: parent.right
@@ -74,29 +87,32 @@ Item {
topMargin: 50
horizontalCenter: parent.horizontalCenter
}
- width: 500
- height: 500
+ width: 500 * .8
+ height: 500 * .8
sourceSize: Qt.size(width, height)
}
Button {
id: btnWorkshop
text: qsTr("Browse the Steam Workshop")
- Material.background: Material.color(Material.Green)
+ Material.background: Material.color(Material.Orange)
Material.foreground: "white"
- smooth: true
- font.pointSize: 18
+ font.pointSize: 16
font.weight: Font.Thin
+ width: implicitWidth + 20
+ height: implicitHeight + 10
+ icon.source: "qrc:/assets/icons/icon_steam.svg"
+ icon.width: 18
+ icon.height: 18
transform: [
Shake {
id: animShake
},
Grow {
id: animGrow
- centerX: btnWorkshop.width *.5
- centerY: btnWorkshop.height *.5
+ centerX: btnWorkshop.width * .5
+ centerY: btnWorkshop.height * .5
loops: -1
-
}
]
anchors {
@@ -125,8 +141,15 @@ Item {
opacity: 0
anchors.topMargin: -500
}
+
+ PropertyChanges {
+ target: imgLogo
+ opacity: 1
+ anchors.topMargin: -500
+ }
+
PropertyChanges {
- target: txtHeadline2
+ target: txtHeadline
opacity: 0
anchors.topMargin: -300
}
@@ -145,19 +168,25 @@ Item {
PropertyChanges {
target: imgShine
- opacity: 1
+ opacity: .5
}
PropertyChanges {
target: imgPC
opacity: 1
- anchors.topMargin: 150
+ anchors.topMargin: 250
}
PropertyChanges {
- target: txtHeadline2
+ target: imgLogo
+ opacity: 1
+ anchors.topMargin: 50
+ }
+
+ PropertyChanges {
+ target: txtHeadline
color: "#ffffff"
opacity: 1
- anchors.topMargin: 100
+ anchors.topMargin: 250
}
PropertyChanges {
target: btnWorkshop
@@ -196,17 +225,28 @@ Item {
duration: 700
easing.type: Easing.OutBack
}
+
+ PropertyAnimation {
+ targets: imgPC
+ property: "opacity"
+ duration: 600
+ easing.type: Easing.OutBack
+ }
}
SequentialAnimation {
- PauseAnimation {
- duration: 100
- }
PropertyAnimation {
- targets: imgPC
+ targets: imgLogo
property: "opacity"
- duration: 700
+ duration: 500
+ easing.type: Easing.InOutExpo
+ }
+
+ PropertyAnimation {
+ targets: imgLogo
+ property: "topMargin"
+ duration: 500
easing.type: Easing.InOutExpo
}
}
@@ -217,7 +257,7 @@ Item {
duration: 200
}
PropertyAnimation {
- targets: txtHeadline2
+ targets: txtHeadline
properties: "topMargin, opacity"
duration: 1100
easing.type: Easing.InOutExpo
@@ -237,7 +277,7 @@ Item {
}
ScriptAction {
script: {
- animShake.start(2000,1000,-1)
+ animShake.start(2000, 1000, -1)
}
}
}
diff --git a/ScreenPlay/qml/Workshop/ScreenPlayItem.qml b/ScreenPlay/qml/Workshop/ScreenPlayItem.qml
index 7e76eb19bd180e5d9317fe20bfb8e5449c609bc0..67a50c02400ceb1b667a4a48ab4da470b71b3b89 100644
--- a/ScreenPlay/qml/Workshop/ScreenPlayItem.qml
+++ b/ScreenPlay/qml/Workshop/ScreenPlayItem.qml
@@ -125,7 +125,7 @@ Item {
Image {
id: mask
- source: "qrc:/assets/img/window.svg"
+ source: "qrc:/assets/images/window.svg"
sourceSize: Qt.size(screenPlayItem.width, screenPlayItem.height)
visible: false
smooth: true