From f07e97b813c7837b9f9bc44e7a1c79a80145f3fd Mon Sep 17 00:00:00 2001 From: donovaly Date: Mon, 23 Dec 2019 00:36:03 +0100 Subject: [PATCH] DlgUnitsCalculator: some tweaks - we call it "unit system" in the preferences, thus call it here so too - add tooltips - we have unit categories --- src/Gui/DlgUnitsCalculator.ui | 17 ++++++++++++++--- src/Gui/DlgUnitsCalculatorImp.cpp | 2 +- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/src/Gui/DlgUnitsCalculator.ui b/src/Gui/DlgUnitsCalculator.ui index ee689fc05c..82dc21fd04 100644 --- a/src/Gui/DlgUnitsCalculator.ui +++ b/src/Gui/DlgUnitsCalculator.ui @@ -114,12 +114,17 @@ To add a calculation press Return in the value input field - Scheme: + Unit System: - + + + Unit system to be used to the Quantity +The preference system is the one set in the FreeCAD preferences + + @@ -130,6 +135,9 @@ To add a calculation press Return in the value input field + + Decimals for the Quantity + 2 @@ -144,7 +152,7 @@ To add a calculation press Return in the value input field - Units: + Unit Category: @@ -156,6 +164,9 @@ To add a calculation press Return in the value input field 0 + + Unit category for the Quantity + diff --git a/src/Gui/DlgUnitsCalculatorImp.cpp b/src/Gui/DlgUnitsCalculatorImp.cpp index 715a4c2cbf..9afa660333 100644 --- a/src/Gui/DlgUnitsCalculatorImp.cpp +++ b/src/Gui/DlgUnitsCalculatorImp.cpp @@ -50,7 +50,7 @@ DlgUnitsCalculator::DlgUnitsCalculator( QWidget* parent, Qt::WindowFlags fl ) ui->setupUi(this); this->setAttribute(Qt::WA_DeleteOnClose); - ui->comboBoxScheme->addItem(QString::fromLatin1("System schema"), static_cast(-1)); + ui->comboBoxScheme->addItem(QString::fromLatin1("Preference system"), static_cast(-1)); int num = static_cast(Base::UnitSystem::NumUnitSystemTypes); for (int i=0; i(i)));