diff --git a/plugins/paintops/experiment/wdgexperimentoptions.ui b/plugins/paintops/experiment/wdgexperimentoptions.ui index e0c6e0b803..cc6ff63a14 100644 --- a/plugins/paintops/experiment/wdgexperimentoptions.ui +++ b/plugins/paintops/experiment/wdgexperimentoptions.ui @@ -1,150 +1,150 @@ WdgExperimentOptions 0 0 - 425 - 328 + 262 + 253 255 255 - 425 - 290 + 100 + 100 Shape creation: QLayout::SetMaximumSize QFormLayout::ExpandingFieldsGrow Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter 0 0 Speed - + 0 0 Smooth - + 0 0 Post-processing Displace - + Winding fill Hard edge Qt::Vertical - 20 - 40 + 5 + 5 KisDoubleSliderSpinBox QWidget
kis_slider_spin_box.h
1 diff --git a/plugins/paintops/hairy/kis_hairy_bristle_option.cpp b/plugins/paintops/hairy/kis_hairy_bristle_option.cpp index 95aecc170d..30ee7906f8 100644 --- a/plugins/paintops/hairy/kis_hairy_bristle_option.cpp +++ b/plugins/paintops/hairy/kis_hairy_bristle_option.cpp @@ -1,104 +1,108 @@ /* * 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 "kis_hairy_bristle_option.h" #include #include "ui_wdgbristleoptions.h" #include class KisBristleOptionsWidget: public QWidget, public Ui::WdgBristleOptions { public: KisBristleOptionsWidget(QWidget *parent = 0) : QWidget(parent) { setupUi(this); + scaleBox->setPrefix(i18n("Random Offset: ")); rndBox->setRange(-10.0, 10.0, 2); rndBox->setValue(2.0); + scaleBox->setPrefix(i18n("Scale: ")); scaleBox->setRange(-10.0, 10.0, 2); scaleBox->setValue(2.0); + shearBox->setPrefix(i18n("Shear: ")); shearBox->setRange(-2.0, 2.0, 2); shearBox->setValue(0.0); + densityBox->setPrefix(i18n("Density: ")); densityBox->setRange(0.0, 100.0, 0); densityBox->setValue(100.0); densityBox->setSuffix(QChar(Qt::Key_Percent)); } }; KisHairyBristleOption::KisHairyBristleOption() : KisPaintOpOption(KisPaintOpOption::GENERAL, false) { setObjectName("KisHairyBristleOption"); m_checkable = false; m_options = new KisBristleOptionsWidget(); // signals connect(m_options->mousePressureCBox, SIGNAL(toggled(bool)), SLOT(emitSettingChanged())); connect(m_options->thresholdCBox, SIGNAL(toggled(bool)), SLOT(emitSettingChanged())); connect(m_options->rndBox, SIGNAL(valueChanged(qreal)), SLOT(emitSettingChanged())); connect(m_options->scaleBox, SIGNAL(valueChanged(qreal)), SLOT(emitSettingChanged())); connect(m_options->shearBox, SIGNAL(valueChanged(qreal)), SLOT(emitSettingChanged())); connect(m_options->densityBox, SIGNAL(valueChanged(qreal)), SLOT(emitSettingChanged())); connect(m_options->connectedCBox, SIGNAL(toggled(bool)), SLOT(emitSettingChanged())); connect(m_options->antialiasCBox, SIGNAL(toggled(bool)), SLOT(emitSettingChanged())); connect(m_options->compositingCBox, SIGNAL(toggled(bool)), SLOT(emitSettingChanged())); setConfigurationPage(m_options); } KisHairyBristleOption::~KisHairyBristleOption() { delete m_options; } void KisHairyBristleOption::readOptionSetting(const KisPropertiesConfigurationSP config) { m_options->thresholdCBox->setChecked(config->getBool(HAIRY_BRISTLE_THRESHOLD)); m_options->mousePressureCBox->setChecked(config->getBool(HAIRY_BRISTLE_USE_MOUSEPRESSURE)); m_options->shearBox->setValue(config->getDouble(HAIRY_BRISTLE_SHEAR)); m_options->rndBox->setValue(config->getDouble(HAIRY_BRISTLE_RANDOM)); m_options->scaleBox->setValue(config->getDouble(HAIRY_BRISTLE_SCALE)); m_options->densityBox->setValue(config->getDouble(HAIRY_BRISTLE_DENSITY)); m_options->connectedCBox->setChecked(config->getBool(HAIRY_BRISTLE_CONNECTED)); m_options->antialiasCBox->setChecked(config->getBool(HAIRY_BRISTLE_ANTI_ALIASING)); m_options->compositingCBox->setChecked(config->getBool(HAIRY_BRISTLE_USE_COMPOSITING)); } void KisHairyBristleOption::writeOptionSetting(KisPropertiesConfigurationSP config) const { config->setProperty(HAIRY_BRISTLE_THRESHOLD, m_options->thresholdCBox->isChecked()); config->setProperty(HAIRY_BRISTLE_USE_MOUSEPRESSURE, m_options->mousePressureCBox->isChecked()); config->setProperty(HAIRY_BRISTLE_SCALE, m_options->scaleBox->value()); config->setProperty(HAIRY_BRISTLE_SHEAR, m_options->shearBox->value()); config->setProperty(HAIRY_BRISTLE_RANDOM, m_options->rndBox->value()); config->setProperty(HAIRY_BRISTLE_DENSITY, m_options->densityBox->value()); config->setProperty(HAIRY_BRISTLE_CONNECTED, m_options->connectedCBox->isChecked()); config->setProperty(HAIRY_BRISTLE_ANTI_ALIASING, m_options->antialiasCBox->isChecked()); config->setProperty(HAIRY_BRISTLE_USE_COMPOSITING, m_options->compositingCBox->isChecked()); } void KisHairyBristleOption::lodLimitations(KisPaintopLodLimitations *l) const { l->limitations << KoID("hairy-brush", i18nc("PaintOp instant preview limitation", "Bristle Brush (the lines will be thinner than on preview)")); } diff --git a/plugins/paintops/hairy/wdgInkOptions.ui b/plugins/paintops/hairy/wdgInkOptions.ui index b78e49925e..d83c36d162 100644 --- a/plugins/paintops/hairy/wdgInkOptions.ui +++ b/plugins/paintops/hairy/wdgInkOptions.ui @@ -1,256 +1,244 @@ WdgInkOptions 0 0 - 405 - 436 + 306 + 488 0 0 - 405 - 400 + 0 + 0 - - - - 300 - 0 - 113 - 391 - - - - - 10 - - - - - Ink Amount - - - - - - - 10000 - - - 1024 - - - - - - - Opacity - - - true - - - - - - - true - - - Saturation - - - false - - - - - - - true - - - Soak ink from the initial position of the stroke - - - Soak ink - - - false - - - - - - - Qt::Vertical - - + + + + + + 0 + 0 + + + + + 150 + 150 + + + + Ink Depletion Curve + + + + + 9 + 33 + 111 + 91 + + + - 20 - 288 + 50 + 50 - - - - - - - - 0 - 0 - 301 - 270 - - - - - 0 - 0 - - - - - 0 - 0 - - - - Ink Depletion Curve - - - - - 9 - 33 - 271 - 228 - - - - - - - - 0 - 270 - 281 - 161 - - - - Saturation Weights - - - - - - weighted saturation - - - - - - - Bristle Ink Weight: - - - - - - - Pressure Weight: - - - - - - - 0 - 0 - - - - - - - - Bristle Length Weight: - - - - - - - - 0 - 0 - - - - - - - - - 0 - 0 - - - - - - - - Ink Depletion Curve Weight: - - - - - - - - 0 - 0 - - - - - - + + + + + + 10 + + + + + Ink Amount + + + + + + + 10000 + + + 1024 + + + + + + + Opacity + + + true + + + + + + + true + + + Saturation + + + false + + + + + + + true + + + Soak ink from the initial position of the stroke + + + Soak ink + + + false + + + + + + + + + Saturation Weights + + + + + + weighted saturation + + + + + + + Bristle Ink Weight: + + + + + + + Pressure Weight: + + + + + + + + 0 + 0 + + + + + + + + Bristle Length Weight: + + + + + + + + 0 + 0 + + + + + + + + + 0 + 0 + + + + + + + + Ink Depletion Curve Weight: + + + + + + + + 0 + 0 + + + + + + + + + + + Qt::Vertical + + + + 5 + 5 + + + + + - - KisIntParseSpinBox - QSpinBox -
kis_int_parse_spin_box.h
- KisDoubleSliderSpinBox QWidget
kis_slider_spin_box.h
1 KisCurveWidget QWidget -
widgets/kis_curve_widget.h
+
widgets/kis_curve_widget.h
1 + + KisIntParseSpinBox + QSpinBox +
kis_int_parse_spin_box.h
+ diff --git a/plugins/paintops/hairy/wdgbristleoptions.ui b/plugins/paintops/hairy/wdgbristleoptions.ui index 4fe2a43849..10587296aa 100644 --- a/plugins/paintops/hairy/wdgbristleoptions.ui +++ b/plugins/paintops/hairy/wdgbristleoptions.ui @@ -1,219 +1,198 @@ WdgBristleOptions 0 0 - 425 - 357 + 245 + 271 0 0 - 425 - 285 + 0 + 200 - + - 10 + 6 - 0 + 6 - 0 + 6 - 0 + 6 - + + + + + 0 + 0 + + + + + 20 + 20 + + + + + + + + + 0 + 0 + + + + + 20 + 20 + + + + + + + + + 0 + 0 + + + + + 20 + 20 + + + + + + + + + 0 + 0 + + + + + 20 + 20 + + + + + + + + + 0 + 0 + + + + Mouse Pressure + + + false + + + + + + + + 0 + 0 + + + + Threshold + + + false + + + + + + + + 0 + 0 + + + + Connect hairs + + + + + + + + 0 + 0 + + + + Anti-aliasing + + + + + + + + 0 + 0 + + + + Composite bristles + + + + Qt::Vertical - 20 - 162 + 5 + 5 - - - - - - - 90 - 0 - - - - Random offset: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - - - - - - - - - - - - - - - - - - - false - - - - - - - - - - - - - - - - - - 90 - 0 - - - - Shear: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - 90 - 0 - - - - Scale: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - 90 - 0 - - - - Density: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - - - false - - - - - - - - - - - - - - Mouse pressure: - - - - - - - Threshold: - - - - - - - Connect hairs: - - - - - - - Anti-aliasing: - - - - - - - Composite bristles: - - - - - KisDoubleSliderSpinBox QWidget
kis_slider_spin_box.h
1