Simplified menu to workaround issue with sub menus on Windows and Kwin

This commit is contained in:
Sylvain Berfini 2017-05-17 13:24:21 +02:00
parent ff1be58796
commit f18b3f40e7

View file

@ -19,8 +19,7 @@ Item {
Shortcut {
id: settingsShortcut
context: Qt.ApplicationShortcut
sequence: StandardKey.Preferences
sequence: "Ctrl+P"
onActivated: App.smartShowWindow(App.getSettingsWindow())
}
@ -52,61 +51,25 @@ Item {
Menu {
id: menu
Menu {
title: qsTr('options')
MenuItem {
shortcut: settingsShortcut.sequence
text: qsTr('settings')
MenuItem {
shortcut: settingsShortcut.sequence
text: qsTr('settings')
onTriggered: settingsShortcut.onActivated()
}
MenuSeparator {}
MenuItem {
shortcut: quitShortcut.sequence
text: qsTr('quit')
onTriggered: quitShortcut.onActivated()
}
onTriggered: settingsShortcut.onActivated()
}
// ---------------------------------------------------------------------------
// Tools.
// ---------------------------------------------------------------------------
MenuItem {
shortcut: aboutShortcut.sequence
text: qsTr('about')
Menu {
title: qsTr('tools')
MenuItem {
text: qsTr('audioAssistant')
onTriggered: console.log('TODO')
}
onTriggered: aboutShortcut.onActivated()
}
// ---------------------------------------------------------------------------
// Help.
// ---------------------------------------------------------------------------
MenuItem {
shortcut: quitShortcut.sequence
text: qsTr('quit')
Menu {
title: qsTr('help')
MenuItem {
shortcut: aboutShortcut.sequence
text: qsTr('about')
onTriggered: aboutShortcut.onActivated()
}
MenuSeparator {}
MenuItem {
text: qsTr('checkForUpdates')
onTriggered: console.log('TODO')
}
onTriggered: quitShortcut.onActivated()
}
}
}