From 1894606c104fea6ee3fc5152f5a6942eb2be27c4 Mon Sep 17 00:00:00 2001 From: Le Tan Date: Fri, 24 Mar 2017 20:29:05 +0800 Subject: [PATCH] bugfix: add custom Exit action in menubar for macOS Qt will create a default exit action for macOS which will crash the app. --- src/vmainwindow.cpp | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/vmainwindow.cpp b/src/vmainwindow.cpp index 0b59b05f..5b287518 100644 --- a/src/vmainwindow.cpp +++ b/src/vmainwindow.cpp @@ -208,7 +208,6 @@ void VMainWindow::initFileToolBar() discardExitAct = new QAction(QIcon(":/resources/icons/discard_exit.svg"), tr("Discard Changes And Exit"), this); discardExitAct->setStatusTip(tr("Discard changes and exit edit mode")); - discardExitAct->setShortcut(QKeySequence("Ctrl+Q")); connect(discardExitAct, &QAction::triggered, editArea, &VEditArea::readFile); @@ -262,7 +261,7 @@ void VMainWindow::initHelpMenu() { QMenu *helpMenu = menuBar()->addMenu(tr("&Help")); - QAction *aboutAct = new QAction(tr("&About"), this); + QAction *aboutAct = new QAction(tr("&About VNote"), this); aboutAct->setStatusTip(tr("View information about VNote")); connect(aboutAct, &QAction::triggered, this, &VMainWindow::aboutMessage); @@ -365,9 +364,18 @@ void VMainWindow::initFileMenu() connect(settingsAct, &QAction::triggered, this, &VMainWindow::viewSettings); + // Exit. + QAction *exitAct = new QAction(tr("Exit"), this); + exitAct->setStatusTip(tr("Exit VNote")); + exitAct->setShortcut(QKeySequence("Ctrl+Q")); + connect(exitAct, &QAction::triggered, + this, &VMainWindow::close); + fileMenu->addAction(m_importNoteAct); fileMenu->addSeparator(); fileMenu->addAction(settingsAct); + fileMenu->addSeparator(); + fileMenu->addAction(exitAct); } void VMainWindow::initEditMenu()