diff --git a/krita/data/brushes/CMakeLists.txt b/krita/data/brushes/CMakeLists.txt index faa1b8aaaf..bc177872f2 100644 --- a/krita/data/brushes/CMakeLists.txt +++ b/krita/data/brushes/CMakeLists.txt @@ -1,51 +1,52 @@ install( FILES 3_brush.png 3_dotted-flat.png 3_eroded.gih 3_splat.png 3_texture.png A_bamboo-leaves.gih A_distant-mountain.gih A_eroded-cercle-anim.gih A_grass-floor.gih A_pin.gih A_smoke.gbr A_snow-pack.gih A_sparkle1.gbr A_sparkle2.gbr A_sparkle3.gbr A_splat2.gih A_starfield2.gbr A_wall-texture.gih cazu-chalk.gbr cazu-freckles.gbr cazu-reptile.gbr cazu-smear-paint.gbr cazu-spines.gbr cazu-smear-ink.gih cazu_watercolor2.gih double_special6.gih dub1.gbr dub6.gbr Flat_textured1.gih knife3.gbr LJF_Water_Brush_02.gih +leaves-scattered.svg M_Pipe_1.gbr MZ_leaves.gbr N_Grass_2.gih oil_bristle.gbr oil_knife.gbr P_Graphite_Pencil_grain.gih Rect_textured1.gih Rect_textured2.gih Rect_textured3.gih round_textured1.gbr R_Rake2.gbr R_Rake4.gbr rock2.gbr S_splats_02.gih scribbles.gbr texture51.gbr w_hearts.gih z_study_pencil_2H.gih DESTINATION ${DATA_INSTALL_DIR}/krita/brushes) diff --git a/krita/data/brushes/leaves-scattered.svg b/krita/data/brushes/leaves-scattered.svg new file mode 100644 index 0000000000..04f52fd6c7 --- /dev/null +++ b/krita/data/brushes/leaves-scattered.svg @@ -0,0 +1,63 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/krita/data/paintoppresets/CMakeLists.txt b/krita/data/paintoppresets/CMakeLists.txt index 96840acf7e..fbcb8b674c 100644 --- a/krita/data/paintoppresets/CMakeLists.txt +++ b/krita/data/paintoppresets/CMakeLists.txt @@ -1,75 +1,76 @@ install( FILES Airbrush_Soft.kpp Basic_Chisel_Smooth.kpp Basic_Flow.kpp Basic_tip_default.kpp Blender_Basic.kpp Blender_Blur.kpp Blender_Mover.kpp Blender_Rake.kpp Blender_Textured.kpp Blender_Water.kpp Clone_Tool.kpp Clone_Tool_Textured.kpp Distort_Grow.kpp Distort_Move.kpp Distort_Shrink.kpp Dry_Bristles_Eroded.kpp Dry_Bristles.kpp Dry_Bristles_Smooth.kpp Dry_Marker.kpp Dry_Textured_Creases.kpp Dry_Textured_Rough.kpp Dry_Textured_Scribbles.kpp Dry_Textured_Soft.kpp Eraser_Airbrush.kpp Eraser_Circle.kpp Eraser_Hard.kpp Eraser_Screentone.kpp Eraser_Soft.kpp Fill_Large_Quick.kpp Fill_Screentones.kpp Fill_Shape.kpp FX_Glow_Add.kpp FX_Image_Blur.kpp FX_Image_Sharpen.kpp FX_Smoke_Particles.kpp FX_Starfield.kpp FX_Value_Burn.kpp FX_Value_Dodge.kpp Ink_Brush.kpp Ink_Brush_Rough.kpp Ink_Fineliner.kpp Ink_Precision.kpp Ink_Tough.kpp Normal_Map.kpp Pixel_Art.kpp Pixel_Art_Dithering.kpp Sketch_2B.kpp +Sketch_6B.kpp Sketch_Chrome.kpp Sketch_Hatch_Noisy.kpp Spray_Smoke.kpp Spray_Watercolor.kpp Stamp_Clouds.kpp Stamp_Freckles.kpp Stamp_Grass.kpp Stamp_Grass_Patch.kpp Stamp_Hearts.kpp Stamp_Leaves.kpp Stamp_Mountains_Distant.kpp Stamp_Scales.kpp Stamp_Shoujo_Bubbles.kpp Stamp_Spines.kpp Stamp_Watercolor.kpp Stamp_Water.kpp Wet_Bristles.kpp Wet_Bristles_Rough.kpp Wet_Circle.kpp Wet_Soft_Tilted.kpp Wet_Smear.kpp DESTINATION ${DATA_INSTALL_DIR}/krita/paintoppresets) install( FILES kis_paintoppresets_tags.xml DESTINATION ${DATA_INSTALL_DIR}/krita/tags) diff --git a/krita/data/paintoppresets/Sketch_6B.kpp b/krita/data/paintoppresets/Sketch_6B.kpp new file mode 100644 index 0000000000..646e82fb9b Binary files /dev/null and b/krita/data/paintoppresets/Sketch_6B.kpp differ diff --git a/krita/data/paintoppresets/Stamp_Leaves.kpp b/krita/data/paintoppresets/Stamp_Leaves.kpp index 91e0d8081f..a8de3bbd55 100644 Binary files a/krita/data/paintoppresets/Stamp_Leaves.kpp and b/krita/data/paintoppresets/Stamp_Leaves.kpp differ diff --git a/plugins/paintops/libpaintop/kis_brush_option.cpp b/plugins/paintops/libpaintop/kis_brush_option.cpp index 52f41ba740..245593ffa1 100644 --- a/plugins/paintops/libpaintop/kis_brush_option.cpp +++ b/plugins/paintops/libpaintop/kis_brush_option.cpp @@ -1,101 +1,104 @@ /* This file is part of the KDE project * Copyright (C) Boudewijn Rempt , (C) 2008 * Copyright (C) Sven Langkamp , (C) 2008 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public * License as published by the Free Software Foundation; either * version 2 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Library General Public License for more details. * * You should have received a copy of the GNU Library General Public License * along with this library; see the file COPYING.LIB. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301, USA. */ #include "kis_brush_option.h" #include #include #include "kis_properties_configuration.h" #include void KisBrushOption::writeOptionSettingImpl(KisPropertiesConfiguration *setting) const { if (!m_brush) return; QDomDocument d; QDomElement e = d.createElement("Brush"); m_brush->toXML(d, e); d.appendChild(e); setting->setProperty("brush_definition", d.toString()); - QString brushFileName = !m_brush->filename().isEmpty() ? - m_brush->shortFilename() : QString(); + QString brushFileName; // = !m_brush->filename().isEmpty() ? + // m_brush->shortFilename() : QString(); setting->setProperty(KisPaintOpUtils::RequiredBrushFileTag, brushFileName); { - QStringList requiredFiles = - setting->getStringList(KisPaintOpUtils::RequiredBrushFilesListTag); + QStringList requiredFiles; // = + //setting->getStringList(KisPaintOpUtils::RequiredBrushFilesListTag); + + + requiredFiles << brushFileName; setting->setProperty(KisPaintOpUtils::RequiredBrushFilesListTag, requiredFiles); } } QDomElement getBrushXMLElement(const KisPropertiesConfiguration *setting) { QDomElement element; QString brushDefinition = setting->getString("brush_definition"); if (!brushDefinition.isEmpty()) { QDomDocument d; d.setContent(brushDefinition, false); element = d.firstChildElement("Brush"); } return element; } void KisBrushOption::readOptionSettingImpl(const KisPropertiesConfiguration *setting) { QDomElement element = getBrushXMLElement(setting); if (!element.isNull()) { m_brush = KisBrush::fromXML(element); } } #ifdef HAVE_THREADED_TEXT_RENDERING_WORKAROUND #include "kis_text_brush_factory.h" bool KisBrushOption::isTextBrush(const KisPropertiesConfiguration *setting) { static QString textBrushId = KisTextBrushFactory().id(); QDomElement element = getBrushXMLElement(setting); QString brushType = element.attribute("type"); return brushType == textBrushId; } #endif /* HAVE_THREADED_TEXT_RENDERING_WORKAROUND */ KisBrushSP KisBrushOption::brush() const { return m_brush; } void KisBrushOption::setBrush(KisBrushSP brush) { m_brush = brush; }