1
0
mirror of https://gitlab.com/kelteseth/ScreenPlay.git synced 2024-11-07 03:22:33 +01:00

Add GrowIconLink with links to my online profiles

This commit is contained in:
Elias Steurer 2019-10-19 20:56:12 +02:00
parent 17f6f8110b
commit ca022d7036
11 changed files with 205 additions and 72 deletions

View File

@ -124,11 +124,18 @@
<file>qml/Common/RippleEffect.qml</file>
<file>qml/Create/FFMPEGPopup.qml</file>
<file>assets/images/FFmpeg_Logo_new.svg</file>
<file>assets/icons/baseline-done-24px.svg</file>
<file>profiles.json</file>
<file>qml/Common/Shake.qml</file>
<file>qml/Common/Grow.qml</file>
<file>qml/Installed/InstalledWelcomeScreen.qml</file>
<file>qml/Monitors/DefaultVideoControls.qml</file>
<file>assets/images/mask_round.svg</file>
<file>assets/icons/icon_launch.svg</file>
<file>qml/Common/GrowIconLink.qml</file>
<file>assets/icons/brand_twitch.svg</file>
<file>assets/icons/brand_github.svg</file>
<file>assets/icons/brand_gitlab.svg</file>
<file>assets/icons/brand_twitter.svg</file>
<file>assets/icons/icon_done.svg</file>
</qresource>
</RCC>

View File

@ -0,0 +1 @@
<svg aria-hidden="true" focusable="false" data-prefix="fab" data-icon="github" class="svg-inline--fa fa-github fa-w-16" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 496 512"><path fill="currentColor" d="M165.9 397.4c0 2-2.3 3.6-5.2 3.6-3.3.3-5.6-1.3-5.6-3.6 0-2 2.3-3.6 5.2-3.6 3-.3 5.6 1.3 5.6 3.6zm-31.1-4.5c-.7 2 1.3 4.3 4.3 4.9 2.6 1 5.6 0 6.2-2s-1.3-4.3-4.3-5.2c-2.6-.7-5.5.3-6.2 2.3zm44.2-1.7c-2.9.7-4.9 2.6-4.6 4.9.3 2 2.9 3.3 5.9 2.6 2.9-.7 4.9-2.6 4.6-4.6-.3-1.9-3-3.2-5.9-2.9zM244.8 8C106.1 8 0 113.3 0 252c0 110.9 69.8 205.8 169.5 239.2 12.8 2.3 17.3-5.6 17.3-12.1 0-6.2-.3-40.4-.3-61.4 0 0-70 15-84.7-29.8 0 0-11.4-29.1-27.8-36.6 0 0-22.9-15.7 1.6-15.4 0 0 24.9 2 38.6 25.8 21.9 38.6 58.6 27.5 72.9 20.9 2.3-16 8.8-27.1 16-33.7-55.9-6.2-112.3-14.3-112.3-110.5 0-27.5 7.6-41.3 23.6-58.9-2.6-6.5-11.1-33.3 2.6-67.9 20.9-6.5 69 27 69 27 20-5.6 41.5-8.5 62.8-8.5s42.8 2.9 62.8 8.5c0 0 48.1-33.6 69-27 13.7 34.7 5.2 61.4 2.6 67.9 16 17.7 25.8 31.5 25.8 58.9 0 96.5-58.9 104.2-114.8 110.5 9.2 7.9 17 22.9 17 46.4 0 33.7-.3 75.4-.3 83.6 0 6.5 4.6 14.4 17.3 12.1C428.2 457.8 496 362.9 496 252 496 113.3 383.5 8 244.8 8zM97.2 352.9c-1.3 1-1 3.3.7 5.2 1.6 1.6 3.9 2.3 5.2 1 1.3-1 1-3.3-.7-5.2-1.6-1.6-3.9-2.3-5.2-1zm-10.8-8.1c-.7 1.3.3 2.9 2.3 3.9 1.6 1 3.6.7 4.3-.7.7-1.3-.3-2.9-2.3-3.9-2-.6-3.6-.3-4.3.7zm32.4 35.6c-1.6 1.3-1 4.3 1.3 6.2 2.3 2.3 5.2 2.6 6.5 1 1.3-1.3.7-4.3-1.3-6.2-2.2-2.3-5.2-2.6-6.5-1zm-11.4-14.7c-1.6 1-1.6 3.6 0 5.9 1.6 2.3 4.3 3.3 5.6 2.3 1.6-1.3 1.6-3.9 0-6.2-1.4-2.3-4-3.3-5.6-2z"></path></svg>

