fergalmoran/flameshot
1
0
Fork 0
mirror of https://github.com/fergalmoran/flameshot.git synced 2026-01-25 04:37:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
913 Commits 1 Branch 0 Tags
da6d2b91a4917cab2400a545aac7fa66145b8aa2
Commit Graph

56 Commits

Author SHA1 Message Date
Yuriy Puchkov
8e92ea5ab4 Merge 0.8.3 upstream 2020-10-02 10:15:56 +03:00
Ahmed Zetao Yang
60c290c540 feat: update windows rc file 2020-09-30 10:58:48 -05:00
Jeremy Borgman
ecfaa2359b Fixed readme 2020-09-28 19:33:36 -05:00
Martin-Eckleben
d349cb5f9d black and white plus and minus icons 2020-09-28 19:02:19 -05:00
Tiago Rinaldi
938bf8815d Add Brazilian portuguese translation 2020-09-28 19:01:15 -05:00
Jeremy Borgman
ceb51a90bd Added releasing info for 0.8.3 2020-09-28 09:24:35 -05: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
991da44968 Fixed snap on ubuntu 20.04 (needed unity7) -S 2020-09-27 18:57:45 -05:00
pafri
9df7c45d62 Update Internationalization_cs.ts 2020-09-27 10:14:36 -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
Jose Riha
2cbccc3d0a Update Slovak translation (#971) 2020-09-24 07:52:59 -05:00
borgmanJeremy
58b09bf259 bumped version for 0.8.1 patch release (#968) 
* bumped versio for 0.8.1 patch release

* Updated debian log and bumped windows version

* bumped CI version

* Applied patch by @hosiet
 2020-09-23 19:57:12 -05:00
Boyuan Yang
2d1d664a57 Remove a trailing space; update translation files 2020-09-23 12:50:43 -05:00
Ahmed Zetao Yang
def8ce21bb Enable deb packaging for ubuntu 18.04 (#959) 
* chore: update rpm packaging dependencies version

* chore: update debian dependencies version & changelog

* chore: enable deb packaging for ubuntu 18.04
 2020-09-23 08:02:51 -05:00
Jeremy Borgman
1b2d704b21 Cleaned up snap and changed confinement settings 2020-09-18 11:01:22 -05:00
Boyuan Yang
ab65c22db2 data/debian: Prepare for 0.8.0 release 
Files under data/debian/ directory are updated to be prepared for
flameshot 0.8.0 release.
 2020-09-14 19:53:13 -05:00
Ahmed Zetao Yang
7a8853def7 fix: flatpak enhancement 
* add network support
* add device=dri for wayland
* add notification access
* system Tray Icon
 2020-09-14 08:45:00 -05:00
Daniel Napora
7a82c1f271 Polish translation update 2020-09-14 07:56:31 -05:00
Boyuan Yang
74c48975d3 Update zh_CN translation again 
This commit really finishes zh_CN translation for 0.8.0 release.
The translation for .desktop file action is also updated.
 2020-09-13 20:07:25 -05:00
Alex P
66ca154245 update Russian translation 2020-09-13 11:28:11 -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
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
Ahmed Zetao Yang
daf74afa8c fix: the language code should be underscore '_' not '-' 2020-09-11 23:42:19 +08:00
Ahmed Zetao Yang
ebf82cbf70 chore: add Dutch (Netherlands) translations 
- help @pollekepol to submit this commit
 2020-09-11 23:14:03 +08:00
Ahmed Zetao Yang
953ab5e84e fix: make the suffixes of translations follow ISO Language Code Table standard 
- see https://github.com/flameshot-org/translation-instruction/blob/master/ISO_Language_Code_Table.md
 2020-09-11 23:11:16 +08:00
Jeremy Borgman
1662744a66 Merged various translation PRs and regenerated ts files 2020-09-09 19:23:04 -05:00
martin-thomas-tm
cb9c646f2c Fix some typos in french translation 
Fix some typos (like "Imposible" ou "Boutton") and use "infinitif" for verbs to be consistent.
 2020-09-09 19:23:04 -05:00
Alex P
b0e081bed9 update Russian translation 2020-09-09 19:23:04 -05:00
luz.paz
5358d124f5 Add Czech translation 
Closes #596
 2020-09-09 19:23:04 -05:00
Boyuan Yang
2e0ffec4fa Refresh zh_CN translation 2020-09-09 10:37:00 -05:00
Ahmed Zetao Yang
4b0740cb52 feat: add snap & update flatpak manifest yaml 
- snap from https://github.com/flameshot-org/packages/tree/master/snap and I update the build tools and dependencies
 2020-09-08 11:13:27 -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
Porrumentzio
86d19324d1 Added Basque translation (#865) 
Added Basque translation
 2020-09-08 11:12:21 +02:00
Daniel Schaefer
dea3c7bb87 dbus/org.dharkael.Flameshot.xml: Mark id as uint 
In src/core/flameshotdbusadapter.h the id is marked as uint.
All other types in the xml are correct.
 2020-09-07 19:33:10 -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
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
Ahmed Zetao Yang
e76aca0d8a fix: update rpm spec file 2020-09-07 10:06:03 -05:00
borgmanJeremy
4ec100dade Merge pull request #846 from sheepjin99/master 
Enable Korean translation
 2020-09-07 07:30:13 -05:00
Martin Eckleben
9f530fdfae added translation for CLI --help output (#839) 
* added translation for CLI --help output

* improved formatting with clang-format
 2020-09-07 07:28:43 -05:00
RieL
a5ec75180c Merge branch 'master' of https://github.com/sheepjin99/flameshot 2020-09-07 13:02:16 +09:00
RieL
49e45b30db Delete Internationalization_kr.ts 2020-09-07 13:01:33 +09:00
RieL
c5de313624 Enable Korean translation 
1. Changed Qt Linguist language code from kr to ko
2. Enabled Korean translation by editing src/CMakeList.txt

It worked well on manjaro linux 18.0 with Korean translated.
 2020-09-07 12:52:38 +09:00
Yangjin Cho
a8055c8488 Add Korean translation (#834) 
* Add Korean Translation

Created Internationalization_kr.ts

* Update Internationalization_kr.ts

* Update Internationalization_kr.ts
 2020-09-06 14:52:00 -05:00
Yangjin Cho
30f9bb7be6 Update Internationalization_kr.ts 2020-09-06 20:35:41 +09:00
Yangjin Cho
c192f849c5 Update Internationalization_kr.ts 2020-09-06 20:35:10 +09:00
RieL
0872b8c1e2 Add Korean Translation 
Created Internationalization_kr.ts
 2020-09-06 20:31:26 +09:00
Jeremy Borgman
f34def6794 changed blur class name to pixelate to match implementation 2020-09-05 11:27:00 -05:00
Boyuan Yang
4bef6a5c7f translation: Finish zh_CN translation 2020-09-05 10:02:15 -05:00
Boyuan Yang
a8fb73b668 Use ${CMAKE_INSTALL_PREFIX} to provide APP_PREFIX 
Currently the value of $prefix is hardcoded in the source code.
This is not a good choice given we have switched to CMake and
that CMake provides the builtin variable ${CMAKE_INSTALL_PREFIX}
to provide this information.

This patch uses the value of ${CMAKE_INSTALL_PREFIX} to populate
flameshot's internal variable APP_PREFIX as well as using it
in generating the org.flameshot.Flameshot.service file with
a proper $prefix value (via CMAKE_INSTALL_FULL_BINDIR as provided
by GNUInstallDirs).
 2020-09-04 20:43:35 -05:00