benkyd/flameshot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix issue #1794 (#1795)

Browse Source 
Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>
This commit is contained in:
Haris Gušić
2021-08-02 15:00:27 +02:00
committed by GitHub
parent 5d1a636e85
commit 2608d1ecc0
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/tools/toolfactory.cpp
View File

@@ -80,7 +80,7 @@ CaptureTool* ToolFactory::CreateTool(CaptureToolButton::ButtonType t,
case CaptureToolButton::TYPE_REDO:
tool = new RedoTool(parent);
break;
#if not defined(Q_OS_MACOS)
#if !defined(Q_OS_MACOS)
case CaptureToolButton::TYPE_OPEN_APP:
tool = new AppLauncher(parent);
break;

4
src/utils/confighandler.cpp
View File

@@ -50,7 +50,7 @@ QVector<CaptureToolButton::ButtonType> ConfigHandler::getButtons()
<< CaptureToolButton::TYPE_COPY << CaptureToolButton::TYPE_SAVE
<< CaptureToolButton::TYPE_EXIT
<< CaptureToolButton::TYPE_IMAGEUPLOADER
#if not defined(Q_OS_MACOS)
#if !defined(Q_OS_MACOS)
<< CaptureToolButton::TYPE_OPEN_APP
#endif
<< CaptureToolButton::TYPE_PIN << CaptureToolButton::TYPE_TEXT
@@ -573,7 +573,7 @@ void ConfigHandler::setCopyPathAfterSaveEnabled(const bool value)
bool ConfigHandler::useJpgForClipboard() const
{
#if not defined(Q_OS_MACOS)
#if !defined(Q_OS_MACOS)
// FIXME - temporary fix to disable option for MacOS
if (m_settings.contains(QStringLiteral("useJpgForClipboard"))) {
return m_settings.value(QStringLiteral("useJpgForClipboard")).toBool();

2
src/utils/configshortcuts.cpp
View File

@@ -145,7 +145,7 @@ const QKeySequence& ConfigShortcuts::captureShortcutDefault(
case CaptureToolButton::ButtonType::TYPE_IMAGEUPLOADER:
m_ks = QKeySequence(Qt::CTRL + Qt::Key_U);
break;
#if not defined(Q_OS_MACOS)
#if !defined(Q_OS_MACOS)
case CaptureToolButton::ButtonType::TYPE_OPEN_APP:
m_ks = QKeySequence(Qt::CTRL + Qt::Key_O);
break;

4
src/widgets/capture/capturetoolbutton.cpp
View File

@@ -137,7 +137,7 @@ static std::map<CaptureToolButton::ButtonType, int> buttonTypeOrder
{ CaptureToolButton::TYPE_COPY, 14 },
{ CaptureToolButton::TYPE_SAVE, 15 },
{ CaptureToolButton::TYPE_IMAGEUPLOADER, 16 },
#if not defined(Q_OS_MACOS)
#if !defined(Q_OS_MACOS)
{ CaptureToolButton::TYPE_OPEN_APP, 17 },
{ CaptureToolButton::TYPE_EXIT, 18 }, { CaptureToolButton::TYPE_PIN, 19 },
#else
@@ -174,7 +174,7 @@ QVector<CaptureToolButton::ButtonType>
CaptureToolButton::TYPE_SAVE,
CaptureToolButton::TYPE_EXIT,
CaptureToolButton::TYPE_IMAGEUPLOADER,
#if not defined(Q_OS_MACOS)
#if !defined(Q_OS_MACOS)
CaptureToolButton::TYPE_OPEN_APP,
#endif
CaptureToolButton::TYPE_PIN,