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

Add icons, stomt description and mouse cursor changes

Browse Source
This commit is contained in:
kelteseth 2018-03-12 20:48:50 +01:00
parent eb8a29419c
commit 629b6e2315
18 changed files with 161 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ScreenPlay/Resources.qrc
View File

@ -100,5 +100,9 @@
<file>assets/icons/icon_scene.svg</file>
<file>qml/NavigationWallpaperConfiguration.qml</file>
<file>qml/MonitorsProjectSettingItem.qml</file>
<file>assets/icons/icon_people.svg</file>
<file>assets/icons/icon_info.svg</file>
<file>assets/icons/icon_document.svg</file>
<file>assets/icons/icon_folder_open.svg</file>
</qresource>
</RCC>

1
ScreenPlay/assets/icons/icon_document.svg Normal file
View File

@ -0,0 +1 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg width="100%" height="100%" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:1.41421;"><path d="M14,17l-7,0l0,-2l7,0m3,-2l-10,0l0,-2l10,0m0,-2l-10,0l0,-2l10,0m2,-4l-14,0c-1.11,0 -2,0.89 -2,2l0,14c0,1.097 0.903,2 2,2l14,0c1.097,0 2,-0.903 2,-2l0,-14c0,-1.11 -0.9,-2 -2,-2Z" style="fill:#fff;fill-rule:nonzero;"/></svg>
Side by Side

After

Width:  |  Height:  |  Size: 676 B

4
ScreenPlay/assets/icons/icon_folder_open.svg Normal file
View File

@ -0,0 +1,4 @@
<svg fill="#FFFFFF" height="24" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg">
<path d="M0 0h24v24H0z" fill="none"/>
<path d="M20 6h-8l-2-2H4c-1.1 0-1.99.9-1.99 2L2 18c0 1.1.9 2 2 2h16c1.1 0 2-.9 2-2V8c0-1.1-.9-2-2-2zm0 12H4V8h16v10z"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 271 B

4
ScreenPlay/assets/icons/icon_info.svg Normal file
View File

@ -0,0 +1,4 @@
<svg fill="#FFFFFF" height="24" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg">
<path d="M0 0h24v24H0z" fill="none"/>
<path d="M11 17h2v-6h-2v6zm1-15C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 18c-4.41 0-8-3.59-8-8s3.59-8 8-8 8 3.59 8 8-3.59 8-8 8zM11 9h2V7h-2v2z"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 320 B

4
ScreenPlay/assets/icons/icon_people.svg Normal file
View File

@ -0,0 +1,4 @@
<svg fill="#FFFFFF" height="24" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg">
<path d="M0 0h24v24H0z" fill="none"/>
<path d="M16 11c1.66 0 2.99-1.34 2.99-3S17.66 5 16 5c-1.66 0-3 1.34-3 3s1.34 3 3 3zm-8 0c1.66 0 2.99-1.34 2.99-3S9.66 5 8 5C6.34 5 5 6.34 5 8s1.34 3 3 3zm0 2c-2.33 0-7 1.17-7 3.5V19h14v-2.5c0-2.33-4.67-3.5-7-3.5zm8 0c-.29 0-.62.02-.97.05 1.16.84 1.97 1.97 1.97 3.45V19h6v-2.5c0-2.33-4.67-3.5-7-3.5z"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 453 B

15
ScreenPlay/assets/icons/icon_share.svg
View File

@ -1,11 +1,4 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg width="100%" height="100%" viewBox="0 0 11 9" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:1.41421;">
<g transform="matrix(1,0,0,1,-456.116,-509.855)">
<g transform="matrix(0.579084,0,0,0.579084,-1310.67,-161.303)">
<g opacity="0.539993">
<path d="M3069,1166L3062,1159L3062,1163C3055,1164 3052,1169 3051,1174C3053.5,1170.5 3057,1168.9 3062,1168.9L3062,1173L3069,1166Z" style="fill-rule:nonzero;"/>
</g>
</g>
</g>
</svg>
<svg fill="#FFFFFF" height="24" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg">
<path d="M0 0h24v24H0z" fill="none"/>
<path d="M18 16.08c-.76 0-1.44.3-1.96.77L8.91 12.7c.05-.23.09-.46.09-.7s-.04-.47-.09-.7l7.05-4.11c.54.5 1.25.81 2.04.81 1.66 0 3-1.34 3-3s-1.34-3-3-3-3 1.34-3 3c0 .24.04.47.09.7L8.04 9.81C7.5 9.31 6.79 9 6 9c-1.66 0-3 1.34-3 3s1.34 3 3 3c.79 0 1.5-.31 2.04-.81l7.12 4.16c-.05.21-.08.43-.08.65 0 1.61 1.31 2.92 2.92 2.92 1.61 0 2.92-1.31 2.92-2.92s-1.31-2.92-2.92-2.92z"/>
</svg>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 794 B

