Jeremy Fleischman
5a9ca6bd11
Exclude the external directory with a .clang-format file.
...
(I copied this trick from https://stackoverflow.com/a/57272592/1739415 )
The GitHub clang-format workflow was already ignoring the `external`
directory because of the setting in the `clang-format.yml` file, but
that doesn't help other people running `clang-format` by hand (which the
CONTRIBUTING.md file instructs developers to do). Without this change,
I'd see a bunch of changes appear in the `external/spdlog` every time I
ran clang-format by hand.
I figure it's better to configure this via files that clang knows about
so both the GitHub workflow *and* developers have a closer to identical
experience.
2021-02-11 19:22:54 -06:00
Jeremy Borgman
92b9379d69
Made changes after review of merge
2021-01-15 17:54:56 -06:00
Jeremy Borgman
76ad9e5a6f
first pass at adding logging framework
2021-01-05 17:01:12 -06:00
Jeremy Borgman
8211b6aff0
updated qtsingleapplication to v3.1.5
2020-10-31 20:05:06 -05:00
Yuriy Puchkov
d4d3b9eae0
Merge branch 'master-flameshotorg' into master_nc_merge_upstream
...
# Conflicts:
# .travis.yml
# appveyor.yml
# data/graphics.qrc
# data/img/app/keyboard.svg
# data/img/material/black/delete.png
# data/img/material/black/delete.svg
# data/img/material/black/filepath.svg
# data/img/material/black/shortcut.svg
# data/img/material/white/filepath.svg
# data/img/material/white/shortcut.svg
# data/translations/Internationalization_hu.ts
# data/translations/Internationalization_ka.ts
# external/Qt-Color-Widgets/src/color_wheel.cpp
# external/singleapplication/singleapplication.cpp
# flameshot.pro
# src/cli/commandlineparser.cpp
# src/config/buttonlistview.cpp
# src/config/configwindow.cpp
# src/config/configwindow.h
# src/config/geneneralconf.cpp
# src/config/geneneralconf.h
# src/config/uicoloreditor.cpp
# src/config/uicoloreditor.h
# src/core/controller.cpp
# src/core/globalshortcutfilter.cpp
# src/main.cpp
# src/third-party/Qt-Color-Widgets/src/color_utils.cpp
# src/tools/abstractactiontool.h
# src/tools/abstractpathtool.h
# src/tools/arrow/arrowtool.cpp
# src/tools/arrow/arrowtool.h
# src/tools/blur/blurtool.cpp
# src/tools/capturetool.h
# src/tools/circle/circletool.cpp
# src/tools/circle/circletool.h
# src/tools/copy/copytool.cpp
# src/tools/copy/copytool.h
# src/tools/exit/exittool.cpp
# src/tools/exit/exittool.h
# src/tools/imgur/imguruploader.cpp
# src/tools/launcher/applaunchertool.cpp
# src/tools/launcher/applaunchertool.h
# src/tools/launcher/applauncherwidget.cpp
# src/tools/launcher/openwithprogram.cpp
# src/tools/line/linetool.cpp
# src/tools/line/linetool.h
# src/tools/marker/markertool.cpp
# src/tools/marker/markertool.h
# src/tools/move/movetool.cpp
# src/tools/pencil/penciltool.cpp
# src/tools/pencil/penciltool.h
# src/tools/pin/pintool.cpp
# src/tools/pin/pintool.h
# src/tools/pin/pinwidget.cpp
# src/tools/pixelate/pixelatetool.h
# src/tools/rectangle/rectangletool.cpp
# src/tools/rectangle/rectangletool.h
# src/tools/redo/redotool.cpp
# src/tools/redo/redotool.h
# src/tools/save/savetool.cpp
# src/tools/save/savetool.h
# src/tools/selection/selectiontool.cpp
# src/tools/selection/selectiontool.h
# src/tools/sizeindicator/sizeindicatortool.cpp
# src/tools/sizeindicator/sizeindicatortool.h
# src/tools/storage/imgur/imguruploader.h
# src/tools/storage/imgur/imguruploadertool.cpp
# src/tools/storage/imgur/imguruploadertool.h
# src/tools/text/textconfig.cpp
# src/tools/text/texttool.cpp
# src/tools/text/texttool.h
# src/tools/toolfactory.cpp
# src/tools/toolfactory.h
# src/tools/undo/undotool.cpp
# src/tools/undo/undotool.h
# src/utils/confighandler.cpp
# src/utils/confighandler.h
# src/utils/dbusutils.cpp
# src/utils/screenshotsaver.cpp
# src/utils/screenshotsaver.h
# src/widgets/capture/buttonhandler.cpp
# src/widgets/capture/buttonhandler.h
# src/widgets/capture/capturebutton.cpp
# src/widgets/capture/capturebutton.h
# src/widgets/capture/capturewidget.cpp
# src/widgets/capture/capturewidget.h
# src/widgets/capture/colorpicker.cpp
# src/widgets/capturelauncher.cpp
# src/widgets/infowindow.cpp
# src/widgets/infowindow.h
# src/widgets/panel/sidepanelwidget.cpp
# src/widgets/panel/utilitypanel.cpp
# src/widgets/panel/utilitypanel.h
# translations/Internationalization_ca.ts
# translations/Internationalization_de_DE.ts
# translations/Internationalization_es.ts
# translations/Internationalization_fr.ts
# translations/Internationalization_ja.ts
# translations/Internationalization_nl.ts
# translations/Internationalization_pl.ts
# translations/Internationalization_pt_br.ts
# translations/Internationalization_ru.ts
# translations/Internationalization_sk.ts
# translations/Internationalization_sr.ts
# translations/Internationalization_tr.ts
# translations/Internationalization_uk.ts
# translations/Internationalization_zh_CN.ts
# translations/Internationalization_zh_TW.ts
2020-09-24 18:52:49 +03:00
Jeremy Borgman
0d5386edd4
Changed clang format to new agreement
2020-09-24 07:53:28 -05:00
Jeremy Borgman
c8d15205be
reformatted to Mozilla code style
2020-09-04 20:40:45 -05:00
Jeremy Borgman
dc77029cde
Fixed most depratated warnings.
2020-07-13 15:02:18 -05:00
Jeremy Borgman
f5013df306
First pass at converting from qmake to cmake.
2020-07-10 20:10:14 -05:00