After

Width:  |  Height:  |  Size: 1.5 KiB

View File

@ -0,0 +1 @@
<svg aria-hidden="true" focusable="false" data-prefix="fab" data-icon="gitlab" class="svg-inline--fa fa-gitlab fa-w-16" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path fill="currentColor" d="M105.2 24.9c-3.1-8.9-15.7-8.9-18.9 0L29.8 199.7h132c-.1 0-56.6-174.8-56.6-174.8zM.9 287.7c-2.6 8 .3 16.9 7.1 22l247.9 184-226.2-294zm160.8-88l94.3 294 94.3-294zm349.4 88l-28.8-88-226.3 294 247.9-184c6.9-5.1 9.7-14 7.2-22zM425.7 24.9c-3.1-8.9-15.7-8.9-18.9 0l-56.6 174.8h132z"></path></svg>

After

Width:  |  Height:  |  Size: 506 B

View File

@ -0,0 +1 @@
<svg aria-hidden="true" focusable="false" data-prefix="fab" data-icon="twitch" class="svg-inline--fa fa-twitch fa-w-14" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"><path fill="currentColor" d="M40.1 32L10 108.9v314.3h107V480h60.2l56.8-56.8h87l117-117V32H40.1zm357.8 254.1L331 353H224l-56.8 56.8V353H76.9V72.1h321v214zM331 149v116.9h-40.1V149H331zm-107 0v116.9h-40.1V149H224z"></path></svg>

After

Width:  |  Height:  |  Size: 413 B

View File

@ -0,0 +1 @@
<svg aria-hidden="true" focusable="false" data-prefix="fab" data-icon="twitter-square" class="svg-inline--fa fa-twitter-square fa-w-14" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"><path fill="currentColor" d="M400 32H48C21.5 32 0 53.5 0 80v352c0 26.5 21.5 48 48 48h352c26.5 0 48-21.5 48-48V80c0-26.5-21.5-48-48-48zm-48.9 158.8c.2 2.8.2 5.7.2 8.5 0 86.7-66 186.6-186.6 186.6-37.2 0-71.7-10.8-100.7-29.4 5.3.6 10.4.8 15.8.8 30.7 0 58.9-10.4 81.4-28-28.8-.6-53-19.5-61.3-45.5 10.1 1.5 19.2 1.5 29.6-1.2-30-6.1-52.5-32.5-52.5-64.4v-.8c8.7 4.9 18.9 7.9 29.6 8.3a65.447 65.447 0 0 1-29.2-54.6c0-12.2 3.2-23.4 8.9-33.1 32.3 39.8 80.8 65.8 135.2 68.6-9.3-44.5 24-80.6 64-80.6 18.9 0 35.9 7.9 47.9 20.7 14.8-2.8 29-8.3 41.6-15.8-4.9 15.2-15.2 28-28.8 36.1 13.2-1.4 26-5.1 37.8-10.2-8.9 13.1-20.1 24.7-32.9 34z"></path></svg>

After

Width:  |  Height:  |  Size: 839 B

View File

Before

Width:  |  Height:  |  Size: 188 B

After

Width:  |  Height:  |  Size: 188 B

View File

@ -0,0 +1,5 @@
<?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:2;">
<path d="M19,19L5,19L5,5L12,5L12,3L5,3C3.89,3 3,3.9 3,5L3,19C3,20.1 3.89,21 5,21L19,21C20.1,21 21,20.1 21,19L21,12L19,12L19,19ZM14,3L14,5L17.59,5L7.76,14.83L9.17,16.24L19,6.41L19,10L21,10L21,3L14,3Z" style="fill:white;fill-rule:nonzero;"/>
</svg>

After

