fergalmoran/flameshot
1
0
Fork 0
mirror of https://github.com/fergalmoran/flameshot.git synced 2026-02-18 08:24:25 +00:00
Code Issues Packages Projects Releases Wiki Activity
876 Commits 1 Branch 0 Tags
51a9beeedd462ee1bcb0a426417e9d0cd8fea01e
Commit Graph

448 Commits

Author SHA1 Message Date
Yuriy Puchkov
51a9beeedd Fix - github CI/CD, SSL for Windows 2020-10-01 23:06:48 +03:00
Yuriy Puchkov
24c55279d6 README for S3 storage 2020-09-29 15:31:04 +03: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
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
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
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
Yuriy Puchkov
54907d2e0b Code refactoring - create base class ImgUploaderTool for different storages 2020-09-22 19:27:32 +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
Jeremy Borgman
c56bb78cf3 Added preview to circle counter and auto adjust circle count font color. 2020-09-20 12:38:33 -05:00
Jeremy Borgman
7715bdeb29 adjusted to only open one window for the launcher 2020-09-18 10:38:59 -05:00
Jeremy Borgman
2722899a46 working on fixing 2020-09-18 10:38:59 -05:00
MD Zaid
2d8ad0d516 Added missing Dependency, Fixed spelling mistake in a comment 
=>qttools5-dev is also required on ubuntu 20.04 (tested on pop os 20.04), so added it in
  README.md under build instructions
=> Fixed spelling mistake in a comment in src/widgets/capture/capturewidget.cpp.
 2020-09-18 07:01:54 -05:00
Alex P
4dc94379c7 fix side panel height on stacked multi-monitor setup 
Not sure what was the purpose of this resize, I think it can be useful only in non-fullscreen mode (currently available only for debugging)
 2020-09-16 06:38:00 -05:00
Yuriy Puchkov
471b25e6a8 Code Refactoring for s3 and imgur storages, create base class for both 2020-09-16 14:34:27 +03:00
Jeremy Borgman
460e30c2ce reworked pixelate to simplier method provided by @kpcee and used old blur effect when pixelate kernel < 1 2020-09-15 07:43:53 -05:00
Jeremy Borgman
6b4565cac6 Fixed visual glitch with circle count undo, rescale circle text to fit circle, set minimum circle count size 2020-09-14 15:08:24 -05:00
Jeremy Borgman
5b8d0eeca5 Moved circle count to fit in with other tools 2020-09-14 08:37:10 -05: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 P
3514345b68 fix text config buttons color 
the check was incorrect, it is windowTEXT, not background
 2020-09-13 15:00:24 -05:00
Alex P
69b4afa394 fix text config width in side panel (was adding hor. scroll) 2020-09-13 15:00:24 -05:00
Alexander Kapshuna
23ae6c1579 Add zsh completion support 
Both bash and zsh completions could be supported using single file.
 2020-09-13 10:45:29 -05:00
Jeremy Borgman
d72d1e6ad9 Quick fix for qclipboard / dbus lockup issue 2020-09-13 10:23:28 -05:00
Boyuan Yang
f18f186b46 Fix windows build badge and typos 
* Drop qmake build-dependency from CI, they should not be installed
  since we have switched to CMake.
* Update README.md badges to reflect recent Windows CI updates.
* Set doc badge to point to flameshot.org website.
* Fix a typo in src/CMakeLists.txt.
 2020-09-13 09:22:37 -05:00
Ahmed Zetao Yang
53a9d44c46 Windows packaging & merge two workflow yaml files (#898) 
* chore: add win setup assets & using CPack

* chore: add windows packaging & merge the previous cmake-windows.yml into build_cmake.yml
 2020-09-13 07:49:04 -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
borgmanJeremy
c3c5bd2501 Merge pull request #889 from ZetaoYang/master 
Translations update & fix
 2020-09-11 19:34:41 -05:00
Jeremy Borgman
e5813d2230 Fixed memory leak and enabled sanatizers 2020-09-11 11:38:35 -05:00
Ahmed Zetao Yang
daf74afa8c fix: the language code should be underscore '_' not '-' 2020-09-11 23:42:19 +08:00
Ahmed Zetao Yang
f34d050e2b chore: update cmakelists.txt due to some translations changes 2020-09-11 23:17:33 +08: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
1662744a66 Merged various translation PRs and regenerated ts files 2020-09-09 19:23:04 -05:00
seamus-45
8da962c418 fix a typo in contrastUiColor 2020-09-09 08:04:57 -05:00
Jeremy Borgman
3bd7aa79b8 Fix count when the redo tool is called with circle counter 2020-09-08 20:26:52 -05:00
Jeremy Borgman
6afa3ca26a Made undo tool aware of circle count to decrement. Refactored tool ID's to be enum 2020-09-08 11:36:30 -05:00
Jeremy Borgman
ed4ea1377b Changed menu item to match window title 2020-09-08 11:30:44 -05:00
Ahmed Zetao Yang
961ce5f732 fix: add opensuse support & correct appstream metainfo xml 
- support opensuse leap >= 15.0
- correct appstream metainfo xml name & its content, see https://www.freedesktop.org/software/appstream/docs/chap-Quickstart.html#sect-Quickstart-DesktopApps
 2020-09-08 11:13:27 -05:00
Yuriy Puchkov
3f708f3160 Add more colors and custom color item 2020-09-08 12:09:04 +03:00
borgmanJeremy
a4f7423967 Fixed dbus name (#859) 
* Fixed dbus name

* Fixed formatting
 2020-09-07 16:11:32 -05:00
borgmanJeremy
ff6d4587e8 Cmake needs to install flameshot.appdata.xml (#857) 
* Cmake needs to install flameshot.appdata.xml

* fixing rpm
 2020-09-07 16:03:21 -05:00
borgmanJeremy
60ef3f3e6f changed dbus naming to match github organization (#856) 
* changed dbus naming to match github organization

* Fixed formatting
 2020-09-07 15:09:57 -05:00
Boyuan Yang
18f18ce7ef Fix D-Bus activation name 
Originally the App uses org.dharkael.Flameshot in D-Bus.
Since we have moved the project under organization, the
name we are using now should be org.flameshot.Flameshot.
This need to be kept unified across the whole project.

This fixes D-Bus invocation problem and should fixes: #850 .
 2020-09-07 11:16:03 -05:00