diff --git a/TheMenuBar.qml b/TheMenuBar.qml index d8fa2f4..5c2099e 100644 --- a/TheMenuBar.qml +++ b/TheMenuBar.qml @@ -1,13 +1,17 @@ import QtQuick.Controls 1.2 +import QtQuick 2.0 import TTRSS 1.0 MenuBar { + id: menuBar property bool loggedIn: false property Server server property Sidebar sidebar property Content content + property bool visible: true Menu { + visible: menuBar.visible title: qsTr("File") MenuItem { text: qsTr("Close") @@ -27,6 +31,7 @@ MenuBar { } Menu { + visible: menuBar.visible title: qsTr("Action") MenuItem { text: qsTr("Reload") @@ -74,6 +79,7 @@ MenuBar { } Menu { + visible: menuBar.visible title: qsTr("View") MenuItem { text: qsTr("Zoom In") @@ -93,6 +99,7 @@ MenuBar { } Menu { + visible: menuBar.visible title: qsTr("Window") MenuItem { text: qsTr("Reset to default") @@ -102,6 +109,7 @@ MenuBar { } Menu { + visible: menuBar.visible title: qsTr("Help") MenuItem { text: qsTr("About") diff --git a/main.qml b/main.qml index 83dd913..caeeace 100644 --- a/main.qml +++ b/main.qml @@ -28,7 +28,7 @@ ApplicationWindow { property alias sidebarWidth: sidebar.width } - menuBar: TheMenuBar { + property TheMenuBar menu: TheMenuBar { id: menu server: server sidebar: sidebar @@ -42,43 +42,43 @@ ApplicationWindow { } function keyPressed(event) { - switch (event.key) { - case Qt.Key_Right: - case Qt.Key_J: - case Qt.Key_j: - sidebar.next() - break - case Qt.Key_Left: - case Qt.Key_K: - case Qt.Key_k: - sidebar.previous() - break - case Qt.Key_Home: - content.scrollUp() - break - case Qt.Key_End: - content.scrollDown() - break - case Qt.Key_PageUp: - content.scrollUp(content.pageJump) - break - case Qt.Key_PageDown: - case Qt.Key_Space: - content.scrollDown(content.pageJump) - break - case Qt.Key_Down: - content.scrollDown(content.scrollJump) - break - case Qt.Key_Up: - content.scrollUp(content.scrollJump) - break - case Qt.Key_Enter: - case Qt.Key_Return: - Qt.openUrlExternally(content.post.link) - break - default: - break - } + switch (event.key) { + case Qt.Key_Right: + case Qt.Key_J: + case Qt.Key_j: + sidebar.next() + break + case Qt.Key_Left: + case Qt.Key_K: + case Qt.Key_k: + sidebar.previous() + break + case Qt.Key_Home: + content.scrollUp() + break + case Qt.Key_End: + content.scrollDown() + break + case Qt.Key_PageUp: + content.scrollUp(content.pageJump) + break + case Qt.Key_PageDown: + case Qt.Key_Space: + content.scrollDown(content.pageJump) + break + case Qt.Key_Down: + content.scrollDown(content.scrollJump) + break + case Qt.Key_Up: + content.scrollUp(content.scrollJump) + break + case Qt.Key_Enter: + case Qt.Key_Return: + Qt.openUrlExternally(content.post.link) + break + default: + break + } } SplitView { @@ -105,6 +105,15 @@ ApplicationWindow { } Keys.onPressed: keyPressed(event) + Keys.onReleased: { + switch (event.key) { + case Qt.Key_Alt: + app.menuBar = menu + break + default: + break + } + } } Login {