fergalmoran/flameshot
1
0
Fork 0
mirror of https://github.com/fergalmoran/flameshot.git synced 2026-02-08 03:23:58 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,246 Commits 1 Branch 0 Tags
f47fe57e4e266eb2c0d2e96f0f8fd31258d70e05
Commit Graph

658 Commits

Author SHA1 Message Date
Boyuan Yang
fe7affa7f8 tools: pin: pintool.h,cpp: Convert to unix fileending 
Since pintool.h and pintool.cpp were using \r\n instead of \n,
this commit fixes that and use \n only.
 2021-02-20 19:26:30 -05:00
Boyuan Yang
a9c7cc7b04 Use SPDX-License-Identifier 
closes: #1374 .

Use SPDX short-form identifiers instead of lengthy copyright
header to document per-file license and copyright.

This commit updates all files under src/ directory where applicable
as well as org.flameshot.Flameshot.metainfo.xml.
 2021-02-20 19:22:53 -05:00
borgmanJeremy
7c3c075a56 Merge pull request #1365 from namecheap/merge_full_nc_to_upstream 
Merge full nc to upstream
 2021-02-20 12:52:48 -06:00
Boyuan Yang
ee2ef05178 Do not include QHotKey header on non-Mac system 
QHotKey is only used on macOS. As a result, do not unconditionally
include QHotKey headers.
 2021-02-20 08:01:02 -05:00
Yuriy Puchkov
12e3c9eb39 Sync 'src' with Namecheap master 2021-02-20 13:19:07 +02:00
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
borgmanJeremy
16fd3b2915 Merge pull request #1354 from namecheap/bugfix/nc_tray 
fix - Hide/show tray icon makes duplicates in the tray menu
 2021-02-18 19:19:07 -06:00
Yuriy Puchkov
cb02578a9e fix - Hide/show tray icon makes duplicates in the tray menu 
(cherry picked from commit 93e3a125be3602f2fd95d02fb0e11f11b1f059be)
 2021-02-18 18:51:33 +02: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
Yurii Puchkov
3179e6d3c8 Merge branch 'master' into nc_0_8_5_10 2021-02-18 08:45:57 +02:00
Yuriy Puchkov
90351b2f1d Code refactoring - clang-format 2021-02-18 08:43:07 +02:00
Yuriy Puchkov
637832b572 fix - merge conflict for hotkeys ShortcutsWidget 2021-02-18 08:41:28 +02:00
Yaman Qalieh
3514c3cd82 Allow setting custom color picker in userColors 2021-02-17 14:11:33 -05:00
Yuriy Puchkov
3649379a00 fix - Overview Shortcuts does not work properly #1339 2021-02-17 12:27:59 -06:00
Yuriy Puchkov
abba420186 fix - Copy URL after upload doesn't work 2021-02-17 18:46:12 +02:00
Yuriy Puchkov
8110970d8e fix after mergin - build ubuntu 18.04 2021-02-17 18:46:12 +02:00
Yuriy Puchkov
45f8752188 fix after mergin - CMakeLists.txt for MacOS 2021-02-17 18:46:12 +02:00
Yuriy Puchkov
3b9fb6aeca fix after merging - Open Url & Copy Url in the history, delete question in the history 2021-02-17 18:46:12 +02: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
d4706b3096 Code refactoring - move QHotKey from /src/core to the /external 
(cherry picked from commit a71de9d5643be4ec2803b2d60c7fb858586b2bee)
 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
0425be7a44 Remove possibility of the infinitive loop on screen capture and remove activeModalWidget check on screen capture for MacOS 
(cherry picked from commit afaed07ae9b3c729e6082cc6b325aeca1dc08436)
 2021-02-17 18:46:12 +02:00
Yuriy Puchkov
3973c2f38d Remove possibility of the infinitive loop on screen capture and remove activeModalWidget check on screen capture for MacOS 
(cherry picked from commit 305e054c9c97e47e092ad974a683cdf5753ab4a9)
 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
1ad6f9ff74 Add a few additional check on initializing trayMenu, possibly they will fix rare issue with frozen application on MacOS 
(cherry picked from commit bf5741a9145659e9fc5489f26a62c9757b824abe)
 2021-02-17 18:46:12 +02:00
Yuriy Puchkov
ecb88380a6 MacOS - Catalina - Tray icon and menu bar stays on screen when taking screenshot 
(cherry picked from commit 517d34d2231da99d238149688ebddc254f35be98)
 2021-02-17 18:46:12 +02:00
Yuriy Puchkov
94f0aecf81 Grab color returns black color 
(cherry picked from commit aa2e236c7dcf882205701ea00c4fed7cfbf7c0c2)
 2021-02-17 18:46:12 +02:00
Yuriy Puchkov
93fcced53d Localization update (Ukrainian and Russian) 
(cherry picked from commit 70ef2a4725ec97f8cb30504a1286b852c8e6b47e)
 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
de3b0385d5 Code refactoring - rename "GeneneralConf" class to "GeneralConf" (fix missprint) 
(cherry picked from commit e2756a28b16d62ec6612aa7a14a40385438eacf1)
 2021-02-17 18:46:12 +02:00
Yuriy Puchkov
7bdbfc5546 fix - MacOS - Sometimes selected area remains on the screen after saving capture 
(cherry picked from commit a38825d16338bbd96d326188513164e81bfe7b60)
 2021-02-17 18:46:12 +02:00
Yuriy Puchkov
c3ee36f809 fix - MacOS - Take screenshot option sometimes doesn't work (because of Mission Control feature) 
(cherry picked from commit fdb086a5eb3106200fe4eb751eaa6d641ede25c4)
 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
48d312b8df fix - Opacity settings resets to default after changing in the configurations if you click on slider (not dragging) 
(cherry picked from commit 17a956c03c7245cecd0f7d84bccdc715d6e82bbd)
 2021-02-17 18:46:12 +02:00
Yuriy Puchkov
6707f15c31 fix - Cannot set 'Save Path' 
(cherry picked from commit de0155abda8cea9b048e6f5aa7587d4f57d96a63)
 2021-02-17 18:46:12 +02:00
Yuriy Puchkov
8f5f656347 fix - MacOS - Pin on retina 
(cherry picked from commit 6e6025740d3c512c4f30d48681b42f997104d367)
 2021-02-17 18:46:12 +02:00
Yuriy Puchkov
05633bf7f7 fix - If retina display is at the right side (display arrangement) it joins ToolButtons on capture widget into one on retina if you have more than 3 displays in the row 
(cherry picked from commit e9ae7501a7eed552bd35b5755792864d55454e2e)
 2021-02-17 18:46:12 +02:00
Yuriy Puchkov
24f02a6dc2 fix - Ubuntu - Broken Flameshot icon in the taskbar with pinned image 
(cherry picked from commit 18722f5b29dde05f22d0a88b7e2251f81a06ca00)
 2021-02-17 18:46:12 +02:00
Yuriy Puchkov
4cfa25b966 fix - MacOS - Grabbed color differs from the clicked area 
(cherry picked from commit 850d7f1df3c8a3fa9aa3db7beaba242abe78a855)
 2021-02-17 18:46:12 +02:00
Jeremy Borgman
911652e5eb Fixed issue with undo and rounded rectangles 2021-02-17 07:27:38 -06:00