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

810 Commits

Author SHA1 Message Date
Yurii Puchkov
203b5baab6 Added UploaderManager for further multiple Storage for images support (#2142) 
Co-authored-by: Yuriy Puchkov <yuriy.puchkov@namecheap.com>
 2021-12-07 17:19:32 -06:00
Haris Gušić
6d9768445f Fix screen grab error (#2139) 
Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>
 2021-12-02 17:30:57 -06:00
borgmanJeremy
ce336a6a70 Found some copy paste code and cleaned it up (#2124) 2021-11-30 10:09:55 -06:00
Vitaly Zaitsev
120ba0bac3 Always use native Wayland backend on KDE Plasma. (#2131) 
This will fix issues with broken hotkeys with KDE Plasma on Wayland.

Partially reverts 5d66405ed0e0fb871c174b8c1dfffb4a4d48034e commit.

Signed-off-by: Vitaly Zaitsev <vitaly@easycoding.org>
 2021-11-30 10:09:35 -06:00
borgmanJeremy
b8c0b74ea2 Qt5 deprications (#2076) 
* working on removing deprecated warnings for Qt6 migration

* tewsting 18.04 fix
 2021-11-21 14:40:56 -06:00
borgmanJeremy
8ab1ac0eaa Bumping Qt-Color-Widgets (#2052) 
* Bumping Qt-Color-Widgets

* changing Qt Color Widget CMAKE setup
 2021-11-20 20:44:58 -06:00
LHBosssss
2283b3e783 Enable Screenshot & Screenshot history shortcut changing in MACOS (#2098) 
* Enable Screenshot & Screenshot history shortcut changing in MACOS
From issue #1259 and my experience, I've fix and test this feature in my Hackintosh. So now you can change shortcut to take screenshot and show screenshot history (require restart flameshot).
- Default key to take screenshot is "Cmd + Shift + X", screenshot history is "Option + Shift + X".
- Added new translate text "Require restart flameshot".

* - Change message text for screenshot shortcut

* - Format code using clang-format

Co-authored-by: adrienpixodeo <adrien@pixodeo.net>
 2021-11-20 20:44:39 -06:00
borgmanJeremy
53cc11ac58 adjusted layout of side bar to center slider (#2093) 2021-11-19 18:47:39 -06:00
borgmanJeremy
f675123e0a working on monochrome icon (#2071) 
* working on monochrome icon

* Update pipeline

* adjusted icns to be monochrome

* Added 1045 monochrome
 2021-11-17 14:28:16 -06:00
Clayton
f25d58b6db Allows color form elements to wrap, sets minimum width to thickness s… (#2068) 
* Allows color form elements to wrap, sets minimum width to thickness slider.

* Uses named constant variable for slider width
 2021-11-15 11:40:14 -06:00
Jeremy Borgman
58e37b092c Resolved seg fault on MacOs due to macro'd out config 2021-11-13 21:38:45 -06:00
borgmanJeremy
e300141ff8 Fixed race condition with clipboard and system notification on upload (#2053) 2021-11-09 17:54:00 -06:00
Haris Gušić
6432490c31 Add --region option (#2013) 
* Fix empty help message bug

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

* Add --region option

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

* Fix: initial selection even without --region

* Enable 'full --region'

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

* Enable 'screen --region'

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

* Allow negative width/height

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

* Fix screen intersection bug

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

* Change output format of --print-geometry

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>
 2021-11-08 22:59:46 +01:00
Dearsh Oberoi
df5d99321a Added confirmation for Upload (#2037) 2021-11-08 13:33:50 -06:00
borgmanJeremy
445a4c68e8 Fixed Gnome File Extensions (#2047) 
* Fixed Gnome File Extensions

* removed old comment
 2021-11-05 13:35:30 -05:00
borgmanJeremy
5a0c5c389a Fix KDE Wayland Screenshots (#2045) 
* testing wayland

* clang-format
 2021-11-05 13:33:58 -05:00
borgmanJeremy
e4e7c90109 Gnome41 (#2035) 
* testing new portal on gnome41

* applied clang format

* macro out portal API on windows
 2021-11-03 08:01:19 -05:00
Sergey Zolotarev
065aa98ce4 Fix some compile warnings in macOS build (#2027) 
* Fix some compile warnings in macOS build

* Update macOS Info.plist template
 2021-11-01 09:59:51 +01:00
Haris Gušić
c3cde5ab2f Fix segfault in ConfigHandler (#2029) 
Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>
 2021-10-31 10:32:55 +01:00
borgmanJeremy
731b82a96d Changed initilization to remove deprecated warnings (#2023) 
* Changed initilization to remove deprecated warnings

* fixing clang formate

* Need to do a Qt version check

* cleaned up formatting
 2021-10-30 15:30:39 -05:00
Sergey Zolotarev
d5ac6e0efd Fix errors when generating flameshot.icons (#2026) 2021-10-30 21:28:51 +02:00
borgmanJeremy
9346da5e20 stdexcept is explicetly required when building on msvc compiler (#2022) 2021-10-29 14:42:39 -05:00
Michael Bryan
65f8ac0414 Save by writing to a QFile so we can capture the error message (#2012) 2021-10-27 12:06:35 +02:00
Dearsh Oberoi
de7eeb4d64 Right click to open panel and select tool (#2008) 
* Right click to open panel and select tool

* Renamed slots
 2021-10-27 10:40:32 +02:00
AdavisSnakes
2107ef38d0 Unnecessary share folder on windows (#1992) 2021-10-26 14:56:49 +02:00
Benja Appel
067f4a1914 Add default file extension configuration (#1995) 
* Add default file extension configuration

* Format fix

* Implement ValueHandler for setSaveAsFileExtension

* Fix formatting issues

* Add format to properScreenshotPath call

* Fix SaveFileExtension::check

* Fix format

* Move extension layout to Save Path group
 2021-10-25 19:24:46 +02:00
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
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
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ć
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