fergalmoran/flameshot
1
0
Fork 0
mirror of https://github.com/fergalmoran/flameshot.git synced 2026-02-04 09:37:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,326 Commits 1 Branch 0 Tags
ecfd13aa1cfb3f8cbca4ebf76e4045efa5d31636
Commit Graph

694 Commits

Author SHA1 Message Date
Jeremy Borgman
7cbc1f076f restructured so clipboard actions happen after copy 2021-04-02 12:36:07 -05:00
Jeremy Borgman
1779a88bb5 refreshed translations after weblate contributions 2021-03-31 09:20:58 -05:00
Marko
ba5b52c95e Make latest uploads max size configurable. Make latest uploads window resizeable 2021-03-31 08:39:21 -05:00
Jeremy Borgman
a2a866669f Moved check to a more reasonable place, fixed issue where the api check could still happen from a constructor 2021-03-17 11:14:08 -05:00
Jeremy Borgman
b3aa917bb0 Dont query github api if check for updates is disabled 2021-03-17 11:14:08 -05:00
Jeremy Borgman
748e152c95 testing appveyor change 2021-03-15 17:50:30 -05:00
Jeremy Borgman
ba461a0c25 Fixed bug where color in color picker was not updated properly 2021-03-15 12:56:36 -05:00
Jeremy Borgman
9af391b2e9 force flameshot icon on info popup 2021-03-15 08:14:12 -05:00
hl10105210
c3e86e7d13 bugfix: issues #1434 2021-03-13 13:24:43 -06:00
Boyuan Yang
2079666d83 Add flameshot(1) man page 2021-03-11 14:49:10 -06:00
nullobsi
33928d45bd clang-format 2021-03-08 11:07:59 -06:00
nullobsi
cb13ebc625 fix windows build 2021-03-08 11:07:59 -06:00
nullobsi
31f997aceb fix XDG desktop check 2021-03-08 11:07:59 -06:00
nullobsi
743f17dd2e clang-format 2021-03-08 11:07:48 -06:00
nullobsi
a3b0cad881 fix compatibility fot Qt < 5.11 2021-03-08 11:07:48 -06:00
nullobsi
6b3e551ce6 use unique token & subscribe to signal before calling screenshot 2021-03-08 11:07:48 -06:00
Jeremy Borgman
e5f2257831 Fixed issue with upload hotkey. It was classified with the wrong set of hotkeys 2021-03-04 12:19:52 -06:00
Jeremy Borgman
b531d2e0e8 fixed minor bug in testing 2021-03-04 07:38:36 -06:00
Martin-Eckleben
1bf75693dd Fixing commit for merging. This is a new feature to add a gui button for 
chaging the global thickness.
 2021-03-04 07:38:36 -06:00
Jeremy Borgman
0401bf08ea Fixed issue with copying url. This issue always occurs in places clipboard actions happen ahead of notifications 2021-03-03 19:53:47 -06:00
Jeremy Borgman
e0333bb0ba Fixed issue where active tool could be nullptr 2021-03-03 14:38:05 -06:00
Jeremy Borgman
01a3b809f3 Added copyright info 2021-03-03 14:37:50 -06:00
Jeremy Borgman
0f69244c0f fixing windows build issues 2021-03-03 14:37:50 -06:00
Jeremy Borgman
f7e8d34c82 Added strf validation 2021-03-03 14:37:50 -06:00
Yuriy Puchkov
f54538ee1e Code refactoring - ScreenGrabber: 'screen' has been explicitly marked deprecated 
(cherry picked from commit 9ffb3fff8cd7ee679070f9e4bfb931b88c960ff6)
 2021-03-01 13:14:12 -06:00
Yuriy Puchkov
93dcc43af3 Code refactoring - CaptureWidget: 'screenGeometry' is deprecated 
(cherry picked from commit 6adf0b053f41003314b59b8f2e472cd56a280b23)
 2021-03-01 13:14:12 -06:00
Yuriy Puchkov
d3140a9ad6 QPixmap use the other overload which returns QPixmap by-value 
(cherry picked from commit 65ff17441628e20c4890f806d02f53647b9e1277)
 2021-03-01 13:14:12 -06:00
Yuriy Puchkov
a5c68a6f5b Code refactoring - Deprecated drawRoundRect->drawRoundedRect 
(cherry picked from commit 51079a3940527b59306d1324f86fe7fe0816d96a)
 2021-03-01 13:14:12 -06:00
Yuriy Puchkov
4c93876b32 Deprecated QPalette::foreground() Use QPalette::windowText() instead 
(cherry picked from commit 8c30246ef36199a32309b8d706163de8bc7b6944)
 2021-03-01 13:14:12 -06:00
Yuriy Puchkov
d32ed7704b fix - File name pattern editor 'Clear' and 'Reset' behavior (configuration window) 
(cherry picked from commit 116c807f166841e1ba2745e32ae1ef5fd7f25276)
 2021-02-26 09:21:19 +02:00
Yuriy Puchkov
1c5dbb3c9e Reset button doesn't reset configurations to the initial values 
(cherry picked from commit 3cc8e1bc1e6c59917169941c97ea87021e7c268f)
 2021-02-26 09:21:08 +02:00
Yuriy Puchkov
a64b9803d7 fix - MacOS - Image is not copied to the clipboard when the 'Use JPG format for clipboard' checkbox is set 
(cherry picked from commit 802d8bc3dfd2644d264938b4fc1e0adbc39d110b)
 2021-02-26 09:20:57 +02:00
Yuriy Puchkov
a1d3ec0147 fix - 'Launch at startup feature' doesn't work after uncheck/check in the Configuration window 
(cherry picked from commit 2d3b02b462300a3de24f2d4115086b5ae7c7bd46)
 2021-02-26 09:20:48 +02:00
Jeremy Borgman
acb9a08e2c removed loop that occured when screenshot failed to save. 2021-02-25 10:33:03 -06:00
Yuriy Puchkov
e3b1d55fd8 fix - 'Show tray icon' checkbox is automatically unchecked when checking some other checkboxes 
(cherry picked from commit 3803f6725d3d7f95f36299a65557f5bfb2d15f2a)
 2021-02-24 17:32:05 +02:00
Yuriy Puchkov
b699bdd4ca fix - MacOS - Tool Settings on secondary display is at strange position 
(cherry picked from commit 672af784c5a459b5bcb617cf4a858edc98de9173)
 2021-02-23 15:23:28 +02:00
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