mirror of
https://github.com/Swordfish90/cool-retro-term.git
synced 2026-02-08 00:32:27 +00:00
Fix menu behaviour on Linux.
This commit is contained in:
@@ -46,7 +46,7 @@ ApplicationWindow {
|
||||
|
||||
Loader {
|
||||
id: qtquickMenuLoader
|
||||
active: !appSettings.isMacOS && (appSettings.showMenubar && !fullscreen)
|
||||
active: appSettings.isMacOS || (appSettings.showMenubar && !fullscreen)
|
||||
sourceComponent: WindowMenu { }
|
||||
}
|
||||
|
||||
@@ -56,23 +56,14 @@ ApplicationWindow {
|
||||
|
||||
title: terminalTabs.currentTitle
|
||||
|
||||
Action {
|
||||
id: showMenubarAction
|
||||
text: qsTr("Show Menubar")
|
||||
enabled: !appSettings.isMacOS
|
||||
shortcut: "Ctrl+Shift+M"
|
||||
checkable: true
|
||||
checked: appSettings.showMenubar
|
||||
onTriggered: appSettings.showMenubar = !appSettings.showMenubar
|
||||
}
|
||||
Action {
|
||||
id: fullscreenAction
|
||||
text: qsTr("Fullscreen")
|
||||
enabled: !appSettings.isMacOS
|
||||
shortcut: "Alt+F11"
|
||||
onTriggered: appSettings.fullscreen = !appSettings.fullscreen
|
||||
onTriggered: fullscreen = !fullscreen
|
||||
checkable: true
|
||||
checked: appSettings.fullscreen
|
||||
checked: fullscreen
|
||||
}
|
||||
Action {
|
||||
id: newWindowAction
|
||||
|
||||
@@ -46,11 +46,6 @@ QtObject {
|
||||
|
||||
property ListModel windowsModel: ListModel { }
|
||||
|
||||
property Loader globalMenuLoader: Loader {
|
||||
active: appSettings.isMacOS
|
||||
sourceComponent: OSXMenu { }
|
||||
}
|
||||
|
||||
function createWindow() {
|
||||
var window = windowComponent.createObject(null)
|
||||
if (!window)
|
||||
|
||||
@@ -64,10 +64,6 @@ Menu {
|
||||
action: fullscreenAction
|
||||
visible: fullscreenAction.enabled
|
||||
}
|
||||
MenuItem {
|
||||
action: showMenubarAction
|
||||
visible: showMenubarAction.enabled
|
||||
}
|
||||
MenuItem {
|
||||
action: zoomIn
|
||||
}
|
||||
|
||||
@@ -56,10 +56,6 @@ MenuBar {
|
||||
action: fullscreenAction
|
||||
visible: fullscreenAction.enabled
|
||||
}
|
||||
MenuItem {
|
||||
action: showMenubarAction
|
||||
visible: showMenubarAction.enabled
|
||||
}
|
||||
MenuItem {
|
||||
action: zoomIn
|
||||
}
|
||||
|
||||
Submodule qmltermwidget updated: 7dad24fefb...d86ebbc396
Reference in New Issue
Block a user