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

155 Commits

Author SHA1 Message Date
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
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
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
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
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
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
Yuriy Puchkov
3649379a00 fix - Overview Shortcuts does not work properly #1339 2021-02-17 12:27:59 -06: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
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
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
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
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
c93c91e09f fix - reset configuration doesn't reset 'Save path' 
(cherry picked from commit aa26cda409b745ed2b585ad393591aa03d4813dd)
 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
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
Jeremy Borgman
73fe772b70 resolving merge conflicts 2021-01-08 10:19:53 -06:00
Yuriy Puchkov
d48d4299e2 fix - stretch to fit shortcuts table on the configuration window 2020-12-08 12:58:28 +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
50d5afed8f Read s3 creds for upload from URL in private network (VPN) 2020-11-18 17:57:15 +02:00
James LaChance
841b40a412 Read shortcut from m_settings in shortcuts widget 
Fixes #1111
 2020-10-29 12:16:43 -05:00
Yuriy Puchkov
1387072711 Fix - Remove localized names option for Month, day of week etc for Windows 2020-10-28 17:35:13 +02:00
Yuriy Puchkov
7e49d4e5eb Fix - Use fixed path for screenshots to save 2020-10-28 16:14:45 +02:00
Jeremy Borgman
8b51af2010 merging fixes from 0.8.x branch 2020-10-25 21:25:10 -05:00
Jeremy Borgman
826165c527 removed close after capture 2020-10-25 21:25:10 -05:00
Jeremy Borgman
62466d6581 Preparing for upstream merge 2020-10-20 06:53:59 -05:00
Yuriy Puchkov
3c5ff1d29c Code refactoring - Cleanup code 2020-10-16 10:41:51 +03:00
Yuriy Puchkov
2a138cf60f Update renames resouce for image flameshot.svg 2020-10-15 16:34:44 +03:00
Yuriy Puchkov
654455e9ac Merge branch 'flameshot-org-master' into merge-from-upstream 
# Conflicts:
#	.github/workflows/Linux-pack.yml
#	CMakeLists.txt
#	appveyor.yml
#	data/graphics.qrc
#	src/tools/imgur/imguruploader.cpp
 2020-10-15 15:44:49 +03:00
borgmanJeremy
f11073bc00 fixing icon regression (#1051) 
* fixing icon regression

* fixed symlink
 2020-10-12 08:40:35 -05:00
Yuriy Puchkov
5d9f8f002a Fix resource path for images 2020-10-12 13:38:41 +03:00
Yuriy Puchkov
c92f8e3014 Merge branch 'flameshot-org-master' into bugfix/memory-leak 
# Conflicts:
#	.github/workflows/Linux-pack.yml
#	CMakeLists.txt
#	data/graphics.qrc
#	src/config/configwindow.cpp
#	src/tools/imgur/imguruploader.cpp
 2020-10-11 20:49:15 +03:00
Yuriy Puchkov
a472648263 Fix - memory leaks 2020-10-11 20:41:25 +03:00
Ahmed Zetao Yang
ac7142c4df fix: correcting images name 2020-10-11 07:18:16 -05:00
Yurii Puchkov
309651e4ec Merge pull request #52 from namecheap/feature/RND-656-flameshot-ability-to-lock-switching-between-s3-and-imgur-and-use-s3-only 
Ability to lock switching between s3 and imgur and use s3 only
 2020-10-06 06:59:37 -07:00
Yuriy Puchkov
7d0d51efb5 Ability to lock switching between s3 and imgur and use s3 only 2020-10-06 16:11:33 +03:00
Yuriy Puchkov
8848b25305 Join two similar options 'Save path' and 'Save default path for screenshots' 2020-10-06 14:10:32 +03:00
Yuriy Puchkov
8e92ea5ab4 Merge 0.8.3 upstream 2020-10-02 10:15:56 +03:00
Jeremy Borgman
3d266834f7 Increased delay by 20% per feedback 2020-09-26 20:16:04 -05:00
Jeremy Borgman
8aa137b35c lowered hover delay to 0.5 s 2020-09-26 20:16:04 -05:00
Yuriy Puchkov
819c365f85 Move storage upload configuration to separate tab, later it can be uses for a plugin manager 2020-09-25 18:32:21 +03:00
Yuriy Puchkov
d0c8cea61f Move storage upload configuration to separate tab, later it can be uses for a plugin manager 2020-09-25 15:08:14 +03:00