1
0
mirror of https://gitlab.com/kelteseth/ScreenPlay.git synced 2024-11-23 03:02:30 +01:00

Add new icon and create visuals

This commit is contained in:
kelteseth 2018-03-14 13:16:50 +01:00
parent a31e38736d
commit 2c509c2845
8 changed files with 73 additions and 73 deletions

View File

@ -104,5 +104,8 @@
<file>assets/icons/icon_info.svg</file>
<file>assets/icons/icon_document.svg</file>
<file>assets/icons/icon_folder_open.svg</file>
<file>assets/icons/icon_library_music.svg</file>
<file>assets/icons/icon_time.svg</file>
<file>assets/icons/icon_emptyWidget.svg</file>
</qresource>
</RCC>

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 128 128" 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="document-landscape" d="M110.35,27.95l-92.7,0c-2.843,0 -5.15,2.302 -5.15,5.15l0,61.8c0,2.848 2.307,5.15 5.15,5.15l92.7,0c2.843,0 5.15,-2.302 5.15,-5.15l0,-61.8c0,-2.848 -2.302,-5.15 -5.15,-5.15Zm-5.15,61.8l-82.4,0l0,-51.5l82.4,0l0,51.5Z" style="fill:#bebebe;fill-rule:nonzero;"/></svg>

After

Width:  |  Height:  |  Size: 742 B

View File

@ -0,0 +1,4 @@
<svg fill="#000000" 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 2H8c-1.1 0-2 .9-2 2v12c0 1.1.9 2 2 2h12c1.1 0 2-.9 2-2V4c0-1.1-.9-2-2-2zm-2 5h-3v5.5c0 1.38-1.12 2.5-2.5 2.5S10 13.88 10 12.5s1.12-2.5 2.5-2.5c.57 0 1.08.19 1.5.51V5h4v2zM4 6H2v14c0 1.1.9 2 2 2h14v-2H4V6z"/>
</svg>

After

Width:  |  Height:  |  Size: 372 B

View File

@ -0,0 +1,5 @@
<svg fill="#000000" height="24" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg">
<path d="M11.99 2C6.47 2 2 6.48 2 12s4.47 10 9.99 10C17.52 22 22 17.52 22 12S17.52 2 11.99 2zM12 20c-4.42 0-8-3.58-8-8s3.58-8 8-8 8 3.58 8 8-3.58 8-8 8z"/>
<path d="M0 0h24v24H0z" fill="none"/>
<path d="M12.5 7H11v6l5.25 3.15.75-1.23-4.5-2.67z"/>
</svg>

After

Width:  |  Height:  |  Size: 364 B

View File

