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

96 Commits

Author SHA1 Message Date
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
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
Jeremy Borgman
c8d15205be reformatted to Mozilla code style 2020-09-04 20:40:45 -05:00
Jeremy Borgman
286db9ff69 Fixed translations and added feedback from PR 2020-09-03 11:51:18 -05:00
Yuriy Puchkov
bbbc37e973 More extended error message on remove and ability to remove outdated screenshots from local history 2020-08-20 17:21:32 +03:00
Yuriy Puchkov
7e00ac4711 Connection lost on network settings update 2020-08-20 14:35:01 +03:00
Yuriy Puchkov
09ebd0c2e5 Fix - build fails on some Ubuntu distributions 2020-08-10 13:15:31 +03:00
Yuriy Puchkov
3da7e28acb Include storage type into history file name 2020-08-07 18:06:56 +03:00
Yuriy Puchkov
30a07f26bd Fix - delete screendhot issue in 'Copy url after upload' option disabled 2020-08-07 12:20:53 +03:00
Yuriy Puchkov
1f40697656 Include storage type into history file name 2020-08-06 21:54:20 +03:00
Yuriy Puchkov
aba85cbf52 Hide history window during waiting for delete screenshot from S3 2020-08-06 18:57:14 +03:00
Yuriy Puchkov
0175d7fd02 Remove screenshot from s3 bucket 2020-08-06 15:31:33 +03:00
Yuriy Puchkov
4fda2cd4f6 Code refactoring - remove hardcode for fields list 2020-08-05 17:34:57 +03:00
Yuriy Puchkov
ae6ceac395 Fix crash on system proxy is set but not available (on Windows) 2020-08-04 13:17:31 +03:00
Yuriy Puchkov
1515db4f21 Chage proxy setting priorities: config.ini - first, windows settins - next if no proxy settings in config.ini 2020-08-04 11:31:35 +03:00
Yuriy Puchkov
9132c59638 Read proxy settings from OS settings (for Windows) 2020-08-04 09:38:30 +03:00
Yuriy Puchkov
41ac8cfee6 S3 - proxy server support code refactoring 2020-07-23 21:37:18 +03:00
Yuriy Puchkov
415711d975 Add local history for last screenshots 2020-07-21 17:05:03 +03:00
Yuriy Puchkov
5861b21fcf Add local history for last screenshots 2020-07-21 13:09:24 +03:00
Yuriy Puchkov
988aa26d4b Add local history for last screenshots 2020-07-20 20:38:42 +03:00
Yuriy Puchkov
6346a82360 Add proxy support for S3 upload 2020-07-20 20:38:42 +03:00
Yuriy Puchkov
f5b512674b Much more stronger blur effect 2020-07-20 20:38:42 +03:00
Yuriy Puchkov
bb2b4026d8 Buxfix - crased on delete last symbol in Filename format 2020-07-20 20:38:42 +03:00
Yuriy Puchkov
f63cd2b392 Move S3 configuration to /etc for linux version 2020-07-20 20:38:42 +03:00
Yuriy Puchkov
f0cac4e60b Remove delete button on form upload to s3 window 2020-07-20 20:38:42 +03:00
Yuriy Puchkov
7a5c7b1006 Upload screenshot to S3 on Enter after capture 2020-07-20 20:38:42 +03:00
Yuriy Puchkov
4293091d47 Message and translation fix 2020-07-20 20:38:42 +03:00
Yuriy Puchkov
48a0555bcc Make S3 bucket configurable 2020-07-20 20:38:42 +03:00