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

837 Commits

Author SHA1 Message Date
Yuriy Puchkov
2a138cf60f Update renames resouce for image flameshot.svg 2020-10-15 16:34:44 +03: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
Yuriy Puchkov
9eb1a7cb18 Fix - memory leaks 2020-10-15 13:36:12 +03:00
Jeremy Borgman
ce331924a4 organizing files 2020-10-14 11:08:12 -05:00
borgmanJeremy
f11073bc00 fixing icon regression (#1051) 
* fixing icon regression

* fixed symlink
 2020-10-12 08:40:35 -05:00
Yuriy Puchkov
f273a06d98 Remove unrequired includes 2020-10-12 13:48:32 +03:00
Yuriy Puchkov
5d9f8f002a Fix resource path for images 2020-10-12 13:38:41 +03:00
Yuriy Puchkov
f894b44f25 Get cache path for linux according to XDG standard 2020-10-12 12:51:04 +03: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
Yuriy Puchkov
a472648263 Fix - memory leaks 2020-10-11 20:41:25 +03:00
Ahmed Zetao Yang
ac7142c4df fix: correcting images name 2020-10-11 07:18:16 -05:00
borgmanJeremy
8ff94a95a8 Cleaned up flatpak build for flathub submission (#1040) 
* Cleaned up flatpak build for flathub submission. Fixed app-id and other assets to match dbus naming.

* fixed missing updates

* fixing build issues
 2020-10-10 13:04:19 -05:00
Ash Holland
c8767e7a1b Fix pixelation of small areas 2020-10-10 12:08:22 -05:00
Ash Holland
a2f845415c Improve pixelation of small areas 
Previously the level of pixelation would decrease if the selected area
was too thin to hold 10 pixelated blocks. Now the level of pixelation
only decreases when the selected area is too thin to hold even one
pixelated block.

This doesn't completely solve the issue of pixelation decreasing when
the area is thin, but it significantly improves the situation.
 2020-10-09 20:53:38 -05:00
Boyuan Yang
40629915f7 Explicitly hide tray icon before exit on Windows 
Currently flameshot tray icon will not disappear after program
terminates on Windows. This is a known issue and need to be
explicitly handled.

This commit connects the aboutToQuit signal to
QSystemTrayIcon::hide slot to ensure that the tray icon is
removed before program terminates.
 2020-10-06 19:50:22 -05:00
Yurii Puchkov
309651e4ec Merge pull request #52 from namecheap/feature/RND-656-flameshot-ability-to-lock-switching-between-s3-and-imgur-and-use-s3-only 
Ability to lock switching between s3 and imgur and use s3 only
 2020-10-06 06:59:37 -07:00
Yuriy Puchkov
59d533d9d6 Fix ubuntu 18.04 build 2020-10-06 16:30:35 +03:00
Yuriy Puchkov
0a31d2d94d Merge branch 'flameshot-org-master' into feature/RND-656-flameshot-ability-to-lock-switching-between-s3-and-imgur-and-use-s3-only 
# Conflicts:
#	data/translations/Internationalization_eu.ts
 2020-10-06 16:13:45 +03:00
Yuriy Puchkov
7d0d51efb5 Ability to lock switching between s3 and imgur and use s3 only 2020-10-06 16:11:33 +03: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
e22a3eeb1e Set option 'Launch at startup' true by default 2020-10-06 08:36:45 +03:00
Yuriy Puchkov
0b372b6a71 Update package.json information and fix typo 2020-10-05 10:03:27 +03:00
Porrumentzio
2bc3d82666 Updated Basque translation (#1027) 
* Added Basque translation

* Changed translation code from eu_ES to eu

* Updated Basque translation

* Modified CMakeLists.txt to fit the new Basque translation code
 2020-10-03 18:50:48 -05:00
Yuriy Puchkov
8e92ea5ab4 Merge 0.8.3 upstream 2020-10-02 10:15:56 +03:00
Yuriy Puchkov
51a9beeedd Fix - github CI/CD, SSL for Windows 2020-10-01 23:06:48 +03:00
Alex P
abdeee9a16 open imgur upload in screen center 2020-09-30 19:27:49 -05:00
Ahmed Zetao Yang
60c290c540 feat: update windows rc file 2020-09-30 10:58:48 -05:00
Ahmed Zetao Yang
4ab28d960c chore: use flameshot icon as tray notification icon 
* this need Qt >= 5.9, see https://doc.qt.io/qt-5.9/qsystemtrayicon.html#showMessage-1
 2020-09-30 10:58:48 -05:00
Jeremy Borgman
5292b894f2 Moved style override to after app creation 2020-09-30 10:58:33 -05:00
Yuriy Puchkov
24c55279d6 README for S3 storage 2020-09-29 15:31:04 +03:00
Jeremy Borgman
931ac154e7 Fixed issue with ctrl s not saving text 2020-09-28 08:53:12 -05:00
hexyoungs
ca57215172 refactor: remove duplicated code in PR#982 2020-09-28 08:52:33 -05:00
hexyoungs
37fa206df2 fix: #994 
fix wrong icon color caused by wrong mainColor
 2020-09-28 08:52:33 -05:00
hexyoungs
01bc618dcc refactor: ColorUtils::colorIsDark 
make it more clear
 2020-09-28 08:52:33 -05:00
hexyoungs
f2101a3296 fix: #994 2020-09-28 08:52:33 -05:00
33kk
8a962c25a1 Fix side panel button color 2020-09-28 08:51:22 -05:00
Yuriy Puchkov
e0523acafe S3 storage - amazon server side (no full documentation yet) 2020-09-28 16:20:05 +03:00
Yuriy Puchkov
fc86f473cd Update Ukrainian and Russian translations 2020-09-28 15:18:52 +03:00
Yuriy Puchkov
9f26384003 Set default storage based on config.ini file (s3 if creds exist otherwise imgur) 2020-09-28 11:04:58 +03:00
Jeremy Borgman
3d266834f7 Increased delay by 20% per feedback 2020-09-26 20:16:04 -05:00
Jeremy Borgman
8aa137b35c lowered hover delay to 0.5 s 2020-09-26 20:16:04 -05: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
Jeremy Borgman
f5d581c89f bolded font in circle 2020-09-25 08:36:25 -05:00
hexyoungs
ac038474ce feat: using luminance to determine text color 
of circlecounttool
 2020-09-25 08:14:00 -05: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
34bfe5a6c0 Code refactoring - remove configenterprise for s3 2020-09-25 10:50:46 +03:00
Yuriy Puchkov
9826558063 Fix issue of merge upstream repo to Namecheap one 2020-09-25 08:59:15 +03:00
Peter Cai
e1214e23e5 correct position of QScreen geometry on HiDPI multi-headed setup 2020-09-24 18:17:43 -05: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