diff --git a/app/qml/SettingsAdvancedTab.qml b/app/qml/SettingsAdvancedTab.qml index acc5a07..a84cad2 100644 --- a/app/qml/SettingsAdvancedTab.qml +++ b/app/qml/SettingsAdvancedTab.qml @@ -28,7 +28,7 @@ ColumnLayout { GroupBox { Layout.fillWidth: true Layout.fillHeight: true - title: qsTr("Command") + title: qsTr("Miscellaneous") padding: appSettings.defaultMargin ColumnLayout { @@ -39,12 +39,6 @@ ColumnLayout { checked: appSettings.useCustomCommand onCheckedChanged: appSettings.useCustomCommand = checked } - // Workaround for QTBUG-31627 for pre 5.3.0 - Binding { - target: useCustomCommand - property: "checked" - value: appSettings.useCustomCommand - } TextField { id: customCommand Layout.fillWidth: true @@ -59,26 +53,18 @@ ColumnLayout { Component.onCompleted: settings_window.closing.connect( saveSetting) } - } - } - - GroupBox { - title: qsTr("Cursor") - Layout.fillWidth: true - Layout.fillHeight: true - padding: appSettings.defaultMargin - ColumnLayout { - anchors.fill: parent CheckBox { id: blinkingCursor text: qsTr("Blinking Cursor") checked: appSettings.blinkingCursor onCheckedChanged: appSettings.blinkingCursor = checked } - Binding { - target: blinkingCursor - property: "checked" - value: appSettings.blinkingCursor + CheckBox { + id: showMenubar + text: qsTr("Show Menubar") + enabled: !appSettings.isMacOS + checked: appSettings.showMenubar + onCheckedChanged: appSettings.showMenubar = checked } } } diff --git a/app/qml/main.qml b/app/qml/main.qml index 53c24b9..dc4f426 100644 --- a/app/qml/main.qml +++ b/app/qml/main.qml @@ -52,15 +52,6 @@ QtObject { sourceComponent: OSXMenu { } } - property Action showMenubarAction: Action { - text: qsTr("Show Menubar") - enabled: !appSettings.isMacOS - shortcut: "Ctrl+Shift+M" - checkable: true - checked: appSettings.showMenubar - onTriggered: appSettings.showMenubar = !appSettings.showMenubar - } - property Action fullscreenAction: Action { text: qsTr("Fullscreen") enabled: !appSettings.isMacOS diff --git a/app/qml/menus/FullContextMenu.qml b/app/qml/menus/FullContextMenu.qml index 75fb8bc..2d7c70f 100644 --- a/app/qml/menus/FullContextMenu.qml +++ b/app/qml/menus/FullContextMenu.qml @@ -64,10 +64,6 @@ Menu { action: fullscreenAction visible: fullscreenAction.enabled } - MenuItem { - action: showMenubarAction - visible: showMenubarAction.enabled - } MenuItem { action: zoomInAction } diff --git a/app/qml/menus/WindowMenu.qml b/app/qml/menus/WindowMenu.qml index 3c7825b..6d3f1f7 100644 --- a/app/qml/menus/WindowMenu.qml +++ b/app/qml/menus/WindowMenu.qml @@ -56,10 +56,6 @@ MenuBar { action: fullscreenAction visible: fullscreenAction.enabled } - MenuItem { - action: showMenubarAction - visible: showMenubarAction.enabled - } MenuItem { action: zoomInAction }