After

Width:  |  Height:  |  Size: 523 B

5
ScreenPlay/assets/icons/icon_upload.svg
View File

@ -1 +1,4 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg width="100%" height="100%" viewBox="0 0 75 75" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:1.41421;"><path id="upload" d="M30.373,45.438l14.25,0l0,-23.761l10.687,0l-17.812,-19.802l-17.812,19.802l10.687,0l0,23.761Zm40.39,6.068c-0.748,-0.887 -5.739,-6.824 -7.164,-8.372c-0.944,-1.026 -2.294,-1.656 -3.712,-1.656l-6.259,0l10.915,11.857l-12.625,0c-0.363,0 -0.691,0.206 -0.855,0.527l-2.907,7.418l-21.317,0l-2.907,-7.418c-0.164,-0.321 -0.495,-0.527 -0.855,-0.527l-12.625,0l10.912,-11.857l-6.256,0c-1.414,0 -2.764,0.63 -3.712,1.656c-1.425,1.552 -6.416,7.488 -7.164,8.372c-1.742,2.063 -2.7,3.707 -2.244,5.738l1.999,12.174c0.456,2.036 2.461,3.707 4.46,3.707l58.109,0c1.999,0 4.004,-1.671 4.46,-3.707l1.999,-12.174c0.449,-2.031 -0.506,-3.675 -2.252,-5.738l0,0Z" style="fill:#bebebe;fill-rule:nonzero;"/></svg>
<svg fill="#FFFFFF" height="24" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg">
<path d="M0 0h24v24H0z" fill="none"/>
<path d="M9 16h6v-6h4l-7-7-7 7h4zm-4 2h14v2H5z"/>
</svg>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 201 B

101
ScreenPlay/qml/Community/Community.qml
View File

