diff --git a/ScreenPlay/main.qml b/ScreenPlay/main.qml index 91c6a632..3c1828a1 100644 --- a/ScreenPlay/main.qml +++ b/ScreenPlay/main.qml @@ -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 diff --git a/ScreenPlay/qml/Background.qml b/ScreenPlay/qml/Background.qml index b9084a29..a8bbcd18 100644 --- a/ScreenPlay/qml/Background.qml +++ b/ScreenPlay/qml/Background.qml @@ -1,4 +1,4 @@ -import QtQuick 2.9 +import QtQuick 2.12 import QtGraphicalEffects 1.0 import QtQuick.Particles 2.0 diff --git a/ScreenPlay/qml/Community/Community.qml b/ScreenPlay/qml/Community/Community.qml index 805dffd6..0786941a 100644 --- a/ScreenPlay/qml/Community/Community.qml +++ b/ScreenPlay/qml/Community/Community.qml @@ -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 diff --git a/ScreenPlay/qml/Community/Feedback.qml b/ScreenPlay/qml/Community/Feedback.qml index a7ed3199..bdfb2e92 100644 --- a/ScreenPlay/qml/Community/Feedback.qml +++ b/ScreenPlay/qml/Community/Feedback.qml @@ -1,4 +1,4 @@ -import QtQuick 2.9 +import QtQuick 2.12 import com.stomt.qmlSDK 1.0 Item { diff --git a/ScreenPlay/qml/Community/XMLNewsfeed.qml b/ScreenPlay/qml/Community/XMLNewsfeed.qml index 281a24f6..06627120 100644 --- a/ScreenPlay/qml/Community/XMLNewsfeed.qml +++ b/ScreenPlay/qml/Community/XMLNewsfeed.qml @@ -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 diff --git a/ScreenPlay/qml/Controls/Slider.qml b/ScreenPlay/qml/Controls/Slider.qml index 5e572bf9..8ac8cb87 100644 --- a/ScreenPlay/qml/Controls/Slider.qml +++ b/ScreenPlay/qml/Controls/Slider.qml @@ -1,4 +1,4 @@ -import QtQuick 2.9 +import QtQuick 2.12 import QtQuick.Controls 2.2 Item { diff --git a/ScreenPlay/qml/Create/Create.qml b/ScreenPlay/qml/Create/Create.qml index 88148aa1..efd3dba2 100644 --- a/ScreenPlay/qml/Create/Create.qml +++ b/ScreenPlay/qml/Create/Create.qml @@ -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 diff --git a/ScreenPlay/qml/Create/CreateImport.qml b/ScreenPlay/qml/Create/CreateImport.qml index db2d3905..edb06057 100644 --- a/ScreenPlay/qml/Create/CreateImport.qml +++ b/ScreenPlay/qml/Create/CreateImport.qml @@ -1,4 +1,4 @@ -import QtQuick 2.9 +import QtQuick 2.12 import QtGraphicalEffects 1.0 import QtQuick.Controls 2.3 diff --git a/ScreenPlay/qml/Create/CreateImportStatus.qml b/ScreenPlay/qml/Create/CreateImportStatus.qml index 6e61d32c..b14b39cd 100644 --- a/ScreenPlay/qml/Create/CreateImportStatus.qml +++ b/ScreenPlay/qml/Create/CreateImportStatus.qml @@ -1,4 +1,4 @@ -import QtQuick 2.9 +import QtQuick 2.12 import QtGraphicalEffects 1.0 import QtQuick.Controls 2.3 diff --git a/ScreenPlay/qml/Create/CreateNew.qml b/ScreenPlay/qml/Create/CreateNew.qml index 837910b1..e4a20dd0 100644 --- a/ScreenPlay/qml/Create/CreateNew.qml +++ b/ScreenPlay/qml/Create/CreateNew.qml @@ -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 diff --git a/ScreenPlay/qml/Create/CreateUpload.qml b/ScreenPlay/qml/Create/CreateUpload.qml index 284a578d..e99c564c 100644 --- a/ScreenPlay/qml/Create/CreateUpload.qml +++ b/ScreenPlay/qml/Create/CreateUpload.qml @@ -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 diff --git a/ScreenPlay/qml/Create/CreateWallpaper.qml b/ScreenPlay/qml/Create/CreateWallpaper.qml index a558839c..7f5bd474 100644 --- a/ScreenPlay/qml/Create/CreateWallpaper.qml +++ b/ScreenPlay/qml/Create/CreateWallpaper.qml @@ -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 diff --git a/ScreenPlay/qml/Create/CreateWidget.qml b/ScreenPlay/qml/Create/CreateWidget.qml index 975f3aef..56c75a51 100644 --- a/ScreenPlay/qml/Create/CreateWidget.qml +++ b/ScreenPlay/qml/Create/CreateWidget.qml @@ -1,4 +1,4 @@ -import QtQuick 2.9 +import QtQuick 2.12 import QtGraphicalEffects 1.0 import Qt.labs.platform 1.0 diff --git a/ScreenPlay/qml/Create/CreateWidgetButton.qml b/ScreenPlay/qml/Create/CreateWidgetButton.qml index 4f5e1eba..f59bfb20 100644 --- a/ScreenPlay/qml/Create/CreateWidgetButton.qml +++ b/ScreenPlay/qml/Create/CreateWidgetButton.qml @@ -1,4 +1,4 @@ -import QtQuick 2.9 +import QtQuick 2.12 import QtGraphicalEffects 1.0 Item { diff --git a/ScreenPlay/qml/Create/Wizards/CreateWallpaper/CreateWallpaperError.qml b/ScreenPlay/qml/Create/Wizards/CreateWallpaper/CreateWallpaperError.qml index 2fa0e26f..cec527df 100644 --- a/ScreenPlay/qml/Create/Wizards/CreateWallpaper/CreateWallpaperError.qml +++ b/ScreenPlay/qml/Create/Wizards/CreateWallpaper/CreateWallpaperError.qml @@ -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 diff --git a/ScreenPlay/qml/Create/Wizards/CreateWallpaper/CreateWallpaperSuccess.qml b/ScreenPlay/qml/Create/Wizards/CreateWallpaper/CreateWallpaperSuccess.qml index a1554743..85dda4da 100644 --- a/ScreenPlay/qml/Create/Wizards/CreateWallpaper/CreateWallpaperSuccess.qml +++ b/ScreenPlay/qml/Create/Wizards/CreateWallpaper/CreateWallpaperSuccess.qml @@ -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 diff --git a/ScreenPlay/qml/Create/Wizards/CreateWallpaper/CreateWallpaperVideoImport.qml b/ScreenPlay/qml/Create/Wizards/CreateWallpaper/CreateWallpaperVideoImport.qml index 7e40ef6b..d134f009 100644 --- a/ScreenPlay/qml/Create/Wizards/CreateWallpaper/CreateWallpaperVideoImport.qml +++ b/ScreenPlay/qml/Create/Wizards/CreateWallpaper/CreateWallpaperVideoImport.qml @@ -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 diff --git a/ScreenPlay/qml/Create/Wizards/CreateWallpaper/CreateWallpaperVideoImportConvert.qml b/ScreenPlay/qml/Create/Wizards/CreateWallpaper/CreateWallpaperVideoImportConvert.qml index 17cb0df1..05e4899b 100644 --- a/ScreenPlay/qml/Create/Wizards/CreateWallpaper/CreateWallpaperVideoImportConvert.qml +++ b/ScreenPlay/qml/Create/Wizards/CreateWallpaper/CreateWallpaperVideoImportConvert.qml @@ -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 diff --git a/ScreenPlay/qml/Create/Wizards/CreateWallpaper/CreateWallpaperWizard.qml b/ScreenPlay/qml/Create/Wizards/CreateWallpaper/CreateWallpaperWizard.qml index fabf575f..af2856c6 100644 --- a/ScreenPlay/qml/Create/Wizards/CreateWallpaper/CreateWallpaperWizard.qml +++ b/ScreenPlay/qml/Create/Wizards/CreateWallpaper/CreateWallpaperWizard.qml @@ -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 diff --git a/ScreenPlay/qml/Create/Wizards/CreateWallpaper/NextButton.qml b/ScreenPlay/qml/Create/Wizards/CreateWallpaper/NextButton.qml index 2eb35230..0898305a 100644 --- a/ScreenPlay/qml/Create/Wizards/CreateWallpaper/NextButton.qml +++ b/ScreenPlay/qml/Create/Wizards/CreateWallpaper/NextButton.qml @@ -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 diff --git a/ScreenPlay/qml/FileDropper.qml b/ScreenPlay/qml/FileDropper.qml index 1d69e4b9..c3d2240e 100644 --- a/ScreenPlay/qml/FileDropper.qml +++ b/ScreenPlay/qml/FileDropper.qml @@ -1,4 +1,4 @@ -import QtQuick 2.9 +import QtQuick 2.12 import QtQuick.Extras 1.4 import PackageFileHandler 1.0 diff --git a/ScreenPlay/qml/FileDropperSingleFile.qml b/ScreenPlay/qml/FileDropperSingleFile.qml index a7aa825e..31215fb6 100644 --- a/ScreenPlay/qml/FileDropperSingleFile.qml +++ b/ScreenPlay/qml/FileDropperSingleFile.qml @@ -1,4 +1,4 @@ -import QtQuick 2.9 +import QtQuick 2.12 import QtQuick.Dialogs 1.2 Rectangle { diff --git a/ScreenPlay/qml/Installed/Installed.qml b/ScreenPlay/qml/Installed/Installed.qml index a5b573e5..bd05cca1 100644 --- a/ScreenPlay/qml/Installed/Installed.qml +++ b/ScreenPlay/qml/Installed/Installed.qml @@ -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 diff --git a/ScreenPlay/qml/Installed/InstalledNavigation.qml b/ScreenPlay/qml/Installed/InstalledNavigation.qml index 4f4e20b4..f1d35a8f 100644 --- a/ScreenPlay/qml/Installed/InstalledNavigation.qml +++ b/ScreenPlay/qml/Installed/InstalledNavigation.qml @@ -1,4 +1,4 @@ -import QtQuick 2.9 +import QtQuick 2.12 import QtGraphicalEffects 1.0 Item { diff --git a/ScreenPlay/qml/Installed/InstalledUserHelper.qml b/ScreenPlay/qml/Installed/InstalledUserHelper.qml index 7efa5a9f..d4d2c8d0 100644 --- a/ScreenPlay/qml/Installed/InstalledUserHelper.qml +++ b/ScreenPlay/qml/Installed/InstalledUserHelper.qml @@ -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 diff --git a/ScreenPlay/qml/Installed/ScreenPlayItem.qml b/ScreenPlay/qml/Installed/ScreenPlayItem.qml index 8ddffd53..e3f3b377 100644 --- a/ScreenPlay/qml/Installed/ScreenPlayItem.qml +++ b/ScreenPlay/qml/Installed/ScreenPlayItem.qml @@ -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 diff --git a/ScreenPlay/qml/Installed/ScreenPlayItemImage.qml b/ScreenPlay/qml/Installed/ScreenPlayItemImage.qml index 23612a16..1ff11130 100644 --- a/ScreenPlay/qml/Installed/ScreenPlayItemImage.qml +++ b/ScreenPlay/qml/Installed/ScreenPlayItemImage.qml @@ -1,4 +1,4 @@ -import QtQuick 2.9 +import QtQuick 2.12 Item { id: screenPlayItemImage diff --git a/ScreenPlay/qml/Installed/Sidebar.qml b/ScreenPlay/qml/Installed/Sidebar.qml index cbdec16a..376736bc 100644 --- a/ScreenPlay/qml/Installed/Sidebar.qml +++ b/ScreenPlay/qml/Installed/Sidebar.qml @@ -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 diff --git a/ScreenPlay/qml/MonitorSelection.qml b/ScreenPlay/qml/MonitorSelection.qml index fff51047..71720a08 100644 --- a/ScreenPlay/qml/MonitorSelection.qml +++ b/ScreenPlay/qml/MonitorSelection.qml @@ -1,4 +1,4 @@ -import QtQuick 2.9 +import QtQuick 2.12 import QtGraphicalEffects 1.0 Rectangle { diff --git a/ScreenPlay/qml/MonitorSelectionItem.qml b/ScreenPlay/qml/MonitorSelectionItem.qml index a5329fe1..fcf4a811 100644 --- a/ScreenPlay/qml/MonitorSelectionItem.qml +++ b/ScreenPlay/qml/MonitorSelectionItem.qml @@ -1,4 +1,4 @@ -import QtQuick 2.9 +import QtQuick 2.12 import QtGraphicalEffects 1.0 Item { diff --git a/ScreenPlay/qml/Monitors.qml b/ScreenPlay/qml/Monitors.qml index a673b1a5..3b7e98e0 100644 --- a/ScreenPlay/qml/Monitors.qml +++ b/ScreenPlay/qml/Monitors.qml @@ -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 diff --git a/ScreenPlay/qml/MonitorsProjectSettingItem.qml b/ScreenPlay/qml/MonitorsProjectSettingItem.qml index 26084cba..67ad0356 100644 --- a/ScreenPlay/qml/MonitorsProjectSettingItem.qml +++ b/ScreenPlay/qml/MonitorsProjectSettingItem.qml @@ -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 diff --git a/ScreenPlay/qml/Navigation.qml b/ScreenPlay/qml/Navigation.qml index f9ee6403..e1916642 100644 --- a/ScreenPlay/qml/Navigation.qml +++ b/ScreenPlay/qml/Navigation.qml @@ -1,4 +1,4 @@ -import QtQuick 2.9 +import QtQuick 2.12 import QtQuick.Controls 2.3 import QtGraphicalEffects 1.0 diff --git a/ScreenPlay/qml/NavigationItem.qml b/ScreenPlay/qml/NavigationItem.qml index 70884a9f..9fa7fa72 100644 --- a/ScreenPlay/qml/NavigationItem.qml +++ b/ScreenPlay/qml/NavigationItem.qml @@ -1,4 +1,4 @@ -import QtQuick 2.9 +import QtQuick 2.12 import QtGraphicalEffects 1.0 Item { diff --git a/ScreenPlay/qml/NavigationWallpaperConfiguration.qml b/ScreenPlay/qml/NavigationWallpaperConfiguration.qml index f86d2b34..da7207cc 100644 --- a/ScreenPlay/qml/NavigationWallpaperConfiguration.qml +++ b/ScreenPlay/qml/NavigationWallpaperConfiguration.qml @@ -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: [] } diff --git a/ScreenPlay/qml/Screen/Screen.qml b/ScreenPlay/qml/Screen/Screen.qml index e07f8780..7481e92e 100644 --- a/ScreenPlay/qml/Screen/Screen.qml +++ b/ScreenPlay/qml/Screen/Screen.qml @@ -1,4 +1,4 @@ -import QtQuick 2.9 +import QtQuick 2.12 import QtQuick.Controls 2.2 import QtQuick.Controls.Material 2.2 diff --git a/ScreenPlay/qml/Settings/SettingBool.qml b/ScreenPlay/qml/Settings/SettingBool.qml index 2602b917..9d68c9b9 100644 --- a/ScreenPlay/qml/Settings/SettingBool.qml +++ b/ScreenPlay/qml/Settings/SettingBool.qml @@ -1,4 +1,4 @@ -import QtQuick 2.9 +import QtQuick 2.12 import QtQuick.Controls 2.3 import QtQuick.Controls.Material 2.2 Item { diff --git a/ScreenPlay/qml/Settings/Settings.qml b/ScreenPlay/qml/Settings/Settings.qml index 4d59cfeb..83ab3ed7 100644 --- a/ScreenPlay/qml/Settings/Settings.qml +++ b/ScreenPlay/qml/Settings/Settings.qml @@ -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 diff --git a/ScreenPlay/qml/Settings/SettingsButton.qml b/ScreenPlay/qml/Settings/SettingsButton.qml index eef3260e..63466d12 100644 --- a/ScreenPlay/qml/Settings/SettingsButton.qml +++ b/ScreenPlay/qml/Settings/SettingsButton.qml @@ -1,4 +1,4 @@ -import QtQuick 2.9 +import QtQuick 2.12 import QtQuick.Controls 2.3 import QtQuick.Controls.Material 2.2 diff --git a/ScreenPlay/qml/Settings/SettingsComboBox.qml b/ScreenPlay/qml/Settings/SettingsComboBox.qml index 51da1a2a..9191db5c 100644 --- a/ScreenPlay/qml/Settings/SettingsComboBox.qml +++ b/ScreenPlay/qml/Settings/SettingsComboBox.qml @@ -1,4 +1,4 @@ -import QtQuick 2.9 +import QtQuick 2.12 import QtQuick.Controls 2.3 diff --git a/ScreenPlay/qml/Settings/SettingsExpander.qml b/ScreenPlay/qml/Settings/SettingsExpander.qml index ac37851a..74366358 100644 --- a/ScreenPlay/qml/Settings/SettingsExpander.qml +++ b/ScreenPlay/qml/Settings/SettingsExpander.qml @@ -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 diff --git a/ScreenPlay/qml/Settings/SettingsHeader.qml b/ScreenPlay/qml/Settings/SettingsHeader.qml index 1aa6176f..3d0c182c 100644 --- a/ScreenPlay/qml/Settings/SettingsHeader.qml +++ b/ScreenPlay/qml/Settings/SettingsHeader.qml @@ -1,4 +1,4 @@ -import QtQuick 2.9 +import QtQuick 2.12 import QtGraphicalEffects 1.0 Item { diff --git a/ScreenPlay/qml/Settings/SettingsHorizontalSeperator.qml b/ScreenPlay/qml/Settings/SettingsHorizontalSeperator.qml index 9d8f3b15..97ff0cd3 100644 --- a/ScreenPlay/qml/Settings/SettingsHorizontalSeperator.qml +++ b/ScreenPlay/qml/Settings/SettingsHorizontalSeperator.qml @@ -1,4 +1,4 @@ -import QtQuick 2.9 +import QtQuick 2.12 Item { property real customWidth: parent.width diff --git a/ScreenPlay/qml/StartupErrorWindow.qml b/ScreenPlay/qml/StartupErrorWindow.qml deleted file mode 100644 index c8b19822..00000000 --- a/ScreenPlay/qml/StartupErrorWindow.qml +++ /dev/null @@ -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") - } - } -} diff --git a/ScreenPlay/qml/Widgets/Window.qml b/ScreenPlay/qml/Widgets/Window.qml index 6d53fc5f..eb7125a0 100644 --- a/ScreenPlay/qml/Widgets/Window.qml +++ b/ScreenPlay/qml/Widgets/Window.qml @@ -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 diff --git a/ScreenPlay/qml/Workshop/Workshop.qml b/ScreenPlay/qml/Workshop/Workshop.qml index c7b57b96..7f415371 100644 --- a/ScreenPlay/qml/Workshop/Workshop.qml +++ b/ScreenPlay/qml/Workshop/Workshop.qml @@ -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 diff --git a/ScreenPlay/qml/Workshop/WorkshopAvailableTest.qml b/ScreenPlay/qml/Workshop/WorkshopAvailableTest.qml index 8daec893..c74eae4d 100644 --- a/ScreenPlay/qml/Workshop/WorkshopAvailableTest.qml +++ b/ScreenPlay/qml/Workshop/WorkshopAvailableTest.qml @@ -1,4 +1,4 @@ -import QtQuick 2.0 +import QtQuick 2.12 import net.aimber.workshop 1.0 Item { diff --git a/ScreenPlay/qml/Workshop/WorkshopLoader.qml b/ScreenPlay/qml/Workshop/WorkshopLoader.qml index 12caaa73..a003541b 100644 --- a/ScreenPlay/qml/Workshop/WorkshopLoader.qml +++ b/ScreenPlay/qml/Workshop/WorkshopLoader.qml @@ -1,4 +1,4 @@ -import QtQuick 2.9 +import QtQuick 2.12 Item { id: workshopLoader diff --git a/ScreenPlayWidget/main.qml b/ScreenPlayWidget/main.qml index 5fab322f..d0488715 100644 --- a/ScreenPlayWidget/main.qml +++ b/ScreenPlayWidget/main.qml @@ -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) diff --git a/ScreenPlayWindow/qml/main.qml b/ScreenPlayWindow/qml/main.qml index 2fdd966c..c7c0fb22 100644 --- a/ScreenPlayWindow/qml/main.qml +++ b/ScreenPlayWindow/qml/main.qml @@ -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)