Commit Graph

827 Commits

Author SHA1 Message Date
Haris Gušić
2b9b988f95 Fix broken copy on upload (#2246)
* Fix broken copy on upload

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Add translation

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>
2022-01-13 20:19:47 +01:00
Haris Gušić
c13270b7e5 Fix broken colorgrabber (#2226)
* Fix broken colorgrabber on macOS

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Fix ColorGrabWidget on Windows

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>
2022-01-10 16:38:24 -06:00
Haris Gušić
883e55c52d Fix flameshot not exiting when it should (#2223)
* Remove unused methods from Controller

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Fix flameshot exit bug

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Remove unnecessary code

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Some more refactoring

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>
2022-01-04 08:02:06 -06:00
borgmanJeremy
179f658cd8 Fixing issue with unicode chars in XDG_PICTURE location (#2222)
* Fixing issue with unicode chars in XDG_PICTURE location

* cleaned up
2022-01-03 14:32:38 -06:00
Yurii Puchkov
493e0d8801 fix - crash on Windows if "setSaveAsFileExtension" is defined in the configuration file (#2204)
Co-authored-by: Yuriy Puchkov <yuriy.puchkov@namecheap.com>
2021-12-30 10:37:07 -06:00
borgmanJeremy
fcadc02a29 Fix recursive static init (#2196)
* Removed default config for abstract logger that sends a system notification, also cleaned up a useless ifdef

* Send notifications from event loop on Win and Mac (#2197)

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

Co-authored-by: Haris Gušić <harisgusic.dev@gmail.com>
2021-12-28 08:43:17 -06:00
Haris Gušić
06eb7acdd3 Fix QLayout warning in 'flameshot config' (#2198)
Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>
2021-12-27 22:40:05 +01:00
borgmanJeremy
da5d71c23c Fixed an issue where the magnifier did not account for hiDPI on retina screens (#2187) 2021-12-24 14:36:39 -06:00
Haris Gušić
5c8a2b25bb Fix daemon persist bug and document instance() (#2185)
Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>
2021-12-23 15:07:24 -06:00
borgmanJeremy
960710206e fixing segfault on windows (#2180) 2021-12-22 11:24:40 -06:00
borgmanJeremy
ca70be773a remove SPD logging framework in favor of abstract logger (#2178) 2021-12-21 13:33:07 -06:00
Haris Gušić
36b3bd9639 Implement abstract logger (#2174)
* AbstractLogger base implementation

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Switch most system notifications to AbstractLogger

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Make CLI parser use AbstractLogger

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Fix annoying QPainter warning in QtColorWidgets

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Remove obsolete TODOs

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Fix failing windows build

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Add missing #include <cassert>

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>
2021-12-21 11:59:08 -06:00
Yurii Puchkov
c6bae91bd6 Automatically fix configuration file "flameshot.ini" (removes unused variables and groups) (#2169)
Co-authored-by: Yuriy Puchkov <yuriy.puchkov@namecheap.com>
2021-12-21 08:28:46 -06:00
Yurii Puchkov
bd4fc0047a Add option for using large color palette on right button click (#2171)
(cherry picked from commit 403a6474e7e8afeb7920fe39c8312481c21d0d1b)

Co-authored-by: Yuriy Puchkov <yuriy.puchkov@namecheap.com>
2021-12-21 08:27:13 -06:00
Yurii Puchkov
a9b56911f8 fix - reset the margin of the selected annotation on pin/save/copy/upload operations (#2170)
Co-authored-by: Yuriy Puchkov <yuriy.puchkov@namecheap.com>
2021-12-20 13:26:24 -06:00
borgmanJeremy
73d64e2987 fixed an issue with the invert tool on hidpi screens (#2153) 2021-12-10 11:43:21 -06:00
Haris Gušić
233c765b1f Reduce dependence on D-Bus (#2003)
* Handle captures without sigslots

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Set {app,organization}Name and version consistently

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Make 'full' dbus-free

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Move CaptureRequest::exportCapture to Controller

We need to wait until the upload widget (or similar widgets) have
finished before exiting. This must be done using a signal. The problem
is that CaptureRequest can't be guaranteed to survive until the widget
has finished what it's doing.

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Use QApplication with the 'full' subcommand

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Do unto 'screen' as we did to 'full'

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Add FlameshotDaemon singleton class

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Support clipboard hosting for both pixmaps and text

* Fix upload handling

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Do not show tray icon if not daemon

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Clean up handling of pin task

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Remove annoying Qt warning messages

The messages were caused by the color wheel.

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Fix small bug in Controller::exportCapture

* Fix --raw output

* Make 'gui' dbus-independent

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Fix accept on select bug

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Fix compile error on Windows

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Make it work on Windows

* Remove obsolete function in main.cpp

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Make 'launcher' work without dbus

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* clang-format, sigh

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Enable CLI parsing on MacOS

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Make 'config' work without dbus

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Small refactor of capture request handling

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Remove obsolete DBusUtils

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Remove unused D-Bus sigslots

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Remove D-Bus methods openConfig, autostartEnabled and trayIconEnabled

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Remove D-Bus method requestCapture

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Remove CaptureRequest id mechanism

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Fix 'launcher' crash

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Handle clipboard notifications properly

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Add 'autoCloseIdleDaemon' option

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Document FlameshotDaemon class

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Make 'flameshot gui' run in single-application mode

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Add `allowmultipleGuiInstances` config option

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Fix endless loop with multiple GUI instances

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Move upload confirmation dialog where it belongs

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Add the new config options to the GUI as well

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Fix failing build on Windows

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Handle persistence on MacOS

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* fixed notifications on macos

* Fixed display on macos

* Reformat tests/action_options.sh

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Fix infinite recursion in tests/action_options.sh

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

Co-authored-by: Dearsh Oberoi <59907159+deo002@users.noreply.github.com>
Co-authored-by: Jeremy Borgman <borgman.jeremy@pm.me>
2021-12-08 22:18:39 +01:00
Yurii Puchkov
203b5baab6 Added UploaderManager for further multiple Storage for images support (#2142)
Co-authored-by: Yuriy Puchkov <yuriy.puchkov@namecheap.com>
2021-12-07 17:19:32 -06:00
Haris Gušić
6d9768445f Fix screen grab error (#2139)
Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>
2021-12-02 17:30:57 -06:00
borgmanJeremy
ce336a6a70 Found some copy paste code and cleaned it up (#2124) 2021-11-30 10:09:55 -06:00
Vitaly Zaitsev
120ba0bac3 Always use native Wayland backend on KDE Plasma. (#2131)
This will fix issues with broken hotkeys with KDE Plasma on Wayland.

Partially reverts 5d66405ed0e0fb871c174b8c1dfffb4a4d48034e commit.

Signed-off-by: Vitaly Zaitsev <vitaly@easycoding.org>
2021-11-30 10:09:35 -06:00
borgmanJeremy
b8c0b74ea2 Qt5 deprications (#2076)
* working on removing deprecated warnings for Qt6 migration

* tewsting 18.04 fix
2021-11-21 14:40:56 -06:00
borgmanJeremy
8ab1ac0eaa Bumping Qt-Color-Widgets (#2052)
* Bumping Qt-Color-Widgets

* changing Qt Color Widget CMAKE setup
2021-11-20 20:44:58 -06:00
LHBosssss
2283b3e783 Enable Screenshot & Screenshot history shortcut changing in MACOS (#2098)
* Enable Screenshot & Screenshot history shortcut changing in MACOS
From issue #1259 and my experience, I've fix and test this feature in my Hackintosh. So now you can change shortcut to take screenshot and show screenshot history (require restart flameshot).
- Default key to take screenshot is "Cmd + Shift + X", screenshot history is "Option + Shift + X".
- Added new translate text "Require restart flameshot".

* - Change message text for screenshot shortcut

* - Format code using clang-format

Co-authored-by: adrienpixodeo <adrien@pixodeo.net>
2021-11-20 20:44:39 -06:00
borgmanJeremy
53cc11ac58 adjusted layout of side bar to center slider (#2093) 2021-11-19 18:47:39 -06:00
borgmanJeremy
f675123e0a working on monochrome icon (#2071)
* working on monochrome icon

* Update pipeline

* adjusted icns to be monochrome

* Added 1045 monochrome
2021-11-17 14:28:16 -06:00
Clayton
f25d58b6db Allows color form elements to wrap, sets minimum width to thickness s… (#2068)
* Allows color form elements to wrap, sets minimum width to thickness slider.

* Uses named constant variable for slider width
2021-11-15 11:40:14 -06:00
Jeremy Borgman
58e37b092c Resolved seg fault on MacOs due to macro'd out config 2021-11-13 21:38:45 -06:00
borgmanJeremy
e300141ff8 Fixed race condition with clipboard and system notification on upload (#2053) 2021-11-09 17:54:00 -06:00
Haris Gušić
6432490c31 Add --region option (#2013)
* Fix empty help message bug

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Add --region option

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Fix: initial selection even without --region

* Enable 'full --region'

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Enable 'screen --region'

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Allow negative width/height

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Fix screen intersection bug

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Change output format of --print-geometry

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>
2021-11-08 22:59:46 +01:00
Dearsh Oberoi
df5d99321a Added confirmation for Upload (#2037) 2021-11-08 13:33:50 -06:00
borgmanJeremy
445a4c68e8 Fixed Gnome File Extensions (#2047)
* Fixed Gnome File Extensions

* removed old comment
2021-11-05 13:35:30 -05:00
borgmanJeremy
5a0c5c389a Fix KDE Wayland Screenshots (#2045)
* testing wayland

* clang-format
2021-11-05 13:33:58 -05:00
borgmanJeremy
e4e7c90109 Gnome41 (#2035)
* testing new portal on gnome41

* applied clang format

* macro out portal API on windows
2021-11-03 08:01:19 -05:00
Sergey Zolotarev
065aa98ce4 Fix some compile warnings in macOS build (#2027)
* Fix some compile warnings in macOS build

* Update macOS Info.plist template
2021-11-01 09:59:51 +01:00
Haris Gušić
c3cde5ab2f Fix segfault in ConfigHandler (#2029)
Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>
2021-10-31 10:32:55 +01:00
borgmanJeremy
731b82a96d Changed initilization to remove deprecated warnings (#2023)
* Changed initilization to remove deprecated warnings

* fixing clang formate

* Need to do a Qt version check

* cleaned up formatting
2021-10-30 15:30:39 -05:00
Sergey Zolotarev
d5ac6e0efd Fix errors when generating flameshot.icons (#2026) 2021-10-30 21:28:51 +02:00
borgmanJeremy
9346da5e20 stdexcept is explicetly required when building on msvc compiler (#2022) 2021-10-29 14:42:39 -05:00
Michael Bryan
65f8ac0414 Save by writing to a QFile so we can capture the error message (#2012) 2021-10-27 12:06:35 +02:00
Dearsh Oberoi
de7eeb4d64 Right click to open panel and select tool (#2008)
* Right click to open panel and select tool

* Renamed slots
2021-10-27 10:40:32 +02:00
AdavisSnakes
2107ef38d0 Unnecessary share folder on windows (#1992) 2021-10-26 14:56:49 +02:00
Benja Appel
067f4a1914 Add default file extension configuration (#1995)
* Add default file extension configuration

* Format fix

* Implement ValueHandler for setSaveAsFileExtension

* Fix formatting issues

* Add format to properScreenshotPath call

* Fix SaveFileExtension::check

* Fix format

* Move extension layout to Save Path group
2021-10-25 19:24:46 +02:00
Haris Gušić
a487fb0257 Fix shortcut conflict when one is a default (#1989)
* Fix config checking on startup

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Handle conflicts when one shortcut is a default

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Fix bugs

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Refactor slot in ShortcutsWidget for consistency

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Update shortcut table on config file change

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Fix bounded int bug in config

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Revert changes manually

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Reimplement ConfigHandler::shortcut and setShortcut

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Handle Return/Numpad-Enter equivalently

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Re-enable user-configured Imgur upload shortcut

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Document copyAndCloseAfterUpload config option

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>
2021-10-24 16:48:30 +02:00
Mehrad Mahmoudian
08e532f787 Pin antialiasing option (#1997)
* adds a config option to toggle antialiasing for the pin zoom

* fix C++ scope error thanks for @veracioux

* set the default value of antialiasing of pin tool to be true

* fix the clang-format
2021-10-22 19:36:21 +02:00
Haris Gušić
988dcab9de Add --pin, --upload, --accept-on-select to CLI (#1970)
* Add --pin option

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Add --upload option

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Add --accept-on-select option

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Fix failing build on MacOS

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Clean up option variable names in main

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Remove missing --path error

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Add tests for action options

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Fix file extension config option

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Fix --print-geometry bug

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Replace Qt::endl with "\n"

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Fix copy/upload task clipboard conflict

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Fix endless loop when using --raw and --delay

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Fix bug in upload handling

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Show dialog after upload if --clipboard is set

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Fix failing build on Mac and Win

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>
2021-10-20 11:48:54 -05:00
Mehrad Mahmoudian
94ed574f35 Minor fix and modification on selectable tests in dialogs (#1990)
* makes text of the imgur upload selectable

* fix the mouse to I shape for selectable texts
2021-10-20 12:50:07 +02:00
Haris Gušić
534f05b238 Refactor tool size handling (#1969)
* Add ConfigHandler::toolSize and setToolSize

* Refactor thickness (now toolSize) in CaptureWidget

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Fix update of tool size while object is drawn

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Rename thickness to tool size across the board

Tool size is the generic term. Depending on the selected tool,
different specialized names are used. This has always been the case
in the config.

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Reorder circle count tool

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* clang-format

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>
2021-10-20 00:01:35 +02:00
Haris Gušić
b05b028861 Miscellaneous small fixes (#1972)
* m_captureWindow->activateWindow(), raise()

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Revert "m_captureWindow->activateWindow(), raise()"

This reverts commit 36320aa38a9584864a5fab32a2ce4872ff5ad072.

* screen --number: indicate 0-indexation

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Fix color update bug

Also refactored SidePanelWidget sigslots related to color change.

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Stop creating empty flameshot.conf file

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>
2021-10-17 17:38:16 +02:00
YizhePKU
7977cbb52c Fix autostart write path (#1979)
* Fix autostart write path (flameshot-org#1975)

* Fix formating
2021-10-16 14:17:02 +02:00