Yuriy Puchkov
4c49461a7a
Fix - MacOS Tool Setting on non-primary screen
2020-11-24 08:53:15 -08: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
Yuriy Puchkov
b88a5fbce8
Code refactoring - change code style to the new clang-format rules
2020-09-23 15:25:13 +03:00
Yuriy Puchkov
d061290fb1
Add configurable shortcuts for drawing tools
2020-09-14 16:14:32 +03:00
Alex P
69b4afa394
fix text config width in side panel (was adding hor. scroll)
2020-09-13 15:00:24 -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
Yuriy Puchkov
3f708f3160
Add more colors and custom color item
2020-09-08 12:09:04 +03:00
Jeremy Borgman
c8d15205be
reformatted to Mozilla code style
2020-09-04 20:40:45 -05:00
Jeremy Borgman
dc77029cde
Fixed most depratated warnings.
2020-07-13 15:02:18 -05:00
Jeremy Borgman
f5013df306
First pass at converting from qmake to cmake.
2020-07-10 20:10:14 -05:00
lupoDharkael
d4715750df
Add basic launcher panel
2019-04-21 20:34:57 +02:00
lupoDharkael
42619158fa
Update copyright year
2019-03-04 16:38:45 +01:00
Alfredo Ramos
ee2f583acd
Fix some issues detected by Clazy ( #384 )
...
* Fix old style connect
* Fix unneeded QString memory allocations
2018-10-24 01:04:42 +02:00
Alfredo Ramos
da49ed556f
[WIP] Add line thickness to side panel ( #374 )
...
* Add thickness slider
* Fix enums compatibility
* Rename ColorPickerWidget to SidePanelWidget
2018-10-10 23:34:42 +02:00
Alfredo Ramos
d09580b873
Optimize and use SVG images where possible ( #281 )
...
SVG images have been optimized with svgo, this will slightly reduce package size though the main reason for this was to remove unneeded markup.
Image paths have been changed and merged, now the directory tree looks like this:
img
├── app
├── material
│ ├── black
│ └── white
└── preview
The reason to merge the paths is to avoid duplicate files for buttons and configuration.
SVG icons are used by default now, PNG images have not been deleted from the images directory, but they were deleted from the graphics.qrc resource file.
All image paths were updated accordingly, except in the tray icon, I could not make it work using the SVG image.
2018-07-24 00:43:01 +02:00
lupoDharkael
dcaa2e321f
Add text configuration in panel
2018-05-26 17:59:44 +02:00
lupoDharkael
cf7066a33e
Add cancel information in grab color button
2018-05-23 12:55:26 +02:00
lupoDharkael
33377d50d5
Toggle panel with Space while grabbing a color
2018-05-19 00:55:11 +02:00
lupoDharkael
09921d507c
Replace QKeySequence::Cancel ( #226 )
2018-05-17 17:45:25 +02:00
lupoDharkael
6adcfef413
Add color tools inside the capture editor
2018-05-16 23:02:30 +02:00