@ -17,12 +17,34 @@ ApplicationWindow {
title: "ScreenPlay Alpha"
minimumHeight: 788
minimumWidth: 1050
Component.onCompleted: {
if(!screenPlaySettings.autostart){
show()
}
}
function switchPage(name) {
if (name === "Create") {
pageLoader.visible = false
pageLoaderCreate.setSource("qrc:/qml/Create/Create.qml")
pageLoaderCreate.visible = true
pageLoaderWorkshop.visible = false
sidebar.state = "inactive"
} else if (name === "Workshop" ) {
pageLoader.visible = false
pageLoaderCreate.visible = false
pageLoaderWorkshop.setSource("qrc:/qml/Workshop/Workshop.qml")
pageLoaderWorkshop.visible = true
sidebar.state = "inactive"
} else {
pageLoader.visible = true
pageLoaderCreate.visible = false
pageLoaderWorkshop.visible = false
pageLoader.setSource("qrc:/qml/" + name + "/" + name + ".qml")
sidebar.state = "inactive"
}
}
Connections {
target: screenPlaySettings
onSetMainWindowVisible: {
@ -31,6 +53,7 @@ ApplicationWindow {
setY(Screen.height / 2 - height / 2)
}
}
Connections {
target: utility
onRequestNavigation:{
@ -155,11 +178,6 @@ ApplicationWindow {
bottom: parent.bottom
left: parent.left
}
onStatusChanged: {
if (status == Loader.Ready) {
connectionsPageLoaderWorkshop.target = pageLoaderWorkshop
}
}
}
// Loader {
// id: pageLoaderCommunity
@ -172,6 +190,7 @@ ApplicationWindow {
// left: parent.left
// }
// }
Loader {
id: pageLoaderWorkshop
visible: false
@ -182,23 +201,8 @@ ApplicationWindow {
bottom: parent.bottom
left: parent.left
}
onStatusChanged: {
if (status == Loader.Ready) {
connectionsPageLoaderWorkshop.target = pageLoaderWorkshop
}
}
}
Connections {
id: connectionsPageLoaderWorkshop
ignoreUnknownSignals: true
onOpenCreate: {
if (!ignoreWorkshopBanner) {
switchPage("Workshop")
ignoreWorkshopBanner = true
}
}
}
Connections {
target: pageLoader.item
ignoreUnknownSignals: true
@ -268,30 +272,6 @@ ApplicationWindow {
}
}
function switchPage(name) {
if (name === "Create") {
pageLoader.visible = false
pageLoaderCreate.setSource("qrc:/qml/Create/Create.qml")
pageLoaderCreate.visible = true
pageLoaderWorkshop.visible = false
sidebar.state = "inactive"
} else if (name === "Workshop" ) {
pageLoader.visible = false
pageLoaderCreate.visible = false
pageLoaderWorkshop.setSource("qrc:/qml/Workshop/Workshop.qml")
pageLoaderWorkshop.visible = true
sidebar.state = "inactive"
} else {
pageLoader.visible = true
pageLoaderCreate.visible = false
pageLoaderWorkshop.visible = false
pageLoader.setSource("qrc:/qml/" + name + "/" + name + ".qml")
sidebar.state = "inactive"
}
}
Monitors {
id: monitors
state: "inactive"

View File

@ -16,8 +16,6 @@ Rectangle {
property url activeVideoFile: ""
property url activeFolder: ""
Connections {
target: createWallpaper
onVideoFileSelected: {
@ -281,19 +279,20 @@ Rectangle {
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("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.background: Material.Orange
Material.foreground: "white"
icon.source: "qrc:/assets/icons/icon_people.svg"
icon.color:"white"

View File

@ -7,7 +7,7 @@ Item {
Text {
id: txtCreate
text: qsTr("Create Widget")
text: qsTr("Create Widgets and Scenes")
anchors {
top: parent.top
horizontalCenter: parent.horizontalCenter
@ -25,13 +25,14 @@ Item {
text: qsTr("Create Emtpy Widget")
anchors.top: txtCreate.bottom
anchors.topMargin: 20
imgSource: "qrc:/assets/icons/icon_emptyWidget.svg"
onClicked: {
}
}
Text {
id: txtExamples
text: qsTr("Examples")
text: qsTr("Examples Widgets")
font.family: "Roboto"
renderType: Text.NativeRendering
font.pixelSize: 18
@ -53,23 +54,26 @@ Item {
}
CreateWidgetButton {
id: btnEmpty1
text: qsTr("Create 123")
text: qsTr("Simple clock widget")
buttonActive: true
imgSource: "qrc:/assets/icons/icon_time.svg"
onClicked: {
}
}
CreateWidgetButton {
id: btnEmpty2
text: qsTr("Create 456")
text: qsTr("Musik scene wallpaper visualizer")
buttonActive: true
imgSource: "qrc:/assets/icons/icon_library_music.svg"
onClicked: {
}
}
CreateWidgetButton {
id: btnEmpty3
text: qsTr("Create 789")
text: qsTr("Changing scene wallpaper via unsplash.com")
imgSource: "qrc:/assets/icons/icon_scene.svg"
buttonActive: true
onClicked: {

View File

@ -2,16 +2,17 @@ import QtQuick 2.9
import QtGraphicalEffects 1.0
Item {
id:btnEmpty
id: btnEmpty
height: 63
anchors {
right:parent.right
left:parent.left
right: parent.right
left: parent.left
}
property string text
signal clicked
property bool buttonActive: true
property string imgSource: "qrc:/assets/icons/icon_library_music.svg"
RectangularGlow {
id: effectBtnEmpty
@ -34,18 +35,23 @@ Item {
height: 60
anchors.top: parent.top
radius: 3
Rectangle {
id: imgIconEmpty
Image {
id:imgIcon
width: 30
height: 30
color: "gray"
radius: 30
sourceSize: Qt.size(30,30)
source: imgSource
anchors {
left: parent.left
leftMargin: 20
verticalCenter: parent.verticalCenter
}
}
ColorOverlay{
color: "gray"
source: imgIcon
anchors.fill: imgIcon
}
Text {
id: name
@ -55,7 +61,7 @@ Item {
font.pixelSize: 18
color: "gray"
anchors {
left: imgIconEmpty.right
left: imgIcon.right
leftMargin: 20
verticalCenter: parent.verticalCenter
}
@ -74,15 +80,13 @@ Item {
}
}
MouseArea {
anchors.fill: parent
enabled: buttonActive
cursorShape: Qt.PointingHandCursor
onClicked: {
clicked()
}
}
}
}