From 704c66449fbe05746f1024775af5d8ce371f2907 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20T=C5=AFma?= Date: Wed, 7 Oct 2020 22:57:30 +0200 Subject: [PATCH] Fixed shorcuts duplicity --- src/GUI/gui.cpp | 4 ++-- src/GUI/keys.h | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/GUI/gui.cpp b/src/GUI/gui.cpp index 1354319c..b74c8da3 100644 --- a/src/GUI/gui.cpp +++ b/src/GUI/gui.cpp @@ -233,14 +233,14 @@ void GUI::createActions() _exportPDFFileAction = new QAction(QIcon(EXPORT_FILE_ICON), tr("Export to PDF..."), this); _exportPDFFileAction->setMenuRole(QAction::NoRole); - _exportPDFFileAction->setShortcut(EXPORT_SHORTCUT); + _exportPDFFileAction->setShortcut(PDF_EXPORT_SHORTCUT); _exportPDFFileAction->setActionGroup(_fileActionGroup); connect(_exportPDFFileAction, SIGNAL(triggered()), this, SLOT(exportPDFFile())); addAction(_exportPDFFileAction); _exportPNGFileAction = new QAction(QIcon(EXPORT_FILE_ICON), tr("Export to PNG..."), this); _exportPNGFileAction->setMenuRole(QAction::NoRole); - _exportPNGFileAction->setShortcut(EXPORT_SHORTCUT); + _exportPNGFileAction->setShortcut(PNG_EXPORT_SHORTCUT); _exportPNGFileAction->setActionGroup(_fileActionGroup); connect(_exportPNGFileAction, SIGNAL(triggered()), this, SLOT(exportPNGFile())); addAction(_exportPNGFileAction); diff --git a/src/GUI/keys.h b/src/GUI/keys.h index b05631c8..4289f6cd 100644 --- a/src/GUI/keys.h +++ b/src/GUI/keys.h @@ -18,7 +18,8 @@ #define OPEN_SHORTCUT QKeySequence(QKeySequence::Open) #define CLOSE_SHORTCUT QKeySequence(QKeySequence::Close) #define RELOAD_SHORTCUT QKeySequence(QKeySequence::Refresh) -#define EXPORT_SHORTCUT QKeySequence(Qt::CTRL + Qt::Key_E) +#define PDF_EXPORT_SHORTCUT QKeySequence(Qt::CTRL + Qt::Key_E) +#define PNG_EXPORT_SHORTCUT QKeySequence(Qt::CTRL + Qt::Key_X) #define SHOW_POI_SHORTCUT QKeySequence(Qt::CTRL + Qt::Key_P) #define SHOW_MAP_SHORTCUT QKeySequence(Qt::CTRL + Qt::Key_M) #define NEXT_MAP_SHORTCUT QKeySequence(QKeySequence::Forward)