Merge pull request #432 from picospuch/master

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
3 changed files with 7 additions and 3 deletions

View File

@@ -36,6 +36,10 @@ int main(int argc, char *argv[])
#endif
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;
FileIO fileIO;

View File

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