Commit Graph

141 Commits

Author SHA1 Message Date
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
e0333bb0ba Fixed issue where active tool could be nullptr 2021-03-03 14:38:05 -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
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
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
12e3c9eb39 Sync 'src' with Namecheap master 2021-02-20 13:19:07 +02:00
Yuriy Puchkov
161b2202a6 Custom color is always black 2021-02-19 19:13:08 +02:00
Yuriy Puchkov
8110970d8e fix after mergin - build ubuntu 18.04 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
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
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
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
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
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
7b4c409a86 fix - MacOS - Strange tool buttons position behaviour on capture screen
(cherry picked from commit 0dee55884b873d6ded139c39d665bb229481c7e2)
2021-02-16 12:34:45 -06:00
Yuriy Puchkov
ea5cf3e042 fix - Line starts from the different point after changing line color
(cherry picked from commit 208f930d4e9425db6c58abd8ffdb2cc0fb6c685a)
2021-02-16 12:34:45 -06:00
Jeremy Borgman
40bad756ad Added BypassWindowManagerHint back since it broke multimonitor support 2021-02-15 19:56:38 -06:00
Jeremy Fleischman
f482596c03 Add back missing call to resize
The call to `resize` is pretty important... without it, nothing shows up
on the screen when I run flameshot (presumably because it's 0 pixels by
0 pixels large). This was accidentally removed when resolving merge
  conflicts in 77c509e798.

While I was in here, I also opted to delete some comments. I personally
am never a fan of commenting out code: if we need something, that's what
Git is for! And, just in case GitHub disappears, I thought it would be
nice to record my research in a Git commit about why I think removing
`Qt::BypassWindowManagerHint` is ok. Comments copied from
https://github.com/flameshot-org/flameshot/pull/731):

> I played around with it [removing `Qt::BypassWindowManagerHint`] a bit
> and it has some really nice properties for me as a Xmonad X11 user:
>
>   - It resolves https://github.com/flameshot-org/flameshot/issues/784
>   - It also makes it possible for me to clearly see when flameshot has
>     focus, and give it focus, which I'd argue is a workaround/fix for
> https://github.com/flameshot-org/flameshot/issues/1072, and also has
> some nice properties as @filipkilibarda mentioned: "Allows the user to
> switch workspaces while in the screenshot GUI..."
>
> I did some git spelunking and here's the history of the current code:
>
> - c4d9210c35 is the first commit where
>   something like this showed up, but it used
> `Qt::X11BypassWindowManagerHint`, which is just [an alias for
> `Qt::BypassWindowManagerHint`](b75d60abd2/src/corelib/global/qnamespace.h (L247))
> - 0f30529c77 removed it (yay!)
> - 11b0e2db4b added in
>   `Qt::BypassWindowManagerHint` with somewhat cryptic message: "Capture
> window showing when mouse events are holded" message. I'm not sure what
> that means.
> - Later, this commit a9b0c21304 added a
>   `#ifdef Q_OS_WIN`  branch that made it so this
> `Qt::BypassWindowManagerHint` only happens on Linux, not Windows.
>
> So, since flameshot doesn't currently target OSX, I think this change
> only affects Linux. @borgmanJeremy if I did some investigation into how
> this behaves with other window managers (and maybe wayland?) would you
> be open to merging it up?
> https://github.com/flameshot-org/flameshot/pull/731#issuecomment-719767364
> for more information.

Later, I investigated how things behave on Linux with a non-tiling
window manager:

