diff --git a/ScreenPlay/Resources.qrc b/ScreenPlay/Resources.qrc index f0cc1878..3e5f7c01 100644 --- a/ScreenPlay/Resources.qrc +++ b/ScreenPlay/Resources.qrc @@ -120,5 +120,7 @@ translations/ScreenPlay_de.qm translations/ScreenPlay_en.qm qml/Create/Wizards/CreateWallpaper/NextButton.qml + qml/Screen/Screen.qml + assets/icons/icon_screen.svg diff --git a/ScreenPlay/assets/icons/icon_screen.svg b/ScreenPlay/assets/icons/icon_screen.svg new file mode 100644 index 00000000..4ee04364 --- /dev/null +++ b/ScreenPlay/assets/icons/icon_screen.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ScreenPlay/qml/Navigation.qml b/ScreenPlay/qml/Navigation.qml index b6d00521..567b0963 100644 --- a/ScreenPlay/qml/Navigation.qml +++ b/ScreenPlay/qml/Navigation.qml @@ -11,27 +11,7 @@ Rectangle { signal changePage(string name) - Action { - shortcut: "F1" - onTriggered: onPageChanged("Create") - } - Action { - shortcut: "F2" - onTriggered: onPageChanged("Workshop") - } - Action { - shortcut: "F3" - onTriggered: onPageChanged("Installed") - } - Action { - shortcut: "F4" - onTriggered: onPageChanged("Community") - } - Action { - shortcut: "F5" - onTriggered: onPageChanged("Settings") - } - property var navArray: [navCreate, navWorkshop, navInstalled, navSettings, navCommunity] + property var navArray: [navCreate, navWorkshop, navInstalled, navSettings, navCommunity, navScreen] function onPageChanged(name) { @@ -82,6 +62,14 @@ Rectangle { onPageClicked: navigation.onPageChanged(name) } + NavigationItem { + id: navScreen + state: "inactive" + name: "Screen" + iconSource: "qrc:/assets/icons/icon_screen.svg" + onPageClicked: navigation.onPageChanged(name) + } + NavigationItem { id: navCommunity state: "inactive" @@ -98,5 +86,6 @@ Rectangle { } } - NavigationWallpaperConfiguration {} + NavigationWallpaperConfiguration { + } } diff --git a/ScreenPlay/qml/Screen/Screen.qml b/ScreenPlay/qml/Screen/Screen.qml new file mode 100644 index 00000000..e07f8780 --- /dev/null +++ b/ScreenPlay/qml/Screen/Screen.qml @@ -0,0 +1,8 @@ +import QtQuick 2.9 +import QtQuick.Controls 2.2 +import QtQuick.Controls.Material 2.2 + +Item { + id: screen + anchors.fill: parent +}