@ -44,7 +44,7 @@ Item {
sourceSize: Qt.size(250, 250)
anchors {
top: parent.top
topMargin: 0
topMargin: -30
horizontalCenter: parent.horizontalCenter
}
MouseArea {
@ -53,12 +53,34 @@ Item {
onClicked: Qt.openUrlExternally("https://stomt.com/")
}
}
Text {
id:txtStomtDescription
font.pointSize: 14
color: "white"
height:100
text: qsTr("We use Stomt because it provides quick and easy feedback via I like/I wish. So you can easily give us feedback and speak your mind. We will read these wishes on a daily basis!")
font.family: "Roboto"
font.weight: Font.Normal
wrapMode: Text.WordWrap
horizontalAlignment: Qt.AlignHCenter
renderType: Text.NativeRendering
anchors {
top: imgStomt.bottom
topMargin: -50
right: parent.right
rightMargin: 50
left: parent.left
leftMargin: 50
}
}
Feedback {
id: feedback
height: 236
width: 420
anchors {
top: parent.top
topMargin: 170
top: txtStomtDescription.bottom
topMargin: 0
horizontalCenter: parent.horizontalCenter
}
}
@ -73,6 +95,11 @@ Item {
}
Material.background: Material.Orange
Material.foreground: "white"
icon.source: "qrc:/assets/icons/icon_share.svg"
icon.color: "white"
icon.width: 16
icon.height: 16
onClicked: {
Qt.openUrlExternally("https://www.stomt.com/screenplay")
}
@ -157,12 +184,13 @@ Item {
id: name
text: qsTr("News & Patchnotes")
wrapMode: Text.WordWrap
color: "#FFAB00"
color: "#626262"
renderType: Text.NativeRendering
verticalAlignment: Text.AlignVCenter
horizontalAlignment: Text.AlignLeft
font.pixelSize: 32
font.family: "Roboto"
anchors {
top: parent.top
topMargin: 30
@ -172,6 +200,7 @@ Item {
}
delegate: Item {
id: root
width: 352
height: 197
@ -208,21 +237,18 @@ Item {
LinearGradient {
visible: true
opacity: .5
anchors.fill: parent
start: Qt.point(0, 0)
end: Qt.point(0, parent.height)
start: Qt.point(0, parent.height)
end: Qt.point(0, parent.height - 150)
gradient: Gradient {
GradientStop {
position: 1.0
color: "#ffffffff"
}
GradientStop {
position: 0.4
color: "#AAffffff"
}
GradientStop {
position: 0.0
color: "#00ffffff"
color: "#BB000000"
}
GradientStop {
position: 1.0
color: "#00000000"
}
}
}
@ -230,35 +256,36 @@ Item {
Text {
id: txtTitle
text: title
renderType: Text.NativeRendering
anchors {
right:parent.right
bottom:parent.bottom
left:parent.left
right: parent.right
bottom: parent.bottom
left: parent.left
margins: 20
}
color: "#3E3E3E"
color: "white"
font.family: "Roboto"
font.weight: Font.Light
font.weight: Font.Normal
font.pixelSize: 18
wrapMode: Text.WordWrap
}
Text {
id: txtPubDate
text: {
return pubDate.replace("+0000","")
return pubDate.replace("+0000", "")
}
anchors {
right:parent.right
right: parent.right
rightMargin: 20
bottom:txtTitle.top
bottom: txtTitle.top
bottomMargin: 10
left:parent.left
left: parent.left
leftMargin: 20
}
color: "#3E3E3E"
color: "white"
font.family: "Roboto"
font.weight: Font.Light
renderType: Text.NativeRendering
font.weight: Font.Normal
font.pixelSize: 14
wrapMode: Text.WordWrap
}
@ -293,22 +320,42 @@ Item {
text: qsTr("Forums")
Material.background: Material.Blue
Material.foreground: "white"
icon.source: "qrc:/assets/icons/icon_people.svg"
icon.color: "white"
icon.width: 16
icon.height: 16
}
Button {
text: qsTr("Documentation")
Material.background: Material.LightGreen
Material.foreground: "white"
icon.source: "qrc:/assets/icons/icon_document.svg"
icon.color: "white"
icon.width: 16
icon.height: 16
}
Button {
text: qsTr("Github")
Material.background: Material.Orange
Material.foreground: "white"
icon.source: "qrc:/assets/icons/icon_code.svg"
icon.color: "white"
icon.width: 16
icon.height: 16
onClicked: Qt.openUrlExternally("https://github.com/Aimber/")
}
Button {
text: qsTr("Workshop")
Material.background: Material.Red
Material.foreground: "white"
icon.source: "qrc:/assets/icons/icon_steam.svg"
icon.color: "white"
icon.width: 16
icon.height: 16
onClicked: Qt.openUrlExternally(
"http://steamcommunity.com/app/672870/workshop/")
}

1
ScreenPlay/qml/Community/Feedback.qml
View File

@ -15,6 +15,7 @@ Item {
appKey: "C1IfJAruqWFdkM8e7BMPK3dx1"
targetDisplayName: "ScreenPlay"
targetImageUrl: "qrc:/assets/images/ScreenPlayIconStomt.png"
}
}

16
ScreenPlay/qml/Create/Create.qml
View File

@ -268,21 +268,37 @@ Rectangle {
text: qsTr("Quickstart Guide")
Material.background: Material.Blue
Material.foreground: "white"
icon.source: "qrc:/assets/icons/icon_info.svg"
icon.color:"white"
icon.width: 16
icon.height: 16
}
Button {
text: qsTr("Documentation")
Material.background: Material.LightGreen
Material.foreground: "white"
icon.source: "qrc:/assets/icons/icon_document.svg"
icon.color:"white"
icon.width: 16
icon.height: 16
}
Button {
text: qsTr("Lore Ipsum")
Material.background: Material.Orange
Material.foreground: "white"
icon.source: "qrc:/assets/icons/icon_plus.svg"
icon.color:"white"
icon.width: 16
icon.height: 16
}
Button {
text: qsTr("Community")
Material.background: Material.Red
Material.foreground: "white"
icon.source: "qrc:/assets/icons/icon_people.svg"
icon.color:"white"
icon.width: 16
icon.height: 16
}
}
}

12
ScreenPlay/qml/Create/CreateImport.qml
View File

@ -194,6 +194,10 @@ Item {
text: qsTr("Select Image Manually")
Material.background: Material.Orange
Material.foreground: "white"
icon.source: "qrc:/assets/icons/icon_folder_open.svg"
icon.color:"white"
icon.width: 16
icon.height: 16
anchors {
right: parent.right
verticalCenter: parent.verticalCenter
@ -230,6 +234,10 @@ Item {
text: qsTr("Choose Folder")
Material.background: Material.Orange
Material.foreground: "white"
icon.source: "qrc:/assets/icons/icon_folder_open.svg"
icon.color:"white"
icon.width: 16
icon.height: 16
anchors {
right: parent.right
verticalCenter: parent.verticalCenter
@ -252,6 +260,10 @@ Item {
text: qsTr("Import Video")
Material.background: Material.Orange
Material.foreground: "white"
icon.source: "qrc:/assets/icons/icon_upload.svg"
icon.color:"white"
icon.width: 16
icon.height: 16
anchors {
bottom: parent.bottom
bottomMargin: 10

4
ScreenPlay/qml/Create/CreateUpload.qml
View File

@ -273,6 +273,10 @@ Item {
}
Material.background: Material.Orange
Material.foreground: "white"
icon.source: "qrc:/assets/icons/icon_upload.svg"
icon.color:"white"
icon.width: 16
icon.height: 16
onClicked: {
createUpload.state = "upload"
// We need to first create a workshop item

25
ScreenPlay/qml/Create/CreateWallpaper.qml
View File

@ -1,6 +1,6 @@
import QtQuick 2.9
import QtGraphicalEffects 1.0
import QtQuick.Controls 2.2
import QtQuick.Controls 2.3
import Qt.labs.platform 1.0
import QtQuick.Controls.Material 2.2
@ -53,11 +53,19 @@ Item {
Image {
id: imgUpload
source: "qrc:/assets/icons/icon_upload.svg"
height: 120
width: 120
anchors {
horizontalCenter: parent.horizontalCenter
top: parent.top
topMargin: 50
}
sourceSize: Qt.size(width, height)
}
ColorOverlay {
anchors.fill: imgUpload
source: imgUpload
color: "#C6C6C6"
}
Button {
@ -69,6 +77,10 @@ Item {
}
Material.background: Material.Orange
Material.foreground: "white"
icon.source: "qrc:/assets/icons/icon_upload.svg"
icon.color: "white"
icon.width: 16
icon.height: 16
onClicked: fileDialogOpenFile.open()
}
@ -98,7 +110,6 @@ Item {
visible: false
cornerRadius: 15
}
}
Item {
@ -141,20 +152,22 @@ Item {
anchors.centerIn: parent
Material.background: Material.Orange
Material.foreground: "white"
icon.source: "qrc:/assets/icons/icon_steam.svg"
icon.color: "white"
icon.width: 16
icon.height: 16
onClicked: {
fileDialogOpenProject.open()
}
}
FileDialog {
id: fileDialogOpenProject
nameFilters: ["Project files (project.json)", ]
nameFilters: ["Project files (project.json)"]
onAccepted: {
projectFileSelected(fileDialogOpenProject.currentFile)
}
}
}
}
states: [
State {
@ -219,7 +232,7 @@ Item {
reversible: true
SequentialAnimation {
PropertyAnimation {
targets: [bg,bg1]
targets: [bg, bg1]
duration: 300
properties: "opacity, anchors.leftMargin"
}

1
ScreenPlay/qml/Installed/InstalledNavigation.qml
View File

@ -36,6 +36,7 @@ Item {
MouseArea {
id: mouseArea
anchors.fill: parent
cursorShape: Qt.PointingHandCursor
onClicked: {
navigationItem.pageClicked(navigationItem.name)
}

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

@ -195,7 +195,7 @@ Item {
MouseArea {
anchors.fill: parent
hoverEnabled: true
cursorShape: Qt.PointingHandCursor
acceptedButtons: Qt.LeftButton | Qt.RightButton
onEntered: {
if (!hasMenuOpen)

5
ScreenPlay/qml/Installed/Sidebar.qml
View File

@ -140,6 +140,7 @@ Item {
width: 50
anchors.top: parent.top
anchors.left: parent.left
cursorShape: Qt.PointingHandCursor
onClicked: {
sidebar.state = sidebar.state === "active" ? "inactive" : "active"
}
@ -246,6 +247,10 @@ Item {
Material.background: Material.Orange
Material.foreground: "white"
icon.source: "qrc:/assets/icons/icon_plus.svg"
icon.color:"white"
icon.width: 16
icon.height: 16
anchors {
bottom: parent.bottom
bottomMargin: 20

3
ScreenPlay/qml/MonitorSelection.qml
View File

@ -15,11 +15,12 @@ Rectangle {
property real availableWidth: 0
property real availableHeight: 0
property int activeMonitorIndex: 0
property int fontSize: 14
property int fontSize: 12
property string activeMonitorID: "empty"
signal requestProjectSettings(var at)
function setActiveMonitorIndex(newIndex) {
activeMonitorIndex = newIndex
activeMonitorID = rp.itemAt(newIndex).monitorID

1
ScreenPlay/qml/NavigationItem.qml
View File

@ -36,6 +36,7 @@ Item {
MouseArea {
id: mouseArea
anchors.fill: parent
cursorShape: Qt.PointingHandCursor
onClicked: {
navigationItem.pageClicked(navigationItem.name)
}