fergalmoran/flameshot
1
0
Fork 0
mirror of https://github.com/fergalmoran/flameshot.git synced 2026-02-13 05:54:01 +00:00
Code Issues Packages Projects Releases Wiki Activity
921 Commits 1 Branch 0 Tags
eefda166d93f662908c6fe84510808ca3e047fe8
Commit Graph

131 Commits

Author SHA1 Message Date
Yuriy Puchkov
8848b25305 Join two similar options 'Save path' and 'Save default path for screenshots' 2020-10-06 14:10:32 +03:00
Yuriy Puchkov
e22a3eeb1e Set option 'Launch at startup' true by default 2020-10-06 08:36:45 +03:00
Yuriy Puchkov
8e92ea5ab4 Merge 0.8.3 upstream 2020-10-02 10:15:56 +03:00
hexyoungs
01bc618dcc refactor: ColorUtils::colorIsDark 
make it more clear
 2020-09-28 08:52:33 -05:00
hexyoungs
f2101a3296 fix: #994 2020-09-28 08:52:33 -05:00
Yuriy Puchkov
fc86f473cd Update Ukrainian and Russian translations 2020-09-28 15:18:52 +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
Peter Cai
e1214e23e5 correct position of QScreen geometry on HiDPI multi-headed setup 2020-09-24 18:17:43 -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
Boyuan Yang
2d1d664a57 Remove a trailing space; update translation files 2020-09-23 12:50:43 -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
1c67ad6345 Add ability to switch between s3 and imgur, add 'Latest uploads' to imgur 2020-09-22 11:23:31 +03:00
Yuriy Puchkov
d061290fb1 Add configurable shortcuts for drawing tools 2020-09-14 16:14:32 +03:00
Alex P
fa9ec7adba refactor CaptureButton and use CSS for side panel button 2020-09-13 15:00:42 -05:00
Jeremy Borgman
d72d1e6ad9 Quick fix for qclipboard / dbus lockup issue 2020-09-13 10:23:28 -05:00
Alex Pantechovskis
5f2132f91e add sidepanel button to make UI more intuitive and accessible without keyboard (tablets, etc.) (#631) 
* add sidepanel toggle button and close button #613

* add side panel toggle button option

* make sidepanel button draggable
 2020-09-12 15:55:51 -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
72f52ac3ed Fixed merge conflicts 2020-09-09 19:58:32 -05:00
seamus-45
8da962c418 fix a typo in contrastUiColor 2020-09-09 08:04:57 -05:00
Yuriy Puchkov
3f708f3160 Add more colors and custom color item 2020-09-08 12:09:04 +03:00
Boyuan Yang
18f18ce7ef Fix D-Bus activation name 
Originally the App uses org.dharkael.Flameshot in D-Bus.
Since we have moved the project under organization, the
name we are using now should be org.flameshot.Flameshot.
This need to be kept unified across the whole project.

This fixes D-Bus invocation problem and should fixes: #850 .
 2020-09-07 11:16:03 -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
c8d15205be reformatted to Mozilla code style 2020-09-04 20:40:45 -05:00
Yurii Puchkov
5c32a9c4a1 Merge branch 'master_nc' into feature/RND-597-flameshot-save-to-the-default-path-without-confirmation 2020-09-04 02:37:08 -07:00
Yuriy Puchkov
0fce7472fd Copy file path (not url) on saving to disk 2020-09-03 18:40:49 +03:00
Yuriy Puchkov
a4d09186d5 Save to the default path without confirmation 2020-09-03 17:26:32 +03:00
Yurii Puchkov
a810f103c1 Fix - Calculate workdir on Windows if startup option was set before the latest fix 2020-09-02 19:24:05 +03:00
Yuriy Puchkov
0c05b03a5b Add workdir to startup on Windows 2020-09-02 16:06:13 +03:00
Yuriy Puchkov
5e65bd6829 Make application startup notification configurable 2020-08-12 16:35:56 +03:00
Yuriy Puchkov
1f40697656 Include storage type into history file name 2020-08-06 21:54:20 +03:00
Yuriy Puchkov
3053541827 Save cached images on local dist in original size to be able to copy to clipboard later 2020-08-06 16:35:29 +03:00
Yuriy Puchkov
c2fc2e998d Remove screenshot feature 2020-08-05 13:45:48 +03:00
Yuriy Puchkov
a88df6b728 Increase pressed button contrast 2020-08-04 17:24:45 +03:00
Yuriy Puchkov
cc0175487c Remove UUID from history path and move .cache to AppData/Roaming for Windows 2020-08-03 15:05:20 +03:00
Yuriy Puchkov
63e2910b8e Add local history for last screenshots 2020-07-21 18:37:55 +03:00
Yuriy Puchkov
988aa26d4b Add local history for last screenshots 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
ac69def36d Add default path configration for screenshots 2020-07-20 20:38:42 +03:00
Yuriy Puchkov
c09eedb1a6 Remove "Choose an app to open the capture" for windows versions 2020-07-20 20:38:42 +03:00
Yuriy Puchkov
7c796888df Set 'Copy URL after upload' turned on by default 2020-07-20 20:38:42 +03:00
Jeremy Borgman
f5013df306 First pass at converting from qmake to cmake. 2020-07-10 20:10:14 -05:00
Jeremy Borgman
9bb556acff added circle counter and fixed issue with latest qt 2020-06-11 15:26:34 -05:00
Joseph Charamut
dfde97e88e Merge branch 'master' of https://github.com/lupoDharkael/flameshot into save 2020-05-08 09:03:31 -04:00
Joseph Charamut
93b03ee8f1 Disable extra notification with save-after-copy 2020-02-05 23:14:43 -05:00
teryanik
62dbabc341 Add option to auto copy URL after upload (#553) 2019-10-01 19:58:29 +02:00
Daniel Chabrowski
807e240d6c Fix pragma once in globalvalues.h (#537) 2019-05-22 17:04:44 +02:00
Joseph Charamut
d303c9dd62 Added feature & config to auto-save a screenshot after copying it 2019-05-01 13:23:43 -04:00