benkyd/flameshot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,018 Commits 1 Branch 0 Tags
ccbc1bfc1741c93a607c49f49ac46d5e64d18b52
Commit Graph

122 Commits

Author SHA1 Message Date
freddii
bc61bf1027 fixed typing mistakes 2020-12-28 19:12:40 -06:00
Jeremy Borgman
826165c527 removed close after capture 2020-10-25 21:25:10 -05:00
borgmanJeremy
c901970091 Merge pull request #1092 from borgmanJeremy/upload_issue 
fixed race condition between notifcation and clipboard
 2020-10-22 17:58:45 -05:00
Jeremy Borgman
368421f198 fixed race condition between notifcation and clipboard 2020-10-22 17:56:25 -05:00
Jeremy Borgman
dec8c63f14 fixed formatting 2020-10-20 10:03:56 -05:00
Jeremy Borgman
62466d6581 Preparing for upstream merge 2020-10-20 06:53:59 -05:00
Yuriy Puchkov
3e7b87ccfe Code refactoring - remove not required headers and definitions 2020-10-16 15:08:08 +03:00
Yuriy Puchkov
5ea80b2ca2 Fix - update history widget on new capture 2020-10-16 15:04:17 +03:00
Yuriy Puchkov
2a138cf60f Update renames resouce for image flameshot.svg 2020-10-15 16:34:44 +03:00
Yuriy Puchkov
654455e9ac Merge branch 'flameshot-org-master' into merge-from-upstream 
# Conflicts:
#	.github/workflows/Linux-pack.yml
#	CMakeLists.txt
#	appveyor.yml
#	data/graphics.qrc
#	src/tools/imgur/imguruploader.cpp
 2020-10-15 15:44:49 +03:00
Yuriy Puchkov
9eb1a7cb18 Fix - memory leaks 2020-10-15 13:36:12 +03:00
borgmanJeremy
f11073bc00 fixing icon regression (#1051) 
* fixing icon regression

* fixed symlink
 2020-10-12 08:40:35 -05:00
Yuriy Puchkov
5d9f8f002a Fix resource path for images 2020-10-12 13:38:41 +03:00
Yuriy Puchkov
c92f8e3014 Merge branch 'flameshot-org-master' into bugfix/memory-leak 
# Conflicts:
#	.github/workflows/Linux-pack.yml
#	CMakeLists.txt
#	data/graphics.qrc
#	src/config/configwindow.cpp
#	src/tools/imgur/imguruploader.cpp
 2020-10-11 20:49:15 +03:00
Ahmed Zetao Yang
ac7142c4df fix: correcting images name 2020-10-11 07:18:16 -05:00
Ash Holland
c8767e7a1b Fix pixelation of small areas 2020-10-10 12:08:22 -05:00
Ash Holland
a2f845415c Improve pixelation of small areas 
Previously the level of pixelation would decrease if the selected area
was too thin to hold 10 pixelated blocks. Now the level of pixelation
only decreases when the selected area is too thin to hold even one
pixelated block.

This doesn't completely solve the issue of pixelation decreasing when
the area is thin, but it significantly improves the situation.
 2020-10-09 20:53:38 -05:00
Yuriy Puchkov
59d533d9d6 Fix ubuntu 18.04 build 2020-10-06 16:30:35 +03:00
Yuriy Puchkov
7d0d51efb5 Ability to lock switching between s3 and imgur and use s3 only 2020-10-06 16:11:33 +03:00
Yuriy Puchkov
0b372b6a71 Update package.json information and fix typo 2020-10-05 10:03:27 +03:00
Yuriy Puchkov
8e92ea5ab4 Merge 0.8.3 upstream 2020-10-02 10:15:56 +03:00
Alex P
abdeee9a16 open imgur upload in screen center 2020-09-30 19:27:49 -05:00
Yuriy Puchkov
24c55279d6 README for S3 storage 2020-09-29 15:31:04 +03:00
hexyoungs
ca57215172 refactor: remove duplicated code in PR#982 2020-09-28 08:52:33 -05:00
Yuriy Puchkov
e0523acafe S3 storage - amazon server side (no full documentation yet) 2020-09-28 16:20:05 +03:00
Yuriy Puchkov
9f26384003 Set default storage based on config.ini file (s3 if creds exist otherwise imgur) 2020-09-28 11:04:58 +03:00
Jeremy Borgman
f5d581c89f bolded font in circle 2020-09-25 08:36:25 -05:00
hexyoungs
ac038474ce feat: using luminance to determine text color 
of circlecounttool
 2020-09-25 08:14:00 -05:00
Yuriy Puchkov
34bfe5a6c0 Code refactoring - remove configenterprise for s3 2020-09-25 10:50:46 +03: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
b88a5fbce8 Code refactoring - change code style to the new clang-format rules 2020-09-23 15:25:13 +03:00
Yuriy Puchkov
54907d2e0b Code refactoring - create base class ImgUploaderTool for different storages 2020-09-22 19:27:32 +03: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
Jeremy Borgman
c56bb78cf3 Added preview to circle counter and auto adjust circle count font color. 2020-09-20 12:38:33 -05:00
Yuriy Puchkov
471b25e6a8 Code Refactoring for s3 and imgur storages, create base class for both 2020-09-16 14:34:27 +03:00
Jeremy Borgman
460e30c2ce reworked pixelate to simplier method provided by @kpcee and used old blur effect when pixelate kernel < 1 2020-09-15 07:43:53 -05:00
Jeremy Borgman
6b4565cac6 Fixed visual glitch with circle count undo, rescale circle text to fit circle, set minimum circle count size 2020-09-14 15:08:24 -05:00
Alex P
fa9ec7adba refactor CaptureButton and use CSS for side panel button 2020-09-13 15:00:42 -05:00
Alex P
3514345b68 fix text config buttons color 
the check was incorrect, it is windowTEXT, not background
 2020-09-13 15:00:24 -05:00
Jeremy Borgman
e5813d2230 Fixed memory leak and enabled sanatizers 2020-09-11 11:38:35 -05:00
Jeremy Borgman
9bc4ea5700 Fixed it so a notification is always sent when saved to clipboard 2020-09-10 10:36:50 -05:00
Jeremy Borgman
6afa3ca26a Made undo tool aware of circle count to decrement. Refactored tool ID's to be enum 2020-09-08 11:36:30 -05:00
Yuriy Puchkov
3f708f3160 Add more colors and custom color item 2020-09-08 12:09:04 +03:00
Ahmed Zetao Yang
793cdce37e fix: set win32 api minimum system level as Win7 2020-09-07 07:29:31 -05:00
Jeremy Borgman
7b0888a0b0 allowed counter bubble size to be adjustable, font to autofill, and fixed issue with low DPI undo 2020-09-06 21:10:41 -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
5dba3de778 Added ubuntu CI and fixed issue uncovered during CI. Also added clang-format 2020-09-04 20:40:45 -05:00