sascha/cool-retro-term
1
0
Fork 0
mirror of https://github.com/Swordfish90/cool-retro-term.git synced 2026-02-08 00:32:27 +00:00
Code Issues Releases Wiki Activity

Fix menu behaviour on Linux.

Browse Source
This commit is contained in:
Filippo Scognamiglio
2026-01-22 00:35:30 +01:00
parent 2e4536ecdf
commit 29dc67d96b
5 changed files with 4 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/qml/TerminalWindow.qml
View File

@@ -46,7 +46,7 @@ ApplicationWindow {
Loader { Loader {
id: qtquickMenuLoader id: qtquickMenuLoader
active: !appSettings.isMacOS && (appSettings.showMenubar && !fullscreen) active: appSettings.isMacOS || (appSettings.showMenubar && !fullscreen)
sourceComponent: WindowMenu { } sourceComponent: WindowMenu { }
} }
@@ -56,23 +56,14 @@ ApplicationWindow {
title: terminalTabs.currentTitle 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 { Action {
id: fullscreenAction id: fullscreenAction
text: qsTr("Fullscreen") text: qsTr("Fullscreen")
enabled: !appSettings.isMacOS enabled: !appSettings.isMacOS
shortcut: "Alt+F11" shortcut: "Alt+F11"
onTriggered: appSettings.fullscreen = !appSettings.fullscreen onTriggered: fullscreen = !fullscreen
checkable: true checkable: true
checked: appSettings.fullscreen checked: fullscreen
} }
Action { Action {
id: newWindowAction id: newWindowAction

5
app/qml/main.qml
View File

@@ -46,11 +46,6 @@ QtObject {
property ListModel windowsModel: ListModel { } property ListModel windowsModel: ListModel { }
property Loader globalMenuLoader: Loader {
active: appSettings.isMacOS
sourceComponent: OSXMenu { }
}
function createWindow() { function createWindow() {
var window = windowComponent.createObject(null) var window = windowComponent.createObject(null)
if (!window) if (!window)

4
app/qml/menus/FullContextMenu.qml
View File

@@ -64,10 +64,6 @@ Menu {
action: fullscreenAction action: fullscreenAction
visible: fullscreenAction.enabled visible: fullscreenAction.enabled
} }
MenuItem {
action: showMenubarAction
visible: showMenubarAction.enabled
}
MenuItem { MenuItem {
action: zoomIn action: zoomIn
} }

4
app/qml/menus/WindowMenu.qml
View File

@@ -56,10 +56,6 @@ MenuBar {
action: fullscreenAction action: fullscreenAction
visible: fullscreenAction.enabled visible: fullscreenAction.enabled
} }
MenuItem {
action: showMenubarAction
visible: showMenubarAction.enabled
}
MenuItem { MenuItem {
action: zoomIn action: zoomIn
} }

2
qmltermwidget

Submodule qmltermwidget updated: 7dad24fefb...d86ebbc396