fergalmoran/flameshot
1
0
Fork 0
mirror of https://github.com/fergalmoran/flameshot.git synced 2026-02-14 22:44:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,227 Commits 1 Branch 0 Tags
9797ae39b2bfcf83a76a63c2794277fb522fd072
Commit Graph

194 Commits

Author SHA1 Message Date
borgmanJeremy
9797ae39b2 Merge pull request #1360 from namecheap/bugfix/nc_custom-color-is-always-black 
Custom color is always black
 2021-02-19 12:46:11 -06:00
Yuriy Puchkov
161b2202a6 Custom color is always black 2021-02-19 19:13:08 +02:00
Jeremy Borgman
ba0432a1b5 fixed glitch with autostart checkboux 2021-02-18 20:11:04 -06:00
Yuriy Puchkov
d3e6191bb5 fix - Reset configuration in the General tab resets general settings only 
(cherry picked from commit 59c84bb57bbf6c4e663662ca6e2f18eabe019f4e)
 2021-02-18 16:44:14 +02:00
Yuriy Puchkov
757ca29a85 fix - Reset configuration in the General tab resets general settings only 
(cherry picked from commit 59c84bb57bbf6c4e663662ca6e2f18eabe019f4e)

# Conflicts:
#	src/utils/confighandler.cpp
 2021-02-18 16:44:02 +02:00
borgmanJeremy
70609548ca Merge pull request #1342 from yamanq/yamanq/custom_color 
Allow setting custom color picker in userColors
 2021-02-18 08:19:14 -06:00
Yaman Qalieh
3514c3cd82 Allow setting custom color picker in userColors 2021-02-17 14:11:33 -05:00
Yuriy Puchkov
894556d681 Code refactoring - remove Q_OS_MAC64 (is not required, is covered by Q_OS_DARWIN) 
(cherry picked from commit e511b521cec6edd9f77916c6ee753329326a5f91)
 2021-02-17 18:46:12 +02:00
Yuriy Puchkov
ebdb3743dd Code refactoring - remove Q_OS_MAC64 (is not required, is covered by Q_OS_DARWIN) 
(cherry picked from commit e511b521cec6edd9f77916c6ee753329326a5f91)
 2021-02-17 18:46:12 +02:00
Yuriy Puchkov
a5cd4cd1bc Code refactoring - remove Q_OS_MACX (is not required, is covered by Q_OS_DARWIN) 
(cherry picked from commit 00b9aae5266aaffb9a01a6f689e1829ae8218bdc)
 2021-02-17 18:46:12 +02:00
Yuriy Puchkov
dd54d028a1 Code refactoring - remove Q_OS_MACX (is not required, is covered by Q_OS_DARWIN) 
(cherry picked from commit 00b9aae5266aaffb9a01a6f689e1829ae8218bdc)
 2021-02-17 18:46:12 +02:00
Yuriy Puchkov
296bed0491 Code refactoring - remove Q_OS_MAC (deprecated synonym for Q_OS_DARWIN) 
(cherry picked from commit aff1649670aa5ba64f2927933a29c62b06fee21f)
 2021-02-17 18:46:12 +02:00
Yuriy Puchkov
a893fdfc75 Code refactoring - remove Q_OS_MAC (deprecated synonym for Q_OS_DARWIN) 
(cherry picked from commit aff1649670aa5ba64f2927933a29c62b06fee21f)
 2021-02-17 18:46:12 +02:00
Yuriy Puchkov
dc7f62ab8d Fix - MacOS - get currentScreen on the edge bottom and right returns nullptr and application crashes 
(cherry picked from commit 01ae74fbed34849db485db53ffbdf4a938ebea8e)
 2021-02-17 18:46:12 +02:00
Yuriy Puchkov
74f5ded7db MacOS - Selected area remains on the screen after saving capture (one more attempt to fix not reproducible bug on my laptop) 
(cherry picked from commit 75e34746fcbc2819e88a54cc4a18e5df36d5e4f0)
 2021-02-17 18:46:12 +02:00
Yuriy Puchkov
7088cc9e2c Confirmation for screenshot remove from the latest uploads and server 
(cherry picked from commit f480cfb53a690328b639c4e0c0f2ab42666c7cc3)
 2021-02-17 18:46:12 +02:00
