diff --git a/src/app/GUI/canvaswindow.cpp b/src/app/GUI/canvaswindow.cpp index b4b9aae41..eedc798b1 100644 --- a/src/app/GUI/canvaswindow.cpp +++ b/src/app/GUI/canvaswindow.cpp @@ -431,6 +431,9 @@ void CanvasWindow::writeStateXEV(QDomElement& ele, bool CanvasWindow::handleCutCopyPasteKeyPress(QKeyEvent *event) { +#ifdef Q_OS_MAC + if (event->type() == QEvent::ShortcutOverride) { return false; } +#endif if (event->modifiers() & Qt::ControlModifier && event->key() == Qt::Key_V) { if (event->isAutoRepeat()) { return false; } diff --git a/src/app/GUI/mainwindow.cpp b/src/app/GUI/mainwindow.cpp index 5ee63dcdf..1a78ee931 100644 --- a/src/app/GUI/mainwindow.cpp +++ b/src/app/GUI/mainwindow.cpp @@ -539,7 +539,9 @@ void MainWindow::setupMenuBar() const auto qAct = new NoShortcutAction(tr("Copy", "MenuBar_Edit")); qAct->setIcon(QIcon::fromTheme("copy")); mEditMenu->addAction(qAct); +#ifndef Q_OS_MAC qAct->setShortcut(Qt::CTRL + Qt::Key_C); +#endif mActions.copyAction->connect(qAct); cmdAddAction(qAct); } @@ -548,7 +550,9 @@ void MainWindow::setupMenuBar() const auto qAct = new NoShortcutAction(tr("Cut", "MenuBar_Edit")); qAct->setIcon(QIcon::fromTheme("cut")); mEditMenu->addAction(qAct); +#ifndef Q_OS_MAC qAct->setShortcut(Qt::CTRL + Qt::Key_X); +#endif mActions.cutAction->connect(qAct); cmdAddAction(qAct); } @@ -557,7 +561,9 @@ void MainWindow::setupMenuBar() const auto qAct = new NoShortcutAction(tr("Paste", "MenuBar_Edit")); qAct->setIcon(QIcon::fromTheme("paste")); mEditMenu->addAction(qAct); +#ifndef Q_OS_MAC qAct->setShortcut(Qt::CTRL + Qt::Key_V); +#endif mActions.pasteAction->connect(qAct); cmdAddAction(qAct); }