diff --git a/app/qml/CRTMainMenuBar.qml b/app/qml/CRTMainMenuBar.qml index 3fd4dec..7bbe6bd 100644 --- a/app/qml/CRTMainMenuBar.qml +++ b/app/qml/CRTMainMenuBar.qml @@ -14,15 +14,15 @@ MenuBar { visible: defaultMenuBar.visible MenuItem {action: copyAction} MenuItem {action: pasteAction} - MenuSeparator{} + MenuSeparator{visible: Qt.platform.os !== "osx"} MenuItem {action: showsettingsAction} } Menu{ title: qsTr("View") visible: defaultMenuBar.visible - MenuItem {action: fullscreenAction} - MenuItem {action: showMenubarAction} - MenuSeparator{} + MenuItem {action: fullscreenAction; visible: fullscreenAction.enabled} + MenuItem {action: showMenubarAction; visible: showMenubarAction.enabled} + MenuSeparator{visible: showMenubarAction.enabled} MenuItem {action: zoomIn} MenuItem {action: zoomOut} } diff --git a/app/qml/PreprocessedTerminal.qml b/app/qml/PreprocessedTerminal.qml index 97318c5..21d4c31 100644 --- a/app/qml/PreprocessedTerminal.qml +++ b/app/qml/PreprocessedTerminal.qml @@ -152,9 +152,9 @@ Item{ id: contextmenu MenuItem{action: copyAction} MenuItem{action: pasteAction} - MenuSeparator{} - MenuItem{action: fullscreenAction} - MenuItem{action: showMenubarAction} + MenuSeparator{visible: Qt.platform.os !== "osx"} + MenuItem{action: fullscreenAction; visible: Qt.platform.os !== "osx"} + MenuItem{action: showMenubarAction; visible: Qt.platform.os !== "osx"} MenuSeparator{visible: !shadersettings.showMenubar} CRTMainMenuBar{visible: !shadersettings.showMenubar} } diff --git a/app/qml/SettingsPerformanceTab.qml b/app/qml/SettingsPerformanceTab.qml index a0963b8..8286e5d 100644 --- a/app/qml/SettingsPerformanceTab.qml +++ b/app/qml/SettingsPerformanceTab.qml @@ -56,7 +56,6 @@ Tab{ id: txtslider onValueChanged: shadersettings.window_scaling = value; value: shadersettings.window_scaling - tickmarksEnabled: true stepSize: 0.25 Component.onCompleted: minimumValue = 0.5 //Without this value gets set to 0.5 } diff --git a/app/qml/main.qml b/app/qml/main.qml index 56647c1..c062d68 100644 --- a/app/qml/main.qml +++ b/app/qml/main.qml @@ -37,7 +37,9 @@ ApplicationWindow{ onFullscreenChanged: visibility = (fullscreen ? Window.FullScreen : Window.Windowed) //Workaround: if menubar is assigned ugly margins are visible. - menuBar: shadersettings.showMenubar ? defaultMenuBar : null + menuBar: Qt.platform.os === "osx" + ? defaultMenuBar + : shadersettings.showMenubar ? defaultMenuBar : null color: "#00000000" title: qsTr("cool-retro-term") @@ -45,6 +47,7 @@ ApplicationWindow{ Action { id: showMenubarAction text: qsTr("Show Menubar") + enabled: Qt.platform.os !== "osx" checkable: true checked: shadersettings.showMenubar onTriggered: shadersettings.showMenubar = !shadersettings.showMenubar @@ -52,6 +55,7 @@ ApplicationWindow{ Action { id: fullscreenAction text: qsTr("Fullscreen") + enabled: Qt.platform.os !== "osx" shortcut: "Alt+F11" onTriggered: shadersettings.fullscreen = !shadersettings.fullscreen; checkable: true