Commit Graph

51 Commits

Author SHA1 Message Date
Jeremy Borgman
be730cf29c Fixed bug related to save path 2021-02-15 20:17:42 -06:00
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
Jeremy Borgman
73fe772b70 resolving merge conflicts 2021-01-08 10:19:53 -06:00
Yuriy Puchkov
7e49d4e5eb Fix - Use fixed path for screenshots to save 2020-10-28 16:14:45 +02:00
Jeremy Borgman
8b51af2010 merging fixes from 0.8.x branch 2020-10-25 21:25:10 -05:00
Jeremy Borgman
826165c527 removed close after capture 2020-10-25 21:25:10 -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
819c365f85 Move storage upload configuration to separate tab, later it can be uses for a plugin manager 2020-09-25 18:32:21 +03:00
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
1c67ad6345 Add ability to switch between s3 and imgur, add 'Latest uploads' to imgur 2020-09-22 11:23:31 +03: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
Yuriy Puchkov
0fce7472fd Copy file path (not url) on saving to disk 2020-09-03 18:40:49 +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
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
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
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
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
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
02865322bf Update copyright 2018-01-12 17:58:30 +01:00
lupoDharkael
2932e5930d Add configurable transparency
Now the opacity of the area outside the selection in the graphical
capture is configurable.
2017-12-31 17:46:26 +01:00
lupoDharkael
749b73cbb6 Add autostart option 2017-12-30 14:35:22 +01:00
lupoDharkael
77aa604127 Remove dbus from Windows build 2017-12-26 02:00:07 +01:00
lupoDharkael
3482228aaa Group config file exporting buttons 2017-12-16 19:29:02 +01:00
lupoDharkael
0214b7f557 Add configuration import, export and reset 2017-12-15 23:11:38 +01:00
lupoDharkael
924d467c53 general cleanup
-use of the override keyword
-delete unused code
-const correctness
-more uniform code style
-for each with const references when possible
-getters no longer use the word 'get'
-others
2017-08-09 13:20:07 +02:00
lupoDharkael
3daeab9b66 Add minor visual improvements to the menu widgets 2017-08-01 13:21:39 +02:00
lupoDharkael
162bd5f543 Add update values slot for config widget 2017-07-31 01:00:14 +02:00
lupoDharkael
e94ef2bd3b Add graphical option to disable the trayicon 2017-07-28 23:58:40 +02:00
lupoDharkael
346607bc34 Redesign of the config menu 2017-07-23 17:13:35 +02:00
lupoDharkael
d4e7c63cb4 Big code refactor
The design was defective and I didn't expect the popularity of the project. After these changes the code will be more mantainable and understandable.

Among the changes we can see:
- A better code structure
- Decoupled button widget from its logic
- More code reuse
- Easier way to add buttons
- Specialized classes
2017-07-19 09:49:24 +02:00
lupoDharkael
b1c86b9ba8 Add option to disable notifications in desktop 2017-06-14 19:52:29 +02:00
lupoDharkael
d78836fb2e Improve the Gnome's UX 2017-06-08 16:07:48 +02:00