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

1533 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Haris Gušić
a487fb0257 Fix shortcut conflict when one is a default (#1989) 
* Fix config checking on startup

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Handle conflicts when one shortcut is a default

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Fix bugs

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Refactor slot in ShortcutsWidget for consistency

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Update shortcut table on config file change

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Fix bounded int bug in config

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Revert changes manually

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Reimplement ConfigHandler::shortcut and setShortcut

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Handle Return/Numpad-Enter equivalently

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Re-enable user-configured Imgur upload shortcut

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Document copyAndCloseAfterUpload config option

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>
 2021-10-24 16:48:30 +02:00
Mehrad Mahmoudian
08e532f787 Pin antialiasing option (#1997) 
* adds a config option to toggle antialiasing for the pin zoom

* fix C++ scope error thanks for @veracioux

* set the default value of antialiasing of pin tool to be true

* fix the clang-format
 2021-10-22 19:36:21 +02:00
Haris Gušić
988dcab9de Add --pin, --upload, --accept-on-select to CLI (#1970) 
* Add --pin option

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Add --upload option

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Add --accept-on-select option

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Fix failing build on MacOS

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Clean up option variable names in main

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Remove missing --path error

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Add tests for action options

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Fix file extension config option

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Fix --print-geometry bug

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Replace Qt::endl with "\n"

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Fix copy/upload task clipboard conflict

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Fix endless loop when using --raw and --delay

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Fix bug in upload handling

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Show dialog after upload if --clipboard is set

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Fix failing build on Mac and Win

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>
 2021-10-20 11:48:54 -05:00
Mehrad Mahmoudian
94ed574f35 Minor fix and modification on selectable tests in dialogs (#1990) 
* makes text of the imgur upload selectable

* fix the mouse to I shape for selectable texts
 2021-10-20 12:50:07 +02:00
Haris Gušić
534f05b238 Refactor tool size handling (#1969) 
* Add ConfigHandler::toolSize and setToolSize

* Refactor thickness (now toolSize) in CaptureWidget

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Fix update of tool size while object is drawn

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Rename thickness to tool size across the board

Tool size is the generic term. Depending on the selected tool,
different specialized names are used. This has always been the case
in the config.

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Reorder circle count tool

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* clang-format

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>
 2021-10-20 00:01:35 +02:00
borgmanJeremy
1b40e62b5b fixing MacOs version and documenting process (#1987) 2021-10-18 08:43:34 -05:00
Haris Gušić
b05b028861 Miscellaneous small fixes (#1972) 
* m_captureWindow->activateWindow(), raise()

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Revert "m_captureWindow->activateWindow(), raise()"

This reverts commit 36320aa38a9584864a5fab32a2ce4872ff5ad072.

* screen --number: indicate 0-indexation

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Fix color update bug

Also refactored SidePanelWidget sigslots related to color change.

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Stop creating empty flameshot.conf file

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>
 2021-10-17 17:38:16 +02:00
Weblate (bot)
f88c98b286 Translated using Weblate (German) (#1986) 
Currently translated at 100.0% (264 of 264 strings)

Translation: Flameshot/Flameshot
Translate-URL: https://hosted.weblate.org/projects/flameshot/flameshot/de/

Co-authored-by: Benjamin Schmid <ben@tolor.de>
 2021-10-17 09:44:54 -05:00
borgmanJeremy
62a21cbbb2 added gnome41 workaround (#1984) 2021-10-16 18:46:24 -05:00
YizhePKU
7977cbb52c Fix autostart write path (#1979) 
* Fix autostart write path (flameshot-org#1975)

* Fix formating
 2021-10-16 14:17:02 +02:00
Giancarlo França
d446f13cc8 Make text alignment buttons mutually exclusive (#1981) 2021-10-16 10:19:17 +02:00
Haris Gušić
dabc596566 Expand role of CaptureRequest and add Accept tool (#1955) 2021-10-12 22:49:41 +02:00
Haris Gušić
0854fa8b84 Change help message from static to a CaptureWidget attribute 
Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>
 2021-10-12 22:25:44 +02:00
Haris Gušić
4df2447b3e Show dyanamic panel shortcut in help message 
Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>
 2021-10-12 17:50:03 +02:00
Haris Gušić
0aa315908d Cleanup 
Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>
 2021-10-12 14:24:09 +02:00
Haris Gušić
5b815e83d3 Reappear help message when selection hidden 
Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>
 2021-10-12 13:35:57 +02:00
Haris Gušić
0b31fcf4cb Change ColorGrabWidget overlay message 
Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>
 2021-10-11 22:46:06 +02:00
Haris Gušić
6f132b77c6 Disappear OverlayMessage on select 
Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>
 2021-10-11 22:46:06 +02:00
Haris Gušić
d89fe10079 Change overlay message style 
Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>
 2021-10-11 22:46:00 +02:00
Haris Gušić
d17d200a28 Merge branch 'master' into capture_requests 
Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>
 2021-10-11 21:11:20 +02:00
Haris Gušić
82096a6301 Fix capture launched from system tray 
Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>
 2021-10-11 21:04:04 +02:00
Haris Gušić
0e43d4b36f Fix boundary bug with pixelate and invert tools (#1957) 
* Fix invert tool selection

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Fix pixelate tool

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>
 2021-10-10 20:32:00 -05:00
Haris Gušić
454e8f887a Workaround for focus problem (#1958) 
Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>
 2021-10-10 20:27:23 -05:00
Haris Gušić
1d334d372b Disable remaining action buttons when accept is active 
Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>
 2021-10-09 20:42:53 +02:00
Haris Gušić
b650231fa5 Improve tool object performance (#1954) 
* Update tool object thickness in real time

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Fix update when drawing with modifier key

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Rename updateToolMousePreview to updateTool

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Fix update bug when changing tool size

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>
 2021-10-08 15:24:27 -05:00
Haris Gušić
f0adfabd47 Fix failing builds 
Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>
 2021-10-08 22:08:35 +02:00
Haris Gušić
c59cd049b7 Add icon for accept tool 
Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>
 2021-10-08 19:11:23 +02:00
Haris Gušić
1e78d74e94 Fix Enter shortcut bug 
Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>
 2021-10-08 19:11:23 +02:00
Haris Gušić
73e6762e3d Remove redundant DBus methods 
NOTE: This breaks KDE shortcuts
 2021-10-08 19:11:22 +02:00
Haris Gušić
6d29e133d3 Remove irrelevant shortcut descriptions 
Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>
 2021-10-08 19:11:22 +02:00
Haris Gušić
1f2afebaa5 Add standardized OverlayMessage 
Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>
 2021-10-08 19:11:22 +02:00
Haris Gušić
5ee85ed5c0 Add requestCapture DBus call 
Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>
 2021-10-08 19:11:22 +02:00
Haris Gušić
f2c5641046 Remove irrelevant buttons 
Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>
 2021-10-08 19:11:22 +02:00
Haris Gušić
d39737fd46 Refactor CaptureTool::pressed and derivatives 
Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>
 2021-10-08 19:11:22 +02:00
Haris Gušić
151f6e35b4 Refactor CaptureRequest 
Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>
 2021-10-08 19:11:22 +02:00
Haris Gušić
60d2d8c33d Stop special treatment of some buttons 
Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>
 2021-10-08 19:11:22 +02:00
Haris Gušić
85352ff72f Add accept button to CaptureWidget 
Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>
 2021-10-08 19:11:22 +02:00
Haris Gušić
a96c3302e9 Add accept tool 
Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>
 2021-10-08 19:11:22 +02:00
borgmanJeremy
875192b465 Updating snap to core20 (#1951) 
Updated snap to core20 and latest KDE framework.
 2021-10-08 11:07:10 -05:00
Haris Gušić
fef7787011 Capture GUI refactor (#1939) 
* Merge CTB::ButtonType into CaptureTool::Type

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Remove configshortcuts.cpp which I forgot to do earlier

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Add activeButtonTool & activeButtonToolType in CaptureWidget

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Rename slots in CaptureTool for better mnemonics

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Fix move tool bug

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Refactor ShortcutsWidget::initButtons

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Move code from CaptureWidget to SelectionWidget: part 1

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Move code from CaptureWidget to SelectionWidget: part 2

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Move code from CaptureWidget to SelectionWidget: part 3

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Move code from CaptureWidget to SelectionWidget: part 4

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Add SelectionWidget::updateCursor

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Move code from CaptureWidget to SelectionWidget: part 5

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Refactor mouse events in CaptureWidget

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Overlay message update

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Replace connect/disconnect with blockSignals

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* updateIcon on button animation finished

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Remove CaptureWidget::selectAll

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Move moveLeft and similar to SelectionWidget

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Mark update calls for removal

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Specialize CaptureWidget update to affected rects

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Tune update of tool objects

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Remove redundant CaptureTool requests

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Improve performance of update in CaptureWidget

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Fix failing builds

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Fix failing builds again

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Fix undo/redo update

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Undo/redo update workaround

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Extend capture tool update rects

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Fix circle count tool update bug

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Add 'Left Double-Click' tooltip to copy button

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Improve ColorPicker performance

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>
 2021-10-08 11:04:06 -05:00
Mehrad Mahmoudian
9cdb8f9fb1 Kde shortcuts dbus2cmd (#1953) 
* changes the KDE shortcuts from dbus to commands

* fixes the file name to have the updated file name for KDE shortcuts

* fixes a grammatical mistake in README
 2021-10-08 09:26:35 -05:00
borgmanJeremy
7e1d596e46 Revert "working on updating to core20 (#1944)" (#1950) 
This reverts commit e632f0788d.
 2021-10-07 17:37:51 -05:00
borgmanJeremy
a45c2f0f5c fixed a clang-formatting issue that was created during a merge (#1948) 2021-10-07 17:34:56 -05:00
borgmanJeremy
e632f0788d working on updating to core20 (#1944) 
* working on updating to core20

* snap seems to work, need to update github actions and fix icon

* trying to enable experimental extensions

* fixed snap icon

* fixed gnome wayland issue
 2021-10-07 17:26:59 -05:00
GongHeng2017
c194d582bb Enhancement: add feature #1765 (#1812) 
* Enhancement: add feature #1765

Double click replace Ctrl+C.
When Double Clicked, Copy the Screen to Clipboard.

* Enhancement: add feature #1765

Double click replace Ctrl+C.
When Double Clicked, Copy the Screen to Clipboard.
 2021-10-07 12:07:57 -05:00
Leandro René Vallejos Puppo
1ba6108474 Translated using Weblate (Spanish) 
Currently translated at 100.0% (264 of 264 strings)

Translation: Flameshot/Flameshot
Translate-URL: https://hosted.weblate.org/projects/flameshot/flameshot/es/
 2021-10-07 10:39:04 -05:00
Mitchel Humpherys
c2ea8b6f61 Reduce max thickness (#1940) 
The thickness slider is fairly small, so it's difficult to make small
adjustments. The max value of the thickness slider is currently 100, which
is actually pretty huge.

Since most common use cases involve smaller pixel values (closer to the
0-10 range, I suspect), reduce the maximum slider value to 25, allowing for
easier fine grained control of the drawing thickness.

Although fine grained control is already possible via the scroll wheel,
this change improves the overall usability of the tool, especially for new
users who many not know that thickness can be adjusted with the scroll
wheel (or for users who don't have a scroll wheel).
 2021-10-06 19:50:54 -05:00
borgmanJeremy
0b777c4558 Added text alignment (#1892) 2021-10-06 13:23:54 -05:00
Pr. Sunflower
27e81bf14d Update 0000-Add-Opacity-slider.md 2021-10-06 13:00:36 -05:00
Pr. Sunflower
008aca81ab Update 0000-Add-Opacity-slider.md 2021-10-06 13:00:36 -05:00