From a38645dacd39f74b1da4b693ff27e9b175351998 Mon Sep 17 00:00:00 2001 From: Stefan Gerlach Date: Fri, 10 Jul 2020 11:43:15 +0200 Subject: [PATCH] [locale] Use number locale in double spin boxes of all docks --- src/kdefrontend/dockwidgets/CustomPointDock.cpp | 5 +++++ src/kdefrontend/dockwidgets/HistogramDock.cpp | 9 ++++++++- src/kdefrontend/dockwidgets/ImageDock.cpp | 7 +++++++ src/kdefrontend/dockwidgets/ReferenceLineDock.cpp | 3 +++ src/kdefrontend/dockwidgets/WorksheetDock.cpp | 10 ++++++++++ src/kdefrontend/dockwidgets/XYConvolutionCurveDock.cpp | 6 ++++++ src/kdefrontend/dockwidgets/XYCorrelationCurveDock.cpp | 6 ++++++ src/kdefrontend/dockwidgets/XYCurveDock.cpp | 10 ++++++++++ .../dockwidgets/XYDataReductionCurveDock.cpp | 7 +++++++ .../dockwidgets/XYDifferentiationCurveDock.cpp | 5 +++++ .../dockwidgets/XYFourierFilterCurveDock.cpp | 7 +++++++ .../dockwidgets/XYFourierTransformCurveDock.cpp | 5 +++++ src/kdefrontend/dockwidgets/XYIntegrationCurveDock.cpp | 5 +++++ .../dockwidgets/XYInterpolationCurveDock.cpp | 10 ++++++++++ src/kdefrontend/dockwidgets/XYSmoothCurveDock.cpp | 8 ++++++++ src/kdefrontend/widgets/LabelWidget.cpp | 7 +++++++ 16 files changed, 109 insertions(+), 1 deletion(-) diff --git a/src/kdefrontend/dockwidgets/CustomPointDock.cpp b/src/kdefrontend/dockwidgets/CustomPointDock.cpp index 9a01e7c13..df1d96bf2 100644 --- a/src/kdefrontend/dockwidgets/CustomPointDock.cpp +++ b/src/kdefrontend/dockwidgets/CustomPointDock.cpp @@ -121,6 +121,11 @@ void CustomPointDock::setPoints(QList list) { m_aspect = list.first(); Q_ASSERT(m_point); + SET_NUMBER_LOCALE + ui.sbSymbolSize->setLocale(numberLocale); + ui.sbSymbolBorderWidth->setLocale(numberLocale); + + //if there is more then one point in the list, disable the comment and name widgets in "general" if (list.size() == 1) { ui.lName->setEnabled(true); diff --git a/src/kdefrontend/dockwidgets/HistogramDock.cpp b/src/kdefrontend/dockwidgets/HistogramDock.cpp index 9afeb0198..c4b059f70 100644 --- a/src/kdefrontend/dockwidgets/HistogramDock.cpp +++ b/src/kdefrontend/dockwidgets/HistogramDock.cpp @@ -364,6 +364,14 @@ void HistogramDock::setCurves(QList list) { m_aspectTreeModel = new AspectTreeModel(m_curve->project()); setModel(); + SET_NUMBER_LOCALE + ui.sbLineWidth->setLocale(numberLocale); + ui.sbSymbolSize->setLocale(numberLocale); + ui.sbSymbolBorderWidth->setLocale(numberLocale); + ui.sbValuesDistance->setLocale(numberLocale); + ui.sbErrorBarsCapSize->setLocale(numberLocale); + ui.sbErrorBarsWidth->setLocale(numberLocale); + //if there are more then one curve in the list, disable the content in the tab "general" if (m_curvesList.size() == 1) { ui.lName->setEnabled(true); @@ -399,7 +407,6 @@ void HistogramDock::setCurves(QList list) { ui.leName->setToolTip(""); //show the properties of the first curve - SET_NUMBER_LOCALE ui.cbType->setCurrentIndex(m_curve->type()); ui.cbOrientation->setCurrentIndex(m_curve->orientation()); ui.cbBinningMethod->setCurrentIndex(m_curve->binningMethod()); diff --git a/src/kdefrontend/dockwidgets/ImageDock.cpp b/src/kdefrontend/dockwidgets/ImageDock.cpp index e41715820..89f7fa62e 100644 --- a/src/kdefrontend/dockwidgets/ImageDock.cpp +++ b/src/kdefrontend/dockwidgets/ImageDock.cpp @@ -138,6 +138,13 @@ void ImageDock::setImages(QList list) { m_image = list.first(); m_aspect = list.first(); + SET_NUMBER_LOCALE + ui.sbWidth->setLocale(numberLocale); + ui.sbHeight->setLocale(numberLocale); + ui.sbPositionX->setLocale(numberLocale); + ui.sbPositionY->setLocale(numberLocale); + ui.sbBorderWidth->setLocale(numberLocale); + //if there are more then one image in the list, disable the name and comment field in the tab "general" if (list.size() == 1) { ui.lName->setEnabled(true); diff --git a/src/kdefrontend/dockwidgets/ReferenceLineDock.cpp b/src/kdefrontend/dockwidgets/ReferenceLineDock.cpp index 9b770966f..0b2d580cc 100644 --- a/src/kdefrontend/dockwidgets/ReferenceLineDock.cpp +++ b/src/kdefrontend/dockwidgets/ReferenceLineDock.cpp @@ -73,6 +73,9 @@ void ReferenceLineDock::setReferenceLines(QList list) { m_aspect = list.first(); Q_ASSERT(m_line); + SET_NUMBER_LOCALE + ui.sbLineWidth->setLocale(numberLocale); + //if there is more then one point in the list, disable the comment and name widgets in "general" if (list.size() == 1) { ui.lName->setEnabled(true); diff --git a/src/kdefrontend/dockwidgets/WorksheetDock.cpp b/src/kdefrontend/dockwidgets/WorksheetDock.cpp index 86f800b8b..9130fb5a2 100644 --- a/src/kdefrontend/dockwidgets/WorksheetDock.cpp +++ b/src/kdefrontend/dockwidgets/WorksheetDock.cpp @@ -158,6 +158,16 @@ void WorksheetDock::setWorksheets(QList list) { m_worksheet = list.first(); m_aspect = list.first(); + SET_NUMBER_LOCALE + ui.sbWidth->setLocale(numberLocale); + ui.sbHeight->setLocale(numberLocale); + ui.sbLayoutTopMargin->setLocale(numberLocale); + ui.sbLayoutBottomMargin->setLocale(numberLocale); + ui.sbLayoutLeftMargin->setLocale(numberLocale); + ui.sbLayoutRightMargin->setLocale(numberLocale); + ui.sbLayoutHorizontalSpacing->setLocale(numberLocale); + ui.sbLayoutVerticalSpacing->setLocale(numberLocale); + //if there are more then one worksheet in the list, disable the name and comment field in the tab "general" if (list.size() == 1) { ui.lName->setEnabled(true); diff --git a/src/kdefrontend/dockwidgets/XYConvolutionCurveDock.cpp b/src/kdefrontend/dockwidgets/XYConvolutionCurveDock.cpp index 19b7821b7..b72e3b997 100644 --- a/src/kdefrontend/dockwidgets/XYConvolutionCurveDock.cpp +++ b/src/kdefrontend/dockwidgets/XYConvolutionCurveDock.cpp @@ -245,6 +245,12 @@ void XYConvolutionCurveDock::setCurves(QList list) { m_aspectTreeModel = new AspectTreeModel(m_curve->project()); this->setModel(); m_convolutionData = m_convolutionCurve->convolutionData(); + + SET_NUMBER_LOCALE + uiGeneralTab.sbSamplingInterval->setLocale(numberLocale); + uiGeneralTab.sbMin->setLocale(numberLocale); + uiGeneralTab.sbMax->setLocale(numberLocale); + initGeneralTab(); initTabs(); m_initializing = false; diff --git a/src/kdefrontend/dockwidgets/XYCorrelationCurveDock.cpp b/src/kdefrontend/dockwidgets/XYCorrelationCurveDock.cpp index e602ff866..1a47f0500 100644 --- a/src/kdefrontend/dockwidgets/XYCorrelationCurveDock.cpp +++ b/src/kdefrontend/dockwidgets/XYCorrelationCurveDock.cpp @@ -228,6 +228,12 @@ void XYCorrelationCurveDock::setCurves(QList list) { m_aspectTreeModel = new AspectTreeModel(m_curve->project()); this->setModel(); m_correlationData = m_correlationCurve->correlationData(); + + SET_NUMBER_LOCALE + uiGeneralTab.sbSamplingInterval->setLocale(numberLocale); + uiGeneralTab.sbMin->setLocale(numberLocale); + uiGeneralTab.sbMax->setLocale(numberLocale); + initGeneralTab(); initTabs(); m_initializing = false; diff --git a/src/kdefrontend/dockwidgets/XYCurveDock.cpp b/src/kdefrontend/dockwidgets/XYCurveDock.cpp index 8fe35aeb4..fb6a6004c 100644 --- a/src/kdefrontend/dockwidgets/XYCurveDock.cpp +++ b/src/kdefrontend/dockwidgets/XYCurveDock.cpp @@ -577,6 +577,16 @@ void XYCurveDock::setCurves(QList list) { Q_ASSERT(m_curve); m_aspectTreeModel = new AspectTreeModel(m_curve->project()); setModel(); + + SET_NUMBER_LOCALE + ui.sbLineWidth->setLocale(numberLocale); + ui.sbDropLineWidth->setLocale(numberLocale); + ui.sbSymbolSize->setLocale(numberLocale); + ui.sbSymbolBorderWidth->setLocale(numberLocale); + ui.sbValuesDistance->setLocale(numberLocale); + ui.sbErrorBarsCapSize->setLocale(numberLocale); + ui.sbErrorBarsWidth->setLocale(numberLocale); + initGeneralTab(); initTabs(); m_initializing = false; diff --git a/src/kdefrontend/dockwidgets/XYDataReductionCurveDock.cpp b/src/kdefrontend/dockwidgets/XYDataReductionCurveDock.cpp index ae2e24a4c..f07e7a827 100644 --- a/src/kdefrontend/dockwidgets/XYDataReductionCurveDock.cpp +++ b/src/kdefrontend/dockwidgets/XYDataReductionCurveDock.cpp @@ -241,6 +241,13 @@ void XYDataReductionCurveDock::setCurves(QList list) { m_aspectTreeModel = new AspectTreeModel(m_curve->project()); this->setModel(); m_dataReductionData = m_dataReductionCurve->dataReductionData(); + + SET_NUMBER_LOCALE + uiGeneralTab.sbMin->setLocale(numberLocale); + uiGeneralTab.sbMax->setLocale(numberLocale); + uiGeneralTab.sbTolerance->setLocale(numberLocale); + uiGeneralTab.sbTolerance2->setLocale(numberLocale); + initGeneralTab(); initTabs(); m_initializing = false; diff --git a/src/kdefrontend/dockwidgets/XYDifferentiationCurveDock.cpp b/src/kdefrontend/dockwidgets/XYDifferentiationCurveDock.cpp index 84762a4b3..17da18a64 100644 --- a/src/kdefrontend/dockwidgets/XYDifferentiationCurveDock.cpp +++ b/src/kdefrontend/dockwidgets/XYDifferentiationCurveDock.cpp @@ -230,6 +230,11 @@ void XYDifferentiationCurveDock::setCurves(QList list) { m_aspectTreeModel = new AspectTreeModel(m_curve->project()); this->setModel(); m_differentiationData = m_differentiationCurve->differentiationData(); + + SET_NUMBER_LOCALE + uiGeneralTab.sbMin->setLocale(numberLocale); + uiGeneralTab.sbMax->setLocale(numberLocale); + initGeneralTab(); initTabs(); m_initializing = false; diff --git a/src/kdefrontend/dockwidgets/XYFourierFilterCurveDock.cpp b/src/kdefrontend/dockwidgets/XYFourierFilterCurveDock.cpp index 3f70fc9f5..9a6ca46fa 100644 --- a/src/kdefrontend/dockwidgets/XYFourierFilterCurveDock.cpp +++ b/src/kdefrontend/dockwidgets/XYFourierFilterCurveDock.cpp @@ -224,6 +224,13 @@ void XYFourierFilterCurveDock::setCurves(QList list) { m_aspectTreeModel = new AspectTreeModel(m_curve->project()); this->setModel(); m_filterData = m_filterCurve->filterData(); + + SET_NUMBER_LOCALE + uiGeneralTab.sbMin->setLocale(numberLocale); + uiGeneralTab.sbMax->setLocale(numberLocale); + uiGeneralTab.sbCutoff->setLocale(numberLocale); + uiGeneralTab.sbCutoff2->setLocale(numberLocale); + initGeneralTab(); initTabs(); m_initializing = false; diff --git a/src/kdefrontend/dockwidgets/XYFourierTransformCurveDock.cpp b/src/kdefrontend/dockwidgets/XYFourierTransformCurveDock.cpp index 81a646f68..feef364ad 100644 --- a/src/kdefrontend/dockwidgets/XYFourierTransformCurveDock.cpp +++ b/src/kdefrontend/dockwidgets/XYFourierTransformCurveDock.cpp @@ -195,6 +195,11 @@ void XYFourierTransformCurveDock::setCurves(QList list) { m_aspectTreeModel = new AspectTreeModel(m_curve->project()); this->setModel(); m_transformData = m_transformCurve->transformData(); + + SET_NUMBER_LOCALE + uiGeneralTab.sbMin->setLocale(numberLocale); + uiGeneralTab.sbMax->setLocale(numberLocale); + initGeneralTab(); initTabs(); m_initializing = false; diff --git a/src/kdefrontend/dockwidgets/XYIntegrationCurveDock.cpp b/src/kdefrontend/dockwidgets/XYIntegrationCurveDock.cpp index be426000b..62c46b533 100644 --- a/src/kdefrontend/dockwidgets/XYIntegrationCurveDock.cpp +++ b/src/kdefrontend/dockwidgets/XYIntegrationCurveDock.cpp @@ -230,6 +230,11 @@ void XYIntegrationCurveDock::setCurves(QList list) { m_aspectTreeModel = new AspectTreeModel(m_curve->project()); this->setModel(); m_integrationData = m_integrationCurve->integrationData(); + + SET_NUMBER_LOCALE + uiGeneralTab.sbMin->setLocale(numberLocale); + uiGeneralTab.sbMax->setLocale(numberLocale); + initGeneralTab(); initTabs(); m_initializing = false; diff --git a/src/kdefrontend/dockwidgets/XYInterpolationCurveDock.cpp b/src/kdefrontend/dockwidgets/XYInterpolationCurveDock.cpp index bb97a6908..12f2c3750 100644 --- a/src/kdefrontend/dockwidgets/XYInterpolationCurveDock.cpp +++ b/src/kdefrontend/dockwidgets/XYInterpolationCurveDock.cpp @@ -130,6 +130,7 @@ void XYInterpolationCurveDock::setupGeneral() { connect(uiGeneralTab.sbContinuity, QOverload::of(&QDoubleSpinBox::valueChanged), this, &XYInterpolationCurveDock::continuityChanged); connect(uiGeneralTab.sbBias, QOverload::of(&QDoubleSpinBox::valueChanged), this, &XYInterpolationCurveDock::biasChanged); connect(uiGeneralTab.cbEval, QOverload::of(&QComboBox::currentIndexChanged), this, &XYInterpolationCurveDock::evaluateChanged); + // double? connect(uiGeneralTab.sbPoints, QOverload::of(&QDoubleSpinBox::valueChanged), this, &XYInterpolationCurveDock::numberOfPointsChanged); connect(uiGeneralTab.cbPointsMode, QOverload::of(&QComboBox::currentIndexChanged), this, &XYInterpolationCurveDock::pointsModeChanged); connect(uiGeneralTab.pbRecalculate, &QPushButton::clicked, this, &XYInterpolationCurveDock::recalculateClicked); @@ -265,6 +266,15 @@ void XYInterpolationCurveDock::setCurves(QList list) { m_aspectTreeModel = new AspectTreeModel(m_curve->project()); this->setModel(); m_interpolationData = m_interpolationCurve->interpolationData(); + + SET_NUMBER_LOCALE + uiGeneralTab.sbMin->setLocale(numberLocale); + uiGeneralTab.sbMax->setLocale(numberLocale); + uiGeneralTab.sbTension->setLocale(numberLocale); + uiGeneralTab.sbContinuity->setLocale(numberLocale); + uiGeneralTab.sbBias->setLocale(numberLocale); + uiGeneralTab.sbPoints->setLocale(numberLocale); + initGeneralTab(); initTabs(); m_initializing = false; diff --git a/src/kdefrontend/dockwidgets/XYSmoothCurveDock.cpp b/src/kdefrontend/dockwidgets/XYSmoothCurveDock.cpp index 57e07eefa..c94e8567e 100644 --- a/src/kdefrontend/dockwidgets/XYSmoothCurveDock.cpp +++ b/src/kdefrontend/dockwidgets/XYSmoothCurveDock.cpp @@ -251,6 +251,14 @@ void XYSmoothCurveDock::setCurves(QList list) { m_aspectTreeModel = new AspectTreeModel(m_curve->project()); this->setModel(); m_smoothData = m_smoothCurve->smoothData(); + + SET_NUMBER_LOCALE + uiGeneralTab.sbMin->setLocale(numberLocale); + uiGeneralTab.sbMax->setLocale(numberLocale); + uiGeneralTab.sbPercentile->setLocale(numberLocale); + uiGeneralTab.sbLeftValue->setLocale(numberLocale); + uiGeneralTab.sbRightValue->setLocale(numberLocale); + initGeneralTab(); initTabs(); m_initializing = false; diff --git a/src/kdefrontend/widgets/LabelWidget.cpp b/src/kdefrontend/widgets/LabelWidget.cpp index 7388995a7..c0d59af92 100644 --- a/src/kdefrontend/widgets/LabelWidget.cpp +++ b/src/kdefrontend/widgets/LabelWidget.cpp @@ -236,6 +236,13 @@ void LabelWidget::setAxes(QList axes) { connect(axis->title(), &TextLabel::rotationAngleChanged, this, &LabelWidget::labelRotationAngleChanged ); } + SET_NUMBER_LOCALE + ui.sbPositionX->setLocale(numberLocale); + ui.sbPositionY->setLocale(numberLocale); + ui.sbOffsetX->setLocale(numberLocale); + ui.sbOffsetY->setLocale(numberLocale); + ui.sbBorderWidth->setLocale(numberLocale); + m_axesList = axes; m_label = m_labelsList.first(); -- GitLab