sascha/cool-retro-term
1
0
Fork 0
mirror of https://github.com/Swordfish90/cool-retro-term.git synced 2025-02-23 05:18:44 +00:00
Code Issues Releases Wiki Activity

Fix: Windows flags and raise behaviour. Also fix OSX quit issues.

Browse Source
This commit is contained in:
Filippo Scognamiglio 2014-12-22 20:50:17 +01:00
parent 1ed4d271c7
commit 56d366116a
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/qml/AboutDialog.qml
View File

@ -9,6 +9,8 @@ Window{
width: 600 width: 600
height: 400 height: 400
modality: Qt.ApplicationModal
ColumnLayout{ ColumnLayout{
anchors.fill: parent anchors.fill: parent
anchors.margins: 15 anchors.margins: 15

16
app/qml/main.qml
View File

@ -68,12 +68,16 @@ ApplicationWindow{
id: quitAction id: quitAction
text: qsTr("Quit") text: qsTr("Quit")
shortcut: "Ctrl+Shift+Q" shortcut: "Ctrl+Shift+Q"
onTriggered: terminalWindow.close(); onTriggered: Qt.quit();
} }
Action{ Action{
id: showsettingsAction id: showsettingsAction
text: qsTr("Settings") text: qsTr("Settings")
onTriggered: settingswindow.show(); onTriggered: {
settingswindow.show();
settingswindow.requestActivate();
settingswindow.raise();
}
} }
Action{ Action{
id: copyAction id: copyAction
@ -102,6 +106,8 @@ ApplicationWindow{
text: qsTr("About") text: qsTr("About")
onTriggered: { onTriggered: {
aboutDialog.show(); aboutDialog.show();
aboutDialog.requestActivate();
aboutDialog.raise();
} }
} }
ApplicationSettings{ ApplicationSettings{
@ -134,4 +140,10 @@ ApplicationWindow{
} }
} }
Component.onCompleted: appSettings.handleFontChanged(); Component.onCompleted: appSettings.handleFontChanged();
onClosing: {
// OSX Since we are currently supporting only one window
// quit the application when it is closed.
if (Qt.platform.os === "osx")
Qt.quit()
}
} }