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

31 Commits

Author SHA1 Message Date
David Mitchell
aee943af5d Implement selectAll and keyboard shortcut (#1106) 2021-02-06 20:01:45 -06:00
Jeremy Borgman
73fe772b70 resolving merge conflicts 2021-01-08 10:19:53 -06:00
Yuriy Puchkov
784da1a652 Update to a new version notification 2020-12-11 15:00:11 +02:00
Yuriy Puchkov
9d968058dc fix - Touchpad - Change of the tool thickness in editor 2020-12-08 15:00:36 +02: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
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
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
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
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
Jeremy Borgman
c8d15205be reformatted to Mozilla code style 2020-09-04 20:40:45 -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
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
lupoDharkael
415b059fb2 Fix #311 
Flameshot was unable to start new captures after saving with
    Ctrl+s while having a text area active from the Text tool.
    This was caused by the overloaded call to close() which
    was deleting the text area instead of closing the capture
    and the consequent call of the destructor. That caused an
    always active capture session.
 2018-09-13 15:35:49 +02:00
Peter Cai
21670e3344 screengrabber: fix devicePixelRatio detection (#277) 2018-07-22 15:30:52 +02:00
lupoDharkael
49227fac43 Solve cppcheck warnings 2018-05-26 18:38:06 +02:00
lupoDharkael
6adcfef413 Add color tools inside the capture editor 2018-05-16 23:02:30 +02:00
lupoDharkael
5432614651 Add Text tool 
closes #11
Add an initial version of the text tool.
This commit adds:
- Basic text tool.
- On demand thickness and color update.
- Generalized logic for future widget based tools.
 2018-05-06 13:56:45 +02:00
lupoDharkael
48c058782a Implement single method capture request 
The core now has a method requestCapture, which receives a
CaptureRequest object with all the needed information.
This reduces code duplication in future features.
 2018-04-29 11:27:55 +02:00
lupoDharkael
f1ec6f885e Selection refactor 
New improved selection code:
- Selection decopuled into a new class
- When you drag the selection against the limits it won't become
permanently smaller, it will "bounce" trying to recover its size.
If you drop it again it will adapt its size to the borders of the
screen.
- Fixed bugs in the button position algorithm.
- Implemented selection animations for future implementations.
 2018-04-15 21:29:16 +02:00
lupoDharkael
522c9b1ed1 Add panel 
The side panel opens with the Space key, this panel can contain
    widgets to assist the capture with more features.
    This commit fixes the preview of the tool hiding it when the
    mouse hovers a widget. This is more needed now having a new widget
    inside the CaptureWidget.
 2018-04-13 20:26:24 +02:00
lupoDharkael
5746a58582 Code refactor 
More flexible tool API
Minor code format fixes
Clipboard freeze fixed(?)
Arrow correcly growing close to the start point
Improve maintainability
Add undo/redo stack
 2018-04-10 15:33:08 +02:00