Commit Graph

17 Commits

Author SHA1 Message Date
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
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
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
James LaChance
841b40a412 Read shortcut from m_settings in shortcuts widget
Fixes #1111
2020-10-29 12:16:43 -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
5d9f8f002a Fix resource path for images 2020-10-12 13:38:41 +03:00
Yuriy Puchkov
a472648263 Fix - memory leaks 2020-10-11 20:41:25 +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
Yuriy Puchkov
b88a5fbce8 Code refactoring - change code style to the new clang-format rules 2020-09-23 15:25:13 +03:00
Yuriy Puchkov
d061290fb1 Add configurable shortcuts for drawing tools 2020-09-14 16:14:32 +03:00