Jeremy Borgman
62466d6581
Preparing for upstream merge
2020-10-20 06:53:59 -05:00
Yuriy Puchkov
9826558063
Fix issue of merge upstream repo to Namecheap one
2020-09-25 08:59:15 +03: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
Yuriy Puchkov
1c67ad6345
Add ability to switch between s3 and imgur, add 'Latest uploads' to imgur
2020-09-22 11:23:31 +03:00
Yuriy Puchkov
471b25e6a8
Code Refactoring for s3 and imgur storages, create base class for both
2020-09-16 14:34:27 +03:00
Alex P
fa9ec7adba
refactor CaptureButton and use CSS for side panel button
2020-09-13 15:00:42 -05:00
Jeremy Borgman
889b688ee2
Moved TS generation behind flag, fixed more references to blur, fixed missing pixelate icon.
2020-09-06 20:21:51 -05:00
Jeremy Borgman
f34def6794
changed blur class name to pixelate to match implementation
2020-09-05 11:27:00 -05:00
Jeremy Borgman
c8d15205be
reformatted to Mozilla code style
2020-09-04 20:40:45 -05:00
Yuriy Puchkov
54812db981
Add S3 cloud storage support
2020-06-23 15:14:56 +03:00
Jeremy Borgman
9bb556acff
added circle counter and fixed issue with latest qt
2020-06-11 15:26:34 -05:00
lupoDharkael
42619158fa
Update copyright year
2019-03-04 16:38:45 +01:00
lupoDharkael
5432614651
Add Text tool
...
closes #11
Add an initial version of the text tool.
This commit adds:
- Basic text tool.
- On demand thickness and color update.
- Generalized logic for future widget based tools.
2018-05-06 13:56:45 +02:00
lupoDharkael
205cd7c87b
Add basic code for the Pin tool
2018-04-17 00:06:57 +02:00
lupoDharkael
5746a58582
Code refactor
...
More flexible tool API
Minor code format fixes
Clipboard freeze fixed(?)
Arrow correcly growing close to the start point
Improve maintainability
Add undo/redo stack
2018-04-10 15:33:08 +02:00
