fergalmoran/flameshot
1
0
Fork 0
mirror of https://github.com/fergalmoran/flameshot.git synced 2026-01-24 20:27:03 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,122 Commits 1 Branch 0 Tags
2ee76addbdff2511ce1a7912725818751cf5df0d
Commit Graph

34 Commits

Author SHA1 Message Date
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
Sonu Lohani
b121c6c72b Fix clang format 2021-02-01 19:57:43 -06:00
Sonu Lohani
8f058f98f3 JPG for clipboard 2021-02-01 19:57:43 -06:00
Jeremy Borgman
9581a698af resolved merge conflicts 2021-01-15 19:02:16 -06:00
brimston3
7f55d0c672 Simplify canonical path generation slightly 2021-01-15 12:49:33 -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
Yuriy Puchkov
7e49d4e5eb Fix - Use fixed path for screenshots to save 2020-10-28 16:14:45 +02: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
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
Ahmed Zetao Yang
ac7142c4df fix: correcting images name 2020-10-11 07:18:16 -05: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
fc86f473cd Update Ukrainian and Russian translations 2020-09-28 15:18:52 +03:00
Yuriy Puchkov
d4d3b9eae0 Merge branch 'master-flameshotorg' into master_nc_merge_upstream 
# Conflicts:
#	.travis.yml
#	appveyor.yml
#	data/graphics.qrc
#	data/img/app/keyboard.svg
#	data/img/material/black/delete.png
#	data/img/material/black/delete.svg
#	data/img/material/black/filepath.svg
#	data/img/material/black/shortcut.svg
#	data/img/material/white/filepath.svg
#	data/img/material/white/shortcut.svg
#	data/translations/Internationalization_hu.ts
#	data/translations/Internationalization_ka.ts
#	external/Qt-Color-Widgets/src/color_wheel.cpp
#	external/singleapplication/singleapplication.cpp
#	flameshot.pro
#	src/cli/commandlineparser.cpp
#	src/config/buttonlistview.cpp
#	src/config/configwindow.cpp
#	src/config/configwindow.h
#	src/config/geneneralconf.cpp
#	src/config/geneneralconf.h
#	src/config/uicoloreditor.cpp
#	src/config/uicoloreditor.h
#	src/core/controller.cpp
#	src/core/globalshortcutfilter.cpp
#	src/main.cpp
#	src/third-party/Qt-Color-Widgets/src/color_utils.cpp
#	src/tools/abstractactiontool.h
#	src/tools/abstractpathtool.h
#	src/tools/arrow/arrowtool.cpp
#	src/tools/arrow/arrowtool.h
#	src/tools/blur/blurtool.cpp
#	src/tools/capturetool.h
#	src/tools/circle/circletool.cpp
#	src/tools/circle/circletool.h
#	src/tools/copy/copytool.cpp
#	src/tools/copy/copytool.h
#	src/tools/exit/exittool.cpp
#	src/tools/exit/exittool.h
#	src/tools/imgur/imguruploader.cpp
#	src/tools/launcher/applaunchertool.cpp
#	src/tools/launcher/applaunchertool.h
#	src/tools/launcher/applauncherwidget.cpp
#	src/tools/launcher/openwithprogram.cpp
#	src/tools/line/linetool.cpp
#	src/tools/line/linetool.h
#	src/tools/marker/markertool.cpp
#	src/tools/marker/markertool.h
#	src/tools/move/movetool.cpp
#	src/tools/pencil/penciltool.cpp
#	src/tools/pencil/penciltool.h
#	src/tools/pin/pintool.cpp
#	src/tools/pin/pintool.h
#	src/tools/pin/pinwidget.cpp
#	src/tools/pixelate/pixelatetool.h
#	src/tools/rectangle/rectangletool.cpp
#	src/tools/rectangle/rectangletool.h
#	src/tools/redo/redotool.cpp
#	src/tools/redo/redotool.h
#	src/tools/save/savetool.cpp
#	src/tools/save/savetool.h
#	src/tools/selection/selectiontool.cpp
#	src/tools/selection/selectiontool.h
#	src/tools/sizeindicator/sizeindicatortool.cpp
#	src/tools/sizeindicator/sizeindicatortool.h
#	src/tools/storage/imgur/imguruploader.h
#	src/tools/storage/imgur/imguruploadertool.cpp
#	src/tools/storage/imgur/imguruploadertool.h
#	src/tools/text/textconfig.cpp
#	src/tools/text/texttool.cpp
#	src/tools/text/texttool.h
#	src/tools/toolfactory.cpp
#	src/tools/toolfactory.h
#	src/tools/undo/undotool.cpp
#	src/tools/undo/undotool.h
#	src/utils/confighandler.cpp
#	src/utils/confighandler.h
#	src/utils/dbusutils.cpp
#	src/utils/screenshotsaver.cpp
#	src/utils/screenshotsaver.h
#	src/widgets/capture/buttonhandler.cpp
#	src/widgets/capture/buttonhandler.h
#	src/widgets/capture/capturebutton.cpp
#	src/widgets/capture/capturebutton.h
#	src/widgets/capture/capturewidget.cpp
#	src/widgets/capture/capturewidget.h
#	src/widgets/capture/colorpicker.cpp
#	src/widgets/capturelauncher.cpp
#	src/widgets/infowindow.cpp
#	src/widgets/infowindow.h
#	src/widgets/panel/sidepanelwidget.cpp
#	src/widgets/panel/utilitypanel.cpp
#	src/widgets/panel/utilitypanel.h
#	translations/Internationalization_ca.ts
#	translations/Internationalization_de_DE.ts
#	translations/Internationalization_es.ts
#	translations/Internationalization_fr.ts
#	translations/Internationalization_ja.ts
#	translations/Internationalization_nl.ts
#	translations/Internationalization_pl.ts
#	translations/Internationalization_pt_br.ts
#	translations/Internationalization_ru.ts
#	translations/Internationalization_sk.ts
#	translations/Internationalization_sr.ts
#	translations/Internationalization_tr.ts
#	translations/Internationalization_uk.ts
#	translations/Internationalization_zh_CN.ts
#	translations/Internationalization_zh_TW.ts
 2020-09-24 18:52:49 +03:00
