diff --git a/krita/data/paintoppresets/CMakeLists.txt b/krita/data/paintoppresets/CMakeLists.txt index c79086c760..6917623cc0 100644 --- a/krita/data/paintoppresets/CMakeLists.txt +++ b/krita/data/paintoppresets/CMakeLists.txt @@ -1,139 +1,138 @@ install( FILES Airbrush_eraser.kpp Airbrush_linear.kpp Airbrush_linear_noisy.kpp Airbrush_pressure.kpp Basic_circle.kpp Basic_mix.kpp Basic_mix_soft.kpp Basic_tip_default.kpp Basic_tip_gaussian.kpp Basic_tip_soft.kpp Basic_wet.kpp Basic_wet_soft.kpp Blender_Blur.kpp Block_basic.kpp Block_bristles.kpp Block_fuzzy.kpp Block_mix_tilt.kpp Block_textured_1.kpp Block_textured_2.kpp Block_tilt.kpp Block_wet_tilt.kpp Bristle_frottis.kpp Bristles_hairy.kpp Bristles_mix.kpp Bristles_textured.kpp Bristles_wet.kpp Brush_dotted.kpp Brush_textured.kpp -Chalk_brush.kpp Clone_tool.kpp Curve_curvy.kpp Curve_ink.kpp Curve_recurvy.kpp Curve_smooth.kpp Eraser_circle.kpp Eraser_hard.kpp Eraser_soft.kpp FX_blur_light.kpp FX_color_HSY.kpp FX_explode.kpp FX_glow_add.kpp FX_overlay.kpp FX_splat_starfield.kpp Fill_block.kpp Fill_circle.kpp Grid_square_25.kpp Bristle_Details.kpp Bristle_Large.kpp Bristle_Special_Blender.kpp Bristle_Squared.kpp Bristle_Tapered.kpp Bristle_Texture.kpp Hatch_crispy.kpp Hatch_cross_regular.kpp Hatch_cross_small.kpp Hatch_diag_S.kpp Hatch_diag_fat.kpp Hatch_moire.kpp Hatch_noisy.kpp Ink_ballpen.kpp Ink_brush_25.kpp Ink_circle_05.kpp Ink_circle_10.kpp Ink_gpen_10.kpp Ink_gpen_25.kpp Ink_tilt_10.kpp Ink_tilt_20.kpp Layout_block.kpp Layout_circle_soft.kpp Layout_oval.kpp Layout_pen.kpp Move_tool.kpp Oils_bristle.kpp Oils_knife.kpp Pastel_texture_large.kpp Pastel_texture_thin.kpp Pencil_2B.kpp Pencil_HB.kpp Pencil_texture.kpp Pencil_tilt.kpp Quick_circle_big.kpp Quick_circle_huge.kpp Quick_circle_layout.kpp Rake_bristle_dry.kpp Rake_texture.kpp Screentones.kpp Screentones_eraser.kpp Shape_fill.kpp Shape_smooth.kpp Sketch.kpp Sketch_chrome.kpp Sketch_fur.kpp Sketch_ink_big.kpp Sketch_ink_small.kpp Sketch_line.kpp Sketch_shade.kpp Sketch_shade_wash.kpp Sketch_speedpaint.kpp Sketch_speedpaint_shade.kpp Sketch_wires.kpp Smudge_block_tilt.kpp Smudge_rake.kpp Smudge_rake_2.kpp Smudge_soft.kpp Smudge_textured.kpp Smudge_water.kpp Sparkle_wet.kpp Sparkle_wet_soft.kpp Special_dyna_dots.kpp Special_FuzzyColor.kpp Special_particles_crazy.kpp Splat_mix_cells.kpp Splat_texture.kpp Splat_texture_2.kpp Splat_wet_cells.kpp Splatter_thin.kpp Sponge_texture.kpp Spray_splat.kpp Tangent_normal_basic.kpp Tangent_normal_drawing_angle.kpp Tangent_normal_hairy.kpp Tangent_normal_pixel.kpp Tangent_normal_y_inverted.kpp Texture_fuzzy.kpp Texture_hair.kpp Texture_leaves_fuzzy.kpp Textured_tilt.kpp ink_precision_03.kpp pixel1.kpp Pixelart_dither.kpp Pixelart_round.kpp Pixelart_square.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/Chalk_brush.kpp b/krita/data/paintoppresets/Chalk_brush.kpp deleted file mode 100644 index d21e39dd39..0000000000 Binary files a/krita/data/paintoppresets/Chalk_brush.kpp and /dev/null differ diff --git a/libs/ui/kis_config.cc b/libs/ui/kis_config.cc index 97ec6bb6f7..cadf88c09d 100644 --- a/libs/ui/kis_config.cc +++ b/libs/ui/kis_config.cc @@ -1,1973 +1,1973 @@ /* * Copyright (c) 2002 Patrick Julien * * 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 * (at your option) any later version. * * This program 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 General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #include "kis_config.h" #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include "kis_canvas_resource_provider.h" #include "kis_config_notifier.h" #include "kis_snap_config.h" #include #include KisConfig::KisConfig() : m_cfg( KSharedConfig::openConfig()->group("")) { } KisConfig::~KisConfig() { if (qApp->thread() != QThread::currentThread()) { //dbgKrita << "WARNING: KisConfig: requested config synchronization from nonGUI thread! Skipping..."; return; } m_cfg.sync(); } bool KisConfig::disableTouchOnCanvas(bool defaultValue) const { return (defaultValue ? false : m_cfg.readEntry("disableTouchOnCanvas", false)); } void KisConfig::setDisableTouchOnCanvas(bool value) const { m_cfg.writeEntry("disableTouchOnCanvas", value); } bool KisConfig::useProjections(bool defaultValue) const { return (defaultValue ? true : m_cfg.readEntry("useProjections", true)); } void KisConfig::setUseProjections(bool useProj) const { m_cfg.writeEntry("useProjections", useProj); } bool KisConfig::undoEnabled(bool defaultValue) const { return (defaultValue ? true : m_cfg.readEntry("undoEnabled", true)); } void KisConfig::setUndoEnabled(bool undo) const { m_cfg.writeEntry("undoEnabled", undo); } int KisConfig::undoStackLimit(bool defaultValue) const { return (defaultValue ? 30 : m_cfg.readEntry("undoStackLimit", 30)); } void KisConfig::setUndoStackLimit(int limit) const { m_cfg.writeEntry("undoStackLimit", limit); } bool KisConfig::useCumulativeUndoRedo(bool defaultValue) const { return (defaultValue ? false : m_cfg.readEntry("useCumulativeUndoRedo",false)); } void KisConfig::setCumulativeUndoRedo(bool value) { m_cfg.writeEntry("useCumulativeUndoRedo", value); } qreal KisConfig::stackT1(bool defaultValue) const { return (defaultValue ? 5 : m_cfg.readEntry("stackT1",5)); } void KisConfig::setStackT1(int T1) { m_cfg.writeEntry("stackT1", T1); } qreal KisConfig::stackT2(bool defaultValue) const { return (defaultValue ? 1 : m_cfg.readEntry("stackT2",1)); } void KisConfig::setStackT2(int T2) { m_cfg.writeEntry("stackT2", T2); } int KisConfig::stackN(bool defaultValue) const { return (defaultValue ? 5 : m_cfg.readEntry("stackN",5)); } void KisConfig::setStackN(int N) { m_cfg.writeEntry("stackN", N); } qint32 KisConfig::defImageWidth(bool defaultValue) const { return (defaultValue ? 1600 : m_cfg.readEntry("imageWidthDef", 1600)); } qint32 KisConfig::defImageHeight(bool defaultValue) const { return (defaultValue ? 1200 : m_cfg.readEntry("imageHeightDef", 1200)); } qreal KisConfig::defImageResolution(bool defaultValue) const { return (defaultValue ? 100.0 : m_cfg.readEntry("imageResolutionDef", 100.0)) / 72.0; } QString KisConfig::defColorModel(bool defaultValue) const { return (defaultValue ? KoColorSpaceRegistry::instance()->rgb8()->colorModelId().id() : m_cfg.readEntry("colorModelDef", KoColorSpaceRegistry::instance()->rgb8()->colorModelId().id())); } void KisConfig::defColorModel(const QString & model) const { m_cfg.writeEntry("colorModelDef", model); } QString KisConfig::defaultColorDepth(bool defaultValue) const { return (defaultValue ? KoColorSpaceRegistry::instance()->rgb8()->colorDepthId().id() : m_cfg.readEntry("colorDepthDef", KoColorSpaceRegistry::instance()->rgb8()->colorDepthId().id())); } void KisConfig::setDefaultColorDepth(const QString & depth) const { m_cfg.writeEntry("colorDepthDef", depth); } QString KisConfig::defColorProfile(bool defaultValue) const { return (defaultValue ? KoColorSpaceRegistry::instance()->rgb8()->profile()->name() : m_cfg.readEntry("colorProfileDef", KoColorSpaceRegistry::instance()->rgb8()->profile()->name())); } void KisConfig::defColorProfile(const QString & profile) const { m_cfg.writeEntry("colorProfileDef", profile); } void KisConfig::defImageWidth(qint32 width) const { m_cfg.writeEntry("imageWidthDef", width); } void KisConfig::defImageHeight(qint32 height) const { m_cfg.writeEntry("imageHeightDef", height); } void KisConfig::defImageResolution(qreal res) const { m_cfg.writeEntry("imageResolutionDef", res*72.0); } void cleanOldCursorStyleKeys(KConfigGroup &cfg) { if (cfg.hasKey("newCursorStyle") && cfg.hasKey("newOutlineStyle")) { cfg.deleteEntry("cursorStyleDef"); } } CursorStyle KisConfig::newCursorStyle(bool defaultValue) const { if (defaultValue) { return CURSOR_STYLE_NO_CURSOR; } int style = m_cfg.readEntry("newCursorStyle", int(-1)); if (style < 0) { // old style format style = m_cfg.readEntry("cursorStyleDef", int(OLD_CURSOR_STYLE_OUTLINE)); switch (style) { case OLD_CURSOR_STYLE_TOOLICON: style = CURSOR_STYLE_TOOLICON; break; case OLD_CURSOR_STYLE_CROSSHAIR: case OLD_CURSOR_STYLE_OUTLINE_CENTER_CROSS: style = CURSOR_STYLE_CROSSHAIR; break; case OLD_CURSOR_STYLE_POINTER: style = CURSOR_STYLE_POINTER; break; case OLD_CURSOR_STYLE_OUTLINE: case OLD_CURSOR_STYLE_NO_CURSOR: style = CURSOR_STYLE_NO_CURSOR; break; case OLD_CURSOR_STYLE_SMALL_ROUND: case OLD_CURSOR_STYLE_OUTLINE_CENTER_DOT: style = CURSOR_STYLE_SMALL_ROUND; break; case OLD_CURSOR_STYLE_TRIANGLE_RIGHTHANDED: case OLD_CURSOR_STYLE_OUTLINE_TRIANGLE_RIGHTHANDED: style = CURSOR_STYLE_TRIANGLE_RIGHTHANDED; break; case OLD_CURSOR_STYLE_TRIANGLE_LEFTHANDED: case OLD_CURSOR_STYLE_OUTLINE_TRIANGLE_LEFTHANDED: style = CURSOR_STYLE_TRIANGLE_LEFTHANDED; break; default: style = -1; } } cleanOldCursorStyleKeys(m_cfg); // compatibility with future versions if (style < 0 || style >= N_CURSOR_STYLE_SIZE) { style = CURSOR_STYLE_NO_CURSOR; } return (CursorStyle) style; } void KisConfig::setNewCursorStyle(CursorStyle style) { m_cfg.writeEntry("newCursorStyle", (int)style); } QColor KisConfig::getCursorMainColor(bool defaultValue) const { QColor col; col.setRgbF(0.501961, 1.0, 0.501961); return (defaultValue ? col : m_cfg.readEntry("cursorMaincColor", col)); } void KisConfig::setCursorMainColor(const QColor &v) const { m_cfg.writeEntry("cursorMaincColor", v); } OutlineStyle KisConfig::newOutlineStyle(bool defaultValue) const { if (defaultValue) { return OUTLINE_FULL; } int style = m_cfg.readEntry("newOutlineStyle", int(-1)); if (style < 0) { // old style format style = m_cfg.readEntry("cursorStyleDef", int(OLD_CURSOR_STYLE_OUTLINE)); switch (style) { case OLD_CURSOR_STYLE_TOOLICON: case OLD_CURSOR_STYLE_CROSSHAIR: case OLD_CURSOR_STYLE_POINTER: case OLD_CURSOR_STYLE_NO_CURSOR: case OLD_CURSOR_STYLE_SMALL_ROUND: case OLD_CURSOR_STYLE_TRIANGLE_RIGHTHANDED: case OLD_CURSOR_STYLE_TRIANGLE_LEFTHANDED: style = OUTLINE_NONE; break; case OLD_CURSOR_STYLE_OUTLINE: case OLD_CURSOR_STYLE_OUTLINE_CENTER_DOT: case OLD_CURSOR_STYLE_OUTLINE_CENTER_CROSS: case OLD_CURSOR_STYLE_OUTLINE_TRIANGLE_RIGHTHANDED: case OLD_CURSOR_STYLE_OUTLINE_TRIANGLE_LEFTHANDED: style = OUTLINE_FULL; break; default: style = -1; } } cleanOldCursorStyleKeys(m_cfg); // compatibility with future versions if (style < 0 || style >= N_OUTLINE_STYLE_SIZE) { style = OUTLINE_FULL; } return (OutlineStyle) style; } void KisConfig::setNewOutlineStyle(OutlineStyle style) { m_cfg.writeEntry("newOutlineStyle", (int)style); } QRect KisConfig::colorPreviewRect() const { return m_cfg.readEntry("colorPreviewRect", QVariant(QRect(32, 32, 48, 48))).toRect(); } void KisConfig::setColorPreviewRect(const QRect &rect) { m_cfg.writeEntry("colorPreviewRect", QVariant(rect)); } bool KisConfig::useDirtyPresets(bool defaultValue) const { return (defaultValue ? false : m_cfg.readEntry("useDirtyPresets",false)); } void KisConfig::setUseDirtyPresets(bool value) { m_cfg.writeEntry("useDirtyPresets",value); KisConfigNotifier::instance()->notifyConfigChanged(); } bool KisConfig::useEraserBrushSize(bool defaultValue) const { return (defaultValue ? false : m_cfg.readEntry("useEraserBrushSize",false)); } void KisConfig::setUseEraserBrushSize(bool value) { m_cfg.writeEntry("useEraserBrushSize",value); KisConfigNotifier::instance()->notifyConfigChanged(); } bool KisConfig::useEraserBrushOpacity(bool defaultValue) const { return (defaultValue ? false : m_cfg.readEntry("useEraserBrushOpacity",false)); } void KisConfig::setUseEraserBrushOpacity(bool value) { m_cfg.writeEntry("useEraserBrushOpacity",value); KisConfigNotifier::instance()->notifyConfigChanged(); } QColor KisConfig::getMDIBackgroundColor(bool defaultValue) const { QColor col(77, 77, 77); return (defaultValue ? col : m_cfg.readEntry("mdiBackgroundColor", col)); } void KisConfig::setMDIBackgroundColor(const QColor &v) const { m_cfg.writeEntry("mdiBackgroundColor", v); } QString KisConfig::getMDIBackgroundImage(bool defaultValue) const { return (defaultValue ? "" : m_cfg.readEntry("mdiBackgroundImage", "")); } void KisConfig::setMDIBackgroundImage(const QString &filename) const { m_cfg.writeEntry("mdiBackgroundImage", filename); } QString KisConfig::monitorProfile(int screen) const { // Note: keep this in sync with the default profile for the RGB colorspaces! QString profile = m_cfg.readEntry("monitorProfile" + QString(screen == 0 ? "": QString("_%1").arg(screen)), "sRGB-elle-V2-srgbtrc.icc"); //dbgKrita << "KisConfig::monitorProfile()" << profile; return profile; } QString KisConfig::monitorForScreen(int screen, const QString &defaultMonitor, bool defaultValue) const { return (defaultValue ? defaultMonitor : m_cfg.readEntry(QString("monitor_for_screen_%1").arg(screen), defaultMonitor)); } void KisConfig::setMonitorForScreen(int screen, const QString& monitor) { m_cfg.writeEntry(QString("monitor_for_screen_%1").arg(screen), monitor); } void KisConfig::setMonitorProfile(int screen, const QString & monitorProfile, bool override) const { m_cfg.writeEntry("monitorProfile/OverrideX11", override); m_cfg.writeEntry("monitorProfile" + QString(screen == 0 ? "": QString("_%1").arg(screen)), monitorProfile); } const KoColorProfile *KisConfig::getScreenProfile(int screen) { if (screen < 0) return 0; KisConfig cfg; QString monitorId; if (KisColorManager::instance()->devices().size() > screen) { monitorId = cfg.monitorForScreen(screen, KisColorManager::instance()->devices()[screen]); } //dbgKrita << "getScreenProfile(). Screen" << screen << "monitor id" << monitorId; if (monitorId.isEmpty()) { return 0; } QByteArray bytes = KisColorManager::instance()->displayProfile(monitorId); //dbgKrita << "\tgetScreenProfile()" << bytes.size(); if (bytes.length() > 0) { const KoColorProfile *profile = KoColorSpaceRegistry::instance()->createColorProfile(RGBAColorModelID.id(), Integer8BitsColorDepthID.id(), bytes); //dbgKrita << "\tKisConfig::getScreenProfile for screen" << screen << profile->name(); return profile; } else { //dbgKrita << "\tCould not get a system monitor profile"; return 0; } } const KoColorProfile *KisConfig::displayProfile(int screen) const { if (screen < 0) return 0; // if the user plays with the settings, they can override the display profile, in which case // we don't want the system setting. bool override = useSystemMonitorProfile(); //dbgKrita << "KisConfig::displayProfile(). Override X11:" << override; const KoColorProfile *profile = 0; if (override) { //dbgKrita << "\tGoing to get the screen profile"; profile = KisConfig::getScreenProfile(screen); } // if it fails. check the configuration if (!profile || !profile->isSuitableForDisplay()) { //dbgKrita << "\tGoing to get the monitor profile"; QString monitorProfileName = monitorProfile(screen); //dbgKrita << "\t\tmonitorProfileName:" << monitorProfileName; if (!monitorProfileName.isEmpty()) { profile = KoColorSpaceRegistry::instance()->profileByName(monitorProfileName); } if (profile) { //dbgKrita << "\t\tsuitable for display" << profile->isSuitableForDisplay(); } else { //dbgKrita << "\t\tstill no profile"; } } // if we still don't have a profile, or the profile isn't suitable for display, // we need to get a last-resort profile. the built-in sRGB is a good choice then. if (!profile || !profile->isSuitableForDisplay()) { //dbgKrita << "\tnothing worked, going to get sRGB built-in"; profile = KoColorSpaceRegistry::instance()->profileByName("sRGB Built-in"); } if (profile) { //dbgKrita << "\tKisConfig::displayProfile for screen" << screen << "is" << profile->name(); } else { //dbgKrita << "\tCouldn't get a display profile at all"; } return profile; } QString KisConfig::workingColorSpace(bool defaultValue) const { return (defaultValue ? "RGBA" : m_cfg.readEntry("workingColorSpace", "RGBA")); } void KisConfig::setWorkingColorSpace(const QString & workingColorSpace) const { m_cfg.writeEntry("workingColorSpace", workingColorSpace); } QString KisConfig::printerColorSpace(bool /*defaultValue*/) const { //TODO currently only rgb8 is supported //return (defaultValue ? "RGBA" : m_cfg.readEntry("printerColorSpace", "RGBA")); return QString("RGBA"); } void KisConfig::setPrinterColorSpace(const QString & printerColorSpace) const { m_cfg.writeEntry("printerColorSpace", printerColorSpace); } QString KisConfig::printerProfile(bool defaultValue) const { return (defaultValue ? "" : m_cfg.readEntry("printerProfile", "")); } void KisConfig::setPrinterProfile(const QString & printerProfile) const { m_cfg.writeEntry("printerProfile", printerProfile); } bool KisConfig::useBlackPointCompensation(bool defaultValue) const { return (defaultValue ? true : m_cfg.readEntry("useBlackPointCompensation", true)); } void KisConfig::setUseBlackPointCompensation(bool useBlackPointCompensation) const { m_cfg.writeEntry("useBlackPointCompensation", useBlackPointCompensation); } bool KisConfig::allowLCMSOptimization(bool defaultValue) const { return (defaultValue ? true : m_cfg.readEntry("allowLCMSOptimization", true)); } void KisConfig::setAllowLCMSOptimization(bool allowLCMSOptimization) { m_cfg.writeEntry("allowLCMSOptimization", allowLCMSOptimization); } bool KisConfig::showRulers(bool defaultValue) const { return (defaultValue ? false : m_cfg.readEntry("showrulers", false)); } void KisConfig::setShowRulers(bool rulers) const { m_cfg.writeEntry("showrulers", rulers); } bool KisConfig::forceShowSaveMessages(bool defaultValue) const { return (defaultValue ? false : m_cfg.readEntry("forceShowSaveMessages", false)); } void KisConfig::setForceShowSaveMessages(bool value) const { m_cfg.writeEntry("forceShowSaveMessages", value); } bool KisConfig::forceShowAutosaveMessages(bool defaultValue) const { return (defaultValue ? false : m_cfg.readEntry("forceShowAutosaveMessages", false)); } void KisConfig::setForceShowAutosaveMessages(bool value) const { m_cfg.writeEntry("forceShowAutosaveMessages", value); } bool KisConfig::rulersTrackMouse(bool defaultValue) const { return (defaultValue ? true : m_cfg.readEntry("rulersTrackMouse", true)); } void KisConfig::setRulersTrackMouse(bool value) const { m_cfg.writeEntry("rulersTrackMouse", value); } qint32 KisConfig::pasteBehaviour(bool defaultValue) const { return (defaultValue ? 2 : m_cfg.readEntry("pasteBehaviour", 2)); } void KisConfig::setPasteBehaviour(qint32 renderIntent) const { m_cfg.writeEntry("pasteBehaviour", renderIntent); } qint32 KisConfig::monitorRenderIntent(bool defaultValue) const { qint32 intent = m_cfg.readEntry("renderIntent", INTENT_PERCEPTUAL); if (intent > 3) intent = 3; if (intent < 0) intent = 0; return (defaultValue ? INTENT_PERCEPTUAL : intent); } void KisConfig::setRenderIntent(qint32 renderIntent) const { if (renderIntent > 3) renderIntent = 3; if (renderIntent < 0) renderIntent = 0; m_cfg.writeEntry("renderIntent", renderIntent); } bool KisConfig::useOpenGL(bool defaultValue) const { if (defaultValue) { return true; } //dbgKrita << "use opengl" << m_cfg.readEntry("useOpenGL", true) << "success" << m_cfg.readEntry("canvasState", "OPENGL_SUCCESS"); QString cs = canvasState(); #ifdef Q_OS_WIN return (m_cfg.readEntry("useOpenGLWindows", true) && (cs == "OPENGL_SUCCESS" || cs == "TRY_OPENGL")); #else return (m_cfg.readEntry("useOpenGL", true) && (cs == "OPENGL_SUCCESS" || cs == "TRY_OPENGL")); #endif } void KisConfig::setUseOpenGL(bool useOpenGL) const { #ifdef Q_OS_WIN m_cfg.writeEntry("useOpenGLWindows", useOpenGL); #else m_cfg.writeEntry("useOpenGL", useOpenGL); #endif } int KisConfig::openGLFilteringMode(bool defaultValue) const { return (defaultValue ? 3 : m_cfg.readEntry("OpenGLFilterMode", 3)); } void KisConfig::setOpenGLFilteringMode(int filteringMode) { m_cfg.writeEntry("OpenGLFilterMode", filteringMode); } bool KisConfig::useOpenGLTextureBuffer(bool defaultValue) const { return (defaultValue ? true : m_cfg.readEntry("useOpenGLTextureBuffer", true)); } void KisConfig::setUseOpenGLTextureBuffer(bool useBuffer) { m_cfg.writeEntry("useOpenGLTextureBuffer", useBuffer); } int KisConfig::openGLTextureSize(bool defaultValue) const { return (defaultValue ? 256 : m_cfg.readEntry("textureSize", 256)); } bool KisConfig::disableVSync(bool defaultValue) const { return (defaultValue ? true : m_cfg.readEntry("disableVSync", true)); } void KisConfig::setDisableVSync(bool disableVSync) { m_cfg.writeEntry("disableVSync", disableVSync); } bool KisConfig::showAdvancedOpenGLSettings(bool defaultValue) const { return (defaultValue ? false : m_cfg.readEntry("showAdvancedOpenGLSettings", false)); } bool KisConfig::forceOpenGLFenceWorkaround(bool defaultValue) const { return (defaultValue ? false : m_cfg.readEntry("forceOpenGLFenceWorkaround", false)); } int KisConfig::numMipmapLevels(bool defaultValue) const { return (defaultValue ? 4 : m_cfg.readEntry("numMipmapLevels", 4)); } int KisConfig::textureOverlapBorder() const { return 1 << qMax(0, numMipmapLevels()); } quint32 KisConfig::getGridMainStyle(bool defaultValue) const { int v = m_cfg.readEntry("gridmainstyle", 0); v = qBound(0, v, 2); return (defaultValue ? 0 : v); } void KisConfig::setGridMainStyle(quint32 v) const { m_cfg.writeEntry("gridmainstyle", v); } quint32 KisConfig::getGridSubdivisionStyle(bool defaultValue) const { quint32 v = m_cfg.readEntry("gridsubdivisionstyle", 1); if (v > 2) v = 2; return (defaultValue ? 1 : v); } void KisConfig::setGridSubdivisionStyle(quint32 v) const { m_cfg.writeEntry("gridsubdivisionstyle", v); } QColor KisConfig::getGridMainColor(bool defaultValue) const { QColor col(99, 99, 99); return (defaultValue ? col : m_cfg.readEntry("gridmaincolor", col)); } void KisConfig::setGridMainColor(const QColor & v) const { m_cfg.writeEntry("gridmaincolor", v); } QColor KisConfig::getGridSubdivisionColor(bool defaultValue) const { QColor col(150, 150, 150); return (defaultValue ? col : m_cfg.readEntry("gridsubdivisioncolor", col)); } void KisConfig::setGridSubdivisionColor(const QColor & v) const { m_cfg.writeEntry("gridsubdivisioncolor", v); } QColor KisConfig::getPixelGridColor(bool defaultValue) const { QColor col(255, 255, 255); return (defaultValue ? col : m_cfg.readEntry("pixelGridColor", col)); } void KisConfig::setPixelGridColor(const QColor & v) const { m_cfg.writeEntry("pixelGridColor", v); } qreal KisConfig::getPixelGridDrawingThreshold(bool defaultValue) const { qreal border = 8.0f; return (defaultValue ? border : m_cfg.readEntry("pixelGridDrawingThreshold", border)); } void KisConfig::setPixelGridDrawingThreshold(qreal v) const { m_cfg.writeEntry("pixelGridDrawingThreshold", v); } bool KisConfig::pixelGridEnabled(bool defaultValue) const { bool enabled = true; return (defaultValue ? enabled : m_cfg.readEntry("pixelGridEnabled", enabled)); } void KisConfig::enablePixelGrid(bool v) const { m_cfg.writeEntry("pixelGridEnabled", v); } quint32 KisConfig::guidesLineStyle(bool defaultValue) const { int v = m_cfg.readEntry("guidesLineStyle", 0); v = qBound(0, v, 2); return (defaultValue ? 0 : v); } void KisConfig::setGuidesLineStyle(quint32 v) const { m_cfg.writeEntry("guidesLineStyle", v); } QColor KisConfig::guidesColor(bool defaultValue) const { QColor col(99, 99, 99); return (defaultValue ? col : m_cfg.readEntry("guidesColor", col)); } void KisConfig::setGuidesColor(const QColor & v) const { m_cfg.writeEntry("guidesColor", v); } void KisConfig::loadSnapConfig(KisSnapConfig *config, bool defaultValue) const { KisSnapConfig defaultConfig(false); if (defaultValue) { *config = defaultConfig; return; } config->setOrthogonal(m_cfg.readEntry("globalSnapOrthogonal", defaultConfig.orthogonal())); config->setNode(m_cfg.readEntry("globalSnapNode", defaultConfig.node())); config->setExtension(m_cfg.readEntry("globalSnapExtension", defaultConfig.extension())); config->setIntersection(m_cfg.readEntry("globalSnapIntersection", defaultConfig.intersection())); config->setBoundingBox(m_cfg.readEntry("globalSnapBoundingBox", defaultConfig.boundingBox())); config->setImageBounds(m_cfg.readEntry("globalSnapImageBounds", defaultConfig.imageBounds())); config->setImageCenter(m_cfg.readEntry("globalSnapImageCenter", defaultConfig.imageCenter())); } void KisConfig::saveSnapConfig(const KisSnapConfig &config) { m_cfg.writeEntry("globalSnapOrthogonal", config.orthogonal()); m_cfg.writeEntry("globalSnapNode", config.node()); m_cfg.writeEntry("globalSnapExtension", config.extension()); m_cfg.writeEntry("globalSnapIntersection", config.intersection()); m_cfg.writeEntry("globalSnapBoundingBox", config.boundingBox()); m_cfg.writeEntry("globalSnapImageBounds", config.imageBounds()); m_cfg.writeEntry("globalSnapImageCenter", config.imageCenter()); } qint32 KisConfig::checkSize(bool defaultValue) const { return (defaultValue ? 32 : m_cfg.readEntry("checksize", 32)); } void KisConfig::setCheckSize(qint32 checksize) const { m_cfg.writeEntry("checksize", checksize); } bool KisConfig::scrollCheckers(bool defaultValue) const { return (defaultValue ? false : m_cfg.readEntry("scrollingcheckers", false)); } void KisConfig::setScrollingCheckers(bool sc) const { m_cfg.writeEntry("scrollingcheckers", sc); } QColor KisConfig::canvasBorderColor(bool defaultValue) const { QColor color(QColor(128,128,128)); return (defaultValue ? color : m_cfg.readEntry("canvasBorderColor", color)); } void KisConfig::setCanvasBorderColor(const QColor& color) const { m_cfg.writeEntry("canvasBorderColor", color); } bool KisConfig::hideScrollbars(bool defaultValue) const { return (defaultValue ? false : m_cfg.readEntry("hideScrollbars", false)); } void KisConfig::setHideScrollbars(bool value) const { m_cfg.writeEntry("hideScrollbars", value); } QColor KisConfig::checkersColor1(bool defaultValue) const { QColor col(220, 220, 220); return (defaultValue ? col : m_cfg.readEntry("checkerscolor", col)); } void KisConfig::setCheckersColor1(const QColor & v) const { m_cfg.writeEntry("checkerscolor", v); } QColor KisConfig::checkersColor2(bool defaultValue) const { return (defaultValue ? QColor(Qt::white) : m_cfg.readEntry("checkerscolor2", QColor(Qt::white))); } void KisConfig::setCheckersColor2(const QColor & v) const { m_cfg.writeEntry("checkerscolor2", v); } bool KisConfig::antialiasCurves(bool defaultValue) const { return (defaultValue ? true : m_cfg.readEntry("antialiascurves", true)); } void KisConfig::setAntialiasCurves(bool v) const { m_cfg.writeEntry("antialiascurves", v); } QColor KisConfig::selectionOverlayMaskColor(bool defaultValue) const { QColor def(255, 0, 0, 220); return (defaultValue ? def : m_cfg.readEntry("selectionOverlayMaskColor", def)); } void KisConfig::setSelectionOverlayMaskColor(const QColor &color) { m_cfg.writeEntry("selectionOverlayMaskColor", color); } bool KisConfig::antialiasSelectionOutline(bool defaultValue) const { return (defaultValue ? false : m_cfg.readEntry("AntialiasSelectionOutline", false)); } void KisConfig::setAntialiasSelectionOutline(bool v) const { m_cfg.writeEntry("AntialiasSelectionOutline", v); } bool KisConfig::showRootLayer(bool defaultValue) const { return (defaultValue ? false : m_cfg.readEntry("ShowRootLayer", false)); } void KisConfig::setShowRootLayer(bool showRootLayer) const { m_cfg.writeEntry("ShowRootLayer", showRootLayer); } bool KisConfig::showGlobalSelection(bool defaultValue) const { return (defaultValue ? false : m_cfg.readEntry("ShowGlobalSelection", false)); } void KisConfig::setShowGlobalSelection(bool showGlobalSelection) const { m_cfg.writeEntry("ShowGlobalSelection", showGlobalSelection); } bool KisConfig::showOutlineWhilePainting(bool defaultValue) const { return (defaultValue ? true : m_cfg.readEntry("ShowOutlineWhilePainting", true)); } void KisConfig::setShowOutlineWhilePainting(bool showOutlineWhilePainting) const { m_cfg.writeEntry("ShowOutlineWhilePainting", showOutlineWhilePainting); } bool KisConfig::hideSplashScreen(bool defaultValue) const { KConfigGroup cfg( KSharedConfig::openConfig(), "SplashScreen"); return (defaultValue ? true : cfg.readEntry("HideSplashAfterStartup", true)); } void KisConfig::setHideSplashScreen(bool hideSplashScreen) const { KConfigGroup cfg( KSharedConfig::openConfig(), "SplashScreen"); cfg.writeEntry("HideSplashAfterStartup", hideSplashScreen); } qreal KisConfig::outlineSizeMinimum(bool defaultValue) const { return (defaultValue ? 1.0 : m_cfg.readEntry("OutlineSizeMinimum", 1.0)); } void KisConfig::setOutlineSizeMinimum(qreal outlineSizeMinimum) const { m_cfg.writeEntry("OutlineSizeMinimum", outlineSizeMinimum); } qreal KisConfig::selectionViewSizeMinimum(bool defaultValue) const { return (defaultValue ? 5.0 : m_cfg.readEntry("SelectionViewSizeMinimum", 5.0)); } void KisConfig::setSelectionViewSizeMinimum(qreal outlineSizeMinimum) const { m_cfg.writeEntry("SelectionViewSizeMinimum", outlineSizeMinimum); } int KisConfig::autoSaveInterval(bool defaultValue) const { return (defaultValue ? 15 * 60 : m_cfg.readEntry("AutoSaveInterval", 15 * 60)); } void KisConfig::setAutoSaveInterval(int seconds) const { return m_cfg.writeEntry("AutoSaveInterval", seconds); } bool KisConfig::backupFile(bool defaultValue) const { return (defaultValue ? true : m_cfg.readEntry("CreateBackupFile", true)); } void KisConfig::setBackupFile(bool backupFile) const { m_cfg.writeEntry("CreateBackupFile", backupFile); } bool KisConfig::showFilterGallery(bool defaultValue) const { return (defaultValue ? false : m_cfg.readEntry("showFilterGallery", false)); } void KisConfig::setShowFilterGallery(bool showFilterGallery) const { m_cfg.writeEntry("showFilterGallery", showFilterGallery); } bool KisConfig::showFilterGalleryLayerMaskDialog(bool defaultValue) const { return (defaultValue ? true : m_cfg.readEntry("showFilterGalleryLayerMaskDialog", true)); } void KisConfig::setShowFilterGalleryLayerMaskDialog(bool showFilterGallery) const { m_cfg.writeEntry("setShowFilterGalleryLayerMaskDialog", showFilterGallery); } QString KisConfig::canvasState(bool defaultValue) const { const QString configPath = QStandardPaths::writableLocation(QStandardPaths::GenericConfigLocation); QSettings kritarc(configPath + QStringLiteral("/kritadisplayrc"), QSettings::IniFormat); return (defaultValue ? "OPENGL_NOT_TRIED" : kritarc.value("canvasState", "OPENGL_NOT_TRIED").toString()); } void KisConfig::setCanvasState(const QString& state) const { static QStringList acceptableStates; if (acceptableStates.isEmpty()) { acceptableStates << "OPENGL_SUCCESS" << "TRY_OPENGL" << "OPENGL_NOT_TRIED" << "OPENGL_FAILED"; } if (acceptableStates.contains(state)) { const QString configPath = QStandardPaths::writableLocation(QStandardPaths::GenericConfigLocation); QSettings kritarc(configPath + QStringLiteral("/kritadisplayrc"), QSettings::IniFormat); kritarc.setValue("canvasState", state); } } bool KisConfig::toolOptionsPopupDetached(bool defaultValue) const { return (defaultValue ? false : m_cfg.readEntry("ToolOptionsPopupDetached", false)); } void KisConfig::setToolOptionsPopupDetached(bool detached) const { m_cfg.writeEntry("ToolOptionsPopupDetached", detached); } bool KisConfig::paintopPopupDetached(bool defaultValue) const { return (defaultValue ? false : m_cfg.readEntry("PaintopPopupDetached", false)); } void KisConfig::setPaintopPopupDetached(bool detached) const { m_cfg.writeEntry("PaintopPopupDetached", detached); } QString KisConfig::pressureTabletCurve(bool defaultValue) const { return (defaultValue ? "0,0;1,1" : m_cfg.readEntry("tabletPressureCurve","0,0;1,1;")); } void KisConfig::setPressureTabletCurve(const QString& curveString) const { m_cfg.writeEntry("tabletPressureCurve", curveString); } bool KisConfig::useWin8PointerInput(bool defaultValue) const { #ifdef Q_OS_WIN return (defaultValue ? false : m_cfg.readEntry("useWin8PointerInput", false)); #else Q_UNUSED(defaultValue); return false; #endif } void KisConfig::setUseWin8PointerInput(bool value) const { #ifdef Q_OS_WIN // Special handling: Only set value if changed // I don't want it to be set if the user hasn't touched it if (useWin8PointerInput() != value) { m_cfg.writeEntry("useWin8PointerInput", value); } #else Q_UNUSED(value) #endif } qreal KisConfig::vastScrolling(bool defaultValue) const { return (defaultValue ? 0.9 : m_cfg.readEntry("vastScrolling", 0.9)); } void KisConfig::setVastScrolling(const qreal factor) const { m_cfg.writeEntry("vastScrolling", factor); } int KisConfig::presetChooserViewMode(bool defaultValue) const { return (defaultValue ? 0 : m_cfg.readEntry("presetChooserViewMode", 0)); } void KisConfig::setPresetChooserViewMode(const int mode) const { m_cfg.writeEntry("presetChooserViewMode", mode); } int KisConfig::presetIconSize(bool defaultValue) const { return (defaultValue ? 30 : m_cfg.readEntry("presetIconSize", 30)); } void KisConfig::setPresetIconSize(const int value) const { m_cfg.writeEntry("presetIconSize", value); } bool KisConfig::firstRun(bool defaultValue) const { return (defaultValue ? true : m_cfg.readEntry("firstRun", true)); } void KisConfig::setFirstRun(const bool first) const { m_cfg.writeEntry("firstRun", first); } int KisConfig::horizontalSplitLines(bool defaultValue) const { return (defaultValue ? 1 : m_cfg.readEntry("horizontalSplitLines", 1)); } void KisConfig::setHorizontalSplitLines(const int numberLines) const { m_cfg.writeEntry("horizontalSplitLines", numberLines); } int KisConfig::verticalSplitLines(bool defaultValue) const { return (defaultValue ? 1 : m_cfg.readEntry("verticalSplitLines", 1)); } void KisConfig::setVerticalSplitLines(const int numberLines) const { m_cfg.writeEntry("verticalSplitLines", numberLines); } bool KisConfig::clicklessSpacePan(bool defaultValue) const { return (defaultValue ? true : m_cfg.readEntry("clicklessSpacePan", true)); } void KisConfig::setClicklessSpacePan(const bool toggle) const { m_cfg.writeEntry("clicklessSpacePan", toggle); } bool KisConfig::hideDockersFullscreen(bool defaultValue) const { return (defaultValue ? true : m_cfg.readEntry("hideDockersFullScreen", true)); } void KisConfig::setHideDockersFullscreen(const bool value) const { m_cfg.writeEntry("hideDockersFullScreen", value); } bool KisConfig::showDockerTitleBars(bool defaultValue) const { return (defaultValue ? true : m_cfg.readEntry("showDockerTitleBars", true)); } void KisConfig::setShowDockerTitleBars(const bool value) const { m_cfg.writeEntry("showDockerTitleBars", value); } bool KisConfig::showDockers(bool defaultValue) const { return (defaultValue ? true : m_cfg.readEntry("showDockers", true)); } void KisConfig::setShowDockers(const bool value) const { m_cfg.writeEntry("showDockers", value); } bool KisConfig::showStatusBar(bool defaultValue) const { return (defaultValue ? true : m_cfg.readEntry("showStatusBar", true)); } void KisConfig::setShowStatusBar(const bool value) const { m_cfg.writeEntry("showStatusBar", value); } bool KisConfig::hideMenuFullscreen(bool defaultValue) const { return (defaultValue ? true: m_cfg.readEntry("hideMenuFullScreen", true)); } void KisConfig::setHideMenuFullscreen(const bool value) const { m_cfg.writeEntry("hideMenuFullScreen", value); } bool KisConfig::hideScrollbarsFullscreen(bool defaultValue) const { return (defaultValue ? true : m_cfg.readEntry("hideScrollbarsFullScreen", true)); } void KisConfig::setHideScrollbarsFullscreen(const bool value) const { m_cfg.writeEntry("hideScrollbarsFullScreen", value); } bool KisConfig::hideStatusbarFullscreen(bool defaultValue) const { return (defaultValue ? true: m_cfg.readEntry("hideStatusbarFullScreen", true)); } void KisConfig::setHideStatusbarFullscreen(const bool value) const { m_cfg.writeEntry("hideStatusbarFullScreen", value); } bool KisConfig::hideTitlebarFullscreen(bool defaultValue) const { return (defaultValue ? true : m_cfg.readEntry("hideTitleBarFullscreen", true)); } void KisConfig::setHideTitlebarFullscreen(const bool value) const { m_cfg.writeEntry("hideTitleBarFullscreen", value); } bool KisConfig::hideToolbarFullscreen(bool defaultValue) const { return (defaultValue ? true : m_cfg.readEntry("hideToolbarFullscreen", true)); } void KisConfig::setHideToolbarFullscreen(const bool value) const { m_cfg.writeEntry("hideToolbarFullscreen", value); } bool KisConfig::fullscreenMode(bool defaultValue) const { return (defaultValue ? true : m_cfg.readEntry("fullscreenMode", true)); } void KisConfig::setFullscreenMode(const bool value) const { m_cfg.writeEntry("fullscreenMode", value); } QStringList KisConfig::favoriteCompositeOps(bool defaultValue) const { return (defaultValue ? QStringList() : m_cfg.readEntry("favoriteCompositeOps", QStringList())); } void KisConfig::setFavoriteCompositeOps(const QStringList& compositeOps) const { m_cfg.writeEntry("favoriteCompositeOps", compositeOps); } QString KisConfig::exportConfiguration(const QString &filterId, bool defaultValue) const { return (defaultValue ? QString() : m_cfg.readEntry("ExportConfiguration-" + filterId, QString())); } void KisConfig::setExportConfiguration(const QString &filterId, KisPropertiesConfigurationSP properties) const { QString exportConfig = properties->toXML(); m_cfg.writeEntry("ExportConfiguration-" + filterId, exportConfig); } QString KisConfig::importConfiguration(const QString &filterId, bool defaultValue) const { return (defaultValue ? QString() : m_cfg.readEntry("ImportConfiguration-" + filterId, QString())); } void KisConfig::setImportConfiguration(const QString &filterId, KisPropertiesConfigurationSP properties) const { QString importConfig = properties->toXML(); m_cfg.writeEntry("ImportConfiguration-" + filterId, importConfig); } bool KisConfig::useOcio(bool defaultValue) const { #ifdef HAVE_OCIO return (defaultValue ? false : m_cfg.readEntry("Krita/Ocio/UseOcio", false)); #else Q_UNUSED(defaultValue); return false; #endif } void KisConfig::setUseOcio(bool useOCIO) const { m_cfg.writeEntry("Krita/Ocio/UseOcio", useOCIO); } int KisConfig::favoritePresets(bool defaultValue) const { return (defaultValue ? 10 : m_cfg.readEntry("numFavoritePresets", 10)); } void KisConfig::setFavoritePresets(const int value) { m_cfg.writeEntry("numFavoritePresets", value); } bool KisConfig::levelOfDetailEnabled(bool defaultValue) const { return (defaultValue ? false : m_cfg.readEntry("levelOfDetailEnabled", false)); } void KisConfig::setLevelOfDetailEnabled(bool value) { m_cfg.writeEntry("levelOfDetailEnabled", value); } KisConfig::OcioColorManagementMode KisConfig::ocioColorManagementMode(bool defaultValue) const { return (OcioColorManagementMode)(defaultValue ? INTERNAL : m_cfg.readEntry("Krita/Ocio/OcioColorManagementMode", (int) INTERNAL)); } void KisConfig::setOcioColorManagementMode(OcioColorManagementMode mode) const { m_cfg.writeEntry("Krita/Ocio/OcioColorManagementMode", (int) mode); } QString KisConfig::ocioConfigurationPath(bool defaultValue) const { return (defaultValue ? QString() : m_cfg.readEntry("Krita/Ocio/OcioConfigPath", QString())); } void KisConfig::setOcioConfigurationPath(const QString &path) const { m_cfg.writeEntry("Krita/Ocio/OcioConfigPath", path); } QString KisConfig::ocioLutPath(bool defaultValue) const { return (defaultValue ? QString() : m_cfg.readEntry("Krita/Ocio/OcioLutPath", QString())); } void KisConfig::setOcioLutPath(const QString &path) const { m_cfg.writeEntry("Krita/Ocio/OcioLutPath", path); } int KisConfig::ocioLutEdgeSize(bool defaultValue) const { return (defaultValue ? 64 : m_cfg.readEntry("Krita/Ocio/LutEdgeSize", 64)); } void KisConfig::setOcioLutEdgeSize(int value) { m_cfg.writeEntry("Krita/Ocio/LutEdgeSize", value); } bool KisConfig::ocioLockColorVisualRepresentation(bool defaultValue) const { return (defaultValue ? false : m_cfg.readEntry("Krita/Ocio/OcioLockColorVisualRepresentation", false)); } void KisConfig::setOcioLockColorVisualRepresentation(bool value) { m_cfg.writeEntry("Krita/Ocio/OcioLockColorVisualRepresentation", value); } QString KisConfig::defaultPalette(bool defaultValue) const { return (defaultValue ? QString() : m_cfg.readEntry("defaultPalette", QString())); } void KisConfig::setDefaultPalette(const QString& name) const { m_cfg.writeEntry("defaultPalette", name); } QString KisConfig::toolbarSlider(int sliderNumber, bool defaultValue) const { QString def = "flow"; if (sliderNumber == 1) { def = "opacity"; } if (sliderNumber == 2) { def = "size"; } return (defaultValue ? def : m_cfg.readEntry(QString("toolbarslider_%1").arg(sliderNumber), def)); } void KisConfig::setToolbarSlider(int sliderNumber, const QString &slider) { m_cfg.writeEntry(QString("toolbarslider_%1").arg(sliderNumber), slider); } bool KisConfig::sliderLabels(bool defaultValue) const { return (defaultValue ? true : m_cfg.readEntry("sliderLabels", true)); } void KisConfig::setSliderLabels(bool enabled) { m_cfg.writeEntry("sliderLabels", enabled); } QString KisConfig::currentInputProfile(bool defaultValue) const { return (defaultValue ? QString() : m_cfg.readEntry("currentInputProfile", QString())); } void KisConfig::setCurrentInputProfile(const QString& name) { m_cfg.writeEntry("currentInputProfile", name); } bool KisConfig::useSystemMonitorProfile(bool defaultValue) const { return (defaultValue ? false : m_cfg.readEntry("ColorManagement/UseSystemMonitorProfile", false)); } void KisConfig::setUseSystemMonitorProfile(bool _useSystemMonitorProfile) const { m_cfg.writeEntry("ColorManagement/UseSystemMonitorProfile", _useSystemMonitorProfile); } bool KisConfig::presetStripVisible(bool defaultValue) const { return (defaultValue ? true : m_cfg.readEntry("presetStripVisible", true)); } void KisConfig::setPresetStripVisible(bool visible) { m_cfg.writeEntry("presetStripVisible", visible); } bool KisConfig::scratchpadVisible(bool defaultValue) const { return (defaultValue ? true : m_cfg.readEntry("scratchpadVisible", true)); } void KisConfig::setScratchpadVisible(bool visible) { m_cfg.writeEntry("scratchpadVisible", visible); } bool KisConfig::showSingleChannelAsColor(bool defaultValue) const { return (defaultValue ? false : m_cfg.readEntry("showSingleChannelAsColor", false)); } void KisConfig::setShowSingleChannelAsColor(bool asColor) { m_cfg.writeEntry("showSingleChannelAsColor", asColor); } bool KisConfig::hidePopups(bool defaultValue) const { return (defaultValue ? false : m_cfg.readEntry("hidePopups", false)); } void KisConfig::setHidePopups(bool hidepopups) { m_cfg.writeEntry("hidePopups", hidepopups); } int KisConfig::numDefaultLayers(bool defaultValue) const { return (defaultValue ? 2 : m_cfg.readEntry("NumberOfLayersForNewImage", 2)); } void KisConfig::setNumDefaultLayers(int num) { m_cfg.writeEntry("NumberOfLayersForNewImage", num); } quint8 KisConfig::defaultBackgroundOpacity(bool defaultValue) const { return (defaultValue ? (int)OPACITY_OPAQUE_U8 : m_cfg.readEntry("BackgroundOpacityForNewImage", (int)OPACITY_OPAQUE_U8)); } void KisConfig::setDefaultBackgroundOpacity(quint8 value) { m_cfg.writeEntry("BackgroundOpacityForNewImage", (int)value); } QColor KisConfig::defaultBackgroundColor(bool defaultValue) const { return (defaultValue ? QColor(Qt::white) : m_cfg.readEntry("BackgroundColorForNewImage", QColor(Qt::white))); } void KisConfig::setDefaultBackgroundColor(QColor value) { m_cfg.writeEntry("BackgroundColorForNewImage", value); } KisConfig::BackgroundStyle KisConfig::defaultBackgroundStyle(bool defaultValue) const { return (KisConfig::BackgroundStyle)(defaultValue ? LAYER : m_cfg.readEntry("BackgroundStyleForNewImage", (int)LAYER)); } void KisConfig::setDefaultBackgroundStyle(KisConfig::BackgroundStyle value) { m_cfg.writeEntry("BackgroundStyleForNewImage", (int)value); } int KisConfig::lineSmoothingType(bool defaultValue) const { return (defaultValue ? 1 : m_cfg.readEntry("LineSmoothingType", 1)); } void KisConfig::setLineSmoothingType(int value) { m_cfg.writeEntry("LineSmoothingType", value); } qreal KisConfig::lineSmoothingDistance(bool defaultValue) const { return (defaultValue ? 50.0 : m_cfg.readEntry("LineSmoothingDistance", 50.0)); } void KisConfig::setLineSmoothingDistance(qreal value) { m_cfg.writeEntry("LineSmoothingDistance", value); } qreal KisConfig::lineSmoothingTailAggressiveness(bool defaultValue) const { return (defaultValue ? 0.15 : m_cfg.readEntry("LineSmoothingTailAggressiveness", 0.15)); } void KisConfig::setLineSmoothingTailAggressiveness(qreal value) { m_cfg.writeEntry("LineSmoothingTailAggressiveness", value); } bool KisConfig::lineSmoothingSmoothPressure(bool defaultValue) const { return (defaultValue ? false : m_cfg.readEntry("LineSmoothingSmoothPressure", false)); } void KisConfig::setLineSmoothingSmoothPressure(bool value) { m_cfg.writeEntry("LineSmoothingSmoothPressure", value); } bool KisConfig::lineSmoothingScalableDistance(bool defaultValue) const { return (defaultValue ? true : m_cfg.readEntry("LineSmoothingScalableDistance", true)); } void KisConfig::setLineSmoothingScalableDistance(bool value) { m_cfg.writeEntry("LineSmoothingScalableDistance", value); } qreal KisConfig::lineSmoothingDelayDistance(bool defaultValue) const { return (defaultValue ? 50.0 : m_cfg.readEntry("LineSmoothingDelayDistance", 50.0)); } void KisConfig::setLineSmoothingDelayDistance(qreal value) { m_cfg.writeEntry("LineSmoothingDelayDistance", value); } bool KisConfig::lineSmoothingUseDelayDistance(bool defaultValue) const { return (defaultValue ? true : m_cfg.readEntry("LineSmoothingUseDelayDistance", true)); } void KisConfig::setLineSmoothingUseDelayDistance(bool value) { m_cfg.writeEntry("LineSmoothingUseDelayDistance", value); } bool KisConfig::lineSmoothingFinishStabilizedCurve(bool defaultValue) const { return (defaultValue ? true : m_cfg.readEntry("LineSmoothingFinishStabilizedCurve", true)); } void KisConfig::setLineSmoothingFinishStabilizedCurve(bool value) { m_cfg.writeEntry("LineSmoothingFinishStabilizedCurve", value); } bool KisConfig::lineSmoothingStabilizeSensors(bool defaultValue) const { return (defaultValue ? true : m_cfg.readEntry("LineSmoothingStabilizeSensors", true)); } void KisConfig::setLineSmoothingStabilizeSensors(bool value) { m_cfg.writeEntry("LineSmoothingStabilizeSensors", value); } int KisConfig::paletteDockerPaletteViewSectionSize(bool defaultValue) const { return (defaultValue ? 12 : m_cfg.readEntry("paletteDockerPaletteViewSectionSize", 12)); } void KisConfig::setPaletteDockerPaletteViewSectionSize(int value) const { m_cfg.writeEntry("paletteDockerPaletteViewSectionSize", value); } int KisConfig::tabletEventsDelay(bool defaultValue) const { return (defaultValue ? 10 : m_cfg.readEntry("tabletEventsDelay", 10)); } void KisConfig::setTabletEventsDelay(int value) { m_cfg.writeEntry("tabletEventsDelay", value); } bool KisConfig::trackTabletEventLatency(bool defaultValue) const { return (defaultValue ? false : m_cfg.readEntry("trackTabletEventLatency", false)); } void KisConfig::setTrackTabletEventLatency(bool value) { m_cfg.writeEntry("trackTabletEventLatency", value); } bool KisConfig::testingAcceptCompressedTabletEvents(bool defaultValue) const { return (defaultValue ? false : m_cfg.readEntry("testingAcceptCompressedTabletEvents", false)); } void KisConfig::setTestingAcceptCompressedTabletEvents(bool value) { m_cfg.writeEntry("testingAcceptCompressedTabletEvents", value); } bool KisConfig::shouldEatDriverShortcuts(bool defaultValue) const { return (defaultValue ? false : m_cfg.readEntry("shouldEatDriverShortcuts", false)); } bool KisConfig::testingCompressBrushEvents(bool defaultValue) const { return (defaultValue ? false : m_cfg.readEntry("testingCompressBrushEvents", false)); } void KisConfig::setTestingCompressBrushEvents(bool value) { m_cfg.writeEntry("testingCompressBrushEvents", value); } int KisConfig::workaroundX11SmoothPressureSteps(bool defaultValue) const { return (defaultValue ? 0 : m_cfg.readEntry("workaroundX11SmoothPressureSteps", 0)); } bool KisConfig::showCanvasMessages(bool defaultValue) const { return (defaultValue ? true : m_cfg.readEntry("showOnCanvasMessages", true)); } void KisConfig::setShowCanvasMessages(bool show) { m_cfg.writeEntry("showOnCanvasMessages", show); } bool KisConfig::compressKra(bool defaultValue) const { return (defaultValue ? false : m_cfg.readEntry("compressLayersInKra", false)); } void KisConfig::setCompressKra(bool compress) { m_cfg.writeEntry("compressLayersInKra", compress); } bool KisConfig::toolOptionsInDocker(bool defaultValue) const { return (defaultValue ? true : m_cfg.readEntry("ToolOptionsInDocker", true)); } void KisConfig::setToolOptionsInDocker(bool inDocker) { m_cfg.writeEntry("ToolOptionsInDocker", inDocker); } int KisConfig::kineticScrollingGesture(bool defaultValue) const { return (defaultValue ? 0 : m_cfg.readEntry("KineticScrollingGesture", 0)); } void KisConfig::setKineticScrollingGesture(int gesture) { m_cfg.writeEntry("KineticScrollingGesture", gesture); } int KisConfig::kineticScrollingSensitivity(bool defaultValue) const { return (defaultValue ? 75 : m_cfg.readEntry("KineticScrollingSensitivity", 75)); } void KisConfig::setKineticScrollingSensitivity(int sensitivity) { m_cfg.writeEntry("KineticScrollingSensitivity", sensitivity); } bool KisConfig::kineticScrollingScrollbar(bool defaultValue) const { return (defaultValue ? true : m_cfg.readEntry("KineticScrollingScrollbar", true)); } void KisConfig::setKineticScrollingScrollbar(bool scrollbar) { m_cfg.writeEntry("KineticScrollingScrollbar", scrollbar); } const KoColorSpace* KisConfig::customColorSelectorColorSpace(bool defaultValue) const { const KoColorSpace *cs = 0; KConfigGroup cfg = KSharedConfig::openConfig()->group("advancedColorSelector"); if (defaultValue || cfg.readEntry("useCustomColorSpace", true)) { KoColorSpaceRegistry* csr = KoColorSpaceRegistry::instance(); QString modelID = cfg.readEntry("customColorSpaceModel", "RGBA"); QString depthID = cfg.readEntry("customColorSpaceDepthID", "U8"); QString profile = cfg.readEntry("customColorSpaceProfile", "sRGB built-in - (lcms internal)"); if (profile == "default") { // qDebug() << "Falling back to default color profile."; profile = "sRGB built-in - (lcms internal)"; } cs = csr->colorSpace(modelID, depthID, profile); } return cs; } void KisConfig::setCustomColorSelectorColorSpace(const KoColorSpace *cs) { KConfigGroup cfg = KSharedConfig::openConfig()->group("advancedColorSelector"); cfg.writeEntry("useCustomColorSpace", bool(cs)); if(cs) { cfg.writeEntry("customColorSpaceModel", cs->colorModelId().id()); cfg.writeEntry("customColorSpaceDepthID", cs->colorDepthId().id()); cfg.writeEntry("customColorSpaceProfile", cs->profile()->name()); } KisConfigNotifier::instance()->notifyConfigChanged(); } bool KisConfig::enableOpenGLFramerateLogging(bool defaultValue) const { return (defaultValue ? false : m_cfg.readEntry("enableOpenGLFramerateLogging", false)); } void KisConfig::setEnableOpenGLFramerateLogging(bool value) const { m_cfg.writeEntry("enableOpenGLFramerateLogging", value); } bool KisConfig::enableBrushSpeedLogging(bool defaultValue) const { return (defaultValue ? false : m_cfg.readEntry("enableBrushSpeedLogging", false)); } void KisConfig::setEnableBrushSpeedLogging(bool value) const { m_cfg.writeEntry("enableBrushSpeedLogging", value); } void KisConfig::setEnableAmdVectorizationWorkaround(bool value) { m_cfg.writeEntry("amdDisableVectorWorkaround", value); } bool KisConfig::enableAmdVectorizationWorkaround(bool defaultValue) const { return (defaultValue ? false : m_cfg.readEntry("amdDisableVectorWorkaround", false)); } void KisConfig::setAnimationDropFrames(bool value) { bool oldValue = animationDropFrames(); if (value == oldValue) return; m_cfg.writeEntry("animationDropFrames", value); KisConfigNotifier::instance()->notifyDropFramesModeChanged(); } bool KisConfig::animationDropFrames(bool defaultValue) const { return (defaultValue ? true : m_cfg.readEntry("animationDropFrames", true)); } int KisConfig::scrubbingUpdatesDelay(bool defaultValue) const { return (defaultValue ? 30 : m_cfg.readEntry("scrubbingUpdatesDelay", 30)); } void KisConfig::setScrubbingUpdatesDelay(int value) { m_cfg.writeEntry("scrubbingUpdatesDelay", value); } int KisConfig::scrubbingAudioUpdatesDelay(bool defaultValue) const { return (defaultValue ? -1 : m_cfg.readEntry("scrubbingAudioUpdatesDelay", -1)); } void KisConfig::setScrubbingAudioUpdatesDelay(int value) { m_cfg.writeEntry("scrubbingAudioUpdatesDelay", value); } int KisConfig::audioOffsetTolerance(bool defaultValue) const { return (defaultValue ? -1 : m_cfg.readEntry("audioOffsetTolerance", -1)); } void KisConfig::setAudioOffsetTolerance(int value) { m_cfg.writeEntry("audioOffsetTolerance", value); } bool KisConfig::switchSelectionCtrlAlt(bool defaultValue) const { return defaultValue ? false : m_cfg.readEntry("switchSelectionCtrlAlt", false); } void KisConfig::setSwitchSelectionCtrlAlt(bool value) { m_cfg.writeEntry("switchSelectionCtrlAlt", value); KisConfigNotifier::instance()->notifyConfigChanged(); } bool KisConfig::convertToImageColorspaceOnImport(bool defaultValue) const { return defaultValue ? false : m_cfg.readEntry("ConvertToImageColorSpaceOnImport", false); } void KisConfig::setConvertToImageColorspaceOnImport(bool value) { m_cfg.writeEntry("ConvertToImageColorSpaceOnImport", value); } int KisConfig::stabilizerSampleSize(bool defaultValue) const { #ifdef Q_OS_WIN const int defaultSampleSize = 50; #else const int defaultSampleSize = 15; #endif return defaultValue ? defaultSampleSize : m_cfg.readEntry("stabilizerSampleSize", defaultSampleSize); } void KisConfig::setStabilizerSampleSize(int value) { m_cfg.writeEntry("stabilizerSampleSize", value); } bool KisConfig::stabilizerDelayedPaint(bool defaultValue) const { const bool defaultEnabled = true; return defaultValue ? defaultEnabled : m_cfg.readEntry("stabilizerDelayedPaint", defaultEnabled); } void KisConfig::setStabilizerDelayedPaint(bool value) { m_cfg.writeEntry("stabilizerDelayedPaint", value); } QString KisConfig::customFFMpegPath(bool defaultValue) const { return defaultValue ? QString() : m_cfg.readEntry("ffmpegExecutablePath", QString()); } void KisConfig::setCustomFFMpegPath(const QString &value) const { m_cfg.writeEntry("ffmpegExecutablePath", value); } bool KisConfig::showBrushHud(bool defaultValue) const { return defaultValue ? false : m_cfg.readEntry("showBrushHud", false); } void KisConfig::setShowBrushHud(bool value) { m_cfg.writeEntry("showBrushHud", value); } QString KisConfig::brushHudSetting(bool defaultValue) const { - QString defaultDoc = "\n\n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n\n"; + QString defaultDoc = "\n\n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n\n"; return defaultValue ? defaultDoc : m_cfg.readEntry("brushHudSettings", defaultDoc); } void KisConfig::setBrushHudSetting(const QString &value) const { m_cfg.writeEntry("brushHudSettings", value); } bool KisConfig::calculateAnimationCacheInBackground(bool defaultValue) const { return defaultValue ? true : m_cfg.readEntry("calculateAnimationCacheInBackground", true); } void KisConfig::setCalculateAnimationCacheInBackground(bool value) { m_cfg.writeEntry("calculateAnimationCacheInBackground", value); } #include #include void KisConfig::writeKoColor(const QString& name, const KoColor& color) const { QDomDocument doc = QDomDocument(name); QDomElement el = doc.createElement(name); doc.appendChild(el); color.toXML(doc, el); m_cfg.writeEntry(name, doc.toString()); } //ported from kispropertiesconfig. KoColor KisConfig::readKoColor(const QString& name, const KoColor& color) const { QDomDocument doc; if (!m_cfg.readEntry(name).isNull()) { doc.setContent(m_cfg.readEntry(name)); QDomElement e = doc.documentElement().firstChild().toElement(); return KoColor::fromXML(e, Integer16BitsColorDepthID.id()); } else { QString blackColor = "\n\n \n\n"; doc.setContent(blackColor); QDomElement e = doc.documentElement().firstChild().toElement(); return KoColor::fromXML(e, Integer16BitsColorDepthID.id()); } return color; } diff --git a/packaging/windows/krita_installer/krita-files.json b/packaging/windows/krita_installer/krita-files.json index 2023417df7..b3502c95a7 100644 --- a/packaging/windows/krita_installer/krita-files.json +++ b/packaging/windows/krita_installer/krita-files.json @@ -1,345 +1,344 @@ {"InstallationInfo" : [ { "dir": "lib\\plugins", "msg": "Copying plugins", "comment": "Hmm", "files": [ "lib\\plugins\\kritathumbnail.dll", "lib\\plugins\\kstyle_oxygen_config.dll" ] }, { "dir": "lib\\plugins\\imageformats", "msg": "Copying image format plugins", "files": [ "lib\\plugins\\imageformats\\kimg_kra.dll", "lib\\plugins\\imageformats\\kimg_ora.dll" ] }, { "dir": "lib\\kritaplugins", "msg": "Copying lib\\kritaplugins", "comment": "Double check these, this list was compiled without all modules built.", "files": [ "lib\\kritaplugins\\calligra_tool_basicflakes.dll", "lib\\kritaplugins\\kritaanimationdocker.dll", "lib\\kritaplugins\\kritaartisticcolorselector.dll", "lib\\kritaplugins\\kritabigbrother.dll", "lib\\kritaplugins\\kritablurfilter.dll", "lib\\kritaplugins\\kritabmpexport.dll", "lib\\kritaplugins\\kritabmpimport.dll", - "lib\\kritaplugins\\kritachalkpaintop.dll", "lib\\kritaplugins\\kritachanneldocker.dll", "lib\\kritaplugins\\kritaclonesarray.dll", "lib\\kritaplugins\\kritacolorgenerator.dll", "lib\\kritaplugins\\kritacolorrange.dll", "lib\\kritaplugins\\kritacolorselectorng.dll", "lib\\kritaplugins\\kritacolorsfilters.dll", "lib\\kritaplugins\\kritacolorslider.dll", "lib\\kritaplugins\\kritacolorsmudgepaintop.dll", "lib\\kritaplugins\\kritacolorspaceconversion.dll", "lib\\kritaplugins\\kritacompositiondocker.dll", "lib\\kritaplugins\\kritaconvolutionfilters.dll", "lib\\kritaplugins\\kritacurvepaintop.dll", "lib\\kritaplugins\\kritadefaultdockers.dll", "lib\\kritaplugins\\kritadefaultpaintops.dll", "lib\\kritaplugins\\kritadefaulttools.dll", "lib\\kritaplugins\\kritadeformpaintop.dll", "lib\\kritaplugins\\kritadigitalmixer.dll", "lib\\kritaplugins\\kritadodgeburn.dll", "lib\\kritaplugins\\kritadynapaintop.dll", "lib\\kritaplugins\\kritaembossfilter.dll", "lib\\kritaplugins\\kritaexample.dll", "lib\\kritaplugins\\kritaexperimentpaintop.dll", "lib\\kritaplugins\\kritaextensioncolorsfilters.dll", "lib\\kritaplugins\\kritafastcolortransferfilter.dll", "lib\\kritaplugins\\kritafilterop.dll", "lib\\kritaplugins\\kritagridpaintop.dll", "lib\\kritaplugins\\kritahairypaintop.dll", "lib\\kritaplugins\\kritahatchingpaintop.dll", "lib\\kritaplugins\\kritaheightmapexport.dll", "lib\\kritaplugins\\kritaheightmapimport.dll", "lib\\kritaplugins\\kritahistogram.dll", "lib\\kritaplugins\\kritahistorydocker.dll", "lib\\kritaplugins\\kritaimagedocker.dll", "lib\\kritaplugins\\kritaimageenhancement.dll", "lib\\kritaplugins\\kritaimagesize.dll", "lib\\kritaplugins\\kritaimagesplit.dll", "lib\\kritaplugins\\kritaindexcolors.dll", "lib\\kritaplugins\\kritajpegexport.dll", "lib\\kritaplugins\\kritajpegimport.dll", "lib\\kritaplugins\\kritalayergroupswitcher.dll", "lib\\kritaplugins\\kritalayersplit.dll", "lib\\kritaplugins\\kritalcmsengine.dll", "lib\\kritaplugins\\kritalevelfilter.dll", "lib\\kritaplugins\\kritametadataeditor.dll", "lib\\kritaplugins\\kritamodifyselection.dll", "lib\\kritaplugins\\kritanoisefilter.dll", "lib\\kritaplugins\\kritanormalize.dll", "lib\\kritaplugins\\kritaodgimport.dll", "lib\\kritaplugins\\kritaoffsetimage.dll", "lib\\kritaplugins\\kritaoilpaintfilter.dll", "lib\\kritaplugins\\kritaoraexport.dll", "lib\\kritaplugins\\kritaoraimport.dll", "lib\\kritaplugins\\kritaoverviewdocker.dll", "lib\\kritaplugins\\kritapalettedocker.dll", "lib\\kritaplugins\\kritaparticlepaintop.dll", "lib\\kritaplugins\\kritapatterndocker.dll", "lib\\kritaplugins\\kritapatterngenerator.dll", "lib\\kritaplugins\\kritaphongbumpmap.dll", "lib\\kritaplugins\\kritapixelizefilter.dll", "lib\\kritaplugins\\kritapngexport.dll", "lib\\kritaplugins\\kritapngimport.dll", "lib\\kritaplugins\\kritaposterize.dll", "lib\\kritaplugins\\kritappmexport.dll", "lib\\kritaplugins\\kritappmimport.dll", "lib\\kritaplugins\\kritapresetdocker.dll", "lib\\kritaplugins\\kritapresethistory.dll", "lib\\kritaplugins\\kritapsdexport.dll", "lib\\kritaplugins\\kritapsdimport.dll", "lib\\kritaplugins\\kritaqmlexport.dll", "lib\\kritaplugins\\kritaraindropsfilter.dll", "lib\\kritaplugins\\kritarandompickfilter.dll", "lib\\kritaplugins\\kritaresourcemanager.dll", "lib\\kritaplugins\\kritarotateimage.dll", "lib\\kritaplugins\\kritaroundcornersfilter.dll", "lib\\kritaplugins\\kritarulerassistanttool.dll", "lib\\kritaplugins\\kritaselectiontools.dll", "lib\\kritaplugins\\kritaseparatechannels.dll", "lib\\kritaplugins\\kritashearimage.dll", "lib\\kritaplugins\\kritasketchpaintop.dll", "lib\\kritaplugins\\kritasmallcolorselector.dll", "lib\\kritaplugins\\kritasmalltilesfilter.dll", "lib\\kritaplugins\\kritasobelfilter.dll", "lib\\kritaplugins\\kritaspecificcolorselector.dll", "lib\\kritaplugins\\kritaspraypaintop.dll", "lib\\kritaplugins\\kritatangentnormalpaintop.dll", "lib\\kritaplugins\\kritatasksetdocker.dll", "lib\\kritaplugins\\kritatgaexport.dll", "lib\\kritaplugins\\kritatgaimport.dll", "lib\\kritaplugins\\kritatiffexport.dll", "lib\\kritaplugins\\kritatiffimport.dll", "lib\\kritaplugins\\kritatoolcrop.dll", "lib\\kritaplugins\\kritatooldyna.dll", "lib\\kritaplugins\\kritatoolgrid.dll", "lib\\kritaplugins\\kritatoolperspectivegrid.dll", "lib\\kritaplugins\\kritatoolpolygon.dll", "lib\\kritaplugins\\kritatoolpolyline.dll", "lib\\kritaplugins\\kritatooltext.dll", "lib\\kritaplugins\\kritatooltransform.dll", "lib\\kritaplugins\\kritaunsharpfilter.dll", "lib\\kritaplugins\\kritawavefilter.dll", "lib\\kritaplugins\\kritaxcfimport.dll", "lib\\kritaplugins\\krita_colorspaces_extensions.dll", "lib\\kritaplugins\\krita_docker_defaults.dll", "lib\\kritaplugins\\krita_filtereffects.dll", "lib\\kritaplugins\\krita_flaketools.dll", "lib\\kritaplugins\\krita_karbontools.dll", "lib\\kritaplugins\\krita_shape_artistictext.dll", "lib\\kritaplugins\\krita_shape_paths.dll", "lib\\kritaplugins\\krita_shape_text.dll", "lib\\kritaplugins\\krita_shape_vector.dll" ] }, { "dir" : "lib\\plugins\\styles", "files" : [ "lib\\plugins\\styles\\oxygen.dll", "lib\\plugins\\styles\\breeze.dll" ] }, { "msg" : "Copying Shared Libraries", "dir" : "bin\\", "files" : ["bin\\boost_system-vc150-mt-1_59.dll", "bin\\dbus-1.dll", "bin\\exiv2.dll", "bin\\expat.dll", "bin\\iconv.dll", "bin\\icudt55.dll", "bin\\icuin55.dll", "bin\\icuuc55.dll", "bin\\lcms2.dll", "bin\\libeay32.dll", "bin\\libintl.dll", "bin\\libpng15.dll", "bin\\lzma.dll", "bin\\oxygenstyle5.dll", "bin\\oxygenstyleconfig5.dll", "bin\\ssleay32.dll", "bin\\tiff3.dll", "bin\\zlib.dll" ] }, { "msg" : "Copying Qt and KDE Libraries", "dir" : "bin\\", "files" : ["bin\\KF5Archive.dll", "bin\\KF5Completion.dll", "bin\\KF5ConfigCore.dll", "bin\\KF5ConfigGui.dll", "bin\\KF5CoreAddons.dll", "bin\\KF5DbusAddons.dll", "bin\\KF5Crash.dll", "bin\\KF5GuiAddons.dll", "bin\\KF5I18n.dll", "bin\\KF5ItemModels.dll", "bin\\KF5ItemViews.dll", "bin\\KF5KIOCore.dll", "bin\\KF5Service.dll", "bin\\KF5WidgetsAddons.dll", "bin\\KF5WindowSystem.dll", "bin\\Qt5Concurrent.dll", "bin\\Qt5Core.dll", "bin\\Qt5DBus.dll", "bin\\Qt5Gui.dll", "bin\\Qt5Network.dll", "bin\\Qt5OpenGL.dll", "bin\\Qt5PrintSupport.dll", "bin\\Qt5Svg.dll", "bin\\Qt5Widgets.dll", "bin\\Qt5WinExtras.dll", "bin\\Qt5Xml.dll" ] }, { "msg" : "Copying Krita Libraries", "dir" : "bin\\", "files" : ["bin\\kritabasicflakes.dll", "bin\\kritacolor.dll", "bin\\kritaflake.dll", "bin\\kritaglobal.dll", "bin\\kritaimage.dll", "bin\\kritalibbrush.dll", "bin\\kritalibpaintop.dll", "bin\\kritaodf.dll", "bin\\kritapigment.dll", "bin\\kritaplugin.dll", "bin\\kritapsd.dll", "bin\\kritasketchlib.dll", "bin\\kritastore.dll", "bin\\kritatext.dll", "bin\\kritatextlayout.dll", "bin\\kritaui.dll", "bin\\kritaundo2.dll", "bin\\kritavectorimage.dll", "bin\\kritaversion.dll", "bin\\kritawidgets.dll", "bin\\kritawidgetutils.dll" ] }, { "msg" : "Copying Executables", "dir" : "bin\\", "files" : [ "bin\\gmicparser.exe", "bin\\krita.exe" ] }, { "msg" : "Copying directory /etc/dbus-1", "dir": "etc\\dbus-1", "files": ["etc\\"] }, { "msg" : "Copying Qt plugins", "dir" : "bin", "files" : [ "plugins\\imageformats", "plugins\\platforms", "plugins\\iconengines"] }, { "msg": "Copying directory /share", "dir" : "share", "files" : [ "share\\calligra", "share\\color-schemes", "share\\apps\\desktoptheme", "share\\krita", "share\\kritasketch", "share\\kritaanimation", "share\\kritaplugins", "share\\kstyle", "share\\mime", "share\\xdg", "share\\color"] }, { "msg" : "Copying directory /etc/xdg", "dir" : "etc\\xdg", "files" : [ "etc\\xdg\\colors", "etc\\xdg\\ui", "etc\\xdg\\krita*", "etc\\xdg\\kdebug*", "etc\\xdg\\khot*", "etc\\xdg\\kdebugrc" ] }, { "msg" : "Copying dbus interfaces", "dir" : "share\\dbus-1\\interfaces", "files" : [ "share\\dbus-1\\interfaces\\kf5_org.kde.*", "share\\dbus-1\\services\\kf5_org.kde.*"] }, { "msg": "Copying directory share/kservices5", "dir" : "share\\kservices5", "files" : [ "share\\kservices5\\krita_kra_thumbnail.desktop", "share\\kservices5\\kshorturifilter.desktop", "share\\kservices5\\kuriikwsfilter.desktop", "share\\kservices5\\kurisearchfilter.desktop", "share\\kservices5\\localdomainurifilter.desktop", "share\\kservices5\\*.protocol"] }, { "msg": "Copying directory share/kservicetypes5", "dir" : "share\\kservicetypes5", "files" : [ "share\\kservicetypes5\\application.desktop", "share\\kservicetypes5\\calligra*.desktop", "share\\kservicetypes5\\filtereffect.desktop", "share\\kservicetypes5\\flake.desktop", "share\\kservicetypes5\\flakedevice.desktop", "share\\kservicetypes5\\flakeshape.desktop", "share\\kservicetypes5\\flaketool.desktop", "share\\kservicetypes5\\inlinetextobject.desktop", "share\\kservicetypes5\\kfileitemactionplugin.desktop", "share\\kservicetypes5\\kfilewrite.desktop", "share\\kservicetypes5\\knotificationplugin.desktop", "share\\kservicetypes5\\kpart.desktop", "share\\kservicetypes5\\kplugininfo.desktop", "share\\kservicetypes5\\krita*.desktop", "share\\kservicetypes5\\kurifilterplugin.desktop", "share\\kservicetypes5\\pigment.desktop", "share\\kservicetypes5\\pigmentextension.desktop", "share\\kservicetypes5\\qimageio_plugin.desktop", "share\\kservicetypes5\\texteditingplugin.desktop" ] } ]} diff --git a/packaging/windows/krita_installer/package.bat b/packaging/windows/krita_installer/package.bat index 4203801301..6969278219 100644 --- a/packaging/windows/krita_installer/package.bat +++ b/packaging/windows/krita_installer/package.bat @@ -1,384 +1,383 @@ :: package_calligra.bat :: :: Copies relevant files from the calligra inst and kderoot folders :: @echo off :: Safety check: :: Make sure key variables are defined IF "%C2WINSTALL_INPUT%"=="" ( echo !!! C2WINSTALL VARIABLES NOT PROPERLY DEFINED !!! echo Operation cancelled. goto :eof pause ) IF "%C2WINSTALL_OUTPUT%"=="" ( echo !!! C2WINSTALL VARIABLES NOT PROPERLY DEFINED !!! echo Operation cancelled. goto :eof pause ) :: Create redistribution directories rm -rf %C2WINSTALL_INPUT% mkdir %C2WINSTALL_INPUT% mkdir %C2WINSTALL_OUTPUT% mkdir %C2WINSTALL_INPUT%\bin mkdir %C2WINSTALL_INPUT%\etc mkdir %C2WINSTALL_INPUT%\lib mkdir %C2WINSTALL_INPUT%\lib\kde4 mkdir %C2WINSTALL_INPUT%\plugins mkdir %C2WINSTALL_INPUT%\share echo Copying plugins cp %CALLIGRA_INST%\lib\kde4/artistictextshape.dll %C2WINSTALL_INPUT%\lib\kde4 cp %CALLIGRA_INST%\lib\kde4/autocorrect.dll %C2WINSTALL_INPUT%\lib\kde4 cp %CALLIGRA_INST%\lib\kde4/basicflakesplugin.dll %C2WINSTALL_INPUT%\lib\kde4 cp %CALLIGRA_INST%\lib\kde4/calligradocinfopropspage.dll %C2WINSTALL_INPUT%\lib\kde4 cp %CALLIGRA_INST%\lib\kde4/calligradockers.dll %C2WINSTALL_INPUT%\lib\kde4 cp %CALLIGRA_INST%\lib\kde4/calligraimagethumbnail.dll %C2WINSTALL_INPUT%\lib\kde4 cp %CALLIGRA_INST%\lib\kde4/calligrathumbnail.dll %C2WINSTALL_INPUT%\lib\kde4 cp %CALLIGRA_INST%\lib\kde4/changecase.dll %C2WINSTALL_INPUT%\lib\kde4 cp %CALLIGRA_INST%\lib\kde4/comicbookthumbnail.dll %C2WINSTALL_INPUT%\lib\kde4 cp %CALLIGRA_INST%\lib\kde4/defaulttools.dll %C2WINSTALL_INPUT%\lib\kde4 cp %CALLIGRA_INST%\lib\kde4/htmlthumbnail.dll %C2WINSTALL_INPUT%\lib\kde4 cp %CALLIGRA_INST%\lib\kde4/imagethumbnail.dll %C2WINSTALL_INPUT%\lib\kde4 cp %CALLIGRA_INST%\lib\kde4/jpegthumbnail.dll %C2WINSTALL_INPUT%\lib\kde4 cp %CALLIGRA_INST%\lib\kde4/karbon_flattenpathplugin.dll %C2WINSTALL_INPUT%\lib\kde4 cp %CALLIGRA_INST%\lib\kde4/karbon_refinepathplugin.dll %C2WINSTALL_INPUT%\lib\kde4 cp %CALLIGRA_INST%\lib\kde4/karbon_roundcornersplugin.dll %C2WINSTALL_INPUT%\lib\kde4 cp %CALLIGRA_INST%\lib\kde4/karbon_whirlpinchplugin.dll %C2WINSTALL_INPUT%\lib\kde4 cp %CALLIGRA_INST%\lib\kde4/karbon1ximport.dll %C2WINSTALL_INPUT%\lib\kde4 cp %CALLIGRA_INST%\lib\kde4/karbonfiltereffects.dll %C2WINSTALL_INPUT%\lib\kde4 cp %CALLIGRA_INST%\lib\kde4/karbonimageexport.dll %C2WINSTALL_INPUT%\lib\kde4 cp %CALLIGRA_INST%\lib\kde4/karbonpart.dll %C2WINSTALL_INPUT%\lib\kde4 cp %CALLIGRA_INST%\lib\kde4/karbonsvgexport.dll %C2WINSTALL_INPUT%\lib\kde4 cp %CALLIGRA_INST%\lib\kde4/karbonsvgimport.dll %C2WINSTALL_INPUT%\lib\kde4 cp %CALLIGRA_INST%\lib\kde4/karbontools.dll %C2WINSTALL_INPUT%\lib\kde4 cp %CALLIGRA_INST%\lib\kde4/karbonxfigimport.dll %C2WINSTALL_INPUT%\lib\kde4 cp %CALLIGRA_INST%\lib\kde4/kded*.dll %C2WINSTALL_INPUT%\lib\kde4 cp %CALLIGRA_INST%\lib\kde4/kio*.dll %C2WINSTALL_INPUT%\lib\kde4 cp %CALLIGRA_INST%\lib\kde4/kfile*.dll %C2WINSTALL_INPUT%\lib\kde4 cp %CALLIGRA_INST%\lib\kde4/kolcmsengine.dll %C2WINSTALL_INPUT%\lib\kde4 cp %CALLIGRA_INST%\lib\kde4/krita_colorspaces_extensions.dll %C2WINSTALL_INPUT%\lib\kde4 cp %CALLIGRA_INST%\lib\kde4/krita_raw_import.dll %C2WINSTALL_INPUT%\lib\kde4 cp %CALLIGRA_INST%\lib\kde4/kritaartisticcolorselector.dll %C2WINSTALL_INPUT%\lib\kde4 cp %CALLIGRA_INST%\lib\kde4/kritabigbrother.dll %C2WINSTALL_INPUT%\lib\kde4 cp %CALLIGRA_INST%\lib\kde4/kritablurfilter.dll %C2WINSTALL_INPUT%\lib\kde4 cp %CALLIGRA_INST%\lib\kde4/kritabmpexport.dll %C2WINSTALL_INPUT%\lib\kde4 cp %CALLIGRA_INST%\lib\kde4/kritabmpimport.dll %C2WINSTALL_INPUT%\lib\kde4 -cp %CALLIGRA_INST%\lib\kde4/kritachalkpaintop.dll %C2WINSTALL_INPUT%\lib\kde4 cp %CALLIGRA_INST%\lib\kde4/kritachanneldocker.dll %C2WINSTALL_INPUT%\lib\kde4 cp %CALLIGRA_INST%\lib\kde4/kritacolorgenerator.dll %C2WINSTALL_INPUT%\lib\kde4 cp %CALLIGRA_INST%\lib\kde4/kritacolorrange.dll %C2WINSTALL_INPUT%\lib\kde4 cp %CALLIGRA_INST%\lib\kde4/kritacolorselectorng.dll %C2WINSTALL_INPUT%\lib\kde4 cp %CALLIGRA_INST%\lib\kde4/kritacolorsfilters.dll %C2WINSTALL_INPUT%\lib\kde4 cp %CALLIGRA_INST%\lib\kde4/kritacolorsmudgepaintop.dll %C2WINSTALL_INPUT%\lib\kde4 cp %CALLIGRA_INST%\lib\kde4/kritacolorspaceconversion.dll %C2WINSTALL_INPUT%\lib\kde4 cp %CALLIGRA_INST%\lib\kde4/kritacompositiondocker.dll %C2WINSTALL_INPUT%\lib\kde4 cp %CALLIGRA_INST%\lib\kde4/kritaconvolutionfilters.dll %C2WINSTALL_INPUT%\lib\kde4 cp %CALLIGRA_INST%\lib\kde4/kritacurvepaintop.dll %C2WINSTALL_INPUT%\lib\kde4 cp %CALLIGRA_INST%\lib\kde4/kritadefaultdockers.dll %C2WINSTALL_INPUT%\lib\kde4 cp %CALLIGRA_INST%\lib\kde4/kritadefaultpaintops.dll %C2WINSTALL_INPUT%\lib\kde4 cp %CALLIGRA_INST%\lib\kde4/kritadefaulttools.dll %C2WINSTALL_INPUT%\lib\kde4 cp %CALLIGRA_INST%\lib\kde4/kritadeformpaintop.dll %C2WINSTALL_INPUT%\lib\kde4 cp %CALLIGRA_INST%\lib\kde4/kritadigitalmixer.dll %C2WINSTALL_INPUT%\lib\kde4 cp %CALLIGRA_INST%\lib\kde4/kritadodgeburn.dll %C2WINSTALL_INPUT%\lib\kde4 cp %CALLIGRA_INST%\lib\kde4/kritadynapaintop.dll %C2WINSTALL_INPUT%\lib\kde4 cp %CALLIGRA_INST%\lib\kde4/kritaembossfilter.dll %C2WINSTALL_INPUT%\lib\kde4 cp %CALLIGRA_INST%\lib\kde4/kritaexample.dll %C2WINSTALL_INPUT%\lib\kde4 cp %CALLIGRA_INST%\lib\kde4/kritaexperimentpaintop.dll %C2WINSTALL_INPUT%\lib\kde4 cp %CALLIGRA_INST%\lib\kde4/kritaextensioncolorsfilters.dll %C2WINSTALL_INPUT%\lib\kde4 cp %CALLIGRA_INST%\lib\kde4/kritafastcolortransferfilter.dll %C2WINSTALL_INPUT%\lib\kde4 cp %CALLIGRA_INST%\lib\kde4/kritafilterop.dll %C2WINSTALL_INPUT%\lib\kde4 cp %CALLIGRA_INST%\lib\kde4/kritaflipbookdocker.dll %C2WINSTALL_INPUT%\lib\kde4 cp %CALLIGRA_INST%\lib\kde4/kritaflipbookimport.dll %C2WINSTALL_INPUT%\lib\kde4 cp %CALLIGRA_INST%\lib\kde4/kritagridpaintop.dll %C2WINSTALL_INPUT%\lib\kde4 cp %CALLIGRA_INST%\lib\kde4/kritahairypaintop.dll %C2WINSTALL_INPUT%\lib\kde4 cp %CALLIGRA_INST%\lib\kde4/kritahatchingpaintop.dll %C2WINSTALL_INPUT%\lib\kde4 cp %CALLIGRA_INST%\lib\kde4/kritahistogram.dll %C2WINSTALL_INPUT%\lib\kde4 cp %CALLIGRA_INST%\lib\kde4/kritahistorydocker.dll %C2WINSTALL_INPUT%\lib\kde4 cp %CALLIGRA_INST%\lib\kde4/kritaimagedocker.dll %C2WINSTALL_INPUT%\lib\kde4 cp %CALLIGRA_INST%\lib\kde4/kritaimageenhancement.dll %C2WINSTALL_INPUT%\lib\kde4 cp %CALLIGRA_INST%\lib\kde4/kritaimagesize.dll %C2WINSTALL_INPUT%\lib\kde4 cp %CALLIGRA_INST%\lib\kde4/kritaimagesplit.dll %C2WINSTALL_INPUT%\lib\kde4 cp %CALLIGRA_INST%\lib\kde4/kritajp2export.dll %C2WINSTALL_INPUT%\lib\kde4 cp %CALLIGRA_INST%\lib\kde4/kritajp2import.dll %C2WINSTALL_INPUT%\lib\kde4 cp %CALLIGRA_INST%\lib\kde4/kritajpegexport.dll %C2WINSTALL_INPUT%\lib\kde4 cp %CALLIGRA_INST%\lib\kde4/kritajpegimport.dll %C2WINSTALL_INPUT%\lib\kde4 cp %CALLIGRA_INST%\lib\kde4/kritalayercompose.dll %C2WINSTALL_INPUT%\lib\kde4 cp %CALLIGRA_INST%\lib\kde4/kritalevelfilter.dll %C2WINSTALL_INPUT%\lib\kde4 cp %CALLIGRA_INST%\lib\kde4/kritametadataeditor.dll %C2WINSTALL_INPUT%\lib\kde4 cp %CALLIGRA_INST%\lib\kde4/kritamodifyselection.dll %C2WINSTALL_INPUT%\lib\kde4 cp %CALLIGRA_INST%\lib\kde4/kritanoisefilter.dll %C2WINSTALL_INPUT%\lib\kde4 cp %CALLIGRA_INST%\lib\kde4/kritaodgimport.dll %C2WINSTALL_INPUT%\lib\kde4 cp %CALLIGRA_INST%\lib\kde4/kritaoilpaintfilter.dll %C2WINSTALL_INPUT%\lib\kde4 cp %CALLIGRA_INST%\lib\kde4/kritaoraexport.dll %C2WINSTALL_INPUT%\lib\kde4 cp %CALLIGRA_INST%\lib\kde4/kritaoraimport.dll %C2WINSTALL_INPUT%\lib\kde4 cp %CALLIGRA_INST%\lib\kde4/kritapart.dll %C2WINSTALL_INPUT%\lib\kde4 cp %CALLIGRA_INST%\lib\kde4/kritaparticlepaintop.dll %C2WINSTALL_INPUT%\lib\kde4 cp %CALLIGRA_INST%\lib\kde4/kritapatterndocker.dll %C2WINSTALL_INPUT%\lib\kde4 cp %CALLIGRA_INST%\lib\kde4/kritapdfimport.dll %C2WINSTALL_INPUT%\lib\kde4 cp %CALLIGRA_INST%\lib\kde4/kritaphongbumpmap.dll %C2WINSTALL_INPUT%\lib\kde4 cp %CALLIGRA_INST%\lib\kde4/kritapixelizefilter.dll %C2WINSTALL_INPUT%\lib\kde4 cp %CALLIGRA_INST%\lib\kde4/kritapngexport.dll %C2WINSTALL_INPUT%\lib\kde4 cp %CALLIGRA_INST%\lib\kde4/kritapngimport.dll %C2WINSTALL_INPUT%\lib\kde4 cp %CALLIGRA_INST%\lib\kde4/kritappmexport.dll %C2WINSTALL_INPUT%\lib\kde4 cp %CALLIGRA_INST%\lib\kde4/kritappmimport.dll %C2WINSTALL_INPUT%\lib\kde4 cp %CALLIGRA_INST%\lib\kde4/kritapresetdocker.dll %C2WINSTALL_INPUT%\lib\kde4 cp %CALLIGRA_INST%\lib\kde4/kritapsdexport.dll %C2WINSTALL_INPUT%\lib\kde4 cp %CALLIGRA_INST%\lib\kde4/kritapsdimport.dll %C2WINSTALL_INPUT%\lib\kde4 cp %CALLIGRA_INST%\lib\kde4/kritaqmlexport.dll %C2WINSTALL_INPUT%\lib\kde4 cp %CALLIGRA_INST%\lib\kde4/kritaraindropsfilter.dll %C2WINSTALL_INPUT%\lib\kde4 cp %CALLIGRA_INST%\lib\kde4/kritarandompickfilter.dll %C2WINSTALL_INPUT%\lib\kde4 cp %CALLIGRA_INST%\lib\kde4/kritarotateimage.dll %C2WINSTALL_INPUT%\lib\kde4 cp %CALLIGRA_INST%\lib\kde4/kritaroundcornersfilter.dll %C2WINSTALL_INPUT%\lib\kde4 cp %CALLIGRA_INST%\lib\kde4/kritarulerassistanttool.dll %C2WINSTALL_INPUT%\lib\kde4 cp %CALLIGRA_INST%\lib\kde4/kritaselectiontools.dll %C2WINSTALL_INPUT%\lib\kde4 cp %CALLIGRA_INST%\lib\kde4/kritaseparatechannels.dll %C2WINSTALL_INPUT%\lib\kde4 cp %CALLIGRA_INST%\lib\kde4/kritashearimage.dll %C2WINSTALL_INPUT%\lib\kde4 cp %CALLIGRA_INST%\lib\kde4/kritasketchpaintop.dll %C2WINSTALL_INPUT%\lib\kde4 cp %CALLIGRA_INST%\lib\kde4/kritasmallcolorselector.dll %C2WINSTALL_INPUT%\lib\kde4 cp %CALLIGRA_INST%\lib\kde4/kritasmalltilesfilter.dll %C2WINSTALL_INPUT%\lib\kde4 cp %CALLIGRA_INST%\lib\kde4/kritasobelfilter.dll %C2WINSTALL_INPUT%\lib\kde4 cp %CALLIGRA_INST%\lib\kde4/kritaspecificcolorselector.dll %C2WINSTALL_INPUT%\lib\kde4 cp %CALLIGRA_INST%\lib\kde4/kritaspraypaintop.dll %C2WINSTALL_INPUT%\lib\kde4 cp %CALLIGRA_INST%\lib\kde4/kritatasksetdocker.dll %C2WINSTALL_INPUT%\lib\kde4 cp %CALLIGRA_INST%\lib\kde4/kritatiffexport.dll %C2WINSTALL_INPUT%\lib\kde4 cp %CALLIGRA_INST%\lib\kde4/kritatiffimport.dll %C2WINSTALL_INPUT%\lib\kde4 cp %CALLIGRA_INST%\lib\kde4/kritatoolcrop.dll %C2WINSTALL_INPUT%\lib\kde4 cp %CALLIGRA_INST%\lib\kde4/kritatooldyna.dll %C2WINSTALL_INPUT%\lib\kde4 cp %CALLIGRA_INST%\lib\kde4/kritatoolgrid.dll %C2WINSTALL_INPUT%\lib\kde4 cp %CALLIGRA_INST%\lib\kde4/kritatoolperspectivegrid.dll %C2WINSTALL_INPUT%\lib\kde4 cp %CALLIGRA_INST%\lib\kde4/kritatoolpolygon.dll %C2WINSTALL_INPUT%\lib\kde4 cp %CALLIGRA_INST%\lib\kde4/kritatoolpolyline.dll %C2WINSTALL_INPUT%\lib\kde4 cp %CALLIGRA_INST%\lib\kde4/kritatooltext.dll %C2WINSTALL_INPUT%\lib\kde4 cp %CALLIGRA_INST%\lib\kde4/kritatooltransform.dll %C2WINSTALL_INPUT%\lib\kde4 cp %CALLIGRA_INST%\lib\kde4/kritaunsharpfilter.dll %C2WINSTALL_INPUT%\lib\kde4 cp %CALLIGRA_INST%\lib\kde4/kritawavefilter.dll %C2WINSTALL_INPUT%\lib\kde4 cp %CALLIGRA_INST%\lib\kde4/kritaxcfimport.dll %C2WINSTALL_INPUT%\lib\kde4 cp %CALLIGRA_INST%\lib\kde4/kstyle_oxygen_config.dll %C2WINSTALL_INPUT%\lib\kde4 cp %CALLIGRA_INST%\lib\kde4/pathshapes.dll %C2WINSTALL_INPUT%\lib\kde4 mkdir %C2WINSTALL_INPUT%\lib\kde4\styles cp %CALLIGRA_INST%\lib\kde4/plugins\styles\oxygen.dll %C2WINSTALL_INPUT%\lib\kde4\styles mkdir %C2WINSTALL_INPUT%\lib\kde4\styles\imageformats cp %CALLIGRA_INST%\lib\kde4/plugins\imageformats\kimg_dds.dll %C2WINSTALL_INPUT%\lib\kde4\imageformats cp %CALLIGRA_INST%\lib\kde4/plugins\imageformats\kimg_pcx.dll %C2WINSTALL_INPUT%\lib\kde4\imageformats cp %CALLIGRA_INST%\lib\kde4/plugins\imageformats\kimg_ras.dll %C2WINSTALL_INPUT%\lib\kde4\imageformats cp %CALLIGRA_INST%\lib\kde4/plugins\imageformats\kimg_xcf.dll %C2WINSTALL_INPUT%\lib\kde4\imageformats cp %CALLIGRA_INST%\lib\kde4/plugins\imageformats\kimg_eps.dll %C2WINSTALL_INPUT%\lib\kde4\imageformats cp %CALLIGRA_INST%\lib\kde4/plugins\imageformats\kimg_pic.dll %C2WINSTALL_INPUT%\lib\kde4\imageformats cp %CALLIGRA_INST%\lib\kde4/plugins\imageformats\kimg_rgb.dll %C2WINSTALL_INPUT%\lib\kde4\imageformats cp %CALLIGRA_INST%\lib\kde4/plugins\imageformats\kimg_xview.dll %C2WINSTALL_INPUT%\lib\kde4\imageformats cp %CALLIGRA_INST%\lib\kde4/plugins\imageformats\kimg_jp2.dll %C2WINSTALL_INPUT%\lib\kde4\imageformats cp %CALLIGRA_INST%\lib\kde4/plugins\imageformats\kimg_psd.dll %C2WINSTALL_INPUT%\lib\kde4\imageformats cp %CALLIGRA_INST%\lib\kde4/plugins\imageformats\kimg_tga.dll %C2WINSTALL_INPUT%\lib\kde4\imageformats cp %CALLIGRA_INST%\lib\kde4/kurisearchfilter.dll %C2WINSTALL_INPUT%\lib\kde4 cp %CALLIGRA_INST%\lib\kde4/localdomainurifilter.dll %C2WINSTALL_INPUT%\lib\kde4 cp %CALLIGRA_INST%\lib\kde4/svgthumbnail.dll %C2WINSTALL_INPUT%\lib\kde4 cp %CALLIGRA_INST%\lib\kde4/textshape.dll %C2WINSTALL_INPUT%\lib\kde4 cp %CALLIGRA_INST%\lib\kde4/textthumbnail.dll %C2WINSTALL_INPUT%\lib\kde4 cp %CALLIGRA_INST%\lib\kde4/windowsexethumbnail.dll %C2WINSTALL_INPUT%\lib\kde4 cp %CALLIGRA_INST%\lib\kde4/windowsimagethumbnail.dll %C2WINSTALL_INPUT%\lib\kde4 cp %CALLIGRA_INST%\lib\kde4/wmfexport.dll %C2WINSTALL_INPUT%\lib\kde4 cp %CALLIGRA_INST%\lib\kde4/wmfimport.dll %C2WINSTALL_INPUT%\lib\kde4 cp %CALLIGRA_INST%\lib\kde4/wpgimport.dll %C2WINSTALL_INPUT%\lib\kde4 echo Copying Libraries cp %CALLIGRA_INST%\bin\*dll %C2WINSTALL_INPUT%\bin\ echo Copying Exes cp %CALLIGRA_INST%\bin\krita.exe %C2WINSTALL_INPUT%\bin\ cp %CALLIGRA_INST%\bin\calligraconverter.exe %C2WINSTALL_INPUT%\bin\ cp %CALLIGRA_INST%\bin\kwalletd.exe %C2WINSTALL_INPUT%\bin\ cp %CALLIGRA_INST%\bin\dbus-daemon.exe %C2WINSTALL_INPUT%\bin\ cp %CALLIGRA_INST%\bin\dbus-launch.exe %C2WINSTALL_INPUT%\bin\ cp %CALLIGRA_INST%\bin\kbuildsycoca4.exe %C2WINSTALL_INPUT%\bin\ cp %CALLIGRA_INST%\bin\kconf_update.exe %C2WINSTALL_INPUT%\bin\ cp %CALLIGRA_INST%\bin\kconfig_compiler.exe %C2WINSTALL_INPUT%\bin\ cp %CALLIGRA_INST%\bin\kde4-config.exe %C2WINSTALL_INPUT%\bin\ cp %CALLIGRA_INST%\bin\kdebugdialog.exe %C2WINSTALL_INPUT%\bin\ cp %CALLIGRA_INST%\bin\kded4.exe %C2WINSTALL_INPUT%\bin\ cp %CALLIGRA_INST%\bin\kdeinit4.exe %C2WINSTALL_INPUT%\bin\ cp %CALLIGRA_INST%\bin\kioexec.exe %C2WINSTALL_INPUT%\bin\ cp %CALLIGRA_INST%\bin\kioclient.exe %C2WINSTALL_INPUT%\bin\ cp %CALLIGRA_INST%\bin\kioslave.exe %C2WINSTALL_INPUT%\bin\ cp %CALLIGRA_INST%\bin\kquitapp.exe %C2WINSTALL_INPUT%\bin\ cp %CALLIGRA_INST%\bin\ktraderclient.exe %C2WINSTALL_INPUT%\bin\ cp %CALLIGRA_INST%\bin\kwalletd.exe %C2WINSTALL_INPUT%\bin\ cp %CALLIGRA_INST%\bin\kwrapper4.exe %C2WINSTALL_INPUT%\bin\ cp %CALLIGRA_INST%\bin\klauncher.exe %C2WINSTALL_INPUT%\bin\ cp %CALLIGRA_INST%\bin\knotify4.exe %C2WINSTALL_INPUT%\bin\ cp %CALLIGRA_INST%\bin\drkonqi.exe %C2WINSTALL_INPUT%\bin\ cp %CALLIGRA_INST%\bin\update-mime-database.exe %C2WINSTALL_INPUT%\bin\ cp %CALLIGRA_INST%\bin\khelpcenter.exe %C2WINSTALL_INPUT%\bin\ echo Copying /etc directory for dbus cp -r %CALLIGRA_INST%\etc\dbus-1 %C2WINSTALL_INPUT%\etc\ echo Copying Qt plugins cp -r %CALLIGRA_INST%\plugins\imageformats %C2WINSTALL_INPUT%\plugins cp -r %CALLIGRA_INST%\plugins\iconengines %C2WINSTALL_INPUT%\plugins echo Copying the /share/applications directory mkdir %C2WINSTALL_INPUT%\share\applications\kde4 cp %CALLIGRA_INST%\share\applications\kde4\calligra.desktop %C2WINSTALL_INPUT%\share\applications\kde4 cp %CALLIGRA_INST%\share\applications\kde4\krita.desktop %C2WINSTALL_INPUT%\share\applications\kde4 cp %CALLIGRA_INST%\share\applications\kde4\krita_bmp.desktop %C2WINSTALL_INPUT%\share\applications\kde4 cp %CALLIGRA_INST%\share\applications\kde4\krita_flipbook.desktop %C2WINSTALL_INPUT%\share\applications\kde4 cp %CALLIGRA_INST%\share\applications\kde4\krita_jp2.desktop %C2WINSTALL_INPUT%\share\applications\kde4 cp %CALLIGRA_INST%\share\applications\kde4\krita_jpeg.desktop %C2WINSTALL_INPUT%\share\applications\kde4 cp %CALLIGRA_INST%\share\applications\kde4\krita_odg.desktop %C2WINSTALL_INPUT%\share\applications\kde4 cp %CALLIGRA_INST%\share\applications\kde4\krita_ora.desktop %C2WINSTALL_INPUT%\share\applications\kde4 cp %CALLIGRA_INST%\share\applications\kde4\krita_pdf.desktop %C2WINSTALL_INPUT%\share\applications\kde4 cp %CALLIGRA_INST%\share\applications\kde4\krita_png.desktop %C2WINSTALL_INPUT%\share\applications\kde4 cp %CALLIGRA_INST%\share\applications\kde4\krita_ppm.desktop %C2WINSTALL_INPUT%\share\applications\kde4 cp %CALLIGRA_INST%\share\applications\kde4\krita_psd.desktop %C2WINSTALL_INPUT%\share\applications\kde4 cp %CALLIGRA_INST%\share\applications\kde4\krita_qml.desktop %C2WINSTALL_INPUT%\share\applications\kde4 cp %CALLIGRA_INST%\share\applications\kde4\krita_raw.desktop %C2WINSTALL_INPUT%\share\applications\kde4 cp %CALLIGRA_INST%\share\applications\kde4\krita_tiff.desktop %C2WINSTALL_INPUT%\share\applications\kde4 cp %CALLIGRA_INST%\share\applications\kde4\krita_xcf.desktop %C2WINSTALL_INPUT%\share\applications\kde4 echo Copying the /share/apps directory mkdir %C2WINSTALL_INPUT%\share\applications\kde4\apps cp -r %CALLIGRA_INST%\share\apps\calligra %C2WINSTALL_INPUT%\share\apps cp -r %CALLIGRA_INST%\share\apps\color-schemes %C2WINSTALL_INPUT%\share\apps cp -r %CALLIGRA_INST%\share\apps\desktoptheme %C2WINSTALL_INPUT%\share\apps cp -r %CALLIGRA_INST%\share\apps\hardwarenotifications %C2WINSTALL_INPUT%\share\apps cp -r %CALLIGRA_INST%\share\apps\kauth %C2WINSTALL_INPUT%\share\apps cp -r %CALLIGRA_INST%\share\apps\kde %C2WINSTALL_INPUT%\share\apps\ cp -r %CALLIGRA_INST%\share\apps\kdeui %C2WINSTALL_INPUT%\share\apps\ cp -r %CALLIGRA_INST%\share\apps\kdewidgets %C2WINSTALL_INPUT%\share\apps\ cp -r %CALLIGRA_INST%\share\apps\kio* %C2WINSTALL_INPUT%\share\apps\ cp -r %CALLIGRA_INST%\share\apps\knewstuff %C2WINSTALL_INPUT%\share\apps\ cp -r %CALLIGRA_INST%\share\apps\kritaplugins %C2WINSTALL_INPUT%\share\apps\ cp -r %CALLIGRA_INST%\share\apps\krita %C2WINSTALL_INPUT%\share\apps\ cp -r %CALLIGRA_INST%\share\apps\kssl %C2WINSTALL_INPUT%\share\apps\ cp -r %CALLIGRA_INST%\share\apps\kstyle %C2WINSTALL_INPUT%\share\apps\ cp -r %CALLIGRA_INST%\share\apps\kwalletd %C2WINSTALL_INPUT%\share\apps\ cp -r %CALLIGRA_INST%\share\apps\mime %C2WINSTALL_INPUT%\share\apps\ echo Copying the /share/color directory cp -r %CALLIGRA_INST%\share\color %C2WINSTALL_INPUT%\share\ echo Copying the /share/config directory mkdir %C2WINSTALL_INPUT%\share\config cp -r %CALLIGRA_INST%\share\config\colors %C2WINSTALL_INPUT%\share\config cp -r %CALLIGRA_INST%\share\config\ui %C2WINSTALL_INPUT%\share\config cp -r %CALLIGRA_INST%\share\config\krita* %C2WINSTALL_INPUT%\share\config cp -r %CALLIGRA_INST%\share\config\kdebug* %C2WINSTALL_INPUT%\share\config cp -r %CALLIGRA_INST%\share\config\khot* %C2WINSTALL_INPUT%\share\config cp -r %CALLIGRA_INST%\share\config\kdebugrc %C2WINSTALL_INPUT%\share\config cp -r %CALLIGRA_INST%\share\config\kdeglobals %C2WINSTALL_INPUT%\share\config echo Copying the /share/dbus-1 directory mkdir %C2WINSTALL_INPUT%\share\dbus-1\interfaces mkdir %C2WINSTALL_INPUT%\share\dbus-1\services mkdir %C2WINSTALL_INPUT%\share\dbus-1\system-services cp -r %CALLIGRA_INST%\share\dbus-1\interfaces\org.kde.* %C2WINSTALL_INPUT%\share\dbus-1\interfaces cp -r %CALLIGRA_INST%\share\dbus-1\services\org.kde.* %C2WINSTALL_INPUT%\share\dbus-1\services echo Copying the /share/icons directory (need to be cleaned out!) cp -r %CALLIGRA_INST%\share\icons %C2WINSTALL_INPUT%\share\ echo Copying the /share/mime directory cp -r %CALLIGRA_INST%\share\mime %C2WINSTALL_INPUT%\share\ echo Copying the /share/kde4 directory mkdir %C2WINSTALL_INPUT%\share\kde4\services cp %CALLIGRA_INST%\share\kde4\services\*.protocol %C2WINSTALL_INPUT%\share\kde4\services cp %CALLIGRA_INST%\share\kde4\services\krita*.desktop %C2WINSTALL_INPUT%\share\kde4\services cp %CALLIGRA_INST%\share\kde4\services\artistictextshape.desktop %C2WINSTALL_INPUT%\share\kde4\services cp %CALLIGRA_INST%\share\kde4\services\autocorrect.desktop %C2WINSTALL_INPUT%\share\kde4\services cp %CALLIGRA_INST%\share\kde4\services\basicflakesplugin.desktop %C2WINSTALL_INPUT%\share\kde4\services cp %CALLIGRA_INST%\share\kde4\services\calligra_odg_thumbnail.desktop %C2WINSTALL_INPUT%\share\kde4\services cp %CALLIGRA_INST%\share\kde4\services\calligradocinfopropspage.desktop %C2WINSTALL_INPUT%\share\kde4\services cp %CALLIGRA_INST%\share\kde4\services\calligradockers.desktop %C2WINSTALL_INPUT%\share\kde4\services cp %CALLIGRA_INST%\share\kde4\services\changecase.desktop %C2WINSTALL_INPUT%\share\kde4\services cp %CALLIGRA_INST%\share\kde4\services\comicbookthumbnail.desktop %C2WINSTALL_INPUT%\share\kde4\services cp %CALLIGRA_INST%\share\kde4\services\componentchooser.desktop %C2WINSTALL_INPUT%\share\kde4\services cp %CALLIGRA_INST%\share\kde4\services\defaulttools.desktop %C2WINSTALL_INPUT%\share\kde4\services cp %CALLIGRA_INST%\share\kde4\services\desktopthumbnail.desktop %C2WINSTALL_INPUT%\share\kde4\services cp %CALLIGRA_INST%\share\kde4\services\directorythumbnail.desktop %C2WINSTALL_INPUT%\share\kde4\services cp %CALLIGRA_INST%\share\kde4\services\djvuthumbnail.desktop %C2WINSTALL_INPUT%\share\kde4\services cp %CALLIGRA_INST%\share\kde4\services\htmlthumbnail.desktop %C2WINSTALL_INPUT%\share\kde4\services cp %CALLIGRA_INST%\share\kde4\services\imagethumbnail.desktop %C2WINSTALL_INPUT%\share\kde4\services cp %CALLIGRA_INST%\share\kde4\services\jpegthumbnail.desktop %C2WINSTALL_INPUT%\share\kde4\services cp %CALLIGRA_INST%\share\kde4\services\kolcmsengine.desktop %C2WINSTALL_INPUT%\share\kde4\services cp %CALLIGRA_INST%\share\kde4\services\kwalletd.desktop %C2WINSTALL_INPUT%\share\kde4\services cp %CALLIGRA_INST%\share\kde4\services\pathshapes.desktop %C2WINSTALL_INPUT%\share\kde4\services cp %CALLIGRA_INST%\share\kde4\services\textshape.desktop %C2WINSTALL_INPUT%\share\kde4\services cp %CALLIGRA_INST%\share\kde4\services\textthumbnail.desktop %C2WINSTALL_INPUT%\share\kde4\services cp %CALLIGRA_INST%\share\kde4\services\thumbnail.protocol %C2WINSTALL_INPUT%\share\kde4\services cp %CALLIGRA_INST%\share\kde4\services\filetypes.desktop %C2WINSTALL_INPUT%\share\kde4\services cp %CALLIGRA_INST%\share\kde4\services\fixhosturifilter.desktop %C2WINSTALL_INPUT%\share\kde4\services cp %CALLIGRA_INST%\share\kde4\services\htmlthumbnail.desktop %C2WINSTALL_INPUT%\share\kde4\services cp %CALLIGRA_INST%\share\kde4\services\icons.desktop %C2WINSTALL_INPUT%\share\kde4\services cp %CALLIGRA_INST%\share\kde4\services\karbonfiltereffects.desktop %C2WINSTALL_INPUT%\share\kde4\service cp %CALLIGRA_INST%\share\kde4\services\karbontools.desktop %C2WINSTALL_INPUT%\share\kde4\services cp %CALLIGRA_INST%\share\kde4\services\kfilemodule.desktop %C2WINSTALL_INPUT%\share\kde4\services cp %CALLIGRA_INST%\share\kde4\services\kglobalaccel.desktop %C2WINSTALL_INPUT%\share\kde4\services cp %CALLIGRA_INST%\share\kde4\services\knotify4.desktop %C2WINSTALL_INPUT%\share\kde4\services cp %CALLIGRA_INST%\share\kde4\services\kshorturifilter.desktop %C2WINSTALL_INPUT%\share\kde4\services cp %CALLIGRA_INST%\share\kde4\services\kuiserver.desktop %C2WINSTALL_INPUT%\share\kde4\services cp %CALLIGRA_INST%\share\kde4\services\kuriikwsfilter.desktop %C2WINSTALL_INPUT%\share\kde4\services cp %CALLIGRA_INST%\share\kde4\services\kurisearchfilter.desktop %C2WINSTALL_INPUT%\share\kde4\services cp %CALLIGRA_INST%\share\kde4\services\localdomainurifilter.desktop %C2WINSTALL_INPUT%\share\kde4\services cp %CALLIGRA_INST%\share\kde4\services\platform.desktop %C2WINSTALL_INPUT%\share\kde4\services cp %CALLIGRA_INST%\share\kde4\services\svgthumbnail.desktop %C2WINSTALL_INPUT%\share\kde4\services cp %CALLIGRA_INST%\share\kde4\services\windowsimagethumbnail.desktop %C2WINSTALL_INPUT%\share\kde4\services cp -r %CALLIGRA_INST%\share\kde4\services\qimageioplugins %C2WINSTALL_INPUT%\share\kde4\services mkdir %C2WINSTALL_INPUT%\share\kde4\servicetypes cp %CALLIGRA_INST%\share\kde4\servicetypes\application.desktop %C2WINSTALL_INPUT%\share\kde4\servicetypes cp %CALLIGRA_INST%\share\kde4\servicetypes\calligra*.desktop %C2WINSTALL_INPUT%\share\kde4\servicetypes cp %CALLIGRA_INST%\share\kde4\servicetypes\filtereffect.desktop %C2WINSTALL_INPUT%\share\kde4\servicetypes cp %CALLIGRA_INST%\share\kde4\servicetypes\flake.desktop %C2WINSTALL_INPUT%\share\kde4\servicetypes cp %CALLIGRA_INST%\share\kde4\servicetypes\flakedevice.desktop %C2WINSTALL_INPUT%\share\kde4\servicetypes cp %CALLIGRA_INST%\share\kde4\servicetypes\flakeshape.desktop %C2WINSTALL_INPUT%\share\kde4\servicetypes cp %CALLIGRA_INST%\share\kde4\servicetypes\flaketool.desktop %C2WINSTALL_INPUT%\share\kde4\servicetypes cp %CALLIGRA_INST%\share\kde4\servicetypes\inlinetextobject.desktop %C2WINSTALL_INPUT%\share\kde4\servicetypes cp %CALLIGRA_INST%\share\kde4\servicetypes\karbon_module.desktop %C2WINSTALL_INPUT%\share\kde4\servicetypes cp %CALLIGRA_INST%\share\kde4\servicetypes\kconfigbackend.desktop %C2WINSTALL_INPUT%\share\kde4\servicetypes cp %CALLIGRA_INST%\share\kde4\servicetypes\kdedmodule.desktop %C2WINSTALL_INPUT%\share\kde4\servicetypes cp %CALLIGRA_INST%\share\kde4\servicetypes\kfileitemactionplugin.desktop %C2WINSTALL_INPUT%\share\kde4\servicetypes cp %CALLIGRA_INST%\share\kde4\servicetypes\kfileplugin.desktop %C2WINSTALL_INPUT%\share\kde4\servicetypes cp %CALLIGRA_INST%\share\kde4\servicetypes\kfilewrite.desktop %C2WINSTALL_INPUT%\share\kde4\servicetypes cp %CALLIGRA_INST%\share\kde4\servicetypes\kiofilemodule.desktop %C2WINSTALL_INPUT%\share\kde4\servicetypes cp %CALLIGRA_INST%\share\kde4\servicetypes\knotifynotifymethod.desktop %C2WINSTALL_INPUT%\share\kde4\servicetypes cp %CALLIGRA_INST%\share\kde4\servicetypes\kofilter.desktop %C2WINSTALL_INPUT%\share\kde4\servicetypes cp %CALLIGRA_INST%\share\kde4\servicetypes\kofilterwrapper.desktop %C2WINSTALL_INPUT%\share\kde4\servicetypes cp %CALLIGRA_INST%\share\kde4\servicetypes\koplugin.desktop %C2WINSTALL_INPUT%\share\kde4\servicetypes cp %CALLIGRA_INST%\share\kde4\servicetypes\kpart.desktop %C2WINSTALL_INPUT%\share\kde4\servicetypes cp %CALLIGRA_INST%\share\kde4\servicetypes\kplugininfo.desktop %C2WINSTALL_INPUT%\share\kde4\servicetypes cp %CALLIGRA_INST%\share\kde4\servicetypes\krita_brush.desktop %C2WINSTALL_INPUT%\share\kde4\servicetypes cp %CALLIGRA_INST%\share\kde4\servicetypes\krita_dock.desktop %C2WINSTALL_INPUT%\share\kde4\servicetypes cp %CALLIGRA_INST%\share\kde4\servicetypes\krita_filter.desktop %C2WINSTALL_INPUT%\share\kde4\servicetypes cp %CALLIGRA_INST%\share\kde4\servicetypes\krita_generator.desktop %C2WINSTALL_INPUT%\share\kde4\servicetypes cp %CALLIGRA_INST%\share\kde4\servicetypes\krita_paintop.desktop %C2WINSTALL_INPUT%\share\kde4\servicetypes cp %CALLIGRA_INST%\share\kde4\servicetypes\krita_plugin.desktop %C2WINSTALL_INPUT%\share\kde4\servicetypes cp %CALLIGRA_INST%\share\kde4\servicetypes\krita_tool.desktop %C2WINSTALL_INPUT%\share\kde4\servicetypes cp %CALLIGRA_INST%\share\kde4\servicetypes\kurifilterplugin.desktop %C2WINSTALL_INPUT%\share\kde4\servicetypes cp %CALLIGRA_INST%\share\kde4\servicetypes\pigment.desktop %C2WINSTALL_INPUT%\share\kde4\servicetypes cp %CALLIGRA_INST%\share\kde4\servicetypes\pigmentextension.desktop %C2WINSTALL_INPUT%\share\kde4\servicetypes cp %CALLIGRA_INST%\share\kde4\servicetypes\qimageio_plugin.desktop %C2WINSTALL_INPUT%\share\kde4\servicetypes cp %CALLIGRA_INST%\share\kde4\servicetypes\texteditingplugin.desktop %C2WINSTALL_INPUT%\share\kde4\servicetypes cp %CALLIGRA_INST%\share\kde4\servicetypes\textvariableplugin.desktop %C2WINSTALL_INPUT%\share\kde4\servicetypes cp %CALLIGRA_INST%\share\kde4\servicetypes\thumbcreator.desktop %C2WINSTALL_INPUT%\share\kde4\servicetypes cp %C2WINSTALL_INPUT%\..\c2winstaller\res\package\env.bat %C2WINSTALL_INPUT% diff --git a/plugins/paintops/curvebrush/kis_curve_paintop_settings_widget.cpp b/plugins/paintops/curvebrush/kis_curve_paintop_settings_widget.cpp index fc1305009e..4af175405b 100644 --- a/plugins/paintops/curvebrush/kis_curve_paintop_settings_widget.cpp +++ b/plugins/paintops/curvebrush/kis_curve_paintop_settings_widget.cpp @@ -1,55 +1,55 @@ /* * Copyright (c) 2008,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 * (at your option) any later version. * * This program 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 General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #include #include #include #include "kis_curve_line_option.h" #include #include #include #include #include #include "kis_curves_opacity_option.h" KisCurvePaintOpSettingsWidget:: KisCurvePaintOpSettingsWidget(QWidget* parent) : KisPaintOpSettingsWidget(parent) { m_curveOption = new KisCurveOpOption(); addPaintOpOption(m_curveOption, i18n("Value")); addPaintOpOption(new KisCurveOptionWidget(new KisPressureOpacityOption(), i18n("Transparent"), i18n("Opaque")), i18n("Opacity")); addPaintOpOption(new KisCurveOptionWidget(new KisLineWidthOption(), i18n("0%"), i18n("100%")), i18n("Line width")); addPaintOpOption(new KisCurveOptionWidget(new KisCurvesOpacityOption(), i18n("0%"), i18n("100%")), i18n("Curves opacity")); addPaintOpOption(new KisCompositeOpOption(true), i18n("Blending Mode")); addPaintOpOption(new KisPaintActionTypeOption(), i18n("Painting Mode")); } KisCurvePaintOpSettingsWidget::~ KisCurvePaintOpSettingsWidget() { } KisPropertiesConfigurationSP KisCurvePaintOpSettingsWidget::configuration() const { KisCurvePaintOpSettings* config = new KisCurvePaintOpSettings(); config->setOptionsWidget(const_cast(this)); - config->setProperty("paintop", "chalkbrush"); // XXX: make this a const id string + config->setProperty("paintop", "curvebrush"); // XXX: make this a const id string writeConfiguration(config); return config; } diff --git a/plugins/paintops/defaultpresets/CMakeLists.txt b/plugins/paintops/defaultpresets/CMakeLists.txt index 7d11beda56..3c2d4c937f 100644 --- a/plugins/paintops/defaultpresets/CMakeLists.txt +++ b/plugins/paintops/defaultpresets/CMakeLists.txt @@ -1,24 +1,23 @@ install( FILES - chalkbrush.kpp curvebrush.kpp duplicate.kpp eraser.kpp filter.kpp hairybrush.kpp particlebrush.kpp smudge.kpp spraybrush.kpp complex.kpp deformbrush.kpp dynabrush.kpp experimentbrush.kpp gridbrush.kpp paintbrush.kpp colorsmudge.kpp sketchbrush.kpp hatchingbrush.kpp tangentnormal.kpp roundmarker.kpp DESTINATION ${DATA_INSTALL_DIR}/krita/defaultpresets) diff --git a/plugins/paintops/defaultpresets/chalkbrush.kpp b/plugins/paintops/defaultpresets/chalkbrush.kpp deleted file mode 100644 index b5350f7a24..0000000000 Binary files a/plugins/paintops/defaultpresets/chalkbrush.kpp and /dev/null differ diff --git a/plugins/paintops/icons/krita-chalk-blue.png b/plugins/paintops/icons/krita-chalk-blue.png deleted file mode 100644 index fd4d0fa896..0000000000 Binary files a/plugins/paintops/icons/krita-chalk-blue.png and /dev/null differ diff --git a/plugins/paintops/icons/krita-chalk-bw.png b/plugins/paintops/icons/krita-chalk-bw.png deleted file mode 100644 index d198c40082..0000000000 Binary files a/plugins/paintops/icons/krita-chalk-bw.png and /dev/null differ diff --git a/plugins/paintops/icons/krita-chalk-red.png b/plugins/paintops/icons/krita-chalk-red.png deleted file mode 100644 index c157200f08..0000000000 Binary files a/plugins/paintops/icons/krita-chalk-red.png and /dev/null differ diff --git a/plugins/paintops/icons/krita-chalk-yellow.png b/plugins/paintops/icons/krita-chalk-yellow.png deleted file mode 100644 index e16446744b..0000000000 Binary files a/plugins/paintops/icons/krita-chalk-yellow.png and /dev/null differ diff --git a/plugins/paintops/icons/krita-chalk.png b/plugins/paintops/icons/krita-chalk.png deleted file mode 100644 index f0605caa77..0000000000 Binary files a/plugins/paintops/icons/krita-chalk.png and /dev/null differ