sascha/cool-retro-term
1
0
Fork 0
mirror of https://github.com/Swordfish90/cool-retro-term.git synced 2025-01-31 10:11:20 +00:00
Code Issues Releases Wiki Activity

Merge pull request #432 from picospuch/master

Browse Source 
Refine alt(meta) and ctrl behaviour for emacs on macos
This commit is contained in:
Filippo Scognamiglio 2018-04-28 00:00:40 +02:00 committed by GitHub
commit 1cf6e2743b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/main.cpp
View File

@ -36,6 +36,10 @@ int main(int argc, char *argv[])
#endif #endif
QApplication app(argc, argv); QApplication app(argc, argv);
// set application attributes
// Has no effects, see https://bugreports.qt.io/browse/QTBUG-51293
// app.setAttribute(Qt::AA_MacDontSwapCtrlAndMeta, true);
QQmlApplicationEngine engine; QQmlApplicationEngine engine;
FileIO fileIO; FileIO fileIO;

4
app/qml/main.qml
View File

@ -103,12 +103,12 @@ ApplicationWindow{
Action{ Action{
id: copyAction id: copyAction
text: qsTr("Copy") text: qsTr("Copy")
shortcut: Qt.platform.os === "osx" ? StandardKey.Copy : "Ctrl+Shift+C" shortcut: "Ctrl+Shift+C"
} }
Action{ Action{
id: pasteAction id: pasteAction
text: qsTr("Paste") text: qsTr("Paste")
shortcut: Qt.platform.os === "osx" ? StandardKey.Paste : "Ctrl+Shift+V" shortcut: "Ctrl+Shift+V"
} }
Action{ Action{
id: zoomIn id: zoomIn

2
qmltermwidget

@ -1 +1 @@
Subproject commit 08958f7c83a7d05627f623b8904f3e79a0b7366b Subproject commit 5da50472e385537879b6e733bc89972c0ed0ec13