Commit 8c15dc3e authored by Tom Tom's avatar Tom Tom Committed by Dmitry Kazakov
Browse files

Fix more slider step disparities between 4.4.3 and master

This merge request is an extension of commit 3dcd08f3, fixing most of the slider step disparities I could find.

Specifically:

* Freehand Brush Tool Weighted - Adjusted Distance steps from 1 to 0.1 and Stroke Ending steps from 1 to 0.01
* Liquify Tool - Adjusted Amount and Flow steps from 1 to 0.01
* Gradient Tool - Adjusted Anti-alias threshold steps from 1 to 0.001
* Performance tab - Adjusted Pool Limit and Undo Limit steps from 1 to 0.01
* Edge Detection Filter - Adjusted Radius steps from 1 to 0.01
* Height to Normal Map Filter - Adjusted Radius steps from 1 to 0.01
* Phong Bumpmap Filter - Adjusted Reflectivity steps from 1 to 0.01
* Text Brushtip - Adjusted Spacing steps from 1 to 0.01
* Pattern options - Adjusted Scale, Brightness, Contrast, and Neutral Point steps from 1 to 0.01

Along with some other minor slider fixes.

What I did not change:

* Freehand Brush Stabilizer Distance - In stable, steps are 0.1. In master, Distance is instea...
parent 52072639
......@@ -979,11 +979,11 @@ PerformanceTab::PerformanceTab(QWidget *parent, const char *name)
sliderPoolLimit->setSuffix(i18n(" %"));
sliderPoolLimit->setRange(0, 20, 2);
sliderMemoryLimit->setSingleStep(0.01);
sliderPoolLimit->setSingleStep(0.01);
sliderUndoLimit->setSuffix(i18n(" %"));
sliderUndoLimit->setRange(0, 50, 2);
sliderMemoryLimit->setSingleStep(0.01);
sliderUndoLimit->setSingleStep(0.01);
intMemoryLimit->setMinimumWidth(80);
intPoolLimit->setMinimumWidth(80);
......
......@@ -289,7 +289,7 @@ KisPaintopBox::KisPaintopBox(KisViewManager *viewManager, QWidget *parent, const
slPatternSize->addMultiplier(2);
slPatternSize->addMultiplier(10);
slPatternSize->setSingleStep(.01);
slPatternSize->setSingleStep(0.01);
slPatternSize->setSuffix(i18n("x"));
slPatternSize->setMinimumWidth(qMax(sliderWidth, slPatternSize->sizeHint().width()));
slPatternSize->setFixedHeight(buttonsize);
......
......@@ -33,10 +33,12 @@ KisWdgConvertHeightToNormalMap::KisWdgConvertHeightToNormalMap(QWidget *parent,
ui->btnAspect->setKeepAspectRatio(false);
ui->sldHorizontalRadius->setRange(1.0, 100.0, 2);
ui->sldHorizontalRadius->setSingleStep(0.01);
ui->sldHorizontalRadius->setPrefix(i18n("Horizontal Radius:"));
connect(ui->sldHorizontalRadius, SIGNAL(valueChanged(qreal)), this, SLOT(horizontalRadiusChanged(qreal)));
ui->sldVerticalRadius->setRange(1.0, 100.0, 2);
ui->sldVerticalRadius->setSingleStep(0.01);
ui->sldVerticalRadius->setPrefix(i18n("Vertical Radius:"));
connect(ui->sldVerticalRadius, SIGNAL(valueChanged(qreal)), this, SLOT(verticalRadiusChanged(qreal)));
......
......@@ -31,10 +31,12 @@ KisWdgEdgeDetection::KisWdgEdgeDetection(QWidget *parent) :
ui->btnAspect->setKeepAspectRatio(false);
ui->sldHorizontalRadius->setRange(1.0, 100.0, 2);
ui->sldHorizontalRadius->setSingleStep(0.01);
ui->sldHorizontalRadius->setPrefix(i18n("Horizontal Radius:"));
connect(ui->sldHorizontalRadius, SIGNAL(valueChanged(qreal)), this, SLOT(horizontalRadiusChanged(qreal)));
ui->sldVerticalRadius->setRange(1.0, 100.0, 2);
ui->sldVerticalRadius->setSingleStep(0.01);
ui->sldVerticalRadius->setPrefix(i18n("Vertical Radius:"));
connect(ui->sldVerticalRadius, SIGNAL(valueChanged(qreal)), this, SLOT(verticalRadiusChanged(qreal)));
......
......@@ -26,6 +26,10 @@ public:
diffuseReflectivityKisDoubleSliderSpinBox -> setRange(0, 1, 2);
specularReflectivityKisDoubleSliderSpinBox -> setRange(0, 1, 2);
shinynessExponentKisSliderSpinBox -> setRange(1, 200);
ambientReflectivityKisDoubleSliderSpinBox -> setSingleStep(0.01);
diffuseReflectivityKisDoubleSliderSpinBox -> setSingleStep(0.01);
specularReflectivityKisDoubleSliderSpinBox -> setSingleStep(0.01);
ambientReflectivityKisDoubleSliderSpinBox -> setValue(0.1);
diffuseReflectivityKisDoubleSliderSpinBox -> setValue(0.5);
......
......@@ -21,6 +21,7 @@ public:
lineWidthSlider->setSuffix(i18n(" px"));
curvesOpacitySlider->setRange(0.0, 1.0, 2);
curvesOpacitySlider->setSingleStep(0.01);
curvesOpacitySlider->setValue(1.0);
}
};
......
......@@ -38,14 +38,17 @@ KisBrushSizeOption::KisBrushSizeOption()
m_options->diameter->setSuffix(i18n(" px"));
m_options->aspectBox->setRange(0.01, 2.0, 2);
m_options->aspectBox->setSingleStep(0.01);
m_options->aspectBox->setValue(1.0);
m_options->aspectBox->setExponentRatio(1.0);
m_options->scale->setRange(0.01, 10.0, 2);
m_options->scale->setSingleStep(0.01);
m_options->scale->setValue(1.0);
m_options->spacing->setRange(0.01, 5.0, 2);
m_options->spacing->setSingleStep(0.01);
m_options->spacing->setValue(0.3);
......@@ -58,6 +61,7 @@ KisBrushSizeOption::KisBrushSizeOption()
m_options->jitterMove->setRange(0.0, 5.0, 2);
m_options->jitterMove->setSingleStep(0.01);
m_options->jitterMove->setValue(0.0);
connect(m_options->diameter, SIGNAL(valueChanged(qreal)), SLOT(emitSettingChanged()));
......
......@@ -17,6 +17,7 @@ public:
setupUi(this);
deformAmount->setRange(0.0, 1.0, 2);
deformAmount->setSingleStep(0.01);
deformAmount->setValue(0.20);
}
};
......
......@@ -58,15 +58,18 @@ KisGridOpOption::KisGridOpOption()
m_options->divisionLevelSPBox->setValue(2);
m_options->scaleDSPBox->setRange(0.1, 10.0, 2);
m_options->scaleDSPBox->setSingleStep(0.01);
m_options->scaleDSPBox->setValue(1.0);
m_options->scaleDSPBox->setExponentRatio(3.0);
m_options->vertBorderDSPBox->setRange(0, 100, 2);
m_options->vertBorderDSPBox->setSingleStep(0.01);
m_options->vertBorderDSPBox->setValue(0.0);
m_options->horizBorderDSPBox->setRange(0, 100, 2);
m_options->vertBorderDSPBox->setValue(0.0);
m_options->horizBorderDSPBox->setSingleStep(0.01);
m_options->horizBorderDSPBox->setValue(0.0);
connect(m_options->diameterSPBox, SIGNAL(valueChanged(qreal)), SLOT(emitSettingChanged()));
......
......@@ -18,12 +18,15 @@ public:
setupUi(this);
rndBox->setRange(-10.0, 10.0, 2);
rndBox->setSingleStep(0.01);
rndBox->setValue(2.0);
scaleBox->setRange(-10.0, 10.0, 2);
scaleBox->setSingleStep(0.01);
scaleBox->setValue(2.0);
shearBox->setRange(-2.0, 2.0, 2);
shearBox->setSingleStep(0.01);
shearBox->setValue(0.0);
densityBox->setRange(0.0, 100.0, 0);
......
......@@ -30,6 +30,9 @@ public:
originXKisDoubleSliderSpinBox -> setRange(-300, 300, 0);
originYKisDoubleSliderSpinBox -> setRange(-300, 300, 0);
separationKisDoubleSliderSpinBox-> setSingleStep(0.1);
thicknessKisDoubleSliderSpinBox -> setSingleStep(0.1);
angleKisAngleSelector -> setAngle(-60);
separationKisDoubleSliderSpinBox-> setValue(6);
thicknessKisDoubleSliderSpinBox -> setValue(1);
......
......@@ -196,7 +196,7 @@
<item row="4" column="0">
<widget class="QLabel" name="lblNeutralPoint">
<property name="text">
<string>Neutral Point</string>
<string>Neutral Point:</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
......
......@@ -30,6 +30,7 @@ KisTextBrushChooser::KisTextBrushChooser(QWidget *parent, const char* name, cons
connect(pipeModeChbox, SIGNAL(toggled(bool)), this, SLOT(rebuildTextBrush()));
m_font = font();
inputSpacing->setRange(0.0, 10, 2);
inputSpacing->setSingleStep(0.01);
inputSpacing->setValue(0.1);
rebuildTextBrush();
connect(inputSpacing, SIGNAL(valueChanged(qreal)), this, SLOT(rebuildTextBrush()));
......
......@@ -19,19 +19,23 @@ KisTextureChooser::KisTextureChooser(KisBrushTextureFlags flags, QWidget *parent
textureSelectorWidget->setCurrentItem(0);
scaleSlider->setRange(0.0, 2.0, 2);
scaleSlider->setSingleStep(0.01);
scaleSlider->setValue(1.0);
scaleSlider->addMultiplier(0.1);
scaleSlider->addMultiplier(2);
scaleSlider->addMultiplier(10);
brightnessSlider->setRange(-1.0, 1.0, 2);
brightnessSlider->setSingleStep(0.01);
brightnessSlider->setValue(0.0);
brightnessSlider->setToolTip(i18n("Makes texture lighter or darker"));
contrastSlider->setRange(0.0, 2.0, 2);
contrastSlider->setSingleStep(0.01);
contrastSlider->setValue(1.0);
neutralPointSlider->setRange(0.0, 1.0, 2);
neutralPointSlider->setSingleStep(0.01);
neutralPointSlider->setValue(0.5);
neutralPointSlider->setToolTip(i18n("Set gray value to be considered neutral for lightness mode"));
......
......@@ -38,6 +38,7 @@ KisMyPaintCurveOptionWidget::KisMyPaintCurveOptionWidget(KisMyPaintCurveOption*
connect(m_curveOptionWidget->yMaxBox, SIGNAL(valueChanged(double)), SLOT(emitSettingChanged()));
m_curveOptionWidget->strengthSlider->setRange(curveOption->minValue(), curveOption->maxValue(), 2);
m_curveOptionWidget->strengthSlider->setSingleStep(0.01);
m_curveOptionWidget->strengthSlider->setValue(curveOption->value());
m_curveOptionWidget->strengthSlider->setPrefix(i18n("Base Value: "));
m_curveOptionWidget->strengthSlider->setSuffix("");
......
......@@ -29,12 +29,15 @@ KisMyPaintOpOption::KisMyPaintOpOption()
m_options = new KisMyPaintOpOptionsWidget();
m_options->radiusSPBox->setRange(0.01, 7.0, 2);
m_options->radiusSPBox->setSingleStep(0.01);
m_options->radiusSPBox->setValue(radius());
m_options->hardnessSPBox->setRange(0.02, 1.0, 2);
m_options->hardnessSPBox->setSingleStep(0.01);
m_options->hardnessSPBox->setValue(hardness());
m_options->opacitySPBox->setRange(0.0, 1.0, 2);
m_options->opacitySPBox->setSingleStep(0.01);
m_options->opacitySPBox->setValue(opacity());
m_options->eraserBox->setChecked(eraser());
......
......@@ -31,15 +31,19 @@ KisParticleOpOption::KisParticleOpOption()
m_options = new KisParticleOpOptionsWidget();
m_options->gravSPBox->setRange(-1.0, 1.0, 3);
m_options->gravSPBox->setSingleStep(0.001);
m_options->gravSPBox->setValue(0.989);
m_options->dySPBox->setRange(-10.0, 10.0, 2);
m_options->dySPBox->setSingleStep(0.01);
m_options->dySPBox->setValue(0.3);
m_options->dxSPBox->setRange(-10.0, 10.0, 2);
m_options->dxSPBox->setSingleStep(0.01);
m_options->dxSPBox->setValue(0.3);
m_options->weightSPBox->setRange(0.01, 1.0, 2);
m_options->weightSPBox->setSingleStep(0.01);
m_options->weightSPBox->setValue(0.2);
m_options->particleSpinBox->setRange(1.0, 500.0, 0);
......
......@@ -43,12 +43,15 @@ void KisSprayShapeDynamicsOption::setupBrushPreviewSignals()
m_options->drawingAngleWeight->setRange(0.0, 1.0, 2);
m_options->drawingAngleWeight->setSingleStep(0.01);
m_options->drawingAngleWeight->setDisabled(true);
m_options->followCursorWeight->setRange(0.0, 1.0, 2);
m_options->followCursorWeight->setSingleStep(0.01);
m_options->followCursorWeight->setDisabled(true);
m_options->randomAngleWeight->setRange(0.0, 1.0, 2);
m_options->randomAngleWeight->setSingleStep(0.01);
m_options->randomAngleWeight->setDisabled(true);
m_options->fixedAngleBox->setDecimals(0);
......
......@@ -31,18 +31,22 @@ KisSprayOpOption::KisSprayOpOption()
m_options->diameterSpinBox->setSuffix(i18n(" px"));
m_options->aspectSPBox->setRange(0.0, 2.0, 2);
m_options->aspectSPBox->setSingleStep(0.01);
m_options->aspectSPBox->setValue(1.0);
m_options->rotationAngleSelector->setDecimals(0);
m_options->rotationAngleSelector->setIncreasingDirection(KisAngleGauge::IncreasingDirection_Clockwise);
m_options->scaleSpin->setRange(0.0, 10.0, 2);
m_options->scaleSpin->setSingleStep(0.01);
m_options->scaleSpin->setValue(1.0);
m_options->spacingSpin->setRange(0.0, 5.0, 2);
m_options->spacingSpin->setSingleStep(0.01);
m_options->spacingSpin->setValue(0.5);
m_options->coverageSpin->setRange(0.001, 0.02, 3);
m_options->coverageSpin->setSingleStep(0.001);
m_options->coverageSpin->setValue(0.003);
m_options->coverageSpin->setSuffix(i18n("%"));
......@@ -51,6 +55,7 @@ KisSprayOpOption::KisSprayOpOption()
m_options->particlesSpinBox->setExponentRatio(3.0);
m_options->jitterMovementSpin->setRange(0.0,5.0, 1);
m_options->jitterMovementSpin->setSingleStep(0.1);
m_options->jitterMovementSpin->setValue(1.0);
......
......@@ -179,6 +179,7 @@ void KisToolBrush::updateSmoothnessDistanceLabel()
if (smoothingType() == KisSmoothingOptions::STABILIZER) {
m_lblSmoothnessDistance->setText(i18n("Sample count:"));
m_sliderSmoothnessDistance->setRange(3.0, MAXIMUM_SMOOTHNESS_DISTANCE, 0);
m_sliderSmoothnessDistance->setSingleStep(1);
m_sliderSmoothnessDistance->setExponentRatio(3.0); // help pick smaller values
if (!qFuzzyCompare(m_sliderSmoothnessDistance->value(), oldValue)) {
......@@ -189,6 +190,7 @@ void KisToolBrush::updateSmoothnessDistanceLabel()
} else {
m_lblSmoothnessDistance->setText(i18nc("Label of Distance value in Freehand brush tool's Weighted Smoothing mode", "Distance:"));
m_sliderSmoothnessDistance->setRange(3.0, MAXIMUM_SMOOTHNESS_DISTANCE, 1);
m_sliderSmoothnessDistance->setSingleStep(0.1);
m_sliderSmoothnessDistance->setExponentRatio(3.0); // help pick smaller values
if (!qFuzzyCompare(m_sliderSmoothnessDistance->value(), oldValue)) {
......@@ -405,6 +407,7 @@ QWidget * KisToolBrush::createOptionWidget()
m_sliderTailAggressiveness = new KisDoubleSliderSpinBox(optionsWidget);
m_sliderTailAggressiveness->setRange(0.0, 1.0, 2);
m_sliderTailAggressiveness->setSingleStep(0.01);
m_sliderTailAggressiveness->setEnabled(true);
connect(m_sliderTailAggressiveness, SIGNAL(valueChanged(qreal)), SLOT(slotSetTailAgressiveness(qreal)));
m_sliderTailAggressiveness->setValue(smoothingOptions()->tailAggressiveness());
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment