Commit c2c4ae73 authored by Nate Graham's avatar Nate Graham
Browse files

Re-arrange hamburger menu contents

Now the items are logically grouped and their order should seem less
random, hopefully.
parent 486c3d7b
Pipeline #219268 passed with stage
in 5 minutes
......@@ -21,6 +21,14 @@ Menu {
property var configureShortcutsAction: ElisaApplication.action("options_configure_keybinding")
property var configureAction: ElisaApplication.action("options_configure")
Action {
text: mainWindow.visibility == Window.FullScreen ? i18nc("@action:inmenu", "Leave Full Screen") : i18nc("@action:inmenu", "Enter Full Screen")
icon.name: mainWindow.visibility == Window.FullScreen ? "view-restore" : "view-fullscreen"
onTriggered: mainWindow.visibility == Window.FullScreen ? mainWindow.showNormal() : mainWindow.showFullScreen()
}
MenuSeparator {}
Action {
text: i18nc("Scan for New Music application menu entry", "Scan for New Music")
icon.name: "view-refresh"
......@@ -30,9 +38,17 @@ Menu {
}
}
MenuSeparator {
Action {
text: i18nc("Reset Database and Re-Scan Everything application menu entry", "Reset Database and Re-Scan Everything")
icon.name: "edit-clear-all"
onTriggered: {
applicationMenu.close()
ElisaApplication.musicManager.scanCollection(MusicListenersManager.Hard)
}
}
MenuSeparator {}
Menu {
title: i18n("Color Scheme")
Repeater {
......@@ -51,11 +67,6 @@ Menu {
}
}
Action {
text: mainWindow.visibility == Window.FullScreen ? i18nc("@action:inmenu", "Leave Full Screen") : i18nc("@action:inmenu", "Enter Full Screen")
icon.name: mainWindow.visibility == Window.FullScreen ? "view-restore" : "view-fullscreen"
onTriggered: mainWindow.visibility == Window.FullScreen ? mainWindow.showNormal() : mainWindow.showFullScreen()
}
Action {
text: configureAction.text
shortcut: ElisaApplication.actionShortcut(configureAction)
......@@ -76,35 +87,7 @@ Menu {
}
}
MenuSeparator {
}
Action {
text: i18nc("Reset Database and Re-Scan Everything application menu entry", "Reset Database and Re-Scan Everything")
icon.name: "edit-clear-all"
onTriggered: {
applicationMenu.close()
ElisaApplication.musicManager.scanCollection(MusicListenersManager.Hard)
}
}
MenuSeparator {
visible: reportBugAction.text !== ""
}
Action {
text: reportBugAction.text
shortcut: ElisaApplication.actionShortcut(reportBugAction)
icon.name: ElisaApplication.iconName(reportBugAction.icon)
onTriggered: {
applicationMenu.close()
reportBugAction.trigger()
}
}
MenuSeparator {
visible: helpAction.text !== ""
}
MenuSeparator {}
Action {
text: helpAction.text
......@@ -125,4 +108,14 @@ Menu {
aboutAppAction.trigger()
}
}
Action {
text: reportBugAction.text
shortcut: ElisaApplication.actionShortcut(reportBugAction)
icon.name: ElisaApplication.iconName(reportBugAction.icon)
onTriggered: {
applicationMenu.close()
reportBugAction.trigger()
}
}
}
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment