1
0
mirror of https://gitlab.com/kelteseth/ScreenPlay.git synced 2024-11-22 02:32:29 +01:00

Remove stomt

Replacing it with website, forum, bugtracker etc
This commit is contained in:
Elias Steurer 2020-08-18 17:07:56 +02:00
parent ee251b090a
commit 81a62311aa
15 changed files with 160 additions and 297 deletions

4
.gitmodules vendored
View File

@ -4,7 +4,3 @@
[submodule "Common/qt-breakpad"]
path = Common/qt-breakpad
url = https://github.com/kelteseth/qt-breakpad
[submodule "Common/stomt-qml"]
path = Common/stomt-qml
url = https://gitlab.com/kelteseth/stomt-qml.git
branch = master

View File

@ -54,7 +54,6 @@ add_subdirectory(ScreenPlaySDK)
add_subdirectory(ScreenPlayWallpaper)
add_subdirectory(ScreenPlayWidget)
add_subdirectory(ScreenPlaySysInfo)
add_subdirectory(Common/stomt-qml)
add_subdirectory(Common/qt-breakpad)

@ -1 +0,0 @@
Subproject commit aeed3e7572d845cc87301a9d2b637e88e5086fb9

View File

@ -58,12 +58,12 @@ set(headers app.h
qt5_add_big_resources(resources resources.qrc)
#qt5_add_big_resources(resources resources.qrc)
qt5_add_resources(qml qml.qrc resources.qrc)
if(CMAKE_BUILD_TYPE STREQUAL "Debug")
qt5_add_resources(qml qml.qrc)
else()
qtquick_compiler_add_resources(qml qml.qrc )
# qtquick_compiler_add_resources(qml qml.qrc resources.qrc)
endif()
add_executable(${PROJECT_NAME} ${src} ${headers} ${resources} ${qml})

View File

@ -45,7 +45,6 @@
<file>assets/icons/icon_share.svg</file>
<file>assets/icons/icon_single_image.svg</file>
<file>assets/icons/icon_steam.svg</file>
<file>assets/icons/icon_stomt.svg</file>
<file>assets/icons/icon_time.svg</file>
<file>assets/icons/icon_tv.svg</file>
<file>assets/icons/icon_upload.svg</file>

View File

@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 0 24 24" width="24"><path d="M0 0h24v24H0z" fill="none"/><path d="M21 6h-2v9H6v2c0 .55.45 1 1 1h11l4 4V7c0-.55-.45-1-1-1zm-4 6V3c0-.55-.45-1-1-1H3c-.55 0-1 .45-1 1v14l4-4h10c.55 0 1-.45 1-1z"/></svg>

After

Width:  |  Height:  |  Size: 262 B

View File

@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" enable-background="new 0 0 24 24" height="24" viewBox="0 0 24 24" width="24"><g><rect fill="none" height="24" width="24"/><path d="M19,3H5C3.9,3,3,3.9,3,5v14c0,1.1,0.9,2,2,2h14c1.1,0,2-0.9,2-2V5C21,3.9,20.1,3,19,3z M12.01,18 c-0.7,0-1.26-0.56-1.26-1.26c0-0.71,0.56-1.25,1.26-1.25c0.71,0,1.25,0.54,1.25,1.25C13.25,17.43,12.72,18,12.01,18z M15.02,10.6 c-0.76,1.11-1.48,1.46-1.87,2.17c-0.16,0.29-0.22,0.48-0.22,1.41h-1.82c0-0.49-0.08-1.29,0.31-1.98c0.49-0.87,1.42-1.39,1.96-2.16 c0.57-0.81,0.25-2.33-1.37-2.33c-1.06,0-1.58,0.8-1.8,1.48L8.56,8.49C9.01,7.15,10.22,6,11.99,6c1.48,0,2.49,0.67,3.01,1.52 C15.44,8.24,15.7,9.59,15.02,10.6z"/></g></svg>

After

Width:  |  Height:  |  Size: 682 B

View File

@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 0 24 24" width="24"><path d="M0 0h24v24H0z" fill="none"/><path d="M23 12l-2.44-2.78.34-3.68-3.61-.82-1.89-3.18L12 3 8.6 1.54 6.71 4.72l-3.61.81.34 3.68L1 12l2.44 2.78-.34 3.69 3.61.82 1.89 3.18L12 21l3.4 1.46 1.89-3.18 3.61-.82-.34-3.68L23 12zm-10 5h-2v-2h2v2zm0-4h-2V7h2v6z"/></svg>

After

Width:  |  Height:  |  Size: 346 B

View File

@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 0 24 24" width="24"><path d="M0 0h24v24H0z" fill="none"/><path d="M1 21h22L12 2 1 21zm12-3h-2v-2h2v2zm0-4h-2v-4h2v4z"/></svg>

After

Width:  |  Height:  |  Size: 188 B

View File

@ -1 +0,0 @@
<?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 51 41" 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="M40.735,0l-20.367,0c-5.625,0 -10.184,4.825 -10.184,10.45c0,5.624 4.559,10.45 10.184,10.45l-10.184,0c-5.625,0 -10.184,4.329 -10.184,9.953c0,5.624 4.559,9.953 10.184,9.953l20.367,0c5.625,0 10.184,-4.329 10.184,-9.953c0,-5.624 -4.559,-9.953 -10.184,-9.953l10.184,0c5.625,0 10.184,-4.826 10.184,-10.45c0,-5.625 -4.559,-10.45 -10.184,-10.45" style="fill:#bebebe;"/></svg>

Before

Width:  |  Height:  |  Size: 821 B

View File

@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 0 24 24" width="24"><path d="M0 0h24v24H0z" fill="none"/><path d="M16.5 12c1.38 0 2.49-1.12 2.49-2.5S17.88 7 16.5 7C15.12 7 14 8.12 14 9.5s1.12 2.5 2.5 2.5zM9 11c1.66 0 2.99-1.34 2.99-3S10.66 5 9 5C7.34 5 6 6.34 6 8s1.34 3 3 3zm7.5 3c-1.83 0-5.5.92-5.5 2.75V19h11v-2.25c0-1.83-3.67-2.75-5.5-2.75zM9 13c-2.33 0-7 1.17-7 3.5V19h7v-2.25c0-.85.33-2.34 2.37-3.47C10.5 13.1 9.66 13 9 13z"/></svg>

After

Width:  |  Height:  |  Size: 453 B

View File

@ -21,7 +21,6 @@
<file>qml/Installed/Sidebar.qml</file>
<file>qml/Installed/InstalledWelcomeScreen.qml</file>
<file>qml/Community/Community.qml</file>
<file>qml/Community/Feedback.qml</file>
<file>qml/Community/XMLNewsfeed.qml</file>
<file>qml/Settings/SettingBool.qml</file>
<file>qml/Settings/Settings.qml</file>
@ -53,5 +52,11 @@
<file>qml/Common/CloseIcon.qml</file>
<file>qml/Common/Headline.qml</file>
<file>qml/Settings/SettingsPage.qml</file>
<file>qml/Community/CommunityNavItem.qml</file>
<file>assets/icons/icon_supervisor_account.svg</file>
<file>assets/icons/icon_new_releases.svg</file>
<file>assets/icons/icon_report_problem.svg</file>
<file>assets/icons/icon_help_center.svg</file>
<file>assets/icons/icon_forum.svg</file>
</qresource>
</RCC>

View File

@ -1,6 +1,6 @@
import QtQuick 2.12
import QtQuick.Controls 2.3
import QtQuick.Controls.Material 2.2
import QtQuick.Controls 2.14
import QtQuick.Controls.Material 2.14
import QtGraphicalEffects 1.0
import QtQuick.Layouts 1.3
import ScreenPlay 1.0
@ -10,247 +10,98 @@ Item {
id: community
anchors.fill: parent
RectangularGlow {
id: effect
anchors {
fill: navWrapper
}
cached: true
glowRadius: 2
spread: 0.15
color: "black"
opacity: 0.3
cornerRadius: 15
}
Rectangle {
id: stomtWrapper
width: 500
color: "gray"
id: navWrapper
color: Material.theme === Material.Light ? "white" : Material.background
height: 50
anchors {
top: parent.top
right: parent.right
left: parent.left
}
TabBar {
id: nav
height: parent.height
background: Item {}
anchors {
top: parent.top
left: parent.left
bottom: parent.bottom
right: parent.right
}
CommunityNavItem {
text: qsTr("Forum")
openLink: swipeView.itemAt(0).url
icon.source: "qrc:/assets/icons/icon_forum.svg"
}
CommunityNavItem {
text: qsTr("Wiki")
openLink: swipeView.itemAt(1).url
icon.source: "qrc:/assets/icons/icon_help_center.svg"
}
CommunityNavItem {
text: qsTr("Issues List")
openLink: swipeView.itemAt(2).url
icon.source: "qrc:/assets/icons/icon_report_problem.svg"
}
CommunityNavItem {
text: qsTr("Release Notes")
openLink: swipeView.itemAt(3).url
icon.source: "qrc:/assets/icons/icon_new_releases.svg"
}
CommunityNavItem {
text: qsTr("Contribution Guide")
openLink: swipeView.itemAt(4).url
icon.source: "qrc:/assets/icons/icon_supervisor_account.svg"
}
}
}
SwipeView {
id: swipeView
currentIndex: nav.currentIndex
anchors {
top: navWrapper.bottom
right: parent.right
bottom: parent.bottom
left: parent.left
}
LinearGradient {
id: tabShadow
cached: true
anchors.fill: parent
start: Qt.point(0, 0)
end: Qt.point(stomtWrapper.width, stomtWrapper.height)
gradient: Gradient {
GradientStop {
position: 0.0
color: "#199EF1"
}
GradientStop {
position: 1.0
color: "#092E6C"
}
}
}
Image {
id: imgStomt
source: "qrc:/assets/images/Stomt_Logo+Wordmark_Mono_BLK.svg"
width: 250
height: 250
sourceSize: Qt.size(250, 250)
anchors {
top: parent.top
topMargin: -30
horizontalCenter: parent.horizontalCenter
}
MouseArea {
anchors.fill: parent
cursorShape: Qt.PointingHandCursor
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: ScreenPlay.settings.font
font.weight: Font.Normal
wrapMode: Text.WordWrap
horizontalAlignment: Qt.AlignHCenter
anchors {
top: imgStomt.bottom
topMargin: -50
right: parent.right
rightMargin: 50
left: parent.left
leftMargin: 50
}
WebEngineView {
url: "https://forum.screen-play.app/"
}
Component {
id: component_feedback
Feedback {
id: feedback
anchors.fill: parent
}
}
Loader {
id: loader_feedback
height: 236
width: 420
anchors {
top: txtStomtDescription.bottom
horizontalCenter: parent.horizontalCenter
}
WebEngineView {
url: "https://kelteseth.gitlab.io/ScreenPlayDocs/"
}
Timer {
interval: 200
running: true
repeat: false
onTriggered: {
loader_feedback.sourceComponent = component_feedback
}
WebEngineView {
url: "https://gitlab.com/kelteseth/ScreenPlay/-/issues"
}
Button {
id: btnStomt
text: qsTr("Open ScreenPlay Stomt page")
anchors {
bottom: parent.bottom
bottomMargin: 30
horizontalCenter: parent.horizontalCenter
}
Material.background: Material.accent
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")
}
}
}
LinearGradient {
id: tabShadowFoot
height: 4
z: 500
cached: true
anchors {
bottom: footer.top
right: parent.right
left: stomtWrapper.right
}
start: Qt.point(0, 4)
end: Qt.point(0, 0)
gradient: Gradient {
GradientStop {
position: 0.0
color: "#33000000"
}
GradientStop {
position: 1.0
color: "#00000000"
}
}
}
// XMLNewsfeed {
// id: changelogFlickableWrapper
// anchors {
// bottom: footer.top
// left: stomtWrapper.right
// leftMargin: 90
// right: parent.right
// rightMargin: 20
// top: parent.top
// topMargin: 20
// }
// }
WebEngineView {
id: we
url:"https://forum.screen-play.app/"
onUrlChanged: {
var tmp = we.url.toString()
if(!tmp.includes("https://forum.screen-play.app/")) {
we.url = "https://forum.screen-play.app/"
}
WebEngineView {
url: "https://gitlab.com/kelteseth/ScreenPlay/-/releases"
}
anchors {
bottom: footer.top
left: stomtWrapper.right
leftMargin: 0
right: parent.right
rightMargin: 0
top: parent.top
topMargin:0
}
}
Rectangle {
id: footer
height: 80
z: 100
anchors {
right: parent.right
bottom: parent.bottom
left: stomtWrapper.right
}
Row {
anchors.centerIn: parent
spacing: 20
Button {
text: qsTr("Forums")
Material.background: Material.Blue
Material.foreground: "white"
font.family: ScreenPlay.settings.font
onClicked: Qt.openUrlExternally(
"https://forum.screen-play.app/")
icon.source: "qrc:/assets/icons/icon_people.svg"
icon.color: "white"
icon.width: 16
icon.height: 16
}
Button {
text: qsTr("Blog")
Material.background: Material.LightGreen
Material.foreground: "white"
font.family: ScreenPlay.settings.font
icon.source: "qrc:/assets/icons/icon_document.svg"
icon.color: "white"
icon.width: 16
icon.height: 16
onClicked: Qt.openUrlExternally(
"https://screen-play.app/blog/")
}
Button {
text: qsTr("Source Code")
Material.background: Material.Orange
Material.foreground: "white"
font.family: ScreenPlay.settings.font
icon.source: "qrc:/assets/icons/icon_code.svg"
icon.color: "white"
icon.width: 16
icon.height: 16
onClicked: Qt.openUrlExternally(
"https://gitlab.com/kelteseth/ScreenPlay/")
}
Button {
text: qsTr("Workshop")
Material.background: Material.Red
Material.foreground: "white"
font.family: ScreenPlay.settings.font
icon.source: "qrc:/assets/icons/icon_steam.svg"
icon.color: "white"
icon.width: 16
icon.height: 16
onClicked: Qt.openUrlExternally(
"steam://url/SteamWorkshopPage/672870")
}
Button {
text: qsTr("Changelog")
Material.background: Material.Purple
Material.foreground: "white"
font.family: ScreenPlay.settings.font
icon.source: "qrc:/assets/icons/icon_info.svg"
icon.color: "white"
icon.width: 16
icon.height: 16
onClicked: Qt.openUrlExternally(
"https://gitlab.com/kelteseth/ScreenPlay/-/releases")
}
WebEngineView {
url: "https://gitlab.com/kelteseth/ScreenPlay#contributing-for-none-programmer"
}
}
}

View File

@ -0,0 +1,66 @@
import QtQuick 2.12
import QtQuick.Controls 2.14
import QtQuick.Controls.Material 2.14
import ScreenPlay 1.0
TabButton {
id: control
height: parent.height
property url openLink
contentItem: Item {
anchors.fill: parent
ToolButton {
icon.source: control.icon.source
anchors {
right: txt.left
rightMargin: 5
verticalCenter: txt.verticalCenter
}
icon.color: control.checked ? Material.accentColor : Material.primaryTextColor
hoverEnabled: false
icon.width: 16
icon.height: 16
}
Text {
id: txt
text: control.text
font.family: ScreenPlay.settings.font
opacity: enabled ? 1.0 : 0.3
color: control.checked ? Material.accentColor : Material.primaryTextColor
horizontalAlignment: Text.AlignHCenter
elide: Text.ElideRight
anchors.bottom: parent.bottom
anchors.bottomMargin: 5
anchors.horizontalCenter: parent.horizontalCenter
font.capitalization: Font.AllUppercase
font.pointSize: 11
}
ToolButton {
anchors {
top: parent.top
topMargin: 15
right: parent.right
}
width: parent.width * .2
icon.source: "qrc:/assets/icons/icon_open_in_new.svg"
icon.width: 16
icon.height: 16
onClicked: Qt.openUrlExternally(control.openLink)
}
}
background: Item {}
}
/*##^##
Designer {
D{i:0;height:60;width:300}
}
##^##*/

View File

@ -1,56 +0,0 @@
import QtQuick 2.12
import com.stomt.sdk 1.0
Item {
id: feedback
height: 236
width: 420
state: "out"
StomtWidget {
id: stomtWidget
anchors {
top: parent.top
topMargin: 30
horizontalCenter: parent.horizontalCenter
}
targetID: "screenplay"
appKey: "C1IfJAruqWFdkM8e7BMPK3dx1"
targetDisplayName: "ScreenPlay"
targetImageUrl: "qrc:/assets/images/ScreenPlayIconStomt.png"
Component.onCompleted: feedback.state = "in"
}
states: [
State {
name: "out"
PropertyChanges {
target: stomtWidget
opacity: 0
anchors.topMargin: 100
}
},
State {
name: "in"
PropertyChanges {
target: stomtWidget
opacity: 1
anchors.topMargin: 30
}
}
]
transitions: [
Transition {
from: "out"
to: "in"
PropertyAnimation {
target: stomtWidget
duration: 300
easing.type: Easing.InOutQuart
properties: "opacity,anchors.topMargin"
}
}
]
}