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

83 Commits

Author SHA1 Message Date
Yuriy Puchkov
8e92ea5ab4 Merge 0.8.3 upstream 2020-10-02 10:15:56 +03:00
Jeremy Borgman
931ac154e7 Fixed issue with ctrl s not saving text 2020-09-28 08:53:12 -05:00
hexyoungs
37fa206df2 fix: #994 
fix wrong icon color caused by wrong mainColor
 2020-09-28 08:52:33 -05:00
33kk
8a962c25a1 Fix side panel button color 2020-09-28 08:51:22 -05: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
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
Jeremy Borgman
2722899a46 working on fixing 2020-09-18 10:38:59 -05:00
MD Zaid
2d8ad0d516 Added missing Dependency, Fixed spelling mistake in a comment 
=>qttools5-dev is also required on ubuntu 20.04 (tested on pop os 20.04), so added it in
  README.md under build instructions
=> Fixed spelling mistake in a comment in src/widgets/capture/capturewidget.cpp.
 2020-09-18 07:01:54 -05:00
Alex P
4dc94379c7 fix side panel height on stacked multi-monitor setup 
Not sure what was the purpose of this resize, I think it can be useful only in non-fullscreen mode (currently available only for debugging)
 2020-09-16 06:38:00 -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
5b8d0eeca5 Moved circle count to fit in with other tools 2020-09-14 08:37:10 -05: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
Alex P
69b4afa394 fix text config width in side panel (was adding hor. scroll) 2020-09-13 15:00:24 -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
3bd7aa79b8 Fix count when the redo tool is called with circle counter 2020-09-08 20:26:52 -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
Yurii Puchkov
3378b78daa Fix - Change coloer widget circle doesn't disappear on Windows (left or right button click will choose a color and hide it after this fix) 2020-09-07 02:28:29 -07: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
Yuriy Puchkov
3da7e28acb Include storage type into history file name 2020-08-07 18:06:56 +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
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
fe1c37d28a Remove screenshot from s3 bucket and old format cache only 2020-08-06 16:29:48 +03:00
Yuriy Puchkov
0175d7fd02 Remove screenshot from s3 bucket 2020-08-06 15:31:33 +03:00
Yuriy Puchkov
c2fc2e998d Remove screenshot feature 2020-08-05 13:45:48 +03:00
Yuriy Puchkov
434ee50b12 Fix button height, make separate button "Copy URL" 2020-08-03 14:18:55 +03:00
Yuriy Puchkov
45daae51e9 Fix - missprints, update to more clear messages 2020-07-24 16:28:11 +03:00
Yuriy Puchkov
b6e3fb9b9c Small UI fixes, translation updates, missprint fixes 2020-07-23 16:45:04 +03:00
Yuriy Puchkov
63e2910b8e Add local history for last screenshots 2020-07-21 18:37:55 +03:00
Yuriy Puchkov
415711d975 Add local history for last screenshots 2020-07-21 17:05:03 +03:00
Yuriy Puchkov
7a5c7b1006 Upload screenshot to S3 on Enter after capture 2020-07-20 20:38:42 +03: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
Yuriy Puchkov
ceadb0d833 Upload screenshot to S3 on Enter after capture 2020-07-02 21:21:32 +03:00
Jeremy Borgman
9bb556acff added circle counter and fixed issue with latest qt 2020-06-11 15:26:34 -05:00
lupoDharkael
d4715750df Add basic launcher panel 2019-04-21 20:34:57 +02:00
Nikolai Oplachko
b42f1cf01d Add 45-multiple degree adjustment for line, arrow and marker tools (#439) 
* Add 45-multiple degree adjustment for line, arrow and marker tools

* Adjustment: Ctrl press is checked + widened functionality for two-point tools
 2019-03-31 12:38:31 +02:00
DaVukovic
abe356a4d8 Add german translation (#467) 2019-03-20 22:42:29 +01:00
lupoDharkael
42619158fa Update copyright year 2019-03-04 16:38:45 +01:00
Jiachen Yang
b612bdbbae fixing #459 by update m_context with m_selection (#470) 2019-02-22 16:29:40 +01:00
luzpaz
665f309018 Misc. source comment typos (#423) 
Found via `codespell -i 3 -w -S ./translations -L uint,exten -C 3`
 2018-12-28 16:13:29 +01:00
Alfredo Ramos
2716631591 Document shortcut for sidebar (#401) 
* Document shortcut for sidebar

* Use appveyor-retry to prevent transfer.sh timeouts
 2018-11-14 16:51:22 +01:00