Commit Graph

55 Commits

Author SHA1 Message Date
Sergey Zolotarev
065aa98ce4 Fix some compile warnings in macOS build (#2027)
* Fix some compile warnings in macOS build

* Update macOS Info.plist template
2021-11-01 09:59:51 +01:00
Sergey Zolotarev
d5ac6e0efd Fix errors when generating flameshot.icons (#2026) 2021-10-30 21:28:51 +02:00
AdavisSnakes
2107ef38d0 Unnecessary share folder on windows (#1992) 2021-10-26 14:56:49 +02:00
a1346054
b95e096136 Simple maintenance improvements (#1918)
* Use license file from gnu.org

Downloaded from:
https://www.gnu.org/licenses/gpl-3.0.txt

* Add missing final newline

* Fix link

* Fix shellcheck warnings

* Move donation header one level up

* Fix typos

* Stop mixing tabs and spaces

* Trim trailing whitespace
2021-09-27 20:33:45 -05:00
Haris Gušić
d13501cea8 Fix FLAMESHOT_DEBUG_CAPTURE cmake option (#1888)
Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>
2021-09-13 08:14:01 -05:00
Haris Gušić
accfeee022 Fix debug option for capture mode (#1884)
Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>
2021-09-11 12:54:38 -05:00
crackcat
df20c7ec8f Add a tool to take an inverted screenshot (#1849)
* Add invert tool to build commands

* Add icons for invert tool

* Integrate invert tool

* Add shortcut for invert tool

* Add invert tool

* Add translation for invert tool

* Run clang-format

* Update tool to invert a region instead of everything

* Update shortcut for invert tool

* Update button order of inverter and counter

* Update translations for invert tool

* Run clang-format

* Revert "Update translations for invert tool"

This reverts commit c1fd5a162be6c64b26790d53eab3749b3a124bcf.

* Revert "Add translation for invert tool"

This reverts commit b0c1da5f36e844fa8b5f1492f5f507d85bb7aa7b.

* Update drawSearchArea to match pixelate

* Update invert icon to one from Material Design

Co-authored-by: crackcat <>
2021-09-01 06:45:20 -05:00
Vitaly Zaitsev
1031980ed1 Automatically set the correct path to the Flameshot executable (#1775)
* Automatically set the correct path to the Flameshot executable.

Signed-off-by: Vitaly Zaitsev <vitaly@easycoding.org>

* Export CMake project settings.

Signed-off-by: Vitaly Zaitsev <vitaly@easycoding.org>

* Fixed AppImage and Snap builds.
2021-07-29 08:09:31 -05:00
jialeens
35a6d430c9 fix #1664 (#1668) 2021-06-16 09:43:48 -05:00
Pavel Kalugin
6a2765f15e CMake: add option to use external singleapplication (#1598) 2021-05-02 13:24:06 -05:00
Yurii Puchkov
df5760c15a NC/Optimisations and bug fixes for objects editing (#1600)
* Optimise undo/redo for thickness, do not save every change on mouse wheel, save just the result

(cherry picked from commit c0bd74790e086dcde1c242a31e27f992a04c07e2)

* fix - In some cases undo/redo stack has excess steps (root cause is in the start move object event on a small not noticeable mouse move)

(cherry picked from commit 912f39f38083e368979f34ef14821979c34482bb)

* fix - It is impossible to remove an object using the "Undo the latest modification" button on second attempt (full undo, draw something, full undo again)

(cherry picked from commit a7f77a130a497ac6fdecd59eb43c889dcc6cbe1a)

* fix - Picked font family in the text editing tool is applied to the autoincrement tool

(cherry picked from commit 11c5eb29b1078bd6aba91fe7a74c2682767ad47c)

* Add git hash to version in the about dialog

(cherry picked from commit b4dbf52b3217b51614100bd307046772a37dc484)

* Add configuration option to limit undo steps

(cherry picked from commit f13cbecabb172060b196a535348f145457ad2f0f)

* Object delete operation is not registered on the undo stack

(cherry picked from commit 5c966cb5d3702a4d735dd542ad03a80899250b4a)

* fix - Unable to draw an object from second attempt after ColorPicker was called

(cherry picked from commit 49a119886fec253376703e8aa2386e16bc23cbcf)

* fix - App freezes and then crashes when changing object line thickness via Active thickness slider in the tool settings

(cherry picked from commit 26fd64f1c333f70c67282630362cbc5fc8427a39)

* fix - set min and max values for thickness slider to 1-100

(cherry picked from commit 6d8661666e4e199a3c29f991d52bef73ec36129c)

* fix - Crash on Move Tool button with an active Text editor

(cherry picked from commit 461f95da3afda56c0e9693e768e86b18d056eecc)

* fix - Text is not modified when picking it as object in the list

(cherry picked from commit 366bb0928b430d442dc67299353f7dc5ceb743b4)

* fix - Text modification cannot be undone
fix - Object that was created after the text object disappears after undo editing text

(cherry picked from commit 79b2fb92aca65b177cffb386db141d30551a2b1c)

* fix - Text is not saved if picking any object in the objects list without clicking at the empty space

(cherry picked from commit 4679a744a3d2498fe27379f89d48b347a34ae0dc)

* Last available undo step reset everything to the beginning

(cherry picked from commit 4af7423d00cfaa9feabc905400aa3ac30fc4a3ea)

* Missed changes (cherry-pick) for switching ColorPicker behaviour (right mouse click and hold to right mouse click and left click)

Co-authored-by: Yuriy Puchkov <yuriy.puchkov@namecheap.com>
2021-05-02 12:48:22 -05:00
Jeremy Borgman
1779a88bb5 refreshed translations after weblate contributions 2021-03-31 09:20:58 -05:00
Jeremy Borgman
748e152c95 testing appveyor change 2021-03-15 17:50:30 -05:00
Boyuan Yang
2079666d83 Add flameshot(1) man page 2021-03-11 14:49:10 -06:00
Martin-Eckleben
1bf75693dd Fixing commit for merging. This is a new feature to add a gui button for
chaging the global thickness.
2021-03-04 07:38:36 -06:00
Yuriy Puchkov
45f8752188 fix after mergin - CMakeLists.txt for MacOS 2021-02-17 18:46:12 +02:00
Jeremy Borgman
67952f06ab Moved SSL check to be windows specific 2021-02-16 10:10:21 -06:00
Jeremy Borgman
92b9379d69 Made changes after review of merge 2021-01-15 17:54:56 -06:00
Jeremy Borgman
73fe772b70 resolving merge conflicts 2021-01-08 10:19:53 -06:00
Jeremy Borgman
76ad9e5a6f first pass at adding logging framework 2021-01-05 17:01:12 -06:00
Yuriy Puchkov
162b864353 MacOS - Global shortcuts 2020-12-17 12:25:08 +02:00
Yuriy Puchkov
6ff18e74dd Get updates url from the current git remote 2020-12-14 08:39:09 +02:00
Yuriy Puchkov
ea11797d07 MacOS - add Application link to the package 2020-12-02 12:47:11 +02:00
Yurii Puchkov
bad270cce4 MacOS dmg package build (cmake only, no CI yet) 2020-11-27 02:00:12 -08:00
Ahmed Zetao Yang
65f28de250 fix: enforce utf-8 charset when building flameshot 2020-11-02 09:34:42 -06:00
Jeremy Borgman
8211b6aff0 updated qtsingleapplication to v3.1.5 2020-10-31 20:05:06 -05:00
Yuriy Puchkov
472d0dca29 Merge branch 'flameshot-org-master' into bugfix/RND-664-flameshot-update-history-widget-on-new-capture 2020-10-16 15:05:12 +03:00
Jeremy Borgman
2d4cd76e85 Updated CMAKE for new translation 2020-10-16 05:47:58 -05: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
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
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
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
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
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
Ahmed Zetao Yang
60c290c540 feat: update windows rc file 2020-09-30 10:58:48 -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
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
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
1662744a66 Merged various translation PRs and regenerated ts files 2020-09-09 19:23:04 -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
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
Yangjin Cho
6f6c9219e9 Update CMakeLists.txt 2020-09-07 13:58:42 +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
Jeremy Borgman
f34def6794 changed blur class name to pixelate to match implementation 2020-09-05 11:27:00 -05:00
Boyuan Yang
4541c79cdc Avoid hardcoded app version
Use ${PROJECT_VERSION} from CMake to provide the project version
information instead of hardcoding.
2020-09-04 21:04:51 -05:00