Diffusion Krita 0c6c571a85e0

Merge branch 'petrovic/brusheditor-save'
0c6c571a85e0
Actions

Authored by scottpetrovic on Jul 26 2017, 1:22 AM.

Description

Merge branch 'petrovic/brusheditor-save'

FEATURE: Brush editor UX update and brush renaming

Allow brushes to be renamed. There is an edit icon next to the brush name in the editor now.
Update the UX with how brushes are saved. If you are overwriting an existing preset, your existing thumbnail is used. If you want to save a new preset, a dialog will appear where you have some new options like loading an image for the thumbnail.
The reload and dirty indicator are by the edit brush name now at the top.
A small bug (not in bugzilla) was fixed with how reloading a preset didn't refresh the brush tip preview area

BUG: 381441

Details

Committed

scottpetrovic

Jul 26 2017, 1:22 AM

Parents

R37:fe8b0dd51319: make sure the dirty preset indicator and reload update when renaming a brush
R37:dcb9b60f6109: Option to control cursor color and grid color/threshold/color

Branches

Unknown

Tags

Unknown

scottpetrovic committed R37:0c6c571a85e0: Merge branch 'petrovic/brusheditor-save' (authored by scottpetrovic).Jul 26 2017, 1:22 AM

Merged Changes

Commit	Author	Details	Committed
fe8b0dd51319	scottpetrovic	make sure the dirty preset indicator and reload update when renaming a brush	Jul 26 2017
0eba6ecac057	scottpetrovic	Merge branch 'master' into petrovic/brusheditor-save	Jul 25 2017
226e97166db1	scottpetrovic	Merge branch 'master' into petrovic/brusheditor-save	Jul 20 2017
98f6aa183e3c	scottpetrovic	Merge remote-tracking branch 'origin/master' into petrovic/brusheditor-save	Jul 20 2017
7b369bfa16a7	scottpetrovic	hide the reload button in the brush editor if the preset is clean. also give a…	Jul 20 2017
0d4c36360845	scottpetrovic	Merge branch 'master' into petrovic/brusheditor-save	Jul 19 2017
811b79dc055f	scottpetrovic	allow the return key to save a preset when renaming. escape already exits out…	Jul 19 2017
188dffa01e40	scottpetrovic	set rename brush text when we are changing resources. There were a couple weird…	Jul 19 2017
07931c3de25b	scottpetrovic	disable the overwrite button if the preset is not dirty	Jul 18 2017
321b0805cd32	scottpetrovic	Merge branch 'master' into petrovic/brusheditor-save	Jul 16 2017
c9289ff5f25b	scottpetrovic	fix bug where reloading a preset does not refresh the brush preset preview area	Jul 16 2017
313d10bb2335	scottpetrovic	change the save preset to overwrite and do not use the dialog. Just assume the…	Jul 16 2017
f47dc2557194	scottpetrovic	try to tighten up the brush editor area more with spacing	Jul 16 2017
f00a761b2af8	scottpetrovic	hook up a dirty icon to the brush editor so we know if the current brush is…	Jul 16 2017
a370d339f0ee	scottpetrovic	fix memory leak with save dialog widget	Jul 16 2017
8370bfaa14a8	scottpetrovic	Merge branch 'master' into petrovic/brusheditor-save	Jul 8 2017
492a4cb5742b	scottpetrovic	if the scratchpad is the only area visible in the brush editor, hide the top…	Jul 8 2017
3cfbf6542957	scottpetrovic	remove some extra lines in the brush editor and condense the space a bit. Also…	Jul 8 2017
33b98678f917	scottpetrovic	make the reload and rename buttons the same size and give them tooltips	Jul 8 2017
6b46fc11cbc2	scottpetrovic	remove the disabling of painting in the scratchpad. That is not being used any…	Jun 29 2017
9a47ca06a61b	scottpetrovic	Merge branch 'master' into petrovic/brusheditor-save	Jun 29 2017
748a94364f42	scottpetrovic	remove a bunch of superfluous this references to make the code more consistent.	Jun 29 2017
c32356faac20	scottpetrovic	after a couple artists looked at it, I added the scratchpad preview area back.	Jun 28 2017
d0c29b2ff058	scottpetrovic	add a signal to the save dialog to update the resource after it is created	Jun 28 2017
65fd5229509c	scottpetrovic	add implementation for renaming the brush preset	Jun 28 2017
1e0eba2a681a	scottpetrovic	create all the UI and UI interactions needed for renaming a brush preset	Jun 28 2017
9710e91be8fb	scottpetrovic	remove the scratchpad controls that dealt with the brush preset thumbnail. Also…	Jun 27 2017
68a16b925ee2	scottpetrovic	move the saving brush preset code to the save widget.	Jun 27 2017
47c167423219	scottpetrovic	Merge branch 'master' into petrovic/brusheditor-save	Jun 27 2017
220bfb92288f	scottpetrovic	add a save as new brush button to the editor. I hooked it up to the same save…	Jun 24 2017
e5981e51bea4	scottpetrovic	move the brush editor UI around a bit. Now the thumbnail of the current preset…	Jun 24 2017
d77b0d116741	scottpetrovic	constrain the thumbnail area to 200 pixels and stub in the connections for…	Jun 24 2017
7e90693782b1	scottpetrovic	Merge branch 'master' into petrovic/brusheditor-save	Jun 24 2017
374a300c9abd	scottpetrovic	move some code to the constructor so it does not get called multiple times	Jun 24 2017
ac2d2656190c	scottpetrovic	add ability to load an image into the preset area when saving a brush	Jun 24 2017
96b6a3f32636	scottpetrovic	improve the variable name for the thumbnail scratchpad. We already have a…	Jun 23 2017
252b57b62baa	scottpetrovic	load the existing preset thumbnail by default. Also load it again if it is…	Jun 23 2017
df17ce2be68f	scottpetrovic	added a scratchpad type element to the dialog so you can paint on the thumbnail.	Jun 23 2017
5a356cd5536f	scottpetrovic	create a new UI file and add it to the brush editor for saving presets	Jun 22 2017

Changes (13)

				Path	Packages
	M			libs/ui/CMakeLists.txt
	M			libs/ui/forms/wdgpaintopsettings.ui
	A			libs/ui/forms/wdgsavebrushpreset.ui
	M			libs/ui/kis_paintop_box.cc
	M			libs/ui/kis_paintop_box.h
	M			libs/ui/widgets/kis_paintop_presets_popup.cpp
	M			libs/ui/widgets/kis_paintop_presets_popup.h
	A			libs/ui/widgets/kis_paintop_presets_save.cpp
	A			libs/ui/widgets/kis_paintop_presets_save.h
	M			libs/ui/widgets/kis_scratch_pad.cpp
	M			libs/ui/widgets/kis_scratch_pad.h
	M			plugins/paintops/libpaintop/kis_auto_brush_widget.cpp
	M			plugins/paintops/libpaintop/kis_auto_brush_widget.h