From 2e7d4431cef194e2331e8af734b97567719615eb Mon Sep 17 00:00:00 2001 From: Yuriy Puchkov Date: Thu, 3 Dec 2020 10:37:23 +0200 Subject: [PATCH] MacOS - disable CaptureToolButton --- src/tools/toolfactory.cpp | 3 ++ src/utils/confighandler.cpp | 3 ++ src/utils/configshortcuts.cpp | 3 ++ src/widgets/capture/capturetoolbutton.cpp | 48 +++++++++++++---------- src/widgets/capture/capturetoolbutton.h | 3 +- 5 files changed, 38 insertions(+), 22 deletions(-) diff --git a/src/tools/toolfactory.cpp b/src/tools/toolfactory.cpp index 65d48c9f..3a6c0487 100644 --- a/src/tools/toolfactory.cpp +++ b/src/tools/toolfactory.cpp @@ -94,9 +94,12 @@ CaptureTool* ToolFactory::CreateTool(CaptureToolButton::ButtonType t, case CaptureToolButton::TYPE_REDO: tool = new RedoTool(parent); break; +#if not(defined(Q_OS_MAC) || defined(Q_OS_MAC64) || defined(Q_OS_MACOS) || \ + defined(Q_OS_MACX)) case CaptureToolButton::TYPE_OPEN_APP: tool = new AppLauncher(parent); break; +#endif case CaptureToolButton::TYPE_PIXELATE: tool = new PixelateTool(parent); break; diff --git a/src/utils/confighandler.cpp b/src/utils/confighandler.cpp index 843f0cbc..531c0f1e 100644 --- a/src/utils/confighandler.cpp +++ b/src/utils/confighandler.cpp @@ -60,7 +60,10 @@ QVector ConfigHandler::getButtons() << CaptureToolButton::TYPE_COPY << CaptureToolButton::TYPE_SAVE << CaptureToolButton::TYPE_EXIT << CaptureToolButton::TYPE_IMAGEUPLOADER +#if not(defined(Q_OS_MAC) || defined(Q_OS_MAC64) || defined(Q_OS_MACOS) || \ + defined(Q_OS_MACX)) << CaptureToolButton::TYPE_OPEN_APP +#endif << CaptureToolButton::TYPE_PIN << CaptureToolButton::TYPE_TEXT << CaptureToolButton::TYPE_CIRCLECOUNT; } diff --git a/src/utils/configshortcuts.cpp b/src/utils/configshortcuts.cpp index 8bc28d56..4cba9c77 100644 --- a/src/utils/configshortcuts.cpp +++ b/src/utils/configshortcuts.cpp @@ -112,9 +112,12 @@ const QKeySequence& ConfigShortcuts::captureShortcutDefault( case CaptureToolButton::ButtonType::TYPE_IMAGEUPLOADER: m_ks = QKeySequence(Qt::Key_Return); break; +#if not(defined(Q_OS_MAC) || defined(Q_OS_MAC64) || defined(Q_OS_MACOS) || \ + defined(Q_OS_MACX)) case CaptureToolButton::ButtonType::TYPE_OPEN_APP: m_ks = QKeySequence(Qt::CTRL + Qt::Key_O); break; +#endif case CaptureToolButton::ButtonType::TYPE_PIXELATE: m_ks = QKeySequence(Qt::Key_B); break; diff --git a/src/widgets/capture/capturetoolbutton.cpp b/src/widgets/capture/capturetoolbutton.cpp index 84a1c811..637a969b 100644 --- a/src/widgets/capture/capturetoolbutton.cpp +++ b/src/widgets/capture/capturetoolbutton.cpp @@ -115,27 +115,32 @@ void CaptureToolButton::setColor(const QColor& c) QColor CaptureToolButton::m_mainColor = ConfigHandler().uiMainColorValue(); -static std::map buttonTypeOrder{ +static std::map buttonTypeOrder +{ { CaptureToolButton::TYPE_PENCIL, 0 }, - { CaptureToolButton::TYPE_DRAWER, 1 }, - { CaptureToolButton::TYPE_ARROW, 2 }, - { CaptureToolButton::TYPE_SELECTION, 3 }, - { CaptureToolButton::TYPE_RECTANGLE, 4 }, - { CaptureToolButton::TYPE_CIRCLE, 5 }, - { CaptureToolButton::TYPE_MARKER, 6 }, - { CaptureToolButton::TYPE_TEXT, 7 }, - { CaptureToolButton::TYPE_PIXELATE, 8 }, - { CaptureToolButton::TYPE_CIRCLECOUNT, 9 }, - { CaptureToolButton::TYPE_SELECTIONINDICATOR, 10 }, - { CaptureToolButton::TYPE_MOVESELECTION, 11 }, - { CaptureToolButton::TYPE_UNDO, 12 }, - { CaptureToolButton::TYPE_REDO, 13 }, - { CaptureToolButton::TYPE_COPY, 14 }, - { CaptureToolButton::TYPE_SAVE, 15 }, - { CaptureToolButton::TYPE_EXIT, 16 }, - { CaptureToolButton::TYPE_IMAGEUPLOADER, 17 }, - { CaptureToolButton::TYPE_OPEN_APP, 18 }, - { CaptureToolButton::TYPE_PIN, 19 }, + { CaptureToolButton::TYPE_DRAWER, 1 }, + { CaptureToolButton::TYPE_ARROW, 2 }, + { CaptureToolButton::TYPE_SELECTION, 3 }, + { CaptureToolButton::TYPE_RECTANGLE, 4 }, + { CaptureToolButton::TYPE_CIRCLE, 5 }, + { CaptureToolButton::TYPE_MARKER, 6 }, + { CaptureToolButton::TYPE_TEXT, 7 }, + { CaptureToolButton::TYPE_PIXELATE, 8 }, + { CaptureToolButton::TYPE_CIRCLECOUNT, 9 }, + { CaptureToolButton::TYPE_SELECTIONINDICATOR, 10 }, + { CaptureToolButton::TYPE_MOVESELECTION, 11 }, + { CaptureToolButton::TYPE_UNDO, 12 }, + { CaptureToolButton::TYPE_REDO, 13 }, + { CaptureToolButton::TYPE_COPY, 14 }, + { CaptureToolButton::TYPE_SAVE, 15 }, + { CaptureToolButton::TYPE_IMAGEUPLOADER, 16 }, +#if not(defined(Q_OS_MAC) || defined(Q_OS_MAC64) || defined(Q_OS_MACOS) || \ + defined(Q_OS_MACX)) + { CaptureToolButton::TYPE_OPEN_APP, 17 }, + { CaptureToolButton::TYPE_EXIT, 18 }, { CaptureToolButton::TYPE_PIN, 19 }, +#else + { CaptureToolButton::TYPE_EXIT, 17 }, { CaptureToolButton::TYPE_PIN, 18 }, +#endif }; int CaptureToolButton::getPriorityByButton(CaptureToolButton::ButtonType b) @@ -164,7 +169,10 @@ QVector CaptureToolButton::TYPE_SAVE, CaptureToolButton::TYPE_EXIT, CaptureToolButton::TYPE_IMAGEUPLOADER, +#if not(defined(Q_OS_MAC) || defined(Q_OS_MAC64) || defined(Q_OS_MACOS) || \ + defined(Q_OS_MACX)) CaptureToolButton::TYPE_OPEN_APP, +#endif CaptureToolButton::TYPE_PIN, CaptureToolButton::TYPE_CIRCLECOUNT, }; diff --git a/src/widgets/capture/capturetoolbutton.h b/src/widgets/capture/capturetoolbutton.h index 2a2908da..319fb9f2 100644 --- a/src/widgets/capture/capturetoolbutton.h +++ b/src/widgets/capture/capturetoolbutton.h @@ -53,8 +53,7 @@ public: TYPE_REDO = 16, TYPE_PIN = 17, TYPE_TEXT = 18, - TYPE_CIRCLECOUNT = 19, - + TYPE_CIRCLECOUNT = 19 }; Q_ENUM(ButtonType)