1
0
mirror of https://gitlab.com/kelteseth/ScreenPlay.git synced 2024-11-06 19:12:30 +01:00

Fix navigation changes

This commit is contained in:
Elias Steurer 2022-11-02 16:12:26 +01:00
parent e7942430eb
commit 141372bee1
4 changed files with 5 additions and 15 deletions

View File

@ -50,14 +50,6 @@ Item {
onTriggered: App.installedListModel.reset() onTriggered: App.installedListModel.reset()
} }
Connections {
function onHelperButtonPressed(pos) {
setNavigationItem(pos)
}
target: loaderHelp.item
}
Connections { Connections {
function onInstalledLoadingFinished() { function onInstalledLoadingFinished() {
checkIsContentInstalled() checkIsContentInstalled()
@ -74,7 +66,6 @@ Item {
Loader { Loader {
id: loaderHelp id: loaderHelp
active: false active: false
z: 99
anchors.fill: parent anchors.fill: parent
source: "qrc:/qml/ScreenPlayApp/qml/Installed/InstalledWelcomeScreen.qml" source: "qrc:/qml/ScreenPlayApp/qml/Installed/InstalledWelcomeScreen.qml"
} }

View File

@ -7,9 +7,6 @@ import ScreenPlayUtil
Item { Item {
id: installedUserHelper id: installedUserHelper
signal helperButtonPressed(var pos)
state: "out" state: "out"
Component.onCompleted: state = "in" Component.onCompleted: state = "in"
@ -119,7 +116,7 @@ Item {
font.pointSize: 16 font.pointSize: 16
width: implicitWidth + 20 width: implicitWidth + 20
height: implicitHeight + 10 height: implicitHeight + 10
icon.source:{ icon.source: {
if (App.settings.steamVersion) { if (App.settings.steamVersion) {
return "qrc:/qml/ScreenPlayApp/assets/icons/icon_steam.svg" return "qrc:/qml/ScreenPlayApp/assets/icons/icon_steam.svg"
} else { } else {
@ -130,7 +127,7 @@ Item {
icon.height: 18 icon.height: 18
onClicked: { onClicked: {
if (App.settings.steamVersion) { if (App.settings.steamVersion) {
helperButtonPressed(1) App.util.setNavigation("Workshop")
} else { } else {
Qt.openUrlExternally("https://forum.screen-play.app/") Qt.openUrlExternally("https://forum.screen-play.app/")
} }

View File

@ -209,7 +209,6 @@ Item {
text: qsTr("Headline") text: qsTr("Headline")
font.family: App.settings.font font.family: App.settings.font
font.weight: Font.Thin
verticalAlignment: Text.AlignBottom verticalAlignment: Text.AlignBottom
font.pointSize: 16 font.pointSize: 16
color: "white" color: "white"

View File

@ -5,6 +5,8 @@ import QtQuick.Controls.Material
import Qt5Compat.GraphicalEffects import Qt5Compat.GraphicalEffects
import ScreenPlayWorkshop import ScreenPlayWorkshop
import ScreenPlayUtil import ScreenPlayUtil
import ScreenPlayApp
import ScreenPlay
Popup { Popup {
id: root id: root
@ -62,6 +64,7 @@ Popup {
Layout.alignment: Qt.AlignHCenter Layout.alignment: Qt.AlignHCenter
onClicked: { onClicked: {
root.close() root.close()
App.util.setNavigation("Installed")
} }
} }
Item { Item {