benkyd/flameshot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
869 Commits 1 Branch 0 Tags
d0c8cea61fd7b5a58e0aa5a3d8b1997e329b0e98
Commit Graph

106 Commits

Author SHA1 Message Date
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
9826558063 Fix issue of merge upstream repo to Namecheap one 2020-09-25 08:59:15 +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
Yuriy Puchkov
b88a5fbce8 Code refactoring - change code style to the new clang-format rules 2020-09-23 15:25:13 +03:00
Yuriy Puchkov
1c67ad6345 Add ability to switch between s3 and imgur, add 'Latest uploads' to imgur 2020-09-22 11:23:31 +03:00
Yuriy Puchkov
d061290fb1 Add configurable shortcuts for drawing tools 2020-09-14 16:14:32 +03:00
Alex P
fa9ec7adba refactor CaptureButton and use CSS for side panel button 2020-09-13 15:00:42 -05:00
Alex Pantechovskis
5f2132f91e add sidepanel button to make UI more intuitive and accessible without keyboard (tablets, etc.) (#631) 
* add sidepanel toggle button and close button #613

* add side panel toggle button option

* make sidepanel button draggable
 2020-09-12 15:55:51 -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
f6e7ff4ff3 Merge branch 'master_nc' into feature/RND-598-flameshot-copy-file-path-not-url-on-saving-to-disk 2020-09-04 02:18:02 -07:00
Yuriy Puchkov
0fce7472fd Copy file path (not url) on saving to disk 2020-09-03 18:40:49 +03:00
Yuriy Puchkov
ee1f5fc029 Fix - Need to choose a file in directory selection widget in Path Default 2020-09-03 13:02:12 +03:00
Yuriy Puchkov
fc694a0ecb Welcome message update 2020-08-12 18:59:08 +03:00
Yuriy Puchkov
5e65bd6829 Make application startup notification configurable 2020-08-12 16:35:56 +03:00
Jeremy Borgman
dc77029cde Fixed most depratated warnings. 2020-07-13 15:02:18 -05:00
Yuriy Puchkov
efa7cb7983 Add default path configration for screenshots 2020-07-13 10:56:08 +03:00
Jeremy Borgman
f5013df306 First pass at converting from qmake to cmake. 2020-07-10 20:10:14 -05:00
Yuriy Puchkov
7e5b5a2775 Update message 'Close after capture' to 'Close application after capture', update russian translations 2020-07-01 18:42:20 +03:00
Joseph Charamut
dfde97e88e Merge branch 'master' of https://github.com/lupoDharkael/flameshot into save 2020-05-08 09:03:31 -04:00
teryanik
62dbabc341 Add option to auto copy URL after upload (#553) 2019-10-01 19:58:29 +02:00
Joseph Charamut
387adc3e35 Added newline at end of file 2019-05-01 13:23:53 -04:00
Joseph Charamut
d303c9dd62 Added feature & config to auto-save a screenshot after copying it 2019-05-01 13:23:43 -04:00
lupoDharkael
cbb4727786 Add option to close flameshot after every capture 2019-04-21 20:03:40 +02:00
greno4ka
7ee9a3f173 Fix problem with disabled tray icon (#495) 2019-04-18 13:41:08 +02:00
lupoDharkael
42619158fa Update copyright year 2019-03-04 16:38:45 +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
Boyuan Yang
ecdd3b2e45 Fix typo; Refresh translation; Update zh-CN translation (#267) 
* Fix typos found by codespell

* redotool: Mark description string as translatable

* Refresh translation; Update zh_CN translation again
 2018-07-07 14:23:24 +02:00
Danilo Egêa Gondolfo
df3958e43a Use defined(Q_OS_LINUX) || defined(Q_OS_UNIX) where applicable to support BSD OSs. (#264) 2018-07-01 13:45:49 +02:00
lupoDharkael
49227fac43 Solve cppcheck warnings 2018-05-26 18:38:06 +02:00
lupoDharkael
6adcfef413 Add color tools inside the capture editor 2018-05-16 23:02:30 +02:00
Alfredo Ramos
e69859dc72 Fix config export (#220) 
If the user presses the Cancel button using the QFileDialog::getSaveFileName() modal file dialog, it will return null string.

Adding this condition will prevent to show an error when trying to write to disk using an invalid filename.
 2018-05-13 23:46:16 +02:00
lupoDharkael
17ac6f7a35 Filename: replace colons with dashes 2018-04-23 17:09:19 +02:00
lupoDharkael
17a9000beb Define default tools 
Before this change all the tools were used in the editor, now
there is a list of tools enabled by default.
 2018-04-16 18:46:00 +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
lupoDharkael
f9fb7694e5 No keyboard focus in opacity slider 2018-04-05 20:37:54 +02:00
lupoDharkael
0e81c6b1f9 Fix #169: Unable to write file when exporting config 2018-03-18 13:15:09 +01:00
Gennadiy Chernyshyk
a289713cfe Remove unnecessary space symbol from one string in settings (#146) 2018-03-02 13:43:15 +01:00
lupoDharkael
cc8f697163 Improve folder organization 2018-01-30 15:23:44 +01:00
lupoDharkael
6e9a9bc69a Fix Qt5.3 build 2018-01-23 19:03:39 +01:00
lupoDharkael
ae9b8c062c Fast draw colors are now loaded from config 2018-01-23 18:58:19 +01:00
lupoDharkael
d721dcd560 Prefer prefer QVector over QList 2018-01-23 18:14:17 +01:00
lupoDharkael
e1bc6ba9c6 Start using #pragma once 2018-01-22 20:08:21 +01:00
lupoDharkael
69625f427b Show error msg after an unsuccessful config export 2018-01-20 17:58:44 +01:00
lupoDharkael
89ac281033 Fix whitespace consistency 2018-01-19 00:58:40 +01:00
lupoDharkael
1cc2161299 Fix config import with no selection 2018-01-18 18:45:58 +01:00
lupoDharkael
16a082c713 Fix MSVC warnings 2018-01-18 17:26:58 +01:00
lupoDharkael
05da137670 Minor code fixes 2018-01-18 17:16:34 +01:00