Yuriy Puchkov
540e407eb7 Add option to disable feature for checking for a new update 
(cherry picked from commit d26dd55dba066aa4884b00b55173597f49309f0d)
 2021-02-17 18:46:12 +02:00
Yuriy Puchkov
595454af5c fix - disable PrtScr button in the hotkeys configuration window because it is not supported on the linux now 
(cherry picked from commit 1e33441ce3f9fe54ff0c98d528724641d1c74ce9)
 2021-02-17 18:46:12 +02:00
Yuriy Puchkov
4ab66411b1 Code refactoring - clang-format 2021-02-16 12:34:45 -06:00
Yuriy Puchkov
5c3e63d30d fix - MacOS - startup (login items) feature 
(cherry picked from commit 97ac0b1da4a3340da8019c7736b99fe5cd9274e5)
 2021-02-16 12:34:45 -06:00
Jeremy Borgman
be730cf29c Fixed bug related to save path 2021-02-15 20:17:42 -06:00
Jeremy Borgman
381985afbb Handle exception when locales are not properly configured 2021-02-15 08:07:31 -06:00
David Mitchell
aee943af5d Implement selectAll and keyboard shortcut (#1106) 2021-02-06 20:01:45 -06:00
Jeremy Borgman
013c0f1169 fixed issue with mime data on clipboard for jpeg 2021-02-06 19:50:19 -06:00
nullobsi
ddf69010d8 code formatting 2021-02-02 19:22:05 -06:00
nullobsi
799c4c9908 use device pixel ratio on screenshot to properly draw the image 2021-02-02 19:22:05 -06:00
nullobsi
b4ba730732 disconnect object when done 2021-02-02 19:22:05 -06:00
nullobsi
4c23d2e45d properly exit event loop 2021-02-02 19:22:05 -06:00
nullobsi
7a18dc096a preliminary support for sway/wlroots compositors 2021-02-02 19:22:05 -06:00
Jeremy Borgman
2ee76addbd Minor tweaks after code review 2021-02-01 19:57:43 -06:00
Sonu Lohani
a944860d12 Add config for jpg/png when copy 2021-02-01 19:57:43 -06:00
Sonu Lohani
b121c6c72b Fix clang format 2021-02-01 19:57:43 -06:00
Sonu Lohani
8f058f98f3 JPG for clipboard 2021-02-01 19:57:43 -06:00
Jeremy Borgman
9581a698af resolved merge conflicts 2021-01-15 19:02:16 -06:00
brimston3
7f55d0c672 Simplify canonical path generation slightly 2021-01-15 12:49:33 -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
Yuriy Puchkov
6300672828 fix - MacOS - no notification in tray on image upload, save to clipboard and other notifications 2020-12-17 15:02:22 +02:00
Yuriy Puchkov
162b864353 MacOS - Global shortcuts 2020-12-17 12:25:08 +02:00
Yuriy Puchkov
784da1a652 Update to a new version notification 2020-12-11 15:00:11 +02:00
Yuriy Puchkov
7e09b818c7 fix - MacOS - In shortcuts: Ctrl now is Cmd while Ctrl is Meta 2020-12-08 11:38:35 +02:00
Yuriy Puchkov
2e7d4431ce MacOS - disable CaptureToolButton 2020-12-03 12:03:51 +02:00
Yuriy Puchkov
293525f5b6 Fix - MacOS capture area, full screen mode, system tray area, etc 2020-11-24 07:39:51 -08:00
Yuriy Puchkov
50d5afed8f Read s3 creds for upload from URL in private network (VPN) 2020-11-18 17:57:15 +02:00
Jeremy Borgman
8211b6aff0 updated qtsingleapplication to v3.1.5 2020-10-31 20:05:06 -05:00
Jeremy Fleischman
f814e2d6b8 Look up the autostart directory using QT's helper methods. 
This fixes https://github.com/flameshot-org/flameshot/issues/928.
 2020-10-29 12:19:52 -05:00
Yuriy Puchkov
7e49d4e5eb Fix - Use fixed path for screenshots to save 2020-10-28 16:14:45 +02: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
Yuriy Puchkov
babbbb8f9b Make preview files on the local disk for the 'Latest uploads' smaller 2020-10-28 11:53:18 +02: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