> I just installed xfce and tried this out, and as far as I can tell,
> things work great! During a screenshot, I can alt-tab to other windows
> and they end up on top of the ongoing screenshot, but I can click back
> on the screenshot to continue editing the screenshot (strangely, I
> cannot alt-tab back to the window). Keyboard shortcuts work as expected,
> and this feels like an improvement in every way, IMO.
2021-02-11 15:20:07 -06:00
Jeremy Borgman
f2f7d8739e Fixed formatting from PR 2021-02-11 09:48:23 -06:00
Filip Kilibarda
77c509e798 Disable Qt::BypassWindowManagerHint, workaround #583 #517 2021-02-11 09:48:23 -06:00
David Mitchell
c63b161025 Symmetric new selection (#1122)
* Move calls to update outside of each input case

* Remove redundant checks when moving selection

* Handle selection clipping the same for each mode

* Fix typo in SelectionWidget enum

* Obligatory "I forgot to clang-format" commit
2021-02-06 20:05:40 -06:00
David Mitchell
aee943af5d Implement selectAll and keyboard shortcut (#1106) 2021-02-06 20:01:45 -06:00
Mantas-2155X
5b665eb97a * Show update notification widget on current active screen, remove some OS dependant checks 2021-01-28 19:30:41 -06:00
Mantas-2155X
23746a07d9 * Check QT version only on Linux 2021-01-28 19:30:41 -06:00
Mantas-2155X
36c92e542f * Fix clang formatting 2021-01-28 19:30:41 -06:00
Mantas-2155X
a2a84ff764 * Fix build on Ubuntu 18.04 2021-01-28 19:30:41 -06:00
Mantas-2155X
7daca5ff90 * Show the Help Text, Tool Settings on the current active monitor 2021-01-28 19:30:41 -06:00
Jeremy Borgman
265e42c7b0 fixed issue with circle count undo redo 2021-01-22 19:11:00 -06:00
Jeremy Borgman
9581a698af resolved merge conflicts 2021-01-15 19:02:16 -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
Jeremy Borgman
76ad9e5a6f first pass at adding logging framework 2021-01-05 17:01:12 -06: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
784da1a652 Update to a new version notification 2020-12-11 15:00:11 +02:00
Yuriy Puchkov
6bd1f8c6a8 fix - ESC - press key twice to exit in the CaptureWidget 2020-12-08 16:33:30 +02:00
Yuriy Puchkov
9d968058dc fix - Touchpad - Change of the tool thickness in editor 2020-12-08 15:00:36 +02:00
Yuriy Puchkov
134239c6d4 fix - MacOS - Tool Settings (side panel) on retina or if primary and other display has different display sized 2020-12-04 12:02:44 +02:00
Yuriy Puchkov
b4be86068d fix - MacOS - Black screen when saving files with a hotkey 2020-12-03 16:18:30 +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
tiller
a0156be7b6 fixed placement issue on windows when multi-monitor setup 2020-10-31 20:00:20 -05:00
David Mitchell
9ac549d086 capturewidget refactor (#1114)
* Renaming methods for better file outline

* Moving redundant code into helper functions

* Combine implementation of move and resize

* Remove checks from move
2020-10-29 14:45:55 -05:00
Jeremy Fleischman
c5e9def59f Add a configurable keyboard shortcut to commit text.
This new shortcut defaults to `ctrl+enter`, and it commits the text
you're currently typing. It does *not* change the behavior of enter
(pressing enter still inserts a newline), nor does it actually exit
flameshot. This isn't exactly what was requested, but I'm going to
somewhat cavalierly say that this fixes
https://github.com/flameshot-org/flameshot/issues/812.

*Note: I added a new user-visible string here, but I didn't update any
ts files. Is that ok?
2020-10-28 07:55:46 -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
823ba6fc8b Founding dangling singal to uploader 2020-10-20 07:03:30 -05:00
Jeremy Borgman
62466d6581 Preparing for upstream merge 2020-10-20 06:53:59 -05:00
Yuriy Puchkov
8e92ea5ab4 Merge 0.8.3 upstream 2020-10-02 10:15:56 +03:00
Jeremy Borgman
931ac154e7 Fixed issue with ctrl s not saving text 2020-09-28 08:53:12 -05:00
33kk
8a962c25a1 Fix side panel button color 2020-09-28 08:51:22 -05:00
Yuriy Puchkov
9826558063 Fix issue of merge upstream repo to Namecheap one 2020-09-25 08:59:15 +03:00