File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -46,7 +46,7 @@ ApplicationWindow {
4646
4747 Loader {
4848 id: qtquickMenuLoader
49- active: ! appSettings .isMacOS && (appSettings .showMenubar && ! fullscreen)
49+ active: appSettings .isMacOS || (appSettings .showMenubar && ! fullscreen)
5050 sourceComponent: WindowMenu { }
5151 }
5252
@@ -56,23 +56,14 @@ ApplicationWindow {
5656
5757 title: terminalTabs .currentTitle
5858
59- Action {
60- id: showMenubarAction
61- text: qsTr (" Show Menubar" )
62- enabled: ! appSettings .isMacOS
63- shortcut: " Ctrl+Shift+M"
64- checkable: true
65- checked: appSettings .showMenubar
66- onTriggered: appSettings .showMenubar = ! appSettings .showMenubar
67- }
6859 Action {
6960 id: fullscreenAction
7061 text: qsTr (" Fullscreen" )
7162 enabled: ! appSettings .isMacOS
7263 shortcut: " Alt+F11"
73- onTriggered: appSettings . fullscreen = ! appSettings . fullscreen
64+ onTriggered: fullscreen = ! fullscreen
7465 checkable: true
75- checked: appSettings . fullscreen
66+ checked: fullscreen
7667 }
7768 Action {
7869 id: newWindowAction
Original file line number Diff line number Diff line change @@ -46,11 +46,6 @@ QtObject {
4646
4747 property ListModel windowsModel: ListModel { }
4848
49- property Loader globalMenuLoader: Loader {
50- active: appSettings .isMacOS
51- sourceComponent: OSXMenu { }
52- }
53-
5449 function createWindow () {
5550 var window = windowComponent .createObject (null )
5651 if (! window )
Original file line number Diff line number Diff line change @@ -64,10 +64,6 @@ Menu {
6464 action: fullscreenAction
6565 visible: fullscreenAction .enabled
6666 }
67- MenuItem {
68- action: showMenubarAction
69- visible: showMenubarAction .enabled
70- }
7167 MenuItem {
7268 action: zoomIn
7369 }
Original file line number Diff line number Diff line change @@ -56,10 +56,6 @@ MenuBar {
5656 action: fullscreenAction
5757 visible: fullscreenAction .enabled
5858 }
59- MenuItem {
60- action: showMenubarAction
61- visible: showMenubarAction .enabled
62- }
6359 MenuItem {
6460 action: zoomIn
6561 }
You can’t perform that action at this time.
0 commit comments