Mirrors/ScreenPlay
Mirrors/ScreenPlay
1
0
Fork 0
mirror of https://gitlab.com/kelteseth/ScreenPlay.git synced 2024-09-02 08:39:49 +02:00
Code Issues Projects Releases Activity

Make import consistent from using 2.x -> 2.12

Browse Source
This commit is contained in:
Elias 2019-02-15 12:07:29 +01:00
parent bb9db9117a
commit c096be89cc
50 changed files with 63 additions and 308 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ScreenPlay/main.qml
View File

@ -1,4 +1,4 @@
import QtQuick 2.9
import QtQuick 2.12
import QtQuick.Window 2.2
import QtQuick.Controls 2.3
import QtQuick.Layouts 1.3

2
ScreenPlay/qml/Background.qml
View File

@ -1,4 +1,4 @@
import QtQuick 2.9
import QtQuick 2.12
import QtGraphicalEffects 1.0
import QtQuick.Particles 2.0

2
ScreenPlay/qml/Community/Community.qml
View File

@ -1,4 +1,4 @@
import QtQuick 2.9
import QtQuick 2.12
import QtQuick.Controls 2.3
import QtQuick.Controls.Material 2.2
import QtGraphicalEffects 1.0

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

@ -1,4 +1,4 @@
import QtQuick 2.9
import QtQuick 2.12
import com.stomt.qmlSDK 1.0
Item {

2
ScreenPlay/qml/Community/XMLNewsfeed.qml
View File

@ -1,4 +1,4 @@
import QtQuick 2.9
import QtQuick 2.12
import QtQuick.Controls 2.3
import QtQuick.Controls.Material 2.2
import QtGraphicalEffects 1.0

2
ScreenPlay/qml/Controls/Slider.qml
View File

@ -1,4 +1,4 @@
import QtQuick 2.9
import QtQuick 2.12
import QtQuick.Controls 2.2
Item {

2
ScreenPlay/qml/Create/Create.qml
View File

@ -1,4 +1,4 @@
import QtQuick 2.9
import QtQuick 2.12
import QtQuick.Controls 2.2
import QtQuick.Controls.Material 2.2
import QtQuick.Particles 2.0

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

@ -1,4 +1,4 @@
import QtQuick 2.9
import QtQuick 2.12
import QtGraphicalEffects 1.0
import QtQuick.Controls 2.3

2
ScreenPlay/qml/Create/CreateImportStatus.qml
View File

@ -1,4 +1,4 @@
import QtQuick 2.9
import QtQuick 2.12
import QtGraphicalEffects 1.0
import QtQuick.Controls 2.3

2
ScreenPlay/qml/Create/CreateNew.qml
View File

@ -1,4 +1,4 @@
import QtQuick 2.9
import QtQuick 2.12
import QtGraphicalEffects 1.0
import QtQuick.Controls 2.2
import QtQuick.Controls.Material 2.2

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

@ -1,4 +1,4 @@
import QtQuick 2.9
import QtQuick 2.12
import QtGraphicalEffects 1.0
import QtQuick.Controls 2.3
import Qt.labs.platform 1.0

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

@ -1,4 +1,4 @@
import QtQuick 2.9
import QtQuick 2.12
import QtGraphicalEffects 1.0
import QtQuick.Controls 2.3
import Qt.labs.platform 1.0

2
ScreenPlay/qml/Create/CreateWidget.qml
View File

@ -1,4 +1,4 @@
import QtQuick 2.9
import QtQuick 2.12
import QtGraphicalEffects 1.0
import Qt.labs.platform 1.0

2
ScreenPlay/qml/Create/CreateWidgetButton.qml
View File

@ -1,4 +1,4 @@
import QtQuick 2.9
import QtQuick 2.12
import QtGraphicalEffects 1.0
Item {

2
ScreenPlay/qml/Create/Wizards/CreateWallpaper/CreateWallpaperError.qml
View File

@ -1,4 +1,4 @@
import QtQuick 2.9
import QtQuick 2.12
import QtGraphicalEffects 1.0
import QtQuick.Controls 2.2
import QtQuick.Controls.Material 2.3

2
ScreenPlay/qml/Create/Wizards/CreateWallpaper/CreateWallpaperSuccess.qml
View File

@ -1,4 +1,4 @@
import QtQuick 2.9
import QtQuick 2.12
import QtGraphicalEffects 1.0
import QtQuick.Controls 2.2
import QtQuick.Controls.Material 2.3

2
ScreenPlay/qml/Create/Wizards/CreateWallpaper/CreateWallpaperVideoImport.qml
View File

@ -1,4 +1,4 @@
import QtQuick 2.9
import QtQuick 2.12
import QtGraphicalEffects 1.0
import QtQuick.Controls 2.2
import QtQuick.Controls.Material 2.3

2
ScreenPlay/qml/Create/Wizards/CreateWallpaper/CreateWallpaperVideoImportConvert.qml
View File

@ -1,4 +1,4 @@
import QtQuick 2.9
import QtQuick 2.12
import QtGraphicalEffects 1.0
import QtQuick.Controls 2.2
import QtQuick.Controls.Material 2.3

2
ScreenPlay/qml/Create/Wizards/CreateWallpaper/CreateWallpaperWizard.qml
View File

@ -1,4 +1,4 @@
import QtQuick 2.9
import QtQuick 2.12
import QtGraphicalEffects 1.0
import QtQuick.Controls 2.2
import QtQuick.Controls.Material 2.3

2
ScreenPlay/qml/Create/Wizards/CreateWallpaper/NextButton.qml
View File

@ -1,4 +1,4 @@
import QtQuick 2.9
import QtQuick 2.12
import QtGraphicalEffects 1.0
import QtQuick.Controls 2.2
import QtQuick.Controls.Material 2.2

2
ScreenPlay/qml/FileDropper.qml
View File

@ -1,4 +1,4 @@
import QtQuick 2.9
import QtQuick 2.12
import QtQuick.Extras 1.4
import PackageFileHandler 1.0

2
ScreenPlay/qml/FileDropperSingleFile.qml
View File

@ -1,4 +1,4 @@
import QtQuick 2.9
import QtQuick 2.12
import QtQuick.Dialogs 1.2
Rectangle {

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

@ -1,4 +1,4 @@
import QtQuick 2.9
import QtQuick 2.12
import QtQuick.Controls 2.3
import QtQuick.Controls.Styles 1.4
import QtGraphicalEffects 1.0

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

@ -1,4 +1,4 @@
import QtQuick 2.9
import QtQuick 2.12
import QtGraphicalEffects 1.0
Item {

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

@ -1,4 +1,4 @@
import QtQuick 2.9
import QtQuick 2.12
import QtQuick.Controls 2.3
import QtQuick.Controls.Styles 1.4
import QtQuick.Controls.Material 2.2

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

@ -1,4 +1,4 @@
import QtQuick 2.9
import QtQuick 2.12
import QtGraphicalEffects 1.0
import QtQuick.Controls 2.3
import QtQuick.Controls.Styles 1.4

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

@ -1,4 +1,4 @@
import QtQuick 2.9
import QtQuick 2.12
Item {
id: screenPlayItemImage

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

@ -1,4 +1,4 @@
import QtQuick 2.9
import QtQuick 2.12
import QtGraphicalEffects 1.0
import QtQuick.Controls 2.3
import QtQuick.Extras 1.4

2
ScreenPlay/qml/MonitorSelection.qml
View File

@ -1,4 +1,4 @@
import QtQuick 2.9
import QtQuick 2.12
import QtGraphicalEffects 1.0
Rectangle {

2
ScreenPlay/qml/MonitorSelectionItem.qml
View File

@ -1,4 +1,4 @@
import QtQuick 2.9
import QtQuick 2.12
import QtGraphicalEffects 1.0
Item {

2
ScreenPlay/qml/Monitors.qml
View File

@ -1,4 +1,4 @@
import QtQuick 2.9
import QtQuick 2.12
import QtQuick.Controls 2.3
import QtGraphicalEffects 1.0
import QtQuick.Controls.Material 2.2

2
ScreenPlay/qml/MonitorsProjectSettingItem.qml
View File

@ -1,4 +1,4 @@
import QtQuick 2.9
import QtQuick 2.12
import QtQuick.Controls 2.3
import QtGraphicalEffects 1.0
import QtQuick.Controls.Material 2.2

2
ScreenPlay/qml/Navigation.qml
View File

@ -1,4 +1,4 @@
import QtQuick 2.9
import QtQuick 2.12
import QtQuick.Controls 2.3
import QtGraphicalEffects 1.0

2
ScreenPlay/qml/NavigationItem.qml
View File

@ -1,4 +1,4 @@
import QtQuick 2.9
import QtQuick 2.12
import QtGraphicalEffects 1.0
Item {

60
ScreenPlay/qml/NavigationWallpaperConfiguration.qml
View File

@ -1,19 +1,10 @@
import QtQuick 2.9
import QtQuick 2.12
import QtQuick.Controls 2.3
import QtGraphicalEffects 1.0
Item {
id:navigationWallpaperConfiguration
id: navigationWallpaperConfiguration
width: 400
state: "out"
property bool isActive: screenPlaySettings.activeWallpaperCounter == 0 ? false : true
onIsActiveChanged: {
if(isActive){
state = "in"
} else {
state = "out"
}
}
anchors {
top: parent.top
@ -26,7 +17,6 @@ Item {
id: image
width: 24
height: 24
// opacity:
anchors {
right: parent.right
verticalCenter: parent.verticalCenter
@ -42,19 +32,25 @@ Item {
font.pointSize: 10
font.bold: true
font.family: "Roboto"
anchors {
horizontalCenter: parent.horizontalCenter
top: parent.top
topMargin: 1
}
}
}
Text {
id: activeMonitorName
text: qsTr("Configurate active Wallpaper")
text: {
if (screenPlaySettings.activeWallpaperCounter > 0) {
return qsTr("Configurate active Wallpaper or Widgets")
} else {
return qsTr("No active Wallpaper or Widgets")
}
}
anchors {
right: image.right
rightMargin: 30
@ -64,7 +60,6 @@ Item {
color: "#626262"
font.pointSize: 12
font.family: "Roboto"
}
MouseArea {
id: mouseArea
@ -75,36 +70,7 @@ Item {
}
}
states: [
State {
name: "out"
PropertyChanges {
target: navigationWallpaperConfiguration
opacity: 0
anchors.topMargin: 100
}
},
State {
name: "in"
PropertyChanges {
target: navigationWallpaperConfiguration
opacity: 1
anchors.topMargin: 0
}
}
]
states: []
transitions: [
Transition {
from: "out"
to: "in"
reversible: true
NumberAnimation {
target: navigationWallpaperConfiguration
properties: "anchors.topMargin, opacity"
duration: 250
easing.type: Easing.OutQuart
}
}
]
transitions: []
}

2
ScreenPlay/qml/Screen/Screen.qml
View File

@ -1,4 +1,4 @@
import QtQuick 2.9
import QtQuick 2.12
import QtQuick.Controls 2.2
import QtQuick.Controls.Material 2.2

2
ScreenPlay/qml/Settings/SettingBool.qml
View File

@ -1,4 +1,4 @@
import QtQuick 2.9
import QtQuick 2.12
import QtQuick.Controls 2.3
import QtQuick.Controls.Material 2.2
Item {

2
ScreenPlay/qml/Settings/Settings.qml
View File

@ -1,4 +1,4 @@
import QtQuick 2.9
import QtQuick 2.12
import QtQuick.Controls 2.3
import QtQuick.Dialogs 1.2
import QtQuick.Layouts 1.3

2
ScreenPlay/qml/Settings/SettingsButton.qml
View File

@ -1,4 +1,4 @@
import QtQuick 2.9
import QtQuick 2.12
import QtQuick.Controls 2.3
import QtQuick.Controls.Material 2.2

2
ScreenPlay/qml/Settings/SettingsComboBox.qml
View File

@ -1,4 +1,4 @@
import QtQuick 2.9
import QtQuick 2.12
import QtQuick.Controls 2.3

2
ScreenPlay/qml/Settings/SettingsExpander.qml
View File

@ -1,4 +1,4 @@
import QtQuick 2.9
import QtQuick 2.12
import QtQuick.Controls 2.3
import QtQuick.Dialogs 1.2
import QtQuick.Layouts 1.3

2
ScreenPlay/qml/Settings/SettingsHeader.qml
View File

@ -1,4 +1,4 @@
import QtQuick 2.9
import QtQuick 2.12
import QtGraphicalEffects 1.0
Item {

2
ScreenPlay/qml/Settings/SettingsHorizontalSeperator.qml
View File

@ -1,4 +1,4 @@
import QtQuick 2.9
import QtQuick 2.12
Item {
property real customWidth: parent.width

211
ScreenPlay/qml/StartupErrorWindow.qml
View File

@ -1,211 +0,0 @@
import QtQuick 2.6
import QtQuick.Window 2.2
import QtQuick.Controls 2.2
import QtQuick.Controls.Material 2.2
import QtQuick.Particles 2.0
import QtGraphicalEffects 1.0
import QtQuick.Layouts 1.3
ApplicationWindow {
id: window
visible: true
height: 500
width: 400
onClosing: Qt.quit()
Component.onCompleted: {
setX(Screen.width / 2 - width / 2)
setY(Screen.height / 2 - height / 2)
}
LinearGradient {
id: gradient
anchors.fill: parent
cached: true
start: Qt.point(0, 0)
end: Qt.point(gradient.width, gradient.height)
gradient: Gradient {
GradientStop {
position: 0.0
color: "#FF9700"
SequentialAnimation on color {
loops: Animation.Infinite
ColorAnimation {
from: "#FF9700"
to: "#F83C3C"
duration: 5000
}
ColorAnimation {
from: "#F83C3C"
to: "#FF9700"
duration: 5000
}
}
}
GradientStop {
position: 1.0
color: "#F83C3C"
SequentialAnimation on color {
loops: Animation.Infinite
ColorAnimation {
from: "#F83C3C"
to: "#FF9700"
duration: 100000
}
ColorAnimation {
from: "#FF9700"
to: "#F83C3C"
duration: 100000
}
}
}
}
}
Item {
anchors.fill: parent
MouseArea {
id: ma
anchors.fill: parent
hoverEnabled: true
onPressed: {
attractor.enabled = true
}
onPositionChanged: {
if (ma.pressed) {
attractor.pointX = mouseX
attractor.pointY = mouseY
}
}
onReleased: {
attractor.enabled = false
}
}
Attractor {
id: attractor
system: particleSystem
affectedParameter: Attractor.Acceleration
strength: 8000000
proportionalToDistance: Attractor.InverseQuadratic
}
ParticleSystem {
id: particleSystem
}
Emitter {
id: emitter
anchors {
horizontalCenter: parent.horizontalCenter
bottom: parent.bottom
}
width: parent.width
height: 80
system: particleSystem
emitRate: 25
lifeSpan: 5000
lifeSpanVariation: 1000
size: 8
endSize: 18
sizeVariation: 4
velocity: AngleDirection {
angle: -90
magnitude: 50
magnitudeVariation: 25
angleVariation: 10
}
}
ImageParticle {
height: 16
width: 16
source: "qrc:/assets/particle/dot.png"
system: particleSystem
opacity: .5
}
Image {
id: bgGlow
width: 500
height: width
opacity: .3
source: "qrc:/assets/particle/backgroundGlow.png"
anchors {
horizontalCenter: parent.horizontalCenter
bottom: parent.bottom
bottomMargin: -width * .65
}
}
}
Text {
id: name
text: qsTr("Could not connect to Steam :(")
color: "white"
font.family: "Roboto"
wrapMode: Text.WordWrap
font.pixelSize: 25
anchors {
top: parent.top
margins: 30
right: parent.right
left: parent.left
}
}
Text {
id: txtDescription
text: qsTr("To use ScreenPlay with all its features you have to have Steam running!")
color: "white"
font.family: "Roboto"
wrapMode: Text.WordWrap
horizontalAlignment: Text.AlignHCenter
font.pixelSize: 18
anchors {
top: name.bottom
margins: 30
right: parent.right
left: parent.left
}
}
ColumnLayout {
spacing: 10
anchors {
horizontalCenter: parent.horizontalCenter
bottom: parent.bottom
bottomMargin: 10
}
Button {
text: qsTr("Close ScreenPlay")
Material.background: Material.Red
Material.foreground: "white"
Layout.alignment: Qt.AlignCenter
onClicked: Qt.quit()
}
Button {
text: qsTr("Continue using ScreenPlay offline")
Material.background: Material.Orange
Material.foreground: "white"
Layout.alignment: Qt.AlignCenter
onClicked: {
suError.startScreenPlayAnyway()
window.close()
}
}
Button {
text: qsTr("Seek help in our greate community!")
Material.background: Material.LightGreen
Material.foreground: "white"
Layout.alignment: Qt.AlignCenter
onClicked: Qt.openUrlExternally("https://forum.screen-play.app")
}
}
}

2
ScreenPlay/qml/Widgets/Window.qml
View File

@ -1,4 +1,4 @@
import QtQuick 2.9
import QtQuick 2.12
import QtQuick.Controls 2.0
import QtQuick.Layouts 1.0
import QtQuick.Window 2.0

2
ScreenPlay/qml/Workshop/Workshop.qml
View File

@ -1,4 +1,4 @@
import QtQuick 2.9
import QtQuick 2.12
import QtQuick.Controls 2.3
import QtQuick.Controls.Material 2.2
import QtGraphicalEffects 1.0

2
ScreenPlay/qml/Workshop/WorkshopAvailableTest.qml
View File

@ -1,4 +1,4 @@
import QtQuick 2.0
import QtQuick 2.12
import net.aimber.workshop 1.0
Item {

2
ScreenPlay/qml/Workshop/WorkshopLoader.qml
View File

@ -1,4 +1,4 @@
import QtQuick 2.9
import QtQuick 2.12
Item {
id: workshopLoader

4
ScreenPlayWidget/main.qml
View File

@ -1,4 +1,4 @@
import QtQuick 2.9
import QtQuick 2.12
import net.aimber.screenplaysdk 1.0
import QtQuick.Controls 2.3
@ -45,7 +45,7 @@ Item {
}
onQmlSceneValueReceived: {
var obj2 = 'import QtQuick 2.9; Item {Component.onCompleted: loader.item.'
var obj2 = 'import QtQuick 2.12; Item {Component.onCompleted: loader.item.'
+ key + ' = ' + value + '; }'
var newObject = Qt.createQmlObject(obj2.toString(), root, "err")
newObject.destroy(10000)

4
ScreenPlayWindow/qml/main.qml
View File

@ -1,4 +1,4 @@
import QtQuick 2.9
import QtQuick 2.12
import QtWebEngine 1.8
Rectangle {
@ -21,7 +21,7 @@ Rectangle {
}
onQmlSceneValueReceived: {
var obj2 = 'import QtQuick 2.9; Item {Component.onCompleted: loader.item.'
var obj2 = 'import QtQuick 2.12; Item {Component.onCompleted: loader.item.'
+ key + ' = ' + value + '; }'
var newObject = Qt.createQmlObject(obj2.toString(), root, "err")
newObject.destroy(10000)