Width:  |  Height:  |  Size: 694 B

View File

@ -0,0 +1,7 @@
<?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 512 512" 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:2;">
<g transform="matrix(1.12527,0,0,1.12527,-28.1319,-11.2527)">
<circle cx="252.5" cy="237.5" r="227.5"/>
</g>
</svg>

After

Width:  |  Height:  |  Size: 577 B

View File

@ -0,0 +1,63 @@
import QtQuick 2.0
import QtGraphicalEffects 1.0
Rectangle {
id: root
color: "gray"
width: 32
height: 32
property alias iconSource: icon.source
property string url
property alias color: overlay.color
Image {
id: icon
sourceSize: Qt.size(32, 32)
anchors.centerIn: parent
visible: false
source: "qrc:/assets/icons/icon_info.svg"
}
ColorOverlay {
id: overlay
anchors.fill: icon
source: icon
color: "orange"
}
MouseArea {
hoverEnabled: true
anchors.fill: parent
onClicked: Qt.openUrlExternally(url)
onEntered: root.state = "hover"
onExited: root.state = ""
cursorShape: Qt.PointingHandCursor
}
states: [
State {
name: "hover"
PropertyChanges {
target: icon
width:40
height:40
sourceSize: Qt.size(40,40)
}
}
]
transitions: [
Transition {
from: ""
to: "hover"
reversible: true
PropertyAnimation {
target: icon
properties: "width,height,sourceSize"
duration: 200
easing.type: Easing.InOutQuart
}
}
]
}

View File

