Marown/cool-retro-term
1
0
Fork 0
mirror of https://github.com/Swordfish90/cool-retro-term.git synced 2024-07-04 03:56:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed a couple of UI issues under osx.

Browse Source
This commit is contained in:
Filippo Scognamiglio 2014-10-10 15:12:28 +02:00
parent c57ef45ce6
commit 093cead312
4 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/qml/CRTMainMenuBar.qml
View File

@ -14,15 +14,15 @@ MenuBar {
visible: defaultMenuBar.visible visible: defaultMenuBar.visible
MenuItem {action: copyAction} MenuItem {action: copyAction}
MenuItem {action: pasteAction} MenuItem {action: pasteAction}
MenuSeparator{} MenuSeparator{visible: Qt.platform.os !== "osx"}
MenuItem {action: showsettingsAction} MenuItem {action: showsettingsAction}
} }
Menu{ Menu{
title: qsTr("View") title: qsTr("View")
visible: defaultMenuBar.visible visible: defaultMenuBar.visible
MenuItem {action: fullscreenAction} MenuItem {action: fullscreenAction; visible: fullscreenAction.enabled}
MenuItem {action: showMenubarAction} MenuItem {action: showMenubarAction; visible: showMenubarAction.enabled}
MenuSeparator{} MenuSeparator{visible: showMenubarAction.enabled}
MenuItem {action: zoomIn} MenuItem {action: zoomIn}
MenuItem {action: zoomOut} MenuItem {action: zoomOut}
} }

6
app/qml/PreprocessedTerminal.qml
View File

@ -152,9 +152,9 @@ Item{
id: contextmenu id: contextmenu
MenuItem{action: copyAction} MenuItem{action: copyAction}
MenuItem{action: pasteAction} MenuItem{action: pasteAction}
MenuSeparator{} MenuSeparator{visible: Qt.platform.os !== "osx"}
MenuItem{action: fullscreenAction} MenuItem{action: fullscreenAction; visible: Qt.platform.os !== "osx"}
MenuItem{action: showMenubarAction} MenuItem{action: showMenubarAction; visible: Qt.platform.os !== "osx"}
MenuSeparator{visible: !shadersettings.showMenubar} MenuSeparator{visible: !shadersettings.showMenubar}
CRTMainMenuBar{visible: !shadersettings.showMenubar} CRTMainMenuBar{visible: !shadersettings.showMenubar}
} }

1
app/qml/SettingsPerformanceTab.qml
View File

@ -56,7 +56,6 @@ Tab{
id: txtslider id: txtslider
onValueChanged: shadersettings.window_scaling = value; onValueChanged: shadersettings.window_scaling = value;
value: shadersettings.window_scaling value: shadersettings.window_scaling
tickmarksEnabled: true
stepSize: 0.25 stepSize: 0.25
Component.onCompleted: minimumValue = 0.5 //Without this value gets set to 0.5 Component.onCompleted: minimumValue = 0.5 //Without this value gets set to 0.5
} }

6
app/qml/main.qml
View File

@ -37,7 +37,9 @@ ApplicationWindow{
onFullscreenChanged: visibility = (fullscreen ? Window.FullScreen : Window.Windowed) onFullscreenChanged: visibility = (fullscreen ? Window.FullScreen : Window.Windowed)
//Workaround: if menubar is assigned ugly margins are visible. //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" color: "#00000000"
title: qsTr("cool-retro-term") title: qsTr("cool-retro-term")
@ -45,6 +47,7 @@ ApplicationWindow{
Action { Action {
id: showMenubarAction id: showMenubarAction
text: qsTr("Show Menubar") text: qsTr("Show Menubar")
enabled: Qt.platform.os !== "osx"
checkable: true checkable: true
checked: shadersettings.showMenubar checked: shadersettings.showMenubar
onTriggered: shadersettings.showMenubar = !shadersettings.showMenubar onTriggered: shadersettings.showMenubar = !shadersettings.showMenubar
@ -52,6 +55,7 @@ ApplicationWindow{
Action { Action {
id: fullscreenAction id: fullscreenAction
text: qsTr("Fullscreen") text: qsTr("Fullscreen")
enabled: Qt.platform.os !== "osx"
shortcut: "Alt+F11" shortcut: "Alt+F11"
onTriggered: shadersettings.fullscreen = !shadersettings.fullscreen; onTriggered: shadersettings.fullscreen = !shadersettings.fullscreen;
checkable: true checkable: true