From kde-commits Tue Sep 28 20:54:40 2010 From: =?utf-8?q?Luk=C3=A1=C5=A1=20Tvrd=C3=BD?= Date: Tue, 28 Sep 2010 20:54:40 +0000 To: kde-commits Subject: koffice/krita Message-Id: <20100928205440.9B0B2AC88E () svn ! kde ! org> X-MARC-Message: https://marc.info/?l=kde-commits&m=128570732209595 SVN commit 1180771 by lukast: Add categories to the brush engines. Step for fixing release blocker for the release. Contains two new strings. Please excuse the small break of the String freeze, it was discussed with Krita team on the mailing list. CCMAIL:kde-i18n-doc@kde.org M +12 -0 image/brushengine/kis_paintop_factory.cpp M +5 -1 image/brushengine/kis_paintop_factory.h M +2 -1 plugins/paintops/chalk/chalk_paintop_plugin.cpp M +2 -1 plugins/paintops/complexop/complexbrush.cpp M +1 -1 plugins/paintops/curvebrush/curve_paintop_plugin.cpp M +2 -2 plugins/paintops/defaultpaintops/defaultpaintops_plugin.cc M +4 -0 plugins/paintops/defaultpaintops/duplicate/kis_duplicateop_factory.h M +3 -0 plugins/paintops/deform/kis_deform_paintop_factory.h M +1 -1 plugins/paintops/dynadraw/dyna_paintop_plugin.cpp M +2 -1 plugins/paintops/experiment/experiment_paintop_plugin.cpp M +1 -1 plugins/paintops/filterop/filterop.cpp M +2 -1 plugins/paintops/gridbrush/grid_paintop_plugin.cpp M +1 -1 plugins/paintops/hairy/hairy_paintop_plugin.cpp M +2 -1 plugins/paintops/hatching/hatching_paintop_plugin.cpp M +7 -1 plugins/paintops/libpaintop/kis_simple_paintop_factory.h M +4 -0 plugins/paintops/mypaint/mypaint_paintop_factory.h M +1 -1 plugins/paintops/particle/particle_paintop_plugin.cpp M +1 -1 plugins/paintops/sketch/sketch_paintop_plugin.cpp M +1 -1 plugins/paintops/spray/spray_paintop_plugin.cpp M +1 -1 plugins/paintops/waterymixbrush/waterymix_paintop_plugin.cpp --- trunk/koffice/krita/image/brushengine/kis_paintop_factory.cpp #1180770:1180771 @@ -17,6 +17,7 @@ */ #include "kis_paintop_factory.h" +#include #include KisPaintOpFactory::KisPaintOpFactory(const QStringList & whiteListedCompositeOps) @@ -39,5 +40,16 @@ return ""; } +QString KisPaintOpFactory::categoryExperimental() +{ + return i18n("Experimental"); +} + +QString KisPaintOpFactory::categoryStable() +{ + return i18n("Stable"); +} + + #include "kis_paintop_factory.moc" --- trunk/koffice/krita/image/brushengine/kis_paintop_factory.h #1180770:1180771 @@ -1,6 +1,6 @@ /* * Copyright (c) 2008 Boudewijn Rempt - * + * Copyright (c) 2010 Lukáš Tvrdý * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or @@ -46,6 +46,9 @@ KisPaintOpFactory(const QStringList & whiteListedCompositeOps = QStringList()); virtual ~KisPaintOpFactory() {} + static QString categoryStable(); + static QString categoryExperimental(); + /** * Create a KisPaintOp with the given settings and painter. * @param settings the settings associated with the input device @@ -54,6 +57,7 @@ virtual KisPaintOp * createOp(const KisPaintOpSettingsSP settings, KisPainter * painter, KisImageWSP image) = 0; virtual QString id() const = 0; virtual QString name() const = 0; + virtual QString category() const = 0; /** * List of usually hidden compositeops that are useful for this paintop. --- trunk/koffice/krita/plugins/paintops/chalk/chalk_paintop_plugin.cpp #1180770:1180771 @@ -43,7 +43,8 @@ // //setComponentData(ChalkPaintOpPluginFactory::componentData()); KisPaintOpRegistry *r = KisPaintOpRegistry::instance(); - r->add(new KisSimplePaintOpFactory("chalkbrush", i18n("Chalk brush"), "krita-chalk.png")); + r->add(new KisSimplePaintOpFactory("chalkbrush", i18n("Chalk brush"), + KisPaintOpFactory::categoryExperimental(), "krita-chalk.png")); } --- trunk/koffice/krita/plugins/paintops/complexop/complexbrush.cpp #1180770:1180771 @@ -34,7 +34,8 @@ Q_UNUSED(sl) //setComponentData(ComplexBrushFactory::componentData()); - KisPaintOpRegistry::instance()->add(new KisSimplePaintOpFactory("complex", i18n("Mixing Brush"), "krita-mixing.png")); + KisPaintOpRegistry::instance()->add(new KisSimplePaintOpFactory("complex", i18n("Mixing Brush"), + KisPaintOpFactory::categoryExperimental(),"krita-mixing.png")); } ComplexBrush::~ComplexBrush() --- trunk/koffice/krita/plugins/paintops/curvebrush/curve_paintop_plugin.cpp #1180770:1180771 @@ -42,7 +42,7 @@ { //setComponentData(CurvePaintOpPluginFactory::componentData()); KisPaintOpRegistry *r = KisPaintOpRegistry::instance(); - r->add(new KisSimplePaintOpFactory("curvebrush", i18n("Curve brush"), "krita-curve.png")); + r->add(new KisSimplePaintOpFactory("curvebrush", i18n("Curve brush"), KisPaintOpFactory::categoryExperimental(), "krita-curve.png")); } --- trunk/koffice/krita/plugins/paintops/defaultpaintops/defaultpaintops_plugin.cc #1180770:1180771 @@ -48,11 +48,11 @@ //setComponentData(DefaultPaintOpsPluginFactory::componentData()); KisPaintOpRegistry *r = KisPaintOpRegistry::instance(); - r->add(new KisSimplePaintOpFactory("paintbrush", i18n("Pixel Brush"), "krita-paintbrush.png")); + r->add(new KisSimplePaintOpFactory("paintbrush", i18n("Pixel Brush"), KisPaintOpFactory::categoryStable(),"krita-paintbrush.png")); r->add(new KisDuplicateOpFactory); QStringList whiteList; whiteList << COMPOSITE_COPY; - r->add(new KisSimplePaintOpFactory("smudge", i18n("Smudge Brush"), "krita-smudgebrush.png","smudge-finger", whiteList)); + r->add(new KisSimplePaintOpFactory("smudge", i18n("Smudge Brush"), KisPaintOpFactory::categoryStable(),"krita-smudgebrush.png","smudge-finger", whiteList)); } DefaultPaintOpsPlugin::~DefaultPaintOpsPlugin() --- trunk/koffice/krita/plugins/paintops/defaultpaintops/duplicate/kis_duplicateop_factory.h #1180770:1180771 @@ -54,6 +54,10 @@ return "krita-duplicate.png"; } + virtual QString category() const{ + return KisPaintOpFactory::categoryStable(); + } + virtual KisPaintOpSettingsSP settings(KisImageWSP image); virtual KisPaintOpSettingsWidget* createSettingsWidget(QWidget* parent); }; --- trunk/koffice/krita/plugins/paintops/deform/kis_deform_paintop_factory.h #1180770:1180771 @@ -47,6 +47,9 @@ virtual QString pixmap() { return "krita-deform.png"; } + virtual QString category() const{ + return KisPaintOpFactory::categoryExperimental(); + } virtual KisPaintOpSettingsSP settings(KisImageWSP image); virtual KisPaintOpSettingsWidget* createSettingsWidget(QWidget* parent); --- trunk/koffice/krita/plugins/paintops/dynadraw/dyna_paintop_plugin.cpp #1180770:1180771 @@ -40,7 +40,7 @@ // //setComponentData(DynaPaintOpPluginFactory::componentData()); KisPaintOpRegistry *r = KisPaintOpRegistry::instance(); - r->add(new KisSimplePaintOpFactory("dynabrush", i18n("Dyna brush"), "krita-dyna.png")); + r->add(new KisSimplePaintOpFactory("dynabrush", i18n("Dyna brush"), KisPaintOpFactory::categoryExperimental(), "krita-dyna.png")); } --- trunk/koffice/krita/plugins/paintops/experiment/experiment_paintop_plugin.cpp #1180770:1180771 @@ -41,7 +41,8 @@ { //setComponentData(ExperimentPaintOpPluginFactory::componentData()); KisPaintOpRegistry *r = KisPaintOpRegistry::instance(); - r->add(new KisSimplePaintOpFactory("experimentbrush", i18n("Experiment brush"), "krita-experiment.png")); + r->add(new KisSimplePaintOpFactory("experimentbrush", i18n("Experiment brush"), + KisPaintOpFactory::categoryExperimental(), "krita-experiment.png")); } ExperimentPaintOpPlugin::~ExperimentPaintOpPlugin() --- trunk/koffice/krita/plugins/paintops/filterop/filterop.cpp #1180770:1180771 @@ -40,7 +40,7 @@ // This is not a gui plugin; only load it when the doc is created. KisPaintOpRegistry *r = KisPaintOpRegistry::instance(); - r->add(new KisSimplePaintOpFactory("filter", i18n("Filter Brush"), "krita-filterop.png")); + r->add(new KisSimplePaintOpFactory("filter", i18n("Filter Brush"), KisPaintOpFactory::categoryStable(), "krita-filterop.png")); } --- trunk/koffice/krita/plugins/paintops/gridbrush/grid_paintop_plugin.cpp #1180770:1180771 @@ -41,7 +41,8 @@ // //setComponentData(GridPaintOpPluginFactory::componentData()); KisPaintOpRegistry *r = KisPaintOpRegistry::instance(); - r->add(new KisSimplePaintOpFactory("gridbrush", i18n("Grid brush"), "krita-grid.png")); + r->add(new KisSimplePaintOpFactory("gridbrush", i18n("Grid brush"), + KisPaintOpFactory::categoryExperimental(), "krita-grid.png")); } --- trunk/koffice/krita/plugins/paintops/hairy/hairy_paintop_plugin.cpp #1180770:1180771 @@ -44,7 +44,7 @@ //setComponentData(HairyPaintOpPluginFactory::componentData()); KisPaintOpRegistry *r = KisPaintOpRegistry::instance(); - r->add(new KisSimplePaintOpFactory("hairybrush", i18n("Hairy brush"), "krita-sumi.png")); + r->add(new KisSimplePaintOpFactory("hairybrush", i18n("Hairy brush"), KisPaintOpFactory::categoryStable(),"krita-sumi.png")); } --- trunk/koffice/krita/plugins/paintops/hatching/hatching_paintop_plugin.cpp #1180770:1180771 @@ -43,7 +43,8 @@ // //setComponentData(HatchingPaintOpPluginFactory::componentData()); KisPaintOpRegistry *r = KisPaintOpRegistry::instance(); - r->add(new KisSimplePaintOpFactory("hatchingbrush", i18n("Hatching brush"), "krita-hatching.png")); + r->add(new KisSimplePaintOpFactory("hatchingbrush", i18n("Hatching brush"), + KisPaintOpFactory::categoryStable() ,"krita-hatching.png")); } --- trunk/koffice/krita/plugins/paintops/libpaintop/kis_simple_paintop_factory.h #1180770:1180771 @@ -29,12 +29,13 @@ template class KisSimplePaintOpFactory : public KisPaintOpFactory { public: - KisSimplePaintOpFactory(const QString& id, const QString& name, + KisSimplePaintOpFactory(const QString& id, const QString& name, const QString& category, const QString& pixmap, const QString& model = QString(), const QStringList& whiteListedCompositeOps = QStringList()) : KisPaintOpFactory(whiteListedCompositeOps) , m_id(id) , m_name(name) + , m_category(category) , m_pixmap(pixmap) , m_model(model) { @@ -79,9 +80,14 @@ return m_pixmap; } + QString category() const{ + return m_category; + } + private: QString m_id; QString m_name; + QString m_category; QString m_pixmap; QString m_model; }; --- trunk/koffice/krita/plugins/paintops/mypaint/mypaint_paintop_factory.h #1180770:1180771 @@ -61,6 +61,10 @@ return "krita-mypaint.png"; } + virtual QString category() const{ + return KisPaintOpFactory::categoryExperimental(); + } + virtual KisPaintOpSettingsSP settings(KisImageWSP image); virtual KisPaintOpSettingsWidget* createSettingsWidget(QWidget* parent); --- trunk/koffice/krita/plugins/paintops/particle/particle_paintop_plugin.cpp #1180770:1180771 @@ -39,7 +39,7 @@ : QObject(parent) { KisPaintOpRegistry *r = KisPaintOpRegistry::instance(); - r->add(new KisSimplePaintOpFactory("particlebrush", i18n("Particle brush"), "krita-particle.png")); + r->add(new KisSimplePaintOpFactory("particlebrush", i18n("Particle brush"), KisPaintOpFactory::categoryExperimental(),"krita-particle.png")); } ParticlePaintOpPlugin::~ParticlePaintOpPlugin() --- trunk/koffice/krita/plugins/paintops/sketch/sketch_paintop_plugin.cpp #1180770:1180771 @@ -43,7 +43,7 @@ // //setComponentData(SketchPaintOpPluginFactory::componentData()); KisPaintOpRegistry *r = KisPaintOpRegistry::instance(); - r->add(new KisSimplePaintOpFactory("sketchbrush", i18n("Sketch brush"), "krita-sketch.png")); + r->add(new KisSimplePaintOpFactory("sketchbrush", i18n("Sketch brush"), KisPaintOpFactory::categoryExperimental(), "krita-sketch.png")); } --- trunk/koffice/krita/plugins/paintops/spray/spray_paintop_plugin.cpp #1180770:1180771 @@ -41,7 +41,7 @@ // //setComponentData(SprayPaintOpPluginFactory::componentData()); KisPaintOpRegistry *r = KisPaintOpRegistry::instance(); - r->add(new KisSimplePaintOpFactory("spraybrush", i18n("Spray brush"), "krita-spray.png")); + r->add(new KisSimplePaintOpFactory("spraybrush", i18n("Spray brush"), KisPaintOpFactory::categoryExperimental() , "krita-spray.png")); } --- trunk/koffice/krita/plugins/paintops/waterymixbrush/waterymix_paintop_plugin.cpp #1180770:1180771 @@ -43,7 +43,7 @@ // //setComponentData(WateryMixPaintOpPluginFactory::componentData()); KisPaintOpRegistry *r = KisPaintOpRegistry::instance(); - r->add(new KisSimplePaintOpFactory("waterymixbrush", i18n("Watery Mixbrush"), "krita-waterymix.png")); + r->add(new KisSimplePaintOpFactory("waterymixbrush", i18n("Watery Mixbrush"), KisPaintOpFactory::categoryExperimental(),"krita-waterymix.png")); }