@ -7,6 +7,8 @@ import Qt.labs.platform 1.0
import ScreenPlay 1.0
import "../Common"
Item {
id: settingsWrapper
anchors.fill: parent
@ -88,42 +90,39 @@ Item {
description: qsTr("ScreenPlay will start with Windows and will setup your Desktop every time for you.")
isChecked: ScreenPlay.settings.autostart
onCheckboxChanged: {
ScreenPlay.settings.setAutostart(checked)
ScreenPlay.settings.writeSingleSettingConfig(
ScreenPlay.settings.setAutostart(checked)
ScreenPlay.settings.writeSingleSettingConfig(
"autostart", checked)
}
}
SettingsHorizontalSeperator {
}
SettingsHorizontalSeperator {}
SettingBool {
headline: qsTr("High priority Autostart")
available: false
description: qsTr("This options grants ScreenPlay a higher autostart priority than other apps.")
isChecked: ScreenPlay.settings.highPriorityStart
isChecked: ScreenPlay.settings.highPriorityStart
onCheckboxChanged: {
ScreenPlay.settings.setHighPriorityStart(checked)
ScreenPlay.settings.writeSingleSettingConfig(
ScreenPlay.settings.setHighPriorityStart(
checked)
ScreenPlay.settings.writeSingleSettingConfig(
"highPriorityStart", checked)
}
}
SettingsHorizontalSeperator {
}
SettingsHorizontalSeperator {}
SettingBool {
height: 70
available: false
headline: qsTr("Send anonymous crash reports and statistics")
description: qsTr("Help us make ScreenPlay faster and more stable. All collected data is purely anonymous and only used for development purposes!")
isChecked: ScreenPlay.settings.sendStatistics
isChecked: ScreenPlay.settings.sendStatistics
onCheckboxChanged: {
ScreenPlay.settings.setSendStatistics(checked)
ScreenPlay.settings.writeSingleSettingConfig(
ScreenPlay.settings.setSendStatistics(checked)
ScreenPlay.settings.writeSingleSettingConfig(
"sendStatistics", checked)
}
}
SettingsHorizontalSeperator {
}
SettingsHorizontalSeperator {}
SettingsButton {
headline: qsTr("Set save location")
@ -152,43 +151,42 @@ Item {
horizontalAlignment: Text.AlignLeft
font.pointSize: 10
font.family: "Roboto"
anchors{
right:parent.right
left:parent.left
anchors {
right: parent.right
left: parent.left
leftMargin: 20
}
}
SettingsHorizontalSeperator {
}
SettingsHorizontalSeperator {}
SettingsComboBox {
id: settingsLanguage
headline: qsTr("Language")
description: qsTr("Set the ScreenPlay UI Language")
onCurrentIndexChanged: {
var key = settingsLanguage.comboBoxListModel.get(
settingsLanguage.currentIndex).text.toString();
settingsLanguage.currentIndex).text.toString()
var languageKey;
var languageKey
switch (key) {
case "German":
languageKey = "de"
break;
break
case "English":
languageKey = "en"
break;
break
case "Russian":
languageKey = "ru"
break;
break
default:
languageKey = "en"
break;
break
}
print(key, languageKey)
ScreenPlay.settings.setqSetting("language", languageKey)
ScreenPlay.settings.setqSetting("language",
languageKey)
}
comboBoxListModel: ListModel {
ListElement {
@ -253,19 +251,20 @@ Item {
}
spacing: 10
SettingBool {
headline: qsTr("Pause wallpaper while ingame")
available: false
description: qsTr("To maximise your framerates ingame, you can enable this setting to pause all active wallpapers!")
isChecked: ScreenPlay.settings.pauseWallpaperWhenIngame
isChecked: ScreenPlay.settings.pauseWallpaperWhenIngame
onCheckboxChanged: {
ScreenPlay.settings.setPauseWallpaperWhenIngame(checked)
ScreenPlay.settings.writeSingleSettingConfig("setPauseWallpaperWhenIngame",checked)
ScreenPlay.settings.setPauseWallpaperWhenIngame(
checked)
ScreenPlay.settings.writeSingleSettingConfig(
"setPauseWallpaperWhenIngame",
checked)
}
}
SettingsHorizontalSeperator {
}
SettingsHorizontalSeperator {}
SettingsComboBox {
id: settingsFillModeComboBox
headline: qsTr("Default Fill Mode")
@ -276,7 +275,6 @@ Item {
comboBoxListModel: ListModel {
ListElement {
text: "Stretch"
}
ListElement {
text: "PreserveAspectFit"
@ -329,7 +327,7 @@ Item {
}
Column {
id:settingsAboutrapperWrapper
id: settingsAboutrapperWrapper
width: parent.width
spacing: 10
anchors {
@ -359,46 +357,96 @@ Item {
}
Text {
id: txtDescriptionAbout
text: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo ligula eget dolor. Aenean massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec quam felis, ultricies nec, pellentesque eu, pretium quis, sem. \n \n Nulla consequat massa quis enim. Donec pede justo, fringilla vel, aliquet nec, vulputate eget, arcu. "
text: qsTr("Hi, I'm Elias Steurer also known as Kelteseth and I'm the developer of ScreenPlay. Thank you for using my software. You can follow me to receive updates about ScreenPlay here:")
color: "#B5B5B5"
wrapMode: Text.WordWrap
verticalAlignment: Text.AlignTop
horizontalAlignment: Text.AlignLeft
font.pointSize: 10
font.pointSize: 11
font.family: "Roboto"
width: parent.width * .6
anchors {
top: txtHeadline.bottom
topMargin: 6
topMargin: 15
left: parent.left
leftMargin: 20
right: imgLogoHead.left
rightMargin: 20
rightMargin: 60
bottom: parent.bottom
}
}
RowLayout {
anchors {
left: parent.left
margins: 20
bottom: parent.bottom
}
spacing: 20
GrowIconLink {
iconSource: "qrc:/assets/icons/brand_github.svg"
url: "https://github.com/kelteseth"
color: "#333333"
}
GrowIconLink {
iconSource: "qrc:/assets/icons/brand_gitlab.svg"
url: "https://gitlab.com/kelteseth"
color: "#FC6D26"
}
GrowIconLink {
iconSource: "qrc:/assets/icons/brand_twitter.svg"
url: "https://twitter.com/Kelteseth"
color: "#1DA1F2"
}
GrowIconLink {
iconSource: "qrc:/assets/icons/brand_twitch.svg"
url: "https://www.twitch.tv/kelteseth/"
color: "#6441A5"
}
}
Image {
id: imgLogoHead
source: "qrc:/assets/icons/icon_logo_head.svg"
width: 150
height: 150
sourceSize: Qt.size(150, 150)
source: "https://assets.gitlab-static.net/uploads/-/system/user/avatar/64172/avatar.png"
width: 120
height: 120
visible: false
anchors {
top: txtHeadline.bottom
topMargin: -10
topMargin: 20
right: parent.right
rightMargin: 20
}
sourceSize: Qt.size(120, 120)
}
Image {
id: mask
source: "qrc:/assets/images/mask_round.svg"
sourceSize: Qt.size(parent.width, parent.height)
smooth: true
visible: false
}
OpacityMask {
anchors.fill: imgLogoHead
source: imgLogoHead
maskSource: mask
smooth: true
}
}
SettingsHorizontalSeperator {}
SettingsButton {
icon.source: "qrc:/assets/icons/icon_launch.svg"
headline: qsTr("Version")
description: qsTr("ScreenPlay Build Version ") + ScreenPlay.settings.gitBuildHash
description: qsTr("ScreenPlay Build Version ")
+ ScreenPlay.settings.gitBuildHash
buttonText: qsTr("Open Changelog")
onButtonPressed: Qt.openUrlExternally("https://gitlab.com/kelteseth/ScreenPlay/-/releases")
onButtonPressed: Qt.openUrlExternally(
"https://gitlab.com/kelteseth/ScreenPlay/-/releases")
}
SettingsHorizontalSeperator {}
@ -412,13 +460,12 @@ Item {
}
}
SettingsExpander {
id:expanderCopyright
id: expanderCopyright
anchors {
left: parent.left
right: parent.right
}
Connections {
target: ScreenPlay.util
onAllLicenseLoaded: {
@ -436,7 +483,7 @@ Item {
}
}
SettingsExpander {
id:expanderDebug
id: expanderDebug
text: ScreenPlay.util.debugMessages
anchors {
left: parent.left
@ -454,13 +501,12 @@ Item {
}
}
SettingsExpander {
id:expanderDataProtection
id: expanderDataProtection
anchors {
left: parent.left
right: parent.right
}
Connections {
target: ScreenPlay.util
onAllDataProtectionLoaded: {
@ -475,7 +521,9 @@ Item {
}
}
/*##^## Designer {
/*##^##
Designer {
D{i:0;autoSize:true;height:480;width:640}
}
##^##*/
##^##*/

View File

@ -2,10 +2,10 @@ import QtQuick 2.12
import QtQuick.Controls 2.3
import QtQuick.Controls.Material 2.2
Item {
id: settingsButton
property alias icon: btnSettings.icon
property string headline: "Headline"
property string description: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit."
property string buttonText: "value"
@ -13,7 +13,7 @@ Item {
property bool enabled: true
property bool available: true
onAvailableChanged: {
if(!available){
if (!available) {
settingsButton.opacity = .5
btnSettings.enabled = false
} else {
@ -22,7 +22,7 @@ Item {
}
}
signal buttonPressed()
signal buttonPressed
height: 20 + txtHeadline.paintedHeight + txtDescription.paintedHeight
width: parent.width
@ -34,15 +34,14 @@ Item {
verticalAlignment: Text.AlignVCenter
horizontalAlignment: Text.AlignLeft
anchors{
top:parent.top
anchors {
top: parent.top
topMargin: 6
left:parent.left
left: parent.left
leftMargin: 20
}
font.pointSize: 12
font.pointSize: 12
}
Text {
@ -55,28 +54,28 @@ Item {
horizontalAlignment: Text.AlignLeft
font.pointSize: 10
font.family: "Roboto"
anchors{
top:txtHeadline.bottom
anchors {
top: txtHeadline.bottom
topMargin: 6
left:parent.left
left: parent.left
leftMargin: 20
right:btnSettings.left
right: btnSettings.left
rightMargin: 20
}
}
Button {
id:btnSettings
id: btnSettings
text: settingsButton.buttonText
Material.background: Material.Orange
Material.foreground: "white"
icon.width: 20
icon.height: 20
anchors {
right: parent.right
rightMargin: 20
verticalCenter: parent.verticalCenter
}
onPressed: buttonPressed()
}
}