diff options
| author | aszlig <aszlig@nix.build> | 2021-03-09 20:41:22 +0100 |
|---|---|---|
| committer | aszlig <aszlig@nix.build> | 2021-03-09 20:43:48 +0100 |
| commit | 7406f471a01a0d277e3157a93298c160814546ac (patch) | |
| tree | be189bae7b7dfa8acd5a9396b0fd819da288851e | |
| parent | 507cb2f6eebfa0e71046e949ba79694874d4720b (diff) | |
flameshot: Rebase config against version 0.9.0
The conflicting changes here are largely because of changed context, except one hunk which is dropped because the "saveAfterCopyPath" no longer existists in version 0.9.0. Signed-off-by: aszlig <aszlig@nix.build>
| -rw-r--r-- | modules/user/aszlig/programs/flameshot/config.patch | 24 |
1 files changed, 8 insertions, 16 deletions
diff --git a/modules/user/aszlig/programs/flameshot/config.patch b/modules/user/aszlig/programs/flameshot/config.patch index 6d01df12..a63636bc 100644 --- a/modules/user/aszlig/programs/flameshot/config.patch +++ b/modules/user/aszlig/programs/flameshot/config.patch @@ -1,9 +1,9 @@ diff --git a/src/utils/confighandler.cpp b/src/utils/confighandler.cpp -index ee50acb..8a92e08 100644 +index 6786225..3a55a73 100644 --- a/src/utils/confighandler.cpp +++ b/src/utils/confighandler.cpp -@@ -22,9 +22,8 @@ - #include <algorithm> +@@ -16,9 +16,8 @@ + #endif ConfigHandler::ConfigHandler() -{ @@ -14,20 +14,22 @@ index ee50acb..8a92e08 100644 QVector<CaptureToolButton::ButtonType> ConfigHandler::getButtons() { -@@ -55,9 +54,7 @@ QVector<CaptureToolButton::ButtonType> ConfigHandler::getButtons() +@@ -49,11 +48,7 @@ QVector<CaptureToolButton::ButtonType> ConfigHandler::getButtons() << CaptureToolButton::TYPE_UNDO << CaptureToolButton::TYPE_REDO << CaptureToolButton::TYPE_COPY << CaptureToolButton::TYPE_SAVE << CaptureToolButton::TYPE_EXIT - << CaptureToolButton::TYPE_IMAGEUPLOADER +-#if not defined(Q_OS_MACOS) - << CaptureToolButton::TYPE_OPEN_APP +-#endif - << CaptureToolButton::TYPE_PIN << CaptureToolButton::TYPE_TEXT + << CaptureToolButton::TYPE_TEXT << CaptureToolButton::TYPE_CIRCLECOUNT; } -@@ -119,7 +116,8 @@ void ConfigHandler::setUserColors(const QVector<QColor>& l) +@@ -105,7 +100,8 @@ QVector<QColor> ConfigHandler::getUserColors() - QString ConfigHandler::savePathValue() + QString ConfigHandler::savePath() { - return m_settings.value(QStringLiteral("savePath")).toString(); + return m_settings.value(QStringLiteral("savePath")).toString() @@ -35,13 +37,3 @@ index ee50acb..8a92e08 100644 } void ConfigHandler::setSavePath(const QString& savePath) -@@ -390,7 +388,8 @@ void ConfigHandler::setSaveAfterCopy(const bool save) - - QString ConfigHandler::saveAfterCopyPathValue() - { -- return m_settings.value(QStringLiteral("saveAfterCopyPath")).toString(); -+ return m_settings.value(QStringLiteral("saveAfterCopyPath")).toString() -+ .replace("$HOME", QDir::homePath()); - } - - void ConfigHandler::setSaveAfterCopyPath(const QString& path) |