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
Jeremy Borgman
e03909c48a
Removed icon symlinks to prevent windows issues with symlinks
2021-02-21 19:53:02 -06:00
Boyuan Yang
d8f8a3aaeb
data/img/material/: Remove unused png files
...
Flameshot after v0.8.5 release turned to use svg icons instead
of png icons for embedded Google Material Design icons. As a result,
the old png icons are now useless. This commit would remove the
leftover.
This commit closes : #1316 .
2021-02-17 21:38:03 -05:00
Yurii Puchkov
bad270cce4
MacOS dmg package build (cmake only, no CI yet)
2020-11-27 02:00:12 -08: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
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
8e92ea5ab4
Merge 0.8.3 upstream
2020-10-02 10:15:56 +03: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
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
f34def6794
changed blur class name to pixelate to match implementation
2020-09-05 11:27:00 -05:00
Jeremy Borgman
f5013df306
First pass at converting from qmake to cmake.
2020-07-10 20:10:14 -05:00
