fix punctuation keys

update submodule
fix alt(meta), ctrl for emacs on macos
2018-04-28 23:57:24 +08:00 · 2018-03-08 20:00:15 +08:00 · 2018-03-06 17:33:30 +08:00
3 changed files with 7 additions and 3 deletions
--- a/app/main.cpp
+++ b/app/main.cpp
@@ -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;

--- a/app/qml/main.qml
+++ b/app/qml/main.qml
@@ -101,12 +101,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
--- a/2
+++ b/2
Author	SHA1	Message	Date
spuch	ab588928be	fix punctuation keys	2018-04-28 23:57:24 +08:00
spuch	68a5f0dd4b	update submodule	2018-03-08 20:00:15 +08:00
spuch	654f8d0761	fix alt(meta), ctrl for emacs on macos	2018-03-06 17:33:30 +08:00