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

67 Commits

Author SHA1 Message Date
Mantas-2155X
36c92e542f * Fix clang formatting 2021-01-28 19:30:41 -06:00
Mantas-2155X
a2a84ff764 * Fix build on Ubuntu 18.04 2021-01-28 19:30:41 -06:00
Mantas-2155X
7daca5ff90 * Show the Help Text, Tool Settings on the current active monitor 2021-01-28 19:30:41 -06:00
Jeremy Borgman
265e42c7b0 fixed issue with circle count undo redo 2021-01-22 19:11:00 -06:00
Jeremy Borgman
9581a698af resolved merge conflicts 2021-01-15 19:02:16 -06:00
brimston3
e07829ec55 Emit dbus captureSaved signal when saving files 
New captureSaved signal contains the request ID and canonical path of the saved
file. This allows a dbus listener interested in postprocessing files access to
the path most recently written.
 2021-01-15 12:49:33 -06:00
Jeremy Borgman
73fe772b70 resolving merge conflicts 2021-01-08 10:19:53 -06:00
Jeremy Borgman
76ad9e5a6f first pass at adding logging framework 2021-01-05 17:01:12 -06:00
Yuriy Puchkov
2114ad3c32 fix - 'update version notification' widget position and event handler for Linux 2020-12-18 15:33:00 +02:00
Yuriy Puchkov
784da1a652 Update to a new version notification 2020-12-11 15:00:11 +02:00
Yuriy Puchkov
6bd1f8c6a8 fix - ESC - press key twice to exit in the CaptureWidget 2020-12-08 16:33:30 +02:00
Yuriy Puchkov
9d968058dc fix - Touchpad - Change of the tool thickness in editor 2020-12-08 15:00:36 +02:00
Yuriy Puchkov
134239c6d4 fix - MacOS - Tool Settings (side panel) on retina or if primary and other display has different display sized 2020-12-04 12:02:44 +02:00
Yuriy Puchkov
b4be86068d fix - MacOS - Black screen when saving files with a hotkey 2020-12-03 16:18:30 +02:00
Yuriy Puchkov
69e698bdb1 Fix - MacOS - activate new widgets, swith to fullscreen mode+hotkeys 2020-11-24 10:08:12 -08:00
Yuriy Puchkov
293525f5b6 Fix - MacOS capture area, full screen mode, system tray area, etc 2020-11-24 07:39:51 -08:00
tiller
a0156be7b6 fixed placement issue on windows when multi-monitor setup 2020-10-31 20:00:20 -05:00
David Mitchell
9ac549d086 capturewidget refactor (#1114) 
* Renaming methods for better file outline

* Moving redundant code into helper functions

* Combine implementation of move and resize

* Remove checks from move
 2020-10-29 14:45:55 -05:00
Jeremy Fleischman
c5e9def59f Add a configurable keyboard shortcut to commit text. 
This new shortcut defaults to `ctrl+enter`, and it commits the text
you're currently typing. It does *not* change the behavior of enter
(pressing enter still inserts a newline), nor does it actually exit
flameshot. This isn't exactly what was requested, but I'm going to
somewhat cavalierly say that this fixes
https://github.com/flameshot-org/flameshot/issues/812.

*Note: I added a new user-visible string here, but I didn't update any
ts files. Is that ok?
 2020-10-28 07:55:46 -05:00
Jeremy Fleischman
05c2bc6ae7 Added a gui --selection option to print out the geometry of the selection. 
Fixes #425.
 2020-10-26 11:46:39 -05:00
Jeremy Borgman
823ba6fc8b Founding dangling singal to uploader 2020-10-20 07:03:30 -05:00
Jeremy Borgman
62466d6581 Preparing for upstream merge 2020-10-20 06:53:59 -05:00
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
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
1c67ad6345 Add ability to switch between s3 and imgur, add 'Latest uploads' to imgur 2020-09-22 11:23:31 +03: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
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 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
c8d15205be reformatted to Mozilla code style 2020-09-04 20:40:45 -05:00
Jeremy Borgman
dc77029cde Fixed most depratated warnings. 2020-07-13 15:02:18 -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
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
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
Alfredo Ramos
da49ed556f [WIP] Add line thickness to side panel (#374) 
* Add thickness slider

* Fix enums compatibility

* Rename ColorPickerWidget to SidePanelWidget
 2018-10-10 23:34:42 +02:00
Streppel
c3ad9b6c41 Fixes #362 (#363) 
This fixes #362, making the enter key copy the content of the GUI selection copy the content to the clipboard
 2018-10-04 16:43:25 +02:00