Jeremy Borgman
0d5386edd4 Changed clang format to new agreement 2020-09-24 07:53:28 -05:00
Boyuan Yang
2d1d664a57 Remove a trailing space; update translation files 2020-09-23 12:50:43 -05:00
Yuriy Puchkov
b88a5fbce8 Code refactoring - change code style to the new clang-format rules 2020-09-23 15:25:13 +03:00
Jeremy Borgman
d72d1e6ad9 Quick fix for qclipboard / dbus lockup issue 2020-09-13 10:23:28 -05:00
Jeremy Borgman
9bc4ea5700 Fixed it so a notification is always sent when saved to clipboard 2020-09-10 10:36:50 -05:00
Jeremy Borgman
72f52ac3ed Fixed merge conflicts 2020-09-09 19:58:32 -05:00
Jeremy Borgman
c8d15205be reformatted to Mozilla code style 2020-09-04 20:40:45 -05:00
Yurii Puchkov
5c32a9c4a1 Merge branch 'master_nc' into feature/RND-597-flameshot-save-to-the-default-path-without-confirmation 2020-09-04 02:37:08 -07:00
Yuriy Puchkov
0fce7472fd Copy file path (not url) on saving to disk 2020-09-03 18:40:49 +03:00
Yuriy Puchkov
a4d09186d5 Save to the default path without confirmation 2020-09-03 17:26:32 +03:00
Joseph Charamut
93b03ee8f1 Disable extra notification with save-after-copy 2020-02-05 23:14:43 -05:00
Joseph Charamut
d303c9dd62 Added feature & config to auto-save a screenshot after copying it 2019-05-01 13:23:43 -04:00
Magnus Groß
5174f8dc1b Allow notification to be dragged and dropped (#473) 
* Set x-kde-urls for notifications

The x-kde-urls field in the hints map allows us to provide a direct URL
to the saved screenshot. The notification server may then use this hint
to provide extra functionality, such as drag and drop support and
thumbnails.

For more information see https://community.kde.org/Plasma/Notifications#File_Path

Fixes #256

Note that other notification servers may ignore this hint.

* Avoid branching twice for ok
 2019-03-20 22:41:55 +01:00
lupoDharkael
42619158fa Update copyright year 2019-03-04 16:38:45 +01:00
Pavel Makarenko
8887b4e7ce Add support for more images formats (#436) 
* Add support for more images formats

* Resolves extension verifying  in case of empty save path string

* Code formatting
 2019-01-30 15:37:56 +01:00
Alfredo Ramos
ee2f583acd Fix some issues detected by Clazy (#384) 
* Fix old style connect

* Fix unneeded QString memory allocations
 2018-10-24 01:04:42 +02:00
Alfredo Ramos
d09580b873 Optimize and use SVG images where possible (#281) 
SVG images have been optimized with svgo, this will slightly reduce package size though the main reason for this was to remove unneeded markup.

Image paths have been changed and merged, now the directory tree looks like this:

img
├── app
├── material
│   ├── black
│   └── white
└── preview

The reason to merge the paths is to avoid duplicate files for buttons and configuration.

SVG icons are used by default now, PNG images have not been deleted from the images directory, but they were deleted from the graphics.qrc resource file.

All image paths were updated accordingly, except in the tray icon, I could not make it work using the SVG image.
 2018-07-24 00:43:01 +02:00
Alfredo Ramos
9748ae015e Fix image file saving (#279) 
This change ensures that the file name contains the PNG extension.

Currently the screenshots are saved as PNG only, so this only checks if the absolute path contains .png, it does not check the file suffix (QFileInfo).

Fixes #278
 2018-07-23 11:15:39 +02:00
lupoDharkael
5746a58582 Code refactor 
More flexible tool API
Minor code format fixes
Clipboard freeze fixed(?)
Arrow correcly growing close to the start point
Improve maintainability
Add undo/redo stack
 2018-04-10 15:33:08 +02:00