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

124 Commits

Author SHA1 Message Date
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
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
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
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
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
Jeremy Borgman
2c734a5479 fixed Mac cmake issue 2021-01-15 19:27:54 -06:00
Jeremy Borgman
9581a698af resolved merge conflicts 2021-01-15 19:02:16 -06:00
Jeremy Borgman
92b9379d69 Made changes after review of merge 2021-01-15 17:54:56 -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
fa096560b6 MacOS - On 2 and more displays notification disappears too quickly 2020-12-23 11:57:45 +02:00
Yuriy Puchkov
6576f0ae47 fix - ignore available updates by "less" instead of "not equal" 2020-12-18 16:46:26 +02:00
Yuriy Puchkov
2114ad3c32 fix - 'update version notification' widget position and event handler for Linux 2020-12-18 15:33:00 +02:00
Yuriy Puchkov
aee8a55292 fix - update version notification logic 2020-12-18 14:55:45 +02:00
Yuriy Puchkov
f735a9106d MacOS - Global shortcuts (add QHotkey license and remove unused files) 2020-12-17 13:11:29 +02:00
Yuriy Puchkov
162b864353 MacOS - Global shortcuts 2020-12-17 12:25:08 +02:00
Yuriy Puchkov
6ff18e74dd Get updates url from the current git remote 2020-12-14 08:39:09 +02:00
Yuriy Puchkov
47c99774ce Add timer for auto-checks for available updates (every 24 hours) 2020-12-11 17:50:53 +02:00
Yuriy Puchkov
784da1a652 Update to a new version notification 2020-12-11 15:00:11 +02:00
Yuriy Puchkov
84e4a9c9c6 MacOS - QSystemTrayIcon does not show context menu on primary screen on Catalina, on BigSur is ok and use native menu 2020-12-04 14:15:06 +02:00
Yuriy Puchkov
719719f36b MacOS and Win - fix tray menu 2020-12-03 15:11:02 +02:00
Yuriy Puchkov
c783b66672 MacOS - QSystemTrayIcon does not show context menu on primary screen 2020-12-02 17:45:12 +02:00
Yuriy Puchkov
2a3c368cf1 MacOS - Take test screenshot on start, MacOS will request a 'Screen Recording' permissions on the first run 2020-12-01 17:06:25 +02:00
Yuriy Puchkov
9e897289b6 Raise window to the top on MacOS 2020-12-01 13:25:36 +02:00
Yuriy Puchkov
69e698bdb1 Fix - MacOS - activate new widgets, swith to fullscreen mode+hotkeys 2020-11-24 10:08:12 -08:00
Yuriy Puchkov
293525f5b6 Fix - MacOS capture area, full screen mode, system tray area, etc 2020-11-24 07:39:51 -08:00
Jeremy Borgman
8211b6aff0 updated qtsingleapplication to v3.1.5 2020-10-31 20:05:06 -05: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
Jeremy Borgman
826165c527 removed close after capture 2020-10-25 21:25:10 -05:00
Yuriy Puchkov
5ea80b2ca2 Fix - update history widget on new capture 2020-10-16 15:04:17 +03:00
Yuriy Puchkov
0919d26145 Fix - call the same HistoryWidget object on Shortcut and from the Menu 2020-10-16 14:01:02 +03:00
Yuriy Puchkov
f9497ee2ea Fix - HistoryWidget is not updated if called by Shortcut 2020-10-16 13:22:32 +03:00
Yuriy Puchkov
161ecc3c04 Fix - HistoryWidget is not deleted in Controller 2020-10-16 10:19:38 +03:00
Yuriy Puchkov
8e25f438f2 Code refactoring - HistoryWidget, add clearHistoryLayout and loadHistory methods 2020-10-16 10:08:13 +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
Yuriy Puchkov
9eb1a7cb18 Fix - memory leaks 2020-10-15 13:36:12 +03:00
borgmanJeremy
f11073bc00 fixing icon regression (#1051) 
* fixing icon regression

* fixed symlink
 2020-10-12 08:40:35 -05: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
borgmanJeremy
8ff94a95a8 Cleaned up flatpak build for flathub submission (#1040) 
* Cleaned up flatpak build for flathub submission. Fixed app-id and other assets to match dbus naming.

* fixed missing updates

* fixing build issues
 2020-10-10 13:04:19 -05:00
Boyuan Yang
40629915f7 Explicitly hide tray icon before exit on Windows 
Currently flameshot tray icon will not disappear after program
terminates on Windows. This is a known issue and need to be
explicitly handled.

This commit connects the aboutToQuit signal to
QSystemTrayIcon::hide slot to ensure that the tray icon is
removed before program terminates.
 2020-10-06 19:50:22 -05:00
Yuriy Puchkov
8e92ea5ab4 Merge 0.8.3 upstream 2020-10-02 10:15:56 +03:00
Ahmed Zetao Yang
4ab28d960c chore: use flameshot icon as tray notification icon 
* this need Qt >= 5.9, see https://doc.qt.io/qt-5.9/qsystemtrayicon.html#showMessage-1
 2020-09-30 10:58:48 -05:00