@@ -195,7 +195,7 @@ void MeasurementDatabaseDialog::retranslateGroups()
QString MeasurementDatabaseDialog::imageUrl(const QString &number)
{
QString imgUrl("![](\"wrong.png\")
"); // In case of error
- const QString filePath = QString("://diagrams/%1.svg").arg(MapDiagrams(qApp->TrVars(), number));
+ const QString filePath = QString("://diagrams/%1.svg").arg(MapDiagrams(qApp->translateVariables(), number));
if (QFileInfo::exists(filePath))
{
// Load your SVG
@@ -356,7 +356,7 @@ void MeasurementDatabaseDialog::showDescription(QTreeWidgetItem *item, int colum
}
const QString name = item->data(0, Qt::UserRole).toString();
- const VTranslateVars *trv = qApp->TrVars();
+ const VTranslateVars *trv = qApp->translateVariables();
const QString number = trv->MNumber(name);
const QString text = QString("TrVars()->MNumber(name) + ". " + qApp->TrVars()->MToUser(name);
+ const QString text = qApp->translateVariables()->MNumber(name) + ". " + qApp->translateVariables()->MToUser(name);
item->setText(0, text);
item->setToolTip(0, text);
item->setData(0, Qt::UserRole, name);
@@ -514,13 +514,13 @@ void MeasurementDatabaseDialog::addMeasurement(QTreeWidgetItem *group, const QSt
//---------------------------------------------------------------------------------------------------------------------
void MeasurementDatabaseDialog::readSettings()
{
- restoreGeometry(qApp->SeamlyMeSettings()->getDataBaseGeometry());
+ restoreGeometry(qApp->seamlyMeSettings()->getDataBaseGeometry());
}
//---------------------------------------------------------------------------------------------------------------------
void MeasurementDatabaseDialog::writeSettings()
{
- qApp->SeamlyMeSettings()->setDataBaseGeometry(saveGeometry());
+ qApp->seamlyMeSettings()->setDataBaseGeometry(saveGeometry());
}
//---------------------------------------------------------------------------------------------------------------------
@@ -590,7 +590,7 @@ void MeasurementDatabaseDialog::retranslateGroup(QTreeWidgetItem *group, const Q
//---------------------------------------------------------------------------------------------------------------------
void MeasurementDatabaseDialog::retranslateMeasurement(QTreeWidgetItem *group, int index, const QString &name)
{
- const QString text = qApp->TrVars()->MNumber(name) + ". " + qApp->TrVars()->MToUser(name);
+ const QString text = qApp->translateVariables()->MNumber(name) + ". " + qApp->translateVariables()->MToUser(name);
QTreeWidgetItem *item = group->child(index);
item->setText(0, text);
diff --git a/src/app/seamlyme/dialogs/dialogseamlymepreferences.cpp b/src/app/seamlyme/dialogs/dialogseamlymepreferences.cpp
index 7fe3c28cb383..164bd4eacad9 100644
--- a/src/app/seamlyme/dialogs/dialogseamlymepreferences.cpp
+++ b/src/app/seamlyme/dialogs/dialogseamlymepreferences.cpp
@@ -55,7 +55,7 @@
#include "dialogseamlymepreferences.h"
#include "ui_dialogseamlymepreferences.h"
-#include "../mapplication.h"
+#include "../application_me.h"
#include "configpages/seamlymepreferencesconfigurationpage.h"
#include "configpages/seamlymepreferencespathpage.h"
@@ -156,7 +156,7 @@ void DialogSeamlyMePreferences::Apply()
m_configurationPage->Apply();
m_pathPage->Apply();
- qApp->SeamlyMeSettings()->getOsSeparator() ? setLocale(QLocale()) : setLocale(QLocale::c());
+ qApp->seamlyMeSettings()->getOsSeparator() ? setLocale(QLocale()) : setLocale(QLocale::c());
emit updateProperties();
setResult(QDialog::Accepted);
}
diff --git a/src/app/seamlyme/dialogs/me_shortcuts_dialog.cpp b/src/app/seamlyme/dialogs/me_shortcuts_dialog.cpp
index f9a06bf76fbd..a1c7281bf7d6 100644
--- a/src/app/seamlyme/dialogs/me_shortcuts_dialog.cpp
+++ b/src/app/seamlyme/dialogs/me_shortcuts_dialog.cpp
@@ -44,7 +44,7 @@
#include
#include
-#include "../mapplication.h"
+#include "../application_me.h"
//---------------------------------------------------------------------------------------------------------------------
MeShortcutsDialog::MeShortcutsDialog(QWidget *parent)
diff --git a/src/app/seamlyme/dialogs/me_welcome_dialog.cpp b/src/app/seamlyme/dialogs/me_welcome_dialog.cpp
index d5cf22b3b86b..47fd7edeff1c 100644
--- a/src/app/seamlyme/dialogs/me_welcome_dialog.cpp
+++ b/src/app/seamlyme/dialogs/me_welcome_dialog.cpp
@@ -27,7 +27,7 @@
#include "../vpatterndb/variables/measurement_variable.h"
//#include "../vmisc/vseamlymesettings.h"
-#include "../mapplication.h"
+#include "../application_me.h"
#include
#include
@@ -38,7 +38,7 @@ SeamlyMeWelcomeDialog::SeamlyMeWelcomeDialog(QWidget *parent)
: QDialog(parent)
, ui(new Ui::SeamlyMeWelcomeDialog)
, m_langChanged(false)
- , settings(qApp->SeamlyMeSettings())
+ , settings(qApp->seamlyMeSettings())
{
ui->setupUi(this);
setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
diff --git a/src/app/seamlyme/dialogs/new_measurements_dialog.cpp b/src/app/seamlyme/dialogs/new_measurements_dialog.cpp
index ac5c18408e6b..530e9ac5b9f1 100644
--- a/src/app/seamlyme/dialogs/new_measurements_dialog.cpp
+++ b/src/app/seamlyme/dialogs/new_measurements_dialog.cpp
@@ -55,7 +55,7 @@
#include "../vpatterndb/variables/measurement_variable.h"
#include "../vmisc/vseamlymesettings.h"
-#include "../mapplication.h"
+#include "../application_me.h"
#include
@@ -68,7 +68,7 @@ NewMeasurementsDialog::NewMeasurementsDialog(QWidget *parent)
ui->setupUi(this);
setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
- const VSeamlyMeSettings *settings = qApp->SeamlyMeSettings();
+ const VSeamlyMeSettings *settings = qApp->seamlyMeSettings();
initializeMeasurementTypes();
initializeUnits(MeasurementsType::Individual);
@@ -241,7 +241,7 @@ void NewMeasurementsDialog::initializeUnits(const MeasurementsType &type)
if (type == MeasurementsType::Individual)
{
ui->comboBoxUnit->addItem(tr("Inches"), static_cast(Unit::Inch));
- index = ui->comboBoxUnit->findData(static_cast(StrToUnits(qApp->SeamlyMeSettings()->GetUnit())));
+ index = ui->comboBoxUnit->findData(static_cast(StrToUnits(qApp->seamlyMeSettings()->GetUnit())));
}
else
{
diff --git a/src/app/seamlyme/main.cpp b/src/app/seamlyme/main.cpp
index aa4bdc776f09..c738a3fab730 100644
--- a/src/app/seamlyme/main.cpp
+++ b/src/app/seamlyme/main.cpp
@@ -56,7 +56,7 @@
*/
#include "tmainwindow.h"
-#include "mapplication.h"
+#include "application_me.h"
#include "dialogs/me_welcome_dialog.h"
#include "../vmisc/vseamlymesettings.h"
@@ -84,10 +84,10 @@ int main(int argc, char *argv[])
initHighDpiScaling(argc, argv);
#endif //Q_OS_MAC
- MApplication app(argc, argv);
- app.InitOptions();
+ ApplicationME app(argc, argv);
+ app.initOptions();
- auto settings = qApp->SeamlyMeSettings();
+ auto settings = qApp->seamlyMeSettings();
app.loadTranslations(settings->getLocale());
// its named showWelcome, but true means "do not show welcome again" and thus we invert it here
@@ -100,7 +100,7 @@ int main(int argc, char *argv[])
dialog->exec();
}
- QTimer::singleShot(0, &app, &MApplication::processCommandLine);
+ QTimer::singleShot(0, &app, &ApplicationME::processCommandLine);
return app.exec();
}
diff --git a/src/app/seamlyme/mapplication.h b/src/app/seamlyme/mapplication.h
deleted file mode 100644
index d88dec5f4427..000000000000
--- a/src/app/seamlyme/mapplication.h
+++ /dev/null
@@ -1,123 +0,0 @@
-/***************************************************************************
- ** @file mapplication.h
- ** @author Douglas S Caskey
- ** @date 17 Sep, 2023
- **
- ** @copyright
- ** Copyright (C) 2017 - 2023 Seamly, LLC
- ** https://github.com/fashionfreedom/seamly2d
- **
- ** @brief
- ** Seamly2D 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 3 of the License, or
- ** (at your option) any later version.
- **
- ** Seamly2D 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 Seamly2D. If not, see .
- **************************************************************************/
-
-/************************************************************************
- **
- ** @file mapplication.h
- ** @author Roman Telezhynskyi
- ** @date 8 7, 2015
- **
- ** @brief
- ** @copyright
- ** This source code is part of the Valentina project, a pattern making
- ** program, whose allow create and modeling patterns of clothing.
- ** Copyright (C) 2015 Valentina project
- ** All Rights Reserved.
- **
- ** Valentina 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 3 of the License, or
- ** (at your option) any later version.
- **
- ** Valentina 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 Valentina. If not, see .
- **
- *************************************************************************/
-
-#ifndef MAPPLICATION_H
-#define MAPPLICATION_H
-
-#include "../vpatterndb/vtranslatevars.h"
-#include "../vmisc/def.h"
-#include "../vmisc/vseamlymesettings.h"
-#include "../vmisc/vabstractapplication.h"
-#include "dialogs/dialogmdatabase.h"
-
-class MApplication;// use in define
-class TMainWindow;
-class QLocalServer;
-
-#if defined(qApp)
-#undef qApp
-#endif
-#define qApp (static_cast(VAbstractApplication::instance()))
-
-enum class SocketConnection : bool {Client = false, Server = true};
-
-class MApplication : public VAbstractApplication
-{
- Q_OBJECT
-
-public:
- MApplication(int &argc, char **argv);
- virtual ~MApplication() Q_DECL_OVERRIDE;
-
- virtual bool notify(QObject * receiver, QEvent * event) Q_DECL_OVERRIDE;
-
- bool IsTestMode() const;
- virtual bool IsAppInGUIMode() const Q_DECL_OVERRIDE;
- TMainWindow *MainWindow();
- QList MainWindows();
- TMainWindow *NewMainWindow();
-
- void InitOptions();
-
- virtual const VTranslateVars *TrVars() Q_DECL_OVERRIDE;
-
- virtual void OpenSettings() Q_DECL_OVERRIDE;
- VSeamlyMeSettings *SeamlyMeSettings();
-
- void ShowDataBase();
- void retranslateGroups();
- void RetranslateTables();
-
- void ParseCommandLine(const SocketConnection &connection, const QStringList &arguments);
-
-public slots:
- void processCommandLine();
-
-protected:
- virtual void InitTrVars() Q_DECL_OVERRIDE;
- virtual bool event(QEvent *e) Q_DECL_OVERRIDE;
-
-private slots:
- void NewLocalSocketConnection();
-
-private:
- Q_DISABLE_COPY(MApplication)
- QList > mainWindows;
- QLocalServer *localServer;
- VTranslateVars *trVars;
- QPointer dataBase;
- bool testMode;
-
- void Clean();
-};
-
-#endif // MAPPLICATION_H
diff --git a/src/app/seamlyme/seamlyme.pri b/src/app/seamlyme/seamlyme.pri
index 25f1fa084e60..14d3d1a6f88c 100644
--- a/src/app/seamlyme/seamlyme.pri
+++ b/src/app/seamlyme/seamlyme.pri
@@ -2,12 +2,12 @@
# This need for correct working file translations.pro
SOURCES += \
+ $$PWD/application_me.cpp \
$$PWD/dialogs/me_shortcuts_dialog.cpp \
$$PWD/dialogs/me_welcome_dialog.cpp \
$$PWD/dialogs/new_measurements_dialog.cpp \
$$PWD/main.cpp \
$$PWD/tmainwindow.cpp \
- $$PWD/mapplication.cpp \
$$PWD/dialogs/dialogaboutseamlyme.cpp \
$$PWD/dialogs/dialogmdatabase.cpp \
$$PWD/vlitepattern.cpp \
@@ -18,12 +18,12 @@ SOURCES += \
*msvc*:SOURCES += $$PWD/stable.cpp
HEADERS += \
+ $$PWD/application_me.h \
$$PWD/dialogs/me_shortcuts_dialog.h \
$$PWD/dialogs/me_welcome_dialog.h \
$$PWD/dialogs/new_measurements_dialog.h \
$$PWD/tmainwindow.h \
$$PWD/stable.h \
- $$PWD/mapplication.h \
$$PWD/dialogs/dialogaboutseamlyme.h \
$$PWD/dialogs/dialogmdatabase.h \
$$PWD/version.h \
diff --git a/src/app/seamlyme/tmainwindow.cpp b/src/app/seamlyme/tmainwindow.cpp
index ceb38d494503..4428cf99620d 100644
--- a/src/app/seamlyme/tmainwindow.cpp
+++ b/src/app/seamlyme/tmainwindow.cpp
@@ -76,7 +76,7 @@
#include "../vtools/dialogs/support/edit_formula_dialog.h"
#include "version.h"
#include "../vformat/measurements.h"
-#include "mapplication.h" // Should be last because of definning qApp
+#include "application_me.h" // Should be last because of definning qApp
#include
#include
@@ -254,7 +254,7 @@ bool TMainWindow::LoadFile(const QString &path)
if (!QFileInfo(filename).exists())
{
qCCritical(tMainWindow, "%s", qUtf8Printable(tr("File '%1' doesn't exist!").arg(filename)));
- if (qApp->IsTestMode())
+ if (qApp->isTestMode())
{
qApp->exit(V_EX_NOINPUT);
}
@@ -262,7 +262,7 @@ bool TMainWindow::LoadFile(const QString &path)
}
// Check if file already opened
- QListlist = qApp->MainWindows();
+ QListlist = qApp->mainWindows();
for (int i = 0; i < list.size(); ++i)
{
if (list.at(i)->CurrentFile() == filename)
@@ -285,7 +285,7 @@ bool TMainWindow::LoadFile(const QString &path)
try
{
- data = new VContainer(qApp->TrVars(), &mUnit);
+ data = new VContainer(qApp->translateVariables(), &mUnit);
individualMeasurements = new MeasurementDoc(data);
individualMeasurements->setSize(¤tSize);
@@ -362,7 +362,7 @@ bool TMainWindow::LoadFile(const QString &path)
data = nullptr;
lock.reset();
- if (qApp->IsTestMode())
+ if (qApp->isTestMode())
{
qApp->exit(V_EX_NOINPUT);
}
@@ -371,8 +371,8 @@ bool TMainWindow::LoadFile(const QString &path)
}
else
{
- qApp->NewMainWindow();
- return qApp->MainWindow()->LoadFile(filename);
+ qApp->newMainWindow();
+ return qApp->mainWindow()->LoadFile(filename);
}
return true;
@@ -406,7 +406,7 @@ void TMainWindow::FileNew()
pUnit = mUnit;
mType = measurements.type();
- data = new VContainer(qApp->TrVars(), &mUnit);
+ data = new VContainer(qApp->translateVariables(), &mUnit);
currentHeight = measurements.baseHeight();
currentSize = measurements.baseSize();
@@ -437,8 +437,8 @@ void TMainWindow::FileNew()
}
else
{
- qApp->NewMainWindow();
- qApp->MainWindow()->FileNew();
+ qApp->newMainWindow();
+ qApp->mainWindow()->FileNew();
}
}
@@ -450,7 +450,7 @@ void TMainWindow::OpenIndividual()
tr("All files") + QLatin1String(" (*.*)");
//Use standard path to individual measurements
- const QString dir = qApp->SeamlyMeSettings()->getIndividualSizePath();
+ const QString dir = qApp->seamlyMeSettings()->getIndividualSizePath();
bool usedNotExistedDir = false;
QDir directory(dir);
@@ -476,7 +476,7 @@ void TMainWindow::OpenMultisize()
tr("All files") + QLatin1String(" (*.*)");
//Use standard path to multisize measurements
- QString dir = qApp->SeamlyMeSettings()->getMultisizePath();
+ QString dir = qApp->seamlyMeSettings()->getMultisizePath();
dir = VCommonSettings::prepareMultisizeTables(dir);
Open(dir, filter);
@@ -491,7 +491,7 @@ void TMainWindow::OpenTemplate()
tr("All files") + QLatin1String(" (*.*)");
//Use standard path to template files
- QString dir = qApp->SeamlyMeSettings()->getTemplatePath();
+ QString dir = qApp->seamlyMeSettings()->getTemplatePath();
dir = VCommonSettings::PrepareStandardTemplates(dir);
Open(dir, filter);
@@ -509,7 +509,7 @@ void TMainWindow::CreateFromExisting()
QLatin1String(" *.") + vitExt + QLatin1String(")");
//Use standard path to individual measurements
- const QString dir = qApp->SeamlyMeSettings()->getIndividualSizePath();
+ const QString dir = qApp->seamlyMeSettings()->getIndividualSizePath();
bool usedNotExistedDir = false;
QDir directory(dir);
@@ -529,7 +529,7 @@ void TMainWindow::CreateFromExisting()
}
else
{
- qApp->NewMainWindow()->CreateFromExisting();
+ qApp->newMainWindow()->CreateFromExisting();
}
}
@@ -547,7 +547,7 @@ void TMainWindow::handleBodyScanner1()
const QString filter = QString("3D Measure Up") + QLatin1String(" (*.txt)");
//Use standard path to template files
- QString dir = qApp->SeamlyMeSettings()->getBodyScansPath();
+ QString dir = qApp->seamlyMeSettings()->getBodyScansPath();
bool usedNotExistedDir = false;
QDir directory(dir);
@@ -1078,14 +1078,14 @@ bool TMainWindow::FileSaveAs()
{
if (mType == MeasurementsType::Individual)
{
- dir = qApp->SeamlyMeSettings()->getDefaultIndividualSizePath();
+ dir = qApp->seamlyMeSettings()->getDefaultIndividualSizePath();
filters = tr("Individual measurements") + QLatin1String(" (*.") + smisExt +
QLatin1String(" *.") + vitExt + QLatin1String(")");
suffix = smisExt;
}
else
{
- dir = qApp->SeamlyMeSettings()->getDefaultMultisizePath();
+ dir = qApp->seamlyMeSettings()->getDefaultMultisizePath();
filters = tr("Multisize measurements") + QLatin1String(" (*.") + smmsExt +
QLatin1String(" *.") + vstExt + QLatin1String(")");
suffix = smmsExt;
@@ -1111,11 +1111,11 @@ bool TMainWindow::FileSaveAs()
{
if (mType == MeasurementsType::Individual)
{
- dir = qApp->SeamlyMeSettings()->getIndividualSizePath();
+ dir = qApp->seamlyMeSettings()->getIndividualSizePath();
}
else
{
- dir = qApp->SeamlyMeSettings()->getMultisizePath();
+ dir = qApp->seamlyMeSettings()->getMultisizePath();
dir = VCommonSettings::prepareMultisizeTables(dir);
}
}
@@ -1229,7 +1229,7 @@ void TMainWindow::ShowWindow() const
if (v.canConvert())
{
const int offset = qvariant_cast(v);
- const QList windows = qApp->MainWindows();
+ const QList windows = qApp->mainWindows();
windows.at(offset)->raise();
windows.at(offset)->activateWindow();
}
@@ -1520,7 +1520,7 @@ void TMainWindow::Fx()
EditFormulaDialog *dialog = new EditFormulaDialog(meash->GetData(), NULL_ID, this);
dialog->setWindowTitle(tr("Edit measurement"));
- dialog->SetFormula(qApp->TrVars()->TryFormulaFromUser(ui->plainTextEditFormula->toPlainText().replace("\n", " "),
+ dialog->SetFormula(qApp->translateVariables()->TryFormulaFromUser(ui->plainTextEditFormula->toPlainText().replace("\n", " "),
true));
const QString postfix = UnitsToStr(mUnit, true);//Show unit in dialog label (cm, mm or inch)
dialog->setPostfix(postfix);
@@ -1587,7 +1587,7 @@ void TMainWindow::AddKnown()
{
if (mType == MeasurementsType::Individual)
{
- individualMeasurements->addEmpty(list.at(i), qApp->TrVars()->MFormula(list.at(i)));
+ individualMeasurements->addEmpty(list.at(i), qApp->translateVariables()->MFormula(list.at(i)));
}
else
{
@@ -1606,7 +1606,7 @@ void TMainWindow::AddKnown()
{
if (mType == MeasurementsType::Individual)
{
- individualMeasurements->AddEmptyAfter(after, list.at(i), qApp->TrVars()->MFormula(list.at(i)));
+ individualMeasurements->AddEmptyAfter(after, list.at(i), qApp->translateVariables()->MFormula(list.at(i)));
}
else
{
@@ -1639,7 +1639,7 @@ void TMainWindow::ImportFromPattern()
const QString filter = tr("Pattern files") + QLatin1String(" (*.") + valExt +
QLatin1String(" *.") + sm2dExt + QLatin1String(")");
//Use standard path to individual measurements
- QString dir = qApp->SeamlyMeSettings()->getTemplatePath();
+ QString dir = qApp->seamlyMeSettings()->getTemplatePath();
dir = VCommonSettings::PrepareStandardTemplates(dir);
const QString filename = fileDialog(this, tr("Import from a pattern"), dir, filter, nullptr,
@@ -1770,8 +1770,8 @@ void TMainWindow::ShowNewMData(bool fresh)
else
{
//Show known
- ui->plainTextEditDescription->setPlainText(qApp->TrVars()->Description(meash->GetName()));
- ui->lineEditFullName->setText(qApp->TrVars()->guiText(meash->GetName()));
+ ui->plainTextEditDescription->setPlainText(qApp->translateVariables()->Description(meash->GetName()));
+ ui->lineEditFullName->setText(qApp->translateVariables()->guiText(meash->GetName()));
ui->lineEditName->setText(nameField->text());
}
connect(ui->lineEditName, &QLineEdit::textEdited, this, &TMainWindow::SaveMName);
@@ -1810,7 +1810,7 @@ void TMainWindow::ShowNewMData(bool fresh)
QString formula;
try
{
- formula = qApp->TrVars()->FormulaToUser(meash->GetFormula(), qApp->Settings()->getOsSeparator());
+ formula = qApp->translateVariables()->FormulaToUser(meash->GetFormula(), qApp->Settings()->getOsSeparator());
}
catch (qmu::QmuParserError &error)
{
@@ -1833,13 +1833,13 @@ void TMainWindow::ShowNewMData(bool fresh)
//---------------------------------------------------------------------------------------------------------------------
QString TMainWindow::getMeasurementNumber(const QString &name)
{
- return qApp->TrVars()->MNumber(name);
+ return qApp->translateVariables()->MNumber(name);
}
//---------------------------------------------------------------------------------------------------------------------
void TMainWindow::ShowMDiagram(const QString &name)
{
- const VTranslateVars *trv = qApp->TrVars();
+ const VTranslateVars *trv = qApp->translateVariables();
const QString number = trv->MNumber(name);
if (number.isEmpty())
@@ -1975,7 +1975,7 @@ void TMainWindow::SaveMValue()
try
{
- const QString formula = qApp->TrVars()->FormulaFromUser(text, qApp->Settings()->getOsSeparator());
+ const QString formula = qApp->translateVariables()->FormulaFromUser(text, qApp->Settings()->getOsSeparator());
individualMeasurements->SetMValue(nameField->data(Qt::UserRole).toString(), formula);
}
catch (qmu::QmuParserError &error) // Just in case something bad will happen
@@ -2221,7 +2221,7 @@ void TMainWindow::SetupMenu()
// Measurements
connect(ui->actionAddCustom, &QAction::triggered, this, &TMainWindow::AddCustom);
connect(ui->actionAddKnown, &QAction::triggered, this, &TMainWindow::AddKnown);
- connect(ui->actionDatabase, &QAction::triggered, qApp, &MApplication::ShowDataBase);
+ connect(ui->actionDatabase, &QAction::triggered, qApp, &ApplicationME::showDataBase);
connect(ui->actionImportFromPattern, &QAction::triggered, this, &TMainWindow::ImportFromPattern);
actionDockDiagram = ui->dockWidgetDiagram->toggleViewAction();
actionDockDiagram->setMenuRole(QAction::NoRole);
@@ -2506,7 +2506,7 @@ void TMainWindow::SetCurrentFile(const QString &fileName)
ui->lineEditPathToFile->setToolTip(QDir::toNativeSeparators(curFile));
ui->lineEditPathToFile->setCursorPosition(0);
ui->pushButtonShowInExplorer->setEnabled(true);
- auto settings = qApp->SeamlyMeSettings();
+ auto settings = qApp->seamlyMeSettings();
QStringList files = settings->GetRecentFileList();
files.removeAll(fileName);
files.prepend(fileName);
@@ -2684,7 +2684,7 @@ void TMainWindow::RefreshTable(bool freshCall)
if (mType == MeasurementsType::Individual)
{
- QTableWidgetItem *item = AddCell(qApp->TrVars()->MToUser(meash->GetName()), currentRow, ColumnName,
+ QTableWidgetItem *item = AddCell(qApp->translateVariables()->MToUser(meash->GetName()), currentRow, ColumnName,
Qt::AlignVCenter); // name
item->setData(Qt::UserRole, meash->GetName());
@@ -2697,7 +2697,7 @@ void TMainWindow::RefreshTable(bool freshCall)
{
AddCell(getMeasurementNumber(meash->GetName()), currentRow, ColumnNumber, Qt::AlignVCenter);
- AddCell(qApp->TrVars()->guiText(meash->GetName()), currentRow, ColumnFullName, Qt::AlignVCenter);
+ AddCell(qApp->translateVariables()->guiText(meash->GetName()), currentRow, ColumnFullName, Qt::AlignVCenter);
}
const qreal value = UnitConvertor(*meash->GetValue(), mUnit, pUnit);
@@ -2707,7 +2707,7 @@ void TMainWindow::RefreshTable(bool freshCall)
QString formula;
try
{
- formula = qApp->TrVars()->FormulaToUser(meash->GetFormula(), qApp->Settings()->getOsSeparator());
+ formula = qApp->translateVariables()->FormulaToUser(meash->GetFormula(), qApp->Settings()->getOsSeparator());
}
catch (qmu::QmuParserError &error)
{
@@ -2719,7 +2719,7 @@ void TMainWindow::RefreshTable(bool freshCall)
}
else
{
- QTableWidgetItem *item = AddCell(qApp->TrVars()->MToUser(meash->GetName()), currentRow, 0,
+ QTableWidgetItem *item = AddCell(qApp->translateVariables()->MToUser(meash->GetName()), currentRow, 0,
Qt::AlignVCenter); // name
item->setData(Qt::UserRole, meash->GetName());
@@ -2731,7 +2731,7 @@ void TMainWindow::RefreshTable(bool freshCall)
else
{
AddCell(getMeasurementNumber(meash->GetName()), currentRow, ColumnNumber, Qt::AlignVCenter);
- AddCell(qApp->TrVars()->guiText(meash->GetName()), currentRow, ColumnFullName, Qt::AlignVCenter);
+ AddCell(qApp->translateVariables()->guiText(meash->GetName()), currentRow, ColumnFullName, Qt::AlignVCenter);
}
const qreal value = UnitConvertor(*data->DataVariables()->value(meash->GetName())->GetValue(), mUnit,
@@ -2771,7 +2771,7 @@ QString TMainWindow::GetCustomName() const
QString name;
do
{
- name = CustomMSign + qApp->TrVars()->InternalVarToUser(measurement_) + QString().number(num);
+ name = CustomMSign + qApp->translateVariables()->InternalVarToUser(measurement_) + QString().number(num);
num++;
} while (data->IsUnique(name) == false);
@@ -2873,7 +2873,7 @@ void TMainWindow::UpdateWindowTitle()
}
else
{
- fileName = tr("untitled %1").arg(qApp->MainWindows().size() + 1);
+ fileName = tr("untitled %1").arg(qApp->mainWindows().size() + 1);
mType == MeasurementsType::Multisize ? fileName += QLatin1String(".") + smmsExt :
fileName += QLatin1String(".") + smisExt;
}
@@ -2943,7 +2943,7 @@ bool TMainWindow::EvalFormula(const QString &formula, bool fromUser, VContainer
QString f;
if (fromUser)
{
- f = qApp->TrVars()->FormulaFromUser(formula, qApp->Settings()->getOsSeparator());
+ f = qApp->translateVariables()->FormulaFromUser(formula, qApp->Settings()->getOsSeparator());
}
else
{
@@ -2989,7 +2989,7 @@ void TMainWindow::Open(const QString &dir, const QString &filter)
}
else
{
- qApp->NewMainWindow()->LoadFile(filename);
+ qApp->newMainWindow()->LoadFile(filename);
}
}
}
@@ -3032,7 +3032,7 @@ void TMainWindow::MeasurementGUI()
//---------------------------------------------------------------------------------------------------------------------
void TMainWindow::ReadSettings()
{
- const VSeamlyMeSettings *settings = qApp->SeamlyMeSettings();
+ const VSeamlyMeSettings *settings = qApp->seamlyMeSettings();
restoreGeometry(settings->GetGeometry());
restoreState(settings->GetWindowState());
restoreState(settings->GetToolbarsState(), APP_VERSION);
@@ -3047,7 +3047,7 @@ void TMainWindow::ReadSettings()
//---------------------------------------------------------------------------------------------------------------------
void TMainWindow::WriteSettings()
{
- VSeamlyMeSettings *settings = qApp->SeamlyMeSettings();
+ VSeamlyMeSettings *settings = qApp->seamlyMeSettings();
settings->SetGeometry(saveGeometry());
settings->SetWindowState(saveState());
settings->SetToolbarsState(saveState(APP_VERSION));
@@ -3084,7 +3084,7 @@ bool TMainWindow::LoadFromExistingFile(const QString &path)
if (!QFileInfo(path).exists())
{
qCCritical(tMainWindow, "%s", qUtf8Printable(tr("File '%1' doesn't exist!").arg(path)));
- if (qApp->IsTestMode())
+ if (qApp->isTestMode())
{
qApp->exit(V_EX_NOINPUT);
}
@@ -3092,7 +3092,7 @@ bool TMainWindow::LoadFromExistingFile(const QString &path)
}
// Check if file already opened
- QListlist = qApp->MainWindows();
+ QListlist = qApp->mainWindows();
for (int i = 0; i < list.size(); ++i)
{
if (list.at(i)->CurrentFile() == path)
@@ -3115,7 +3115,7 @@ bool TMainWindow::LoadFromExistingFile(const QString &path)
try
{
- data = new VContainer(qApp->TrVars(), &mUnit);
+ data = new VContainer(qApp->translateVariables(), &mUnit);
individualMeasurements = new MeasurementDoc(data);
individualMeasurements->setSize(¤tSize);
@@ -3189,7 +3189,7 @@ bool TMainWindow::LoadFromExistingFile(const QString &path)
data = nullptr;
lock.reset();
- if (qApp->IsTestMode())
+ if (qApp->isTestMode())
{
qApp->exit(V_EX_NOINPUT);
}
@@ -3198,8 +3198,8 @@ bool TMainWindow::LoadFromExistingFile(const QString &path)
}
else
{
- qApp->NewMainWindow();
- return qApp->MainWindow()->LoadFile(path);
+ qApp->newMainWindow();
+ return qApp->mainWindow()->LoadFile(path);
}
return true;
@@ -3208,7 +3208,7 @@ bool TMainWindow::LoadFromExistingFile(const QString &path)
void TMainWindow::UpdateRecentFileActions()
{
qCDebug(tMainWindow, "Updating recent file actions.");
- const QStringList files = qApp->SeamlyMeSettings()->GetRecentFileList();
+ const QStringList files = qApp->seamlyMeSettings()->GetRecentFileList();
const int numRecentFiles = qMin(files.size(), static_cast(MaxRecentFiles));
qCDebug(tMainWindow, "Updating recent file actions = %i ",numRecentFiles);
@@ -3237,13 +3237,13 @@ void TMainWindow::CreateWindowMenu(QMenu *menu)
QAction *action = menu->addAction(tr("&New Window"));
connect(action, &QAction::triggered, this, []()
{
- qApp->NewMainWindow();
- qApp->MainWindow()->activateWindow();
+ qApp->newMainWindow();
+ qApp->mainWindow()->activateWindow();
});
action->setMenuRole(QAction::NoRole);
menu->addSeparator();
- const QList windows = qApp->MainWindows();
+ const QList windows = qApp->mainWindows();
for (int i = 0; i < windows.count(); ++i)
{
TMainWindow *window = windows.at(i);
@@ -3270,7 +3270,7 @@ void TMainWindow::CreateWindowMenu(QMenu *menu)
bool TMainWindow::IgnoreLocking(int error, const QString &path)
{
QMessageBox::StandardButton answer = QMessageBox::Abort;
- if (!qApp->IsTestMode())
+ if (!qApp->isTestMode())
{
switch(error)
{
@@ -3304,7 +3304,7 @@ bool TMainWindow::IgnoreLocking(int error, const QString &path)
{
qCWarning(tMainWindow, "Failed to lock %s", qUtf8Printable(path));
qCWarning(tMainWindow, "Error type: %d", error);
- if (qApp->IsTestMode())
+ if (qApp->isTestMode())
{
switch(error)
{
diff --git a/src/libs/vformat/measurements.cpp b/src/libs/vformat/measurements.cpp
index 422b559ff460..e1ccfe93d0f2 100644
--- a/src/libs/vformat/measurements.cpp
+++ b/src/libs/vformat/measurements.cpp
@@ -290,7 +290,7 @@ void MeasurementDoc::readMeasurements() const
// That's why we need two containers: one for converted values, second for real data.
// Container for values in measurement file's unit
- QScopedPointer tempData(new VContainer(data->GetTrVars(), data->GetPatternUnit()));
+ QScopedPointer tempData(new VContainer(data->getTranslateVariables(), data->GetPatternUnit()));
const QDomNodeList list = elementsByTagName(TagMeasurement);
for (int i=0; i < list.size(); ++i)
diff --git a/src/libs/vmisc/vabstractapplication.cpp b/src/libs/vmisc/vabstractapplication.cpp
index 46054c5d1bb4..6cfb8ce0007c 100644
--- a/src/libs/vmisc/vabstractapplication.cpp
+++ b/src/libs/vmisc/vabstractapplication.cpp
@@ -108,7 +108,7 @@ VAbstractApplication::VAbstractApplication(int &argc, char **argv)
{
// If try to use the method QApplication::exit program can't sync settings and show warning about QApplication
// instance. Solution is to call sync() before quit.
- // Connect this slot with VApplication::aboutToQuit.
+ // Connect this slot with Application2D::aboutToQuit.
Settings()->sync();
});
}
@@ -301,7 +301,7 @@ void VAbstractApplication::loadTranslations(const QString &locale)
installTranslator(appTranslator);
installTranslator(pmsTranslator);
- InitTrVars();//Very important do it after load QM files.
+ initTranslateVariables();//Very important do it after load QM files.
}
//---------------------------------------------------------------------------------------------------------------------
diff --git a/src/libs/vmisc/vabstractapplication.h b/src/libs/vmisc/vabstractapplication.h
index 48e3651355bc..317e610579c1 100644
--- a/src/libs/vmisc/vabstractapplication.h
+++ b/src/libs/vmisc/vabstractapplication.h
@@ -89,7 +89,7 @@ class VAbstractApplication : public QApplication
VAbstractApplication(int &argc, char ** argv);
virtual ~VAbstractApplication() Q_DECL_OVERRIDE;
- virtual const VTranslateVars *TrVars()=0;
+ virtual const VTranslateVars *translateVariables()=0;
QString translationsPath(const QString &locale = QString()) const;
@@ -102,7 +102,7 @@ class VAbstractApplication : public QApplication
MeasurementsType patternType() const;
void setPatternType(const MeasurementsType &patternType);
- virtual void OpenSettings()=0;
+ virtual void openSettings()=0;
VCommonSettings *Settings();
template
@@ -131,7 +131,7 @@ class VAbstractApplication : public QApplication
QUndoStack *getUndoStack() const;
- virtual bool IsAppInGUIMode()const =0;
+ virtual bool isAppInGUIMode()const =0;
QString getFilePath() const;
void setFilePath(const QString &value);
@@ -156,7 +156,7 @@ class VAbstractApplication : public QApplication
QPointer appTranslator;
QPointer pmsTranslator;
- virtual void InitTrVars()=0;
+ virtual void initTranslateVariables()=0;
private:
Q_DISABLE_COPY(VAbstractApplication)
diff --git a/src/libs/vmisc/vsettings.cpp b/src/libs/vmisc/vsettings.cpp
index 96804ebb7962..a5345b11ee8b 100644
--- a/src/libs/vmisc/vsettings.cpp
+++ b/src/libs/vmisc/vsettings.cpp
@@ -70,7 +70,7 @@ Q_DECLARE_METATYPE(QMarginsF)
namespace
{
-const QString settingConfigurationLabelLanguage = QStringLiteral("configuration/label_language");
+const QString settingConfigurationPointLanguage = QStringLiteral("configuration/label_language");
const QString settingPathsPattern = QStringLiteral("paths/pattern");
const QString settingPathsLayout = QStringLiteral("paths/layout");
@@ -119,15 +119,15 @@ VSettings::VSettings(Format format, Scope scope, const QString &organization, co
}
//---------------------------------------------------------------------------------------------------------------------
-QString VSettings::getLabelLanguage() const
+QString VSettings::getPointNameLanguage() const
{
- return value(settingConfigurationLabelLanguage, QLocale().bcp47Name()).toString();
+ return value(settingConfigurationPointLanguage, QLocale().bcp47Name()).toString();
}
//---------------------------------------------------------------------------------------------------------------------
-void VSettings::setLabelLanguage(const QString &value)
+void VSettings::setPointNameLanguage(const QString &value)
{
- setValue(settingConfigurationLabelLanguage, value);
+ setValue(settingConfigurationPointLanguage, value);
}
//---------------------------------------------------------------------------------------------------------------------
diff --git a/src/libs/vmisc/vsettings.h b/src/libs/vmisc/vsettings.h
index e363363f2043..f48cb3f056f1 100644
--- a/src/libs/vmisc/vsettings.h
+++ b/src/libs/vmisc/vsettings.h
@@ -72,8 +72,8 @@ class VSettings : public VCommonSettings
VSettings(Format format, Scope scope, const QString &organization, const QString &application = QString(),
QObject *parent = nullptr);
- QString getLabelLanguage() const;
- void setLabelLanguage(const QString &value);
+ QString getPointNameLanguage() const;
+ void setPointNameLanguage(const QString &value);
static QString getDefaultPatternPath();
QString getPatternPath() const;
diff --git a/src/libs/vpatterndb/pmsystems.cpp b/src/libs/vpatterndb/pmsystems.cpp
index e418d9556c12..9333abd24806 100644
--- a/src/libs/vpatterndb/pmsystems.cpp
+++ b/src/libs/vpatterndb/pmsystems.cpp
@@ -184,14 +184,14 @@ void InitPMSystems(QComboBox *systemCombo)
QMap systems;
for (int i = 0; i < listSystems.size()-1; ++i)
{
- systems.insert(qApp->TrVars()->PMSystemName(listSystems.at(i)) + " ("+listSystems.at(i)+")", listSystems.at(i));
+ systems.insert(qApp->translateVariables()->PMSystemName(listSystems.at(i)) + " ("+listSystems.at(i)+")", listSystems.at(i));
}
// * The default option (blank field or 'None') should appear at the top of the list.
// * The list should be sorted alphabetically so users can find their system easily.
SCASSERT(systemCombo != nullptr)
- systemCombo->addItem(qApp->TrVars()->PMSystemName(listSystems.at(listSystems.size()-1)),
+ systemCombo->addItem(qApp->translateVariables()->PMSystemName(listSystems.at(listSystems.size()-1)),
listSystems.at(listSystems.size()-1));
QMap::const_iterator i = systems.constBegin();
diff --git a/src/libs/vpatterndb/vcontainer.cpp b/src/libs/vpatterndb/vcontainer.cpp
index 2e46f47bd814..d0ccbace080c 100644
--- a/src/libs/vpatterndb/vcontainer.cpp
+++ b/src/libs/vpatterndb/vcontainer.cpp
@@ -602,7 +602,7 @@ const Unit *VContainer::GetPatternUnit() const
}
//---------------------------------------------------------------------------------------------------------------------
-const VTranslateVars *VContainer::GetTrVars() const
+const VTranslateVars *VContainer::getTranslateVariables() const
{
return d->trVars;
}
diff --git a/src/libs/vpatterndb/vcontainer.h b/src/libs/vpatterndb/vcontainer.h
index c8b514afc810..9c16ef0cbc07 100644
--- a/src/libs/vpatterndb/vcontainer.h
+++ b/src/libs/vpatterndb/vcontainer.h
@@ -223,7 +223,7 @@ class VContainer
static QStringList AllUniqueNames();
const Unit *GetPatternUnit() const;
- const VTranslateVars *GetTrVars() const;
+ const VTranslateVars *getTranslateVariables() const;
private:
/**
diff --git a/src/libs/vpatterndb/vformula.cpp b/src/libs/vpatterndb/vformula.cpp
index e86b66cb3b18..0ad46df5378a 100644
--- a/src/libs/vpatterndb/vformula.cpp
+++ b/src/libs/vpatterndb/vformula.cpp
@@ -75,7 +75,7 @@ VFormula::VFormula()
//---------------------------------------------------------------------------------------------------------------------
VFormula::VFormula(const QString &formula, const VContainer *container)
- : formula(qApp->TrVars()->FormulaToUser(formula, qApp->Settings()->getOsSeparator())),
+ : formula(qApp->translateVariables()->FormulaToUser(formula, qApp->Settings()->getOsSeparator())),
value(tr("Error")),
checkZero(true),
data(container),
@@ -141,7 +141,7 @@ QString VFormula::GetFormula(FormulaType type) const
}
else
{
- return qApp->TrVars()->TryFormulaFromUser(formula, qApp->Settings()->getOsSeparator());
+ return qApp->translateVariables()->TryFormulaFromUser(formula, qApp->Settings()->getOsSeparator());
}
}
@@ -152,7 +152,7 @@ void VFormula::SetFormula(const QString &value, FormulaType type)
{
if (type == FormulaType::ToUser)
{
- formula = qApp->TrVars()->FormulaToUser(value, qApp->Settings()->getOsSeparator());
+ formula = qApp->translateVariables()->FormulaToUser(value, qApp->Settings()->getOsSeparator());
}
else
{
@@ -265,7 +265,7 @@ void VFormula::Eval()
try
{
QScopedPointer cal(new Calculator());
- QString expression = qApp->TrVars()->FormulaFromUser(formula, qApp->Settings()->getOsSeparator());
+ QString expression = qApp->translateVariables()->FormulaFromUser(formula, qApp->Settings()->getOsSeparator());
const qreal result = cal->EvalFormula(data->DataVariables(), expression);
if (qIsInf(result) || qIsNaN(result))
diff --git a/src/libs/vpatterndb/vtranslatevars.cpp b/src/libs/vpatterndb/vtranslatevars.cpp
index 950821233930..456e7e77b503 100644
--- a/src/libs/vpatterndb/vtranslatevars.cpp
+++ b/src/libs/vpatterndb/vtranslatevars.cpp
@@ -945,7 +945,7 @@ QString VTranslateVars::TryFormulaFromUser(const QString &formula, bool osSepara
{
try
{
- return qApp->TrVars()->FormulaFromUser(formula, osSeparator);
+ return qApp->translateVariables()->FormulaFromUser(formula, osSeparator);
}
catch (qmu::QmuParserError &error)// In case something bad will happen
{
diff --git a/src/libs/vtools/dialogs/support/edit_formula_dialog.cpp b/src/libs/vtools/dialogs/support/edit_formula_dialog.cpp
index 29589426dcb7..46e4215eabcf 100644
--- a/src/libs/vtools/dialogs/support/edit_formula_dialog.cpp
+++ b/src/libs/vtools/dialogs/support/edit_formula_dialog.cpp
@@ -211,7 +211,7 @@ void EditFormulaDialog::valueChanged(int row)
{
case VariableTab::Measurements:
{
- const QString name = qApp->TrVars()->VarFromUser(item->text());
+ const QString name = qApp->translateVariables()->VarFromUser(item->text());
const QSharedPointer measurements = data->GetVariable(name);
const QString desc = (measurements->getGuiText() == "") ? "" : QString("\nDescription: %1").arg(measurements->getGuiText());
setDescription(item->text(), *data->DataVariables()->value(name)->GetValue(),
@@ -229,35 +229,35 @@ void EditFormulaDialog::valueChanged(int row)
case VariableTab::LineLengths:
{
setDescription(item->text(),
- *data->GetVariable(qApp->TrVars()->VarFromUser(item->text()))->GetValue(),
+ *data->GetVariable(qApp->translateVariables()->VarFromUser(item->text()))->GetValue(),
UnitsToStr(qApp->patternUnit(), true), tr("Line length"), "");
break;
}
case VariableTab::CurveLengths:
{
setDescription(item->text(),
- *data->GetVariable(qApp->TrVars()->VarFromUser(item->text()))->GetValue(),
+ *data->GetVariable(qApp->translateVariables()->VarFromUser(item->text()))->GetValue(),
UnitsToStr(qApp->patternUnit(), true), tr("Curve length"), "");
break;
}
case VariableTab::LineAngles:
{
setDescription(item->text(),
- *data->GetVariable(qApp->TrVars()->VarFromUser(item->text()))->GetValue(),
+ *data->GetVariable(qApp->translateVariables()->VarFromUser(item->text()))->GetValue(),
degreeSymbol, tr("Line Angle"), "");
break;
}
case VariableTab::ArcRadii:
{
setDescription(item->text(),
- *data->GetVariable(qApp->TrVars()->VarFromUser(item->text()))->GetValue(),
+ *data->GetVariable(qApp->translateVariables()->VarFromUser(item->text()))->GetValue(),
UnitsToStr(qApp->patternUnit(), true), tr("Arc radius"), "");
break;
}
case VariableTab::CurveAngles:
{
setDescription(item->text(),
- *data->GetVariable(qApp->TrVars()->VarFromUser(item->text()))->GetValue(),
+ *data->GetVariable(qApp->translateVariables()->VarFromUser(item->text()))->GetValue(),
degreeSymbol, tr("Curve angle"), "");
break;
}
@@ -520,7 +520,7 @@ void EditFormulaDialog::resizeEvent(QResizeEvent *event)
//---------------------------------------------------------------------------------------------------------------------
void EditFormulaDialog::SetFormula(const QString &value)
{
- m_formula = qApp->TrVars()->FormulaToUser(value, qApp->Settings()->getOsSeparator());
+ m_formula = qApp->translateVariables()->FormulaToUser(value, qApp->Settings()->getOsSeparator());
m_undoFormula = m_formula;
ui->plainTextEditFormula->setPlainText(m_formula);
MoveCursorToEnd(ui->plainTextEditFormula);
@@ -547,7 +547,7 @@ void EditFormulaDialog::setPostfix(const QString &value)
//---------------------------------------------------------------------------------------------------------------------
QString EditFormulaDialog::GetFormula() const
{
- return qApp->TrVars()->TryFormulaFromUser(m_formula, qApp->Settings()->getOsSeparator());
+ return qApp->translateVariables()->TryFormulaFromUser(m_formula, qApp->Settings()->getOsSeparator());
}
//---------------------------------------------------------------------------------------------------------------------
@@ -647,7 +647,7 @@ void EditFormulaDialog::showMeasurements(const QMapsetText(qApp->TrVars()->guiText(iMap.value()->GetName()));
+ itemFullName->setText(qApp->translateVariables()->guiText(iMap.value()->GetName()));
}
itemFullName->setToolTip(itemFullName->text());
@@ -672,8 +672,8 @@ void EditFormulaDialog::showFunctions()
ui->tableWidget->setColumnHidden(ColumnFullName, true);
ui->description_Label->setText("");
- QMap::const_iterator i = qApp->TrVars()->getFunctions().constBegin();
- while (i != qApp->TrVars()->getFunctions().constEnd())
+ QMap::const_iterator i = qApp->translateVariables()->getFunctions().constBegin();
+ while (i != qApp->translateVariables()->getFunctions().constEnd())
{
ui->tableWidget->setRowCount(ui->tableWidget->rowCount() + 1);
QTableWidgetItem *item = new QTableWidgetItem(i.value().translate());
diff --git a/src/libs/vtools/dialogs/support/editlabeltemplate_dialog.cpp b/src/libs/vtools/dialogs/support/editlabeltemplate_dialog.cpp
index ddbc97cf5be8..7cfd61e0fd31 100644
--- a/src/libs/vtools/dialogs/support/editlabeltemplate_dialog.cpp
+++ b/src/libs/vtools/dialogs/support/editlabeltemplate_dialog.cpp
@@ -481,7 +481,7 @@ void EditLabelTemplateDialog::InitPlaceholdersMenu()
{
auto value = i.value();
QAction *action = m_placeholdersMenu->addAction(value.first);
- action->setData(per + qApp->TrVars()->PlaceholderToUser(i.key()) + per);
+ action->setData(per + qApp->translateVariables()->PlaceholderToUser(i.key()) + per);
connect(action, &QAction::triggered, this, &EditLabelTemplateDialog::InsertPlaceholder);
++i;
}
@@ -572,7 +572,7 @@ QVector EditLabelTemplateDialog::GetTemplate() const
if (lineItem)
{
VLabelTemplateLine line;
- line.line = qApp->TrVars()->PlaceholderFromUserText(lineItem->text());
+ line.line = qApp->translateVariables()->PlaceholderFromUserText(lineItem->text());
line.alignment = lineItem->textAlignment();
line.fontSizeIncrement = lineItem->data(Qt::UserRole).toInt();
@@ -597,7 +597,7 @@ void EditLabelTemplateDialog::SetTemplate(const QVector &lin
for (int i=0; iTrVars()->PlaceholderToUserText(lines.at(i).line));
+ QListWidgetItem *item = new QListWidgetItem(qApp->translateVariables()->PlaceholderToUserText(lines.at(i).line));
item->setTextAlignment(lines.at(i).alignment);
item->setData(Qt::UserRole, lines.at(i).fontSizeIncrement);
diff --git a/src/libs/vtools/dialogs/tools/dialogalongline.cpp b/src/libs/vtools/dialogs/tools/dialogalongline.cpp
index ad6a1d6bd8e1..892f38bb9f08 100644
--- a/src/libs/vtools/dialogs/tools/dialogalongline.cpp
+++ b/src/libs/vtools/dialogs/tools/dialogalongline.cpp
@@ -335,7 +335,7 @@ void DialogAlongLine::SetFirstPointId(const quint32 &value)
*/
void DialogAlongLine::SetFormula(const QString &value)
{
- formula = qApp->TrVars()->FormulaToUser(value, qApp->Settings()->getOsSeparator());
+ formula = qApp->translateVariables()->FormulaToUser(value, qApp->Settings()->getOsSeparator());
// increase height if needed.
if (formula.length() > 80)
{
@@ -422,7 +422,7 @@ void DialogAlongLine::SetPointName(const QString &value)
*/
QString DialogAlongLine::GetFormula() const
{
- return qApp->TrVars()->TryFormulaFromUser(formula, qApp->Settings()->getOsSeparator());
+ return qApp->translateVariables()->TryFormulaFromUser(formula, qApp->Settings()->getOsSeparator());
}
//---------------------------------------------------------------------------------------------------------------------
diff --git a/src/libs/vtools/dialogs/tools/dialogarc.cpp b/src/libs/vtools/dialogs/tools/dialogarc.cpp
index 13c9c35d9ee4..e10198c8c398 100644
--- a/src/libs/vtools/dialogs/tools/dialogarc.cpp
+++ b/src/libs/vtools/dialogs/tools/dialogarc.cpp
@@ -199,7 +199,7 @@ VArc DialogArc::getArc() const
void DialogArc::setArc(const VArc &arc)
{
m_arc = arc;
- ui->name_LineEdit->setText(qApp->TrVars()->VarToUser(m_arc.name()));
+ ui->name_LineEdit->setText(qApp->translateVariables()->VarToUser(m_arc.name()));
}
//---------------------------------------------------------------------------------------------------------------------
@@ -220,7 +220,7 @@ void DialogArc::setCenter(const quint32 &value)
*/
void DialogArc::setF2(const QString &value)
{
- f2 = qApp->TrVars()->FormulaToUser(value, qApp->Settings()->getOsSeparator());
+ f2 = qApp->translateVariables()->FormulaToUser(value, qApp->Settings()->getOsSeparator());
// increase height if needed.
if (f2.length() > 80)
{
@@ -286,7 +286,7 @@ void DialogArc::setLineColor(const QString &value)
*/
void DialogArc::setF1(const QString &value)
{
- f1 = qApp->TrVars()->FormulaToUser(value, qApp->Settings()->getOsSeparator());
+ f1 = qApp->translateVariables()->FormulaToUser(value, qApp->Settings()->getOsSeparator());
// increase height if needed.
if (f1.length() > 80)
{
@@ -308,7 +308,7 @@ void DialogArc::setF1(const QString &value)
*/
void DialogArc::setRadius(const QString &value)
{
- radius = qApp->TrVars()->FormulaToUser(value, qApp->Settings()->getOsSeparator());
+ radius = qApp->translateVariables()->FormulaToUser(value, qApp->Settings()->getOsSeparator());
// increase height if needed.
if (radius.length() > 80)
{
@@ -468,7 +468,7 @@ void DialogArc::pointNameChanged()
if (getCurrentObjectId(ui->centerPoint_ComboBox) == m_arc.GetCenter().id())
{
newDuplicate = -1;
- ui->name_LineEdit->setText(qApp->TrVars()->VarToUser(m_arc.name()));
+ ui->name_LineEdit->setText(qApp->translateVariables()->VarToUser(m_arc.name()));
}
else
{
@@ -484,11 +484,11 @@ void DialogArc::pointNameChanged()
}
if (m_arc.id() == NULL_ID)
{
- ui->name_LineEdit->setText(qApp->TrVars()->VarToUser(arc.name() + "_" + QString().setNum(m_Id + 1)));
+ ui->name_LineEdit->setText(qApp->translateVariables()->VarToUser(arc.name() + "_" + QString().setNum(m_Id + 1)));
}
else
{
- ui->name_LineEdit->setText(qApp->TrVars()->VarToUser(arc.name() + "_" + QString().setNum(m_arc.id())));
+ ui->name_LineEdit->setText(qApp->translateVariables()->VarToUser(arc.name() + "_" + QString().setNum(m_arc.id())));
}
}
@@ -586,7 +586,7 @@ quint32 DialogArc::getCenter() const
*/
QString DialogArc::getRadius() const
{
- return qApp->TrVars()->TryFormulaFromUser(radius, qApp->Settings()->getOsSeparator());
+ return qApp->translateVariables()->TryFormulaFromUser(radius, qApp->Settings()->getOsSeparator());
}
//---------------------------------------------------------------------------------------------------------------------
@@ -596,7 +596,7 @@ QString DialogArc::getRadius() const
*/
QString DialogArc::getF1() const
{
- return qApp->TrVars()->TryFormulaFromUser(f1, qApp->Settings()->getOsSeparator());
+ return qApp->translateVariables()->TryFormulaFromUser(f1, qApp->Settings()->getOsSeparator());
}
//---------------------------------------------------------------------------------------------------------------------
@@ -606,5 +606,5 @@ QString DialogArc::getF1() const
*/
QString DialogArc::getF2() const
{
- return qApp->TrVars()->TryFormulaFromUser(f2, qApp->Settings()->getOsSeparator());
+ return qApp->translateVariables()->TryFormulaFromUser(f2, qApp->Settings()->getOsSeparator());
}
diff --git a/src/libs/vtools/dialogs/tools/dialogarcwithlength.cpp b/src/libs/vtools/dialogs/tools/dialogarcwithlength.cpp
index 14dab4c0e1ba..3f395157d7b7 100644
--- a/src/libs/vtools/dialogs/tools/dialogarcwithlength.cpp
+++ b/src/libs/vtools/dialogs/tools/dialogarcwithlength.cpp
@@ -174,7 +174,7 @@ VArc DialogArcWithLength::getArc() const
void DialogArcWithLength::setArc(const VArc &arc)
{
m_arc = arc;
- ui->name_LineEdit->setText(qApp->TrVars()->VarToUser(m_arc.name()));
+ ui->name_LineEdit->setText(qApp->translateVariables()->VarToUser(m_arc.name()));
}
//---------------------------------------------------------------------------------------------------------------------
@@ -193,13 +193,13 @@ void DialogArcWithLength::SetCenter(const quint32 &value)
//---------------------------------------------------------------------------------------------------------------------
QString DialogArcWithLength::GetRadius() const
{
- return qApp->TrVars()->TryFormulaFromUser(radius, qApp->Settings()->getOsSeparator());
+ return qApp->translateVariables()->TryFormulaFromUser(radius, qApp->Settings()->getOsSeparator());
}
//---------------------------------------------------------------------------------------------------------------------
void DialogArcWithLength::SetRadius(const QString &value)
{
- radius = qApp->TrVars()->FormulaToUser(value, qApp->Settings()->getOsSeparator());
+ radius = qApp->translateVariables()->FormulaToUser(value, qApp->Settings()->getOsSeparator());
// increase height if needed.
if (radius.length() > 80)
{
@@ -217,12 +217,12 @@ void DialogArcWithLength::SetRadius(const QString &value)
//---------------------------------------------------------------------------------------------------------------------
QString DialogArcWithLength::GetF1() const
{
- return qApp->TrVars()->TryFormulaFromUser(f1, qApp->Settings()->getOsSeparator());
+ return qApp->translateVariables()->TryFormulaFromUser(f1, qApp->Settings()->getOsSeparator());
}
void DialogArcWithLength::SetF1(const QString &value)
{
- f1 = qApp->TrVars()->FormulaToUser(value, qApp->Settings()->getOsSeparator());
+ f1 = qApp->translateVariables()->FormulaToUser(value, qApp->Settings()->getOsSeparator());
// increase height if needed.
if (f1.length() > 80)
{
@@ -240,13 +240,13 @@ void DialogArcWithLength::SetF1(const QString &value)
//---------------------------------------------------------------------------------------------------------------------
QString DialogArcWithLength::GetLength() const
{
- return qApp->TrVars()->TryFormulaFromUser(length, qApp->Settings()->getOsSeparator());
+ return qApp->translateVariables()->TryFormulaFromUser(length, qApp->Settings()->getOsSeparator());
}
//---------------------------------------------------------------------------------------------------------------------
void DialogArcWithLength::SetLength(const QString &value)
{
- length = qApp->TrVars()->FormulaToUser(value, qApp->Settings()->getOsSeparator());
+ length = qApp->translateVariables()->FormulaToUser(value, qApp->Settings()->getOsSeparator());
// increase height if needed.
if (length.length() > 80)
{
@@ -420,7 +420,7 @@ void DialogArcWithLength::pointNameChanged()
if (getCurrentObjectId(ui->centerPoint_ComboBox) == m_arc.GetCenter().id())
{
newDuplicate = -1;
- ui->name_LineEdit->setText(qApp->TrVars()->VarToUser(m_arc.name()));
+ ui->name_LineEdit->setText(qApp->translateVariables()->VarToUser(m_arc.name()));
}
else
{
@@ -434,7 +434,7 @@ void DialogArcWithLength::pointNameChanged()
newDuplicate = static_cast(DNumber(arc.name()));
arc.SetDuplicate(static_cast(newDuplicate));
}
- ui->name_LineEdit->setText(qApp->TrVars()->VarToUser(arc.name() + "_" + QString().setNum(m_Id)));
+ ui->name_LineEdit->setText(qApp->translateVariables()->VarToUser(arc.name() + "_" + QString().setNum(m_Id)));
}
ChangeColor(ui->name_Label, color);
diff --git a/src/libs/vtools/dialogs/tools/dialogbisector.cpp b/src/libs/vtools/dialogs/tools/dialogbisector.cpp
index 5b3d2c3850e7..707432c8a0b1 100644
--- a/src/libs/vtools/dialogs/tools/dialogbisector.cpp
+++ b/src/libs/vtools/dialogs/tools/dialogbisector.cpp
@@ -341,7 +341,7 @@ void DialogBisector::setLineColor(const QString &value)
*/
void DialogBisector::SetFormula(const QString &value)
{
- formula = qApp->TrVars()->FormulaToUser(value, qApp->Settings()->getOsSeparator());
+ formula = qApp->translateVariables()->FormulaToUser(value, qApp->Settings()->getOsSeparator());
// increase height if needed.
if (formula.length() > 80)
{
@@ -432,7 +432,7 @@ void DialogBisector::closeEvent(QCloseEvent *event)
*/
QString DialogBisector::GetFormula() const
{
- return qApp->TrVars()->TryFormulaFromUser(formula, qApp->Settings()->getOsSeparator());
+ return qApp->translateVariables()->TryFormulaFromUser(formula, qApp->Settings()->getOsSeparator());
}
//---------------------------------------------------------------------------------------------------------------------
diff --git a/src/libs/vtools/dialogs/tools/dialogcubicbezier.cpp b/src/libs/vtools/dialogs/tools/dialogcubicbezier.cpp
index 91c0676031a3..ecba2208289d 100644
--- a/src/libs/vtools/dialogs/tools/dialogcubicbezier.cpp
+++ b/src/libs/vtools/dialogs/tools/dialogcubicbezier.cpp
@@ -140,7 +140,7 @@ void DialogCubicBezier::SetSpline(const VCubicBezier &spline)
setCurrentPointId(ui->comboBoxP3, spl.GetP3().id());
setCurrentPointId(ui->comboBoxP4, spl.GetP4().id());
- ui->lineEditSplineName->setText(qApp->TrVars()->VarToUser(spl.name()));
+ ui->lineEditSplineName->setText(qApp->translateVariables()->VarToUser(spl.name()));
auto path = qobject_cast(vis);
SCASSERT(path != nullptr)
@@ -273,7 +273,7 @@ void DialogCubicBezier::PointNameChanged()
getCurrentObjectId(ui->comboBoxP4) == spl.GetP4().id())
{
newDuplicate = -1;
- ui->lineEditSplineName->setText(qApp->TrVars()->VarToUser(spl.name()));
+ ui->lineEditSplineName->setText(qApp->translateVariables()->VarToUser(spl.name()));
}
else
{
@@ -284,7 +284,7 @@ void DialogCubicBezier::PointNameChanged()
newDuplicate = static_cast(DNumber(spline.name()));
spline.SetDuplicate(static_cast(newDuplicate));
}
- ui->lineEditSplineName->setText(qApp->TrVars()->VarToUser(spline.name()));
+ ui->lineEditSplineName->setText(qApp->translateVariables()->VarToUser(spline.name()));
}
}
ChangeColor(ui->labelName, color);
diff --git a/src/libs/vtools/dialogs/tools/dialogcubicbezierpath.cpp b/src/libs/vtools/dialogs/tools/dialogcubicbezierpath.cpp
index 8f826d51136d..7b83a83cbb23 100644
--- a/src/libs/vtools/dialogs/tools/dialogcubicbezierpath.cpp
+++ b/src/libs/vtools/dialogs/tools/dialogcubicbezierpath.cpp
@@ -150,7 +150,7 @@ void DialogCubicBezierPath::SetPath(const VCubicBezierPath &value)
NewItem(path.at(i));
}
ui->listWidget->setFocus(Qt::OtherFocusReason);
- ui->lineEditSplPathName->setText(qApp->TrVars()->VarToUser(path.name()));
+ ui->lineEditSplPathName->setText(qApp->translateVariables()->VarToUser(path.name()));
auto visPath = qobject_cast(vis);
SCASSERT(visPath != nullptr)
@@ -323,7 +323,7 @@ void DialogCubicBezierPath::currentPointChanged(int index)
if (first.id() == path.at(0).id() && last.id() == path.at(path.CountPoints()-1).id())
{
newDuplicate = -1;
- ui->lineEditSplPathName->setText(qApp->TrVars()->VarToUser(path.name()));
+ ui->lineEditSplPathName->setText(qApp->translateVariables()->VarToUser(path.name()));
}
else
{
@@ -335,7 +335,7 @@ void DialogCubicBezierPath::currentPointChanged(int index)
newPath.SetDuplicate(static_cast(newDuplicate));
}
- ui->lineEditSplPathName->setText(qApp->TrVars()->VarToUser(newPath.name()));
+ ui->lineEditSplPathName->setText(qApp->translateVariables()->VarToUser(newPath.name()));
}
}
ChangeColor(ui->name_Label, color);
diff --git a/src/libs/vtools/dialogs/tools/dialogcurveintersectaxis.cpp b/src/libs/vtools/dialogs/tools/dialogcurveintersectaxis.cpp
index a2571eb9686a..2783261d9f4d 100644
--- a/src/libs/vtools/dialogs/tools/dialogcurveintersectaxis.cpp
+++ b/src/libs/vtools/dialogs/tools/dialogcurveintersectaxis.cpp
@@ -180,13 +180,13 @@ void DialogCurveIntersectAxis::setLineWeight(const QString &value)
//---------------------------------------------------------------------------------------------------------------------
QString DialogCurveIntersectAxis::GetAngle() const
{
- return qApp->TrVars()->TryFormulaFromUser(formulaAngle, qApp->Settings()->getOsSeparator());
+ return qApp->translateVariables()->TryFormulaFromUser(formulaAngle, qApp->Settings()->getOsSeparator());
}
//---------------------------------------------------------------------------------------------------------------------
void DialogCurveIntersectAxis::SetAngle(const QString &value)
{
- formulaAngle = qApp->TrVars()->FormulaToUser(value, qApp->Settings()->getOsSeparator());
+ formulaAngle = qApp->translateVariables()->FormulaToUser(value, qApp->Settings()->getOsSeparator());
// increase height if needed. TODO : see if I can get the max number of caracters in one line
// of this PlainTextEdit to change 80 to this value
if (formulaAngle.length() > 80)
diff --git a/src/libs/vtools/dialogs/tools/dialogcutarc.cpp b/src/libs/vtools/dialogs/tools/dialogcutarc.cpp
index 66daa0f61ee9..5b279d8edd9c 100644
--- a/src/libs/vtools/dialogs/tools/dialogcutarc.cpp
+++ b/src/libs/vtools/dialogs/tools/dialogcutarc.cpp
@@ -210,7 +210,7 @@ void DialogCutArc::setArcId(const quint32 &value)
*/
void DialogCutArc::SetFormula(const QString &value)
{
- formula = qApp->TrVars()->FormulaToUser(value, qApp->Settings()->getOsSeparator());
+ formula = qApp->translateVariables()->FormulaToUser(value, qApp->Settings()->getOsSeparator());
// increase height if needed.
if (formula.length() > 80)
{
@@ -243,7 +243,7 @@ void DialogCutArc::SetPointName(const QString &value)
*/
QString DialogCutArc::GetFormula() const
{
- return qApp->TrVars()->TryFormulaFromUser(formula, qApp->Settings()->getOsSeparator());
+ return qApp->translateVariables()->TryFormulaFromUser(formula, qApp->Settings()->getOsSeparator());
}
//---------------------------------------------------------------------------------------------------------------------
diff --git a/src/libs/vtools/dialogs/tools/dialogcutspline.cpp b/src/libs/vtools/dialogs/tools/dialogcutspline.cpp
index 233cce30e1ee..c909fb89ec5e 100644
--- a/src/libs/vtools/dialogs/tools/dialogcutspline.cpp
+++ b/src/libs/vtools/dialogs/tools/dialogcutspline.cpp
@@ -130,7 +130,7 @@ void DialogCutSpline::SetPointName(const QString &value)
*/
void DialogCutSpline::SetFormula(const QString &value)
{
- formula = qApp->TrVars()->FormulaToUser(value, qApp->Settings()->getOsSeparator());
+ formula = qApp->translateVariables()->FormulaToUser(value, qApp->Settings()->getOsSeparator());
// increase height if needed. TODO : see if I can get the max number of caracters in one line
// of this PlainTextEdit to change 80 to this value
if (formula.length() > 80)
@@ -238,7 +238,7 @@ void DialogCutSpline::ShowVisualization()
*/
QString DialogCutSpline::GetFormula() const
{
- return qApp->TrVars()->TryFormulaFromUser(formula, qApp->Settings()->getOsSeparator());
+ return qApp->translateVariables()->TryFormulaFromUser(formula, qApp->Settings()->getOsSeparator());
}
//---------------------------------------------------------------------------------------------------------------------
diff --git a/src/libs/vtools/dialogs/tools/dialogcutsplinepath.cpp b/src/libs/vtools/dialogs/tools/dialogcutsplinepath.cpp
index bb3ca5b33d99..31936d01464c 100644
--- a/src/libs/vtools/dialogs/tools/dialogcutsplinepath.cpp
+++ b/src/libs/vtools/dialogs/tools/dialogcutsplinepath.cpp
@@ -130,7 +130,7 @@ void DialogCutSplinePath::SetPointName(const QString &value)
*/
void DialogCutSplinePath::SetFormula(const QString &value)
{
- formula = qApp->TrVars()->FormulaToUser(value, qApp->Settings()->getOsSeparator());
+ formula = qApp->translateVariables()->FormulaToUser(value, qApp->Settings()->getOsSeparator());
// increase height if needed. TODO : see if I can get the max number of caracters in one line
// of this PlainTextEdit to change 80 to this value
if (formula.length() > 80)
@@ -238,7 +238,7 @@ void DialogCutSplinePath::ShowVisualization()
*/
QString DialogCutSplinePath::GetFormula() const
{
- return qApp->TrVars()->TryFormulaFromUser(formula, qApp->Settings()->getOsSeparator());
+ return qApp->translateVariables()->TryFormulaFromUser(formula, qApp->Settings()->getOsSeparator());
}
//---------------------------------------------------------------------------------------------------------------------
diff --git a/src/libs/vtools/dialogs/tools/dialogellipticalarc.cpp b/src/libs/vtools/dialogs/tools/dialogellipticalarc.cpp
index ad4930415a15..df39a1ccc49e 100644
--- a/src/libs/vtools/dialogs/tools/dialogellipticalarc.cpp
+++ b/src/libs/vtools/dialogs/tools/dialogellipticalarc.cpp
@@ -205,7 +205,7 @@ VEllipticalArc DialogEllipticalArc::getArc() const
void DialogEllipticalArc::setArc(const VEllipticalArc &arc)
{
m_arc = arc;
- ui->name_LineEdit->setText(qApp->TrVars()->VarToUser(m_arc.name()));
+ ui->name_LineEdit->setText(qApp->translateVariables()->VarToUser(m_arc.name()));
}
//---------------------------------------------------------------------------------------------------------------------
@@ -236,7 +236,7 @@ void DialogEllipticalArc::SetCenter(const quint32 &value)
*/
QString DialogEllipticalArc::GetRadius1() const
{
- return qApp->TrVars()->TryFormulaFromUser(radius1, qApp->Settings()->getOsSeparator());
+ return qApp->translateVariables()->TryFormulaFromUser(radius1, qApp->Settings()->getOsSeparator());
}
//---------------------------------------------------------------------------------------------------------------------
@@ -246,7 +246,7 @@ QString DialogEllipticalArc::GetRadius1() const
*/
void DialogEllipticalArc::SetRadius1(const QString &value)
{
- radius1 = qApp->TrVars()->FormulaToUser(value, qApp->Settings()->getOsSeparator());
+ radius1 = qApp->translateVariables()->FormulaToUser(value, qApp->Settings()->getOsSeparator());
// increase height if needed.
if (radius1.length() > 80)
{
@@ -268,7 +268,7 @@ void DialogEllipticalArc::SetRadius1(const QString &value)
*/
QString DialogEllipticalArc::GetRadius2() const
{
- return qApp->TrVars()->TryFormulaFromUser(radius2, qApp->Settings()->getOsSeparator());
+ return qApp->translateVariables()->TryFormulaFromUser(radius2, qApp->Settings()->getOsSeparator());
}
//---------------------------------------------------------------------------------------------------------------------
@@ -278,7 +278,7 @@ QString DialogEllipticalArc::GetRadius2() const
*/
void DialogEllipticalArc::SetRadius2(const QString &value)
{
- radius2 = qApp->TrVars()->FormulaToUser(value, qApp->Settings()->getOsSeparator());
+ radius2 = qApp->translateVariables()->FormulaToUser(value, qApp->Settings()->getOsSeparator());
// increase height if needed.
if (radius2.length() > 80)
{
@@ -300,7 +300,7 @@ void DialogEllipticalArc::SetRadius2(const QString &value)
*/
QString DialogEllipticalArc::GetF1() const
{
- return qApp->TrVars()->TryFormulaFromUser(f1, qApp->Settings()->getOsSeparator());
+ return qApp->translateVariables()->TryFormulaFromUser(f1, qApp->Settings()->getOsSeparator());
}
//---------------------------------------------------------------------------------------------------------------------
@@ -310,7 +310,7 @@ QString DialogEllipticalArc::GetF1() const
*/
void DialogEllipticalArc::SetF1(const QString &value)
{
- f1 = qApp->TrVars()->FormulaToUser(value, qApp->Settings()->getOsSeparator());
+ f1 = qApp->translateVariables()->FormulaToUser(value, qApp->Settings()->getOsSeparator());
// increase height if needed.
if (f1.length() > 80)
{
@@ -332,7 +332,7 @@ void DialogEllipticalArc::SetF1(const QString &value)
*/
QString DialogEllipticalArc::GetF2() const
{
- return qApp->TrVars()->TryFormulaFromUser(f2, qApp->Settings()->getOsSeparator());
+ return qApp->translateVariables()->TryFormulaFromUser(f2, qApp->Settings()->getOsSeparator());
}
//---------------------------------------------------------------------------------------------------------------------
@@ -342,7 +342,7 @@ QString DialogEllipticalArc::GetF2() const
*/
void DialogEllipticalArc::SetF2(const QString &value)
{
- f2 = qApp->TrVars()->FormulaToUser(value, qApp->Settings()->getOsSeparator());
+ f2 = qApp->translateVariables()->FormulaToUser(value, qApp->Settings()->getOsSeparator());
// increase height if needed.
if (f2.length() > 80)
{
@@ -364,7 +364,7 @@ void DialogEllipticalArc::SetF2(const QString &value)
*/
QString DialogEllipticalArc::GetRotationAngle() const
{
- return qApp->TrVars()->TryFormulaFromUser(rotationAngle, qApp->Settings()->getOsSeparator());
+ return qApp->translateVariables()->TryFormulaFromUser(rotationAngle, qApp->Settings()->getOsSeparator());
}
//---------------------------------------------------------------------------------------------------------------------
@@ -374,7 +374,7 @@ QString DialogEllipticalArc::GetRotationAngle() const
*/
void DialogEllipticalArc::SetRotationAngle(const QString &value)
{
- rotationAngle = qApp->TrVars()->FormulaToUser(value, qApp->Settings()->getOsSeparator());
+ rotationAngle = qApp->translateVariables()->FormulaToUser(value, qApp->Settings()->getOsSeparator());
// increase height if needed.
if (rotationAngle.length() > 80)
{
@@ -728,7 +728,7 @@ void DialogEllipticalArc::pointNameChanged()
if (getCurrentObjectId(ui->centerPoint_ComboBox) == m_arc.GetCenter().id())
{
newDuplicate = -1;
- ui->name_LineEdit->setText(qApp->TrVars()->VarToUser(m_arc.name()));
+ ui->name_LineEdit->setText(qApp->translateVariables()->VarToUser(m_arc.name()));
}
else
{
@@ -744,7 +744,7 @@ void DialogEllipticalArc::pointNameChanged()
newDuplicate = static_cast(DNumber(arc.name()));
arc.SetDuplicate(static_cast(newDuplicate));
}
- ui->name_LineEdit->setText(qApp->TrVars()->VarToUser(arc.name() + "_" + QString().setNum(m_Id)));
+ ui->name_LineEdit->setText(qApp->translateVariables()->VarToUser(arc.name() + "_" + QString().setNum(m_Id)));
}
ChangeColor(ui->name_Label, color);
diff --git a/src/libs/vtools/dialogs/tools/dialogendline.cpp b/src/libs/vtools/dialogs/tools/dialogendline.cpp
index 7331201c04b9..2ee3c68e6ac4 100644
--- a/src/libs/vtools/dialogs/tools/dialogendline.cpp
+++ b/src/libs/vtools/dialogs/tools/dialogendline.cpp
@@ -287,7 +287,7 @@ void DialogEndLine::setLineWeight(const QString &value)
*/
void DialogEndLine::SetFormula(const QString &value)
{
- formulaLength = qApp->TrVars()->FormulaToUser(value, qApp->Settings()->getOsSeparator());
+ formulaLength = qApp->translateVariables()->FormulaToUser(value, qApp->Settings()->getOsSeparator());
// increase height if needed. TODO : see if I can get the max number of caracters in one line
// of this PlainTextEdit to change 80 to this value
if (formulaLength.length() > 80)
@@ -310,7 +310,7 @@ void DialogEndLine::SetFormula(const QString &value)
*/
void DialogEndLine::SetAngle(const QString &value)
{
- formulaAngle = qApp->TrVars()->FormulaToUser(value, qApp->Settings()->getOsSeparator());
+ formulaAngle = qApp->translateVariables()->FormulaToUser(value, qApp->Settings()->getOsSeparator());
// increase height if needed. TODO : see if I can get the max number of caracters in one line
// of this PlainTextEdit to change 80 to this value
if (formulaAngle.length() > 80)
@@ -464,7 +464,7 @@ QString DialogEndLine::getLineType() const
*/
QString DialogEndLine::GetFormula() const
{
- return qApp->TrVars()->TryFormulaFromUser(formulaLength, qApp->Settings()->getOsSeparator());
+ return qApp->translateVariables()->TryFormulaFromUser(formulaLength, qApp->Settings()->getOsSeparator());
}
//---------------------------------------------------------------------------------------------------------------------
@@ -474,7 +474,7 @@ QString DialogEndLine::GetFormula() const
*/
QString DialogEndLine::GetAngle() const
{
- return qApp->TrVars()->TryFormulaFromUser(formulaAngle, qApp->Settings()->getOsSeparator());
+ return qApp->translateVariables()->TryFormulaFromUser(formulaAngle, qApp->Settings()->getOsSeparator());
}
//---------------------------------------------------------------------------------------------------------------------
diff --git a/src/libs/vtools/dialogs/tools/dialoglineintersectaxis.cpp b/src/libs/vtools/dialogs/tools/dialoglineintersectaxis.cpp
index 2fbafaaad2a1..5ae31c65ef94 100644
--- a/src/libs/vtools/dialogs/tools/dialoglineintersectaxis.cpp
+++ b/src/libs/vtools/dialogs/tools/dialoglineintersectaxis.cpp
@@ -204,13 +204,13 @@ void DialogLineIntersectAxis::setLineColor(const QString &value)
//---------------------------------------------------------------------------------------------------------------------
QString DialogLineIntersectAxis::GetAngle() const
{
- return qApp->TrVars()->TryFormulaFromUser(formulaAngle, qApp->Settings()->getOsSeparator());
+ return qApp->translateVariables()->TryFormulaFromUser(formulaAngle, qApp->Settings()->getOsSeparator());
}
//---------------------------------------------------------------------------------------------------------------------
void DialogLineIntersectAxis::SetAngle(const QString &value)
{
- formulaAngle = qApp->TrVars()->FormulaToUser(value, qApp->Settings()->getOsSeparator());
+ formulaAngle = qApp->translateVariables()->FormulaToUser(value, qApp->Settings()->getOsSeparator());
// increase height if needed. TODO : see if I can get the max number of caracters in one line
// of this PlainTextEdit to change 80 to this value
if (formulaAngle.length() > 80)
diff --git a/src/libs/vtools/dialogs/tools/dialogmove.cpp b/src/libs/vtools/dialogs/tools/dialogmove.cpp
index 8d808e290adf..2e3ec1fde9ad 100644
--- a/src/libs/vtools/dialogs/tools/dialogmove.cpp
+++ b/src/libs/vtools/dialogs/tools/dialogmove.cpp
@@ -160,13 +160,13 @@ DialogMove::~DialogMove()
//---------------------------------------------------------------------------------------------------------------------
QString DialogMove::GetAngle() const
{
- return qApp->TrVars()->TryFormulaFromUser(angleFormula, qApp->Settings()->getOsSeparator());
+ return qApp->translateVariables()->TryFormulaFromUser(angleFormula, qApp->Settings()->getOsSeparator());
}
//---------------------------------------------------------------------------------------------------------------------
void DialogMove::SetAngle(const QString &value)
{
- angleFormula = qApp->TrVars()->FormulaToUser(value, qApp->Settings()->getOsSeparator());
+ angleFormula = qApp->translateVariables()->FormulaToUser(value, qApp->Settings()->getOsSeparator());
ui->angle_PlainTextEdit->setPlainText(angleFormula);
VisToolMove *operation = qobject_cast(vis);
@@ -179,13 +179,13 @@ void DialogMove::SetAngle(const QString &value)
//---------------------------------------------------------------------------------------------------------------------
QString DialogMove::GetLength() const
{
- return qApp->TrVars()->TryFormulaFromUser(lengthFormula, qApp->Settings()->getOsSeparator());
+ return qApp->translateVariables()->TryFormulaFromUser(lengthFormula, qApp->Settings()->getOsSeparator());
}
//---------------------------------------------------------------------------------------------------------------------
void DialogMove::SetLength(const QString &value)
{
- lengthFormula = qApp->TrVars()->FormulaToUser(value, qApp->Settings()->getOsSeparator());
+ lengthFormula = qApp->translateVariables()->FormulaToUser(value, qApp->Settings()->getOsSeparator());
ui->length_PlainTextEdit->setPlainText(lengthFormula);
VisToolMove *operation = qobject_cast(vis);
@@ -198,13 +198,13 @@ void DialogMove::SetLength(const QString &value)
//---------------------------------------------------------------------------------------------------------------------
QString DialogMove::getRotation() const
{
- return qApp->TrVars()->TryFormulaFromUser(rotationFormula, qApp->Settings()->getOsSeparator());
+ return qApp->translateVariables()->TryFormulaFromUser(rotationFormula, qApp->Settings()->getOsSeparator());
}
//---------------------------------------------------------------------------------------------------------------------
void DialogMove::setRotation(const QString &value)
{
- rotationFormula = qApp->TrVars()->FormulaToUser(value, qApp->Settings()->getOsSeparator());
+ rotationFormula = qApp->translateVariables()->FormulaToUser(value, qApp->Settings()->getOsSeparator());
ui->rotation_PlainTextEdit->setPlainText(rotationFormula);
VisToolMove *operation = qobject_cast(vis);
@@ -287,8 +287,8 @@ void DialogMove::ShowDialog(bool click)
if (operation->LengthValue() > 0)
{
- angleFormula = qApp->TrVars()->FormulaToUser(operation->Angle(), qApp->Settings()->getOsSeparator());
- lengthFormula = qApp->TrVars()->FormulaToUser(operation->Length(), qApp->Settings()->getOsSeparator());
+ angleFormula = qApp->translateVariables()->FormulaToUser(operation->Angle(), qApp->Settings()->getOsSeparator());
+ lengthFormula = qApp->translateVariables()->FormulaToUser(operation->Length(), qApp->Settings()->getOsSeparator());
operation->SetAngle(angleFormula);
operation->SetLength(lengthFormula);
diff --git a/src/libs/vtools/dialogs/tools/dialognormal.cpp b/src/libs/vtools/dialogs/tools/dialognormal.cpp
index 5be65be6a3ef..b66983324512 100644
--- a/src/libs/vtools/dialogs/tools/dialognormal.cpp
+++ b/src/libs/vtools/dialogs/tools/dialognormal.cpp
@@ -314,7 +314,7 @@ void DialogNormal::SetAngle(const qreal &value)
*/
void DialogNormal::SetFormula(const QString &value)
{
- formula = qApp->TrVars()->FormulaToUser(value, qApp->Settings()->getOsSeparator());
+ formula = qApp->translateVariables()->FormulaToUser(value, qApp->Settings()->getOsSeparator());
// increase height if needed.
if (formula.length() > 80)
{
@@ -401,7 +401,7 @@ void DialogNormal::SetPointName(const QString &value)
*/
QString DialogNormal::GetFormula() const
{
- return qApp->TrVars()->TryFormulaFromUser(formula, qApp->Settings()->getOsSeparator());
+ return qApp->translateVariables()->TryFormulaFromUser(formula, qApp->Settings()->getOsSeparator());
}
//---------------------------------------------------------------------------------------------------------------------
diff --git a/src/libs/vtools/dialogs/tools/dialogpointofcontact.cpp b/src/libs/vtools/dialogs/tools/dialogpointofcontact.cpp
index 3dba3375bba7..538a59d0573f 100644
--- a/src/libs/vtools/dialogs/tools/dialogpointofcontact.cpp
+++ b/src/libs/vtools/dialogs/tools/dialogpointofcontact.cpp
@@ -313,7 +313,7 @@ void DialogPointOfContact::setCenter(const quint32 &value)
*/
void DialogPointOfContact::setRadius(const QString &value)
{
- radius = qApp->TrVars()->FormulaToUser(value, qApp->Settings()->getOsSeparator());
+ radius = qApp->translateVariables()->FormulaToUser(value, qApp->Settings()->getOsSeparator());
// increase height if needed.
if (radius.length() > 80)
{
@@ -346,7 +346,7 @@ void DialogPointOfContact::SetPointName(const QString &value)
*/
QString DialogPointOfContact::getRadius() const
{
- return qApp->TrVars()->TryFormulaFromUser(radius, qApp->Settings()->getOsSeparator());
+ return qApp->translateVariables()->TryFormulaFromUser(radius, qApp->Settings()->getOsSeparator());
}
//---------------------------------------------------------------------------------------------------------------------
diff --git a/src/libs/vtools/dialogs/tools/dialogrotation.cpp b/src/libs/vtools/dialogs/tools/dialogrotation.cpp
index 2c60e9afef3c..f01e26d33de0 100644
--- a/src/libs/vtools/dialogs/tools/dialogrotation.cpp
+++ b/src/libs/vtools/dialogs/tools/dialogrotation.cpp
@@ -146,13 +146,13 @@ void DialogRotation::setOriginPointId(const quint32 &value)
//---------------------------------------------------------------------------------------------------------------------
QString DialogRotation::GetAngle() const
{
- return qApp->TrVars()->TryFormulaFromUser(angleFormula, qApp->Settings()->getOsSeparator());
+ return qApp->translateVariables()->TryFormulaFromUser(angleFormula, qApp->Settings()->getOsSeparator());
}
//---------------------------------------------------------------------------------------------------------------------
void DialogRotation::SetAngle(const QString &value)
{
- angleFormula = qApp->TrVars()->FormulaToUser(value, qApp->Settings()->getOsSeparator());
+ angleFormula = qApp->translateVariables()->FormulaToUser(value, qApp->Settings()->getOsSeparator());
ui->plainTextEditFormula->setPlainText(angleFormula);
VisToolRotation *operation = qobject_cast(vis);
diff --git a/src/libs/vtools/dialogs/tools/dialogshoulderpoint.cpp b/src/libs/vtools/dialogs/tools/dialogshoulderpoint.cpp
index fa6054c43ad2..bf4f48fcfe90 100644
--- a/src/libs/vtools/dialogs/tools/dialogshoulderpoint.cpp
+++ b/src/libs/vtools/dialogs/tools/dialogshoulderpoint.cpp
@@ -348,7 +348,7 @@ void DialogShoulderPoint::SetP1Line(const quint32 &value)
*/
void DialogShoulderPoint::SetFormula(const QString &value)
{
- formula = qApp->TrVars()->FormulaToUser(value, qApp->Settings()->getOsSeparator());
+ formula = qApp->translateVariables()->FormulaToUser(value, qApp->Settings()->getOsSeparator());
// increase height if needed.
if (formula.length() > 80)
{
@@ -422,7 +422,7 @@ void DialogShoulderPoint::SetPointName(const QString &value)
*/
QString DialogShoulderPoint::GetFormula() const
{
- return qApp->TrVars()->TryFormulaFromUser(formula, qApp->Settings()->getOsSeparator());
+ return qApp->translateVariables()->TryFormulaFromUser(formula, qApp->Settings()->getOsSeparator());
}
//---------------------------------------------------------------------------------------------------------------------
diff --git a/src/libs/vtools/dialogs/tools/dialogspline.cpp b/src/libs/vtools/dialogs/tools/dialogspline.cpp
index caeba8795c2d..2d3517311807 100644
--- a/src/libs/vtools/dialogs/tools/dialogspline.cpp
+++ b/src/libs/vtools/dialogs/tools/dialogspline.cpp
@@ -331,13 +331,13 @@ void DialogSpline::FXAngle1()
{
auto dialog = new EditFormulaDialog(data, toolId, this);
dialog->setWindowTitle(tr("Edit first control point angle"));
- QString angle1F = qApp->TrVars()->TryFormulaFromUser(ui->plainTextEditAngle1F->toPlainText(),
+ QString angle1F = qApp->translateVariables()->TryFormulaFromUser(ui->plainTextEditAngle1F->toPlainText(),
qApp->Settings()->getOsSeparator());
dialog->SetFormula(angle1F);
dialog->setPostfix(degreeSymbol);
if (dialog->exec() == QDialog::Accepted)
{
- angle1F = qApp->TrVars()->FormulaToUser(dialog->GetFormula(), qApp->Settings()->getOsSeparator());
+ angle1F = qApp->translateVariables()->FormulaToUser(dialog->GetFormula(), qApp->Settings()->getOsSeparator());
// increase height if needed.
if (angle1F.length() > 80)
{
@@ -354,13 +354,13 @@ void DialogSpline::FXAngle2()
{
auto dialog = new EditFormulaDialog(data, toolId, this);
dialog->setWindowTitle(tr("Edit second control point angle"));
- QString angle2F = qApp->TrVars()->TryFormulaFromUser(ui->plainTextEditAngle2F->toPlainText(),
+ QString angle2F = qApp->translateVariables()->TryFormulaFromUser(ui->plainTextEditAngle2F->toPlainText(),
qApp->Settings()->getOsSeparator());
dialog->SetFormula(angle2F);
dialog->setPostfix(degreeSymbol);
if (dialog->exec() == QDialog::Accepted)
{
- angle2F = qApp->TrVars()->FormulaToUser(dialog->GetFormula(), qApp->Settings()->getOsSeparator());
+ angle2F = qApp->translateVariables()->FormulaToUser(dialog->GetFormula(), qApp->Settings()->getOsSeparator());
// increase height if needed.
if (angle2F.length() > 80)
{
@@ -377,13 +377,13 @@ void DialogSpline::FXLength1()
{
auto dialog = new EditFormulaDialog(data, toolId, this);
dialog->setWindowTitle(tr("Edit first control point length"));
- QString length1F = qApp->TrVars()->TryFormulaFromUser(ui->plainTextEditLength1F->toPlainText(),
+ QString length1F = qApp->translateVariables()->TryFormulaFromUser(ui->plainTextEditLength1F->toPlainText(),
qApp->Settings()->getOsSeparator());
dialog->SetFormula(length1F);
dialog->setPostfix(UnitsToStr(qApp->patternUnit(), true));
if (dialog->exec() == QDialog::Accepted)
{
- length1F = qApp->TrVars()->FormulaToUser(dialog->GetFormula(), qApp->Settings()->getOsSeparator());
+ length1F = qApp->translateVariables()->FormulaToUser(dialog->GetFormula(), qApp->Settings()->getOsSeparator());
// increase height if needed.
if (length1F.length() > 80)
{
@@ -400,13 +400,13 @@ void DialogSpline::FXLength2()
{
auto dialog = new EditFormulaDialog(data, toolId, this);
dialog->setWindowTitle(tr("Edit second control point length"));
- QString length2F = qApp->TrVars()->TryFormulaFromUser(ui->plainTextEditLength2F->toPlainText(),
+ QString length2F = qApp->translateVariables()->TryFormulaFromUser(ui->plainTextEditLength2F->toPlainText(),
qApp->Settings()->getOsSeparator());
dialog->SetFormula(length2F);
dialog->setPostfix(UnitsToStr(qApp->patternUnit(), true));
if (dialog->exec() == QDialog::Accepted)
{
- length2F = qApp->TrVars()->FormulaToUser(dialog->GetFormula(), qApp->Settings()->getOsSeparator());
+ length2F = qApp->translateVariables()->FormulaToUser(dialog->GetFormula(), qApp->Settings()->getOsSeparator());
// increase height if needed.
if (length2F.length() > 80)
{
@@ -506,10 +506,10 @@ VSpline DialogSpline::CurrentSpline() const
const bool separator = qApp->Settings()->getOsSeparator();
- angle1F = qApp->TrVars()->TryFormulaFromUser(angle1F, separator);
- angle2F = qApp->TrVars()->TryFormulaFromUser(angle2F, separator);
- length1F = qApp->TrVars()->TryFormulaFromUser(length1F, separator);
- length2F = qApp->TrVars()->TryFormulaFromUser(length2F, separator);
+ angle1F = qApp->translateVariables()->TryFormulaFromUser(angle1F, separator);
+ angle2F = qApp->translateVariables()->TryFormulaFromUser(angle2F, separator);
+ length1F = qApp->translateVariables()->TryFormulaFromUser(length1F, separator);
+ length2F = qApp->translateVariables()->TryFormulaFromUser(length2F, separator);
VSpline spline(*GetP1(), *GetP4(), angle1, angle1F, angle2, angle2F, length1, length1F, length2, length2F);
@@ -540,7 +540,7 @@ void DialogSpline::PointNameChanged()
getCurrentObjectId(ui->comboBoxP4) == spl.GetP4().id())
{
newDuplicate = -1;
- ui->lineEditSplineName->setText(qApp->TrVars()->VarToUser(spl.name()));
+ ui->lineEditSplineName->setText(qApp->translateVariables()->VarToUser(spl.name()));
}
else
{
@@ -552,7 +552,7 @@ void DialogSpline::PointNameChanged()
newDuplicate = static_cast(DNumber(spline.name()));
spline.SetDuplicate(static_cast(newDuplicate));
}
- ui->lineEditSplineName->setText(qApp->TrVars()->VarToUser(spline.name()));
+ ui->lineEditSplineName->setText(qApp->translateVariables()->VarToUser(spline.name()));
}
}
ChangeColor(ui->labelName, color);
@@ -571,16 +571,16 @@ void DialogSpline::ShowDialog(bool click)
spl = VSpline(*GetP1(), path->GetP2(), path->GetP3(), *GetP4());
- const QString angle1F = qApp->TrVars()->FormulaToUser(spl.GetStartAngleFormula(),
+ const QString angle1F = qApp->translateVariables()->FormulaToUser(spl.GetStartAngleFormula(),
qApp->Settings()->getOsSeparator());
- const QString angle2F = qApp->TrVars()->FormulaToUser(spl.GetEndAngleFormula(),
+ const QString angle2F = qApp->translateVariables()->FormulaToUser(spl.GetEndAngleFormula(),
qApp->Settings()->getOsSeparator());
ui->plainTextEditAngle1F->setPlainText(angle1F);
ui->plainTextEditAngle2F->setPlainText(angle2F);
- ui->plainTextEditLength1F->setPlainText(qApp->TrVars()->FormulaToUser(spl.GetC1LengthFormula(),
+ ui->plainTextEditLength1F->setPlainText(qApp->translateVariables()->FormulaToUser(spl.GetC1LengthFormula(),
qApp->Settings()->getOsSeparator()));
- ui->plainTextEditLength2F->setPlainText(qApp->TrVars()->FormulaToUser(spl.GetC2LengthFormula(),
+ ui->plainTextEditLength2F->setPlainText(qApp->translateVariables()->FormulaToUser(spl.GetC2LengthFormula(),
qApp->Settings()->getOsSeparator()));
if (not data->IsUnique(spl.name()))
@@ -588,7 +588,7 @@ void DialogSpline::ShowDialog(bool click)
spl.SetDuplicate(DNumber(spl.name()));
}
- ui->lineEditSplineName->setText(qApp->TrVars()->VarToUser(spl.name()));
+ ui->lineEditSplineName->setText(qApp->translateVariables()->VarToUser(spl.name()));
DialogAccepted();
}
@@ -626,22 +626,22 @@ void DialogSpline::SetSpline(const VSpline &spline)
setCurrentPointId(ui->comboBoxP1, spl.GetP1().id());
setCurrentPointId(ui->comboBoxP4, spl.GetP4().id());
- const QString angle1F = qApp->TrVars()->FormulaToUser(spl.GetStartAngleFormula(),
+ const QString angle1F = qApp->translateVariables()->FormulaToUser(spl.GetStartAngleFormula(),
qApp->Settings()->getOsSeparator());
- const QString angle2F = qApp->TrVars()->FormulaToUser(spl.GetEndAngleFormula(),
+ const QString angle2F = qApp->translateVariables()->FormulaToUser(spl.GetEndAngleFormula(),
qApp->Settings()->getOsSeparator());
ui->plainTextEditAngle1F->setPlainText(angle1F);
ui->plainTextEditAngle2F->setPlainText(angle2F);
- const QString length1F = qApp->TrVars()->FormulaToUser(spl.GetC1LengthFormula(),
+ const QString length1F = qApp->translateVariables()->FormulaToUser(spl.GetC1LengthFormula(),
qApp->Settings()->getOsSeparator());
- const QString length2F = qApp->TrVars()->FormulaToUser(spl.GetC2LengthFormula(),
+ const QString length2F = qApp->translateVariables()->FormulaToUser(spl.GetC2LengthFormula(),
qApp->Settings()->getOsSeparator());
ui->plainTextEditLength1F->setPlainText(length1F);
ui->plainTextEditLength2F->setPlainText(length2F);
- ui->lineEditSplineName->setText(qApp->TrVars()->VarToUser(spl.name()));
+ ui->lineEditSplineName->setText(qApp->translateVariables()->VarToUser(spl.name()));
auto path = qobject_cast(vis);
SCASSERT(path != nullptr)
diff --git a/src/libs/vtools/dialogs/tools/dialogsplinepath.cpp b/src/libs/vtools/dialogs/tools/dialogsplinepath.cpp
index 6c6d80fb53c4..f2417a281a13 100644
--- a/src/libs/vtools/dialogs/tools/dialogsplinepath.cpp
+++ b/src/libs/vtools/dialogs/tools/dialogsplinepath.cpp
@@ -208,7 +208,7 @@ void DialogSplinePath::SetPath(const VSplinePath &value)
NewItem(path.at(i));
}
ui->listWidget->setFocus(Qt::OtherFocusReason);
- ui->lineEditSplPathName->setText(qApp->TrVars()->VarToUser(path.name()));
+ ui->lineEditSplPathName->setText(qApp->translateVariables()->VarToUser(path.name()));
auto visPath = qobject_cast(vis);
SCASSERT(visPath != nullptr)
@@ -409,7 +409,7 @@ void DialogSplinePath::Angle1Changed()
try
{
- p.SetAngle1(angle1, qApp->TrVars()->FormulaFromUser(angle1F, qApp->Settings()->getOsSeparator()));
+ p.SetAngle1(angle1, qApp->translateVariables()->FormulaFromUser(angle1F, qApp->Settings()->getOsSeparator()));
}
catch (qmu::QmuParserError &error)
{
@@ -424,7 +424,7 @@ void DialogSplinePath::Angle1Changed()
if (row != ui->listWidget->count()-1)
{
ui->plainTextEditAngle2F->blockSignals(true);
- ui->plainTextEditAngle2F->setPlainText(qApp->TrVars()->FormulaToUser(p.Angle2Formula(),
+ ui->plainTextEditAngle2F->setPlainText(qApp->translateVariables()->FormulaToUser(p.Angle2Formula(),
qApp->Settings()->getOsSeparator()));
EvalAngle2();
ui->plainTextEditAngle2F->blockSignals(false);
@@ -452,7 +452,7 @@ void DialogSplinePath::Angle2Changed()
try
{
- p.SetAngle2(angle2, qApp->TrVars()->FormulaFromUser(angle2F, qApp->Settings()->getOsSeparator()));
+ p.SetAngle2(angle2, qApp->translateVariables()->FormulaFromUser(angle2F, qApp->Settings()->getOsSeparator()));
}
catch (qmu::QmuParserError &error)
{
@@ -467,7 +467,7 @@ void DialogSplinePath::Angle2Changed()
if (row != 0)
{
ui->plainTextEditAngle1F->blockSignals(true);
- ui->plainTextEditAngle1F->setPlainText(qApp->TrVars()->FormulaToUser(p.Angle1Formula(),
+ ui->plainTextEditAngle1F->setPlainText(qApp->translateVariables()->FormulaToUser(p.Angle1Formula(),
qApp->Settings()->getOsSeparator()));
EvalAngle1();
ui->plainTextEditAngle1F->blockSignals(false);
@@ -495,7 +495,7 @@ void DialogSplinePath::Length1Changed()
try
{
- p.SetLength1(length1, qApp->TrVars()->FormulaFromUser(length1F, qApp->Settings()->getOsSeparator()));
+ p.SetLength1(length1, qApp->translateVariables()->FormulaFromUser(length1F, qApp->Settings()->getOsSeparator()));
}
catch (qmu::QmuParserError &error)
{
@@ -529,7 +529,7 @@ void DialogSplinePath::Length2Changed()
try
{
- p.SetLength2(length2, qApp->TrVars()->FormulaFromUser(length2F, qApp->Settings()->getOsSeparator()));
+ p.SetLength2(length2, qApp->translateVariables()->FormulaFromUser(length2F, qApp->Settings()->getOsSeparator()));
}
catch (qmu::QmuParserError &error)
{
@@ -549,14 +549,14 @@ void DialogSplinePath::FXAngle1()
auto dialog = new EditFormulaDialog(data, toolId, this);
dialog->setWindowTitle(tr("Edit first control point angle"));
- QString angle1F = qApp->TrVars()->TryFormulaFromUser(ui->plainTextEditAngle1F->toPlainText().replace("\n", " "),
+ QString angle1F = qApp->translateVariables()->TryFormulaFromUser(ui->plainTextEditAngle1F->toPlainText().replace("\n", " "),
qApp->Settings()->getOsSeparator());
dialog->SetFormula(angle1F);
dialog->setPostfix(degreeSymbol);
if (dialog->exec() == QDialog::Accepted)
{
- angle1F = qApp->TrVars()->FormulaToUser(dialog->GetFormula(), qApp->Settings()->getOsSeparator());
+ angle1F = qApp->translateVariables()->FormulaToUser(dialog->GetFormula(), qApp->Settings()->getOsSeparator());
// increase height if needed.
if (angle1F.length() > 80)
{
@@ -574,14 +574,14 @@ void DialogSplinePath::FXAngle2()
auto dialog = new EditFormulaDialog(data, toolId, this);
dialog->setWindowTitle(tr("Edit second control point angle"));
- QString angle2F = qApp->TrVars()->TryFormulaFromUser(ui->plainTextEditAngle2F->toPlainText().replace("\n", " "),
+ QString angle2F = qApp->translateVariables()->TryFormulaFromUser(ui->plainTextEditAngle2F->toPlainText().replace("\n", " "),
qApp->Settings()->getOsSeparator());
dialog->SetFormula(angle2F);
dialog->setPostfix(degreeSymbol);
if (dialog->exec() == QDialog::Accepted)
{
- angle2F = qApp->TrVars()->FormulaToUser(dialog->GetFormula(), qApp->Settings()->getOsSeparator());
+ angle2F = qApp->translateVariables()->FormulaToUser(dialog->GetFormula(), qApp->Settings()->getOsSeparator());
// increase height if needed.
if (angle2F.length() > 80)
{
@@ -599,14 +599,14 @@ void DialogSplinePath::FXLength1()
auto dialog = new EditFormulaDialog(data, toolId, this);
dialog->setWindowTitle(tr("Edit first control point length"));
- QString length1F = qApp->TrVars()->TryFormulaFromUser(ui->plainTextEditLength1F->toPlainText().replace("\n", " "),
+ QString length1F = qApp->translateVariables()->TryFormulaFromUser(ui->plainTextEditLength1F->toPlainText().replace("\n", " "),
qApp->Settings()->getOsSeparator());
dialog->SetFormula(length1F);
dialog->setPostfix(UnitsToStr(qApp->patternUnit(), true));
if (dialog->exec() == QDialog::Accepted)
{
- length1F = qApp->TrVars()->FormulaToUser(dialog->GetFormula(), qApp->Settings()->getOsSeparator());
+ length1F = qApp->translateVariables()->FormulaToUser(dialog->GetFormula(), qApp->Settings()->getOsSeparator());
// increase height if needed.
if (length1F.length() > 80)
{
@@ -624,14 +624,14 @@ void DialogSplinePath::FXLength2()
auto dialog = new EditFormulaDialog(data, toolId, this);
dialog->setWindowTitle(tr("Edit second control point length"));
- QString length2F = qApp->TrVars()->TryFormulaFromUser(ui->plainTextEditLength2F->toPlainText().replace("\n", " "),
+ QString length2F = qApp->translateVariables()->TryFormulaFromUser(ui->plainTextEditLength2F->toPlainText().replace("\n", " "),
qApp->Settings()->getOsSeparator());
dialog->SetFormula(length2F);
dialog->setPostfix(UnitsToStr(qApp->patternUnit(), true));
if (dialog->exec() == QDialog::Accepted)
{
- length2F = qApp->TrVars()->FormulaToUser(dialog->GetFormula(), qApp->Settings()->getOsSeparator());
+ length2F = qApp->translateVariables()->FormulaToUser(dialog->GetFormula(), qApp->Settings()->getOsSeparator());
// increase height if needed.
if (length2F.length() > 80)
{
@@ -794,7 +794,7 @@ void DialogSplinePath::currentPointChanged(int index)
if (first.P().id() == path.at(0).P().id() && last.P().id() == path.at(path.CountPoints()-1).P().id())
{
newDuplicate = -1;
- ui->lineEditSplPathName->setText(qApp->TrVars()->VarToUser(path.name()));
+ ui->lineEditSplPathName->setText(qApp->translateVariables()->VarToUser(path.name()));
}
else
{
@@ -806,7 +806,7 @@ void DialogSplinePath::currentPointChanged(int index)
newPath.SetDuplicate(static_cast(newDuplicate));
}
- ui->lineEditSplPathName->setText(qApp->TrVars()->VarToUser(newPath.name()));
+ ui->lineEditSplPathName->setText(qApp->translateVariables()->VarToUser(newPath.name()));
}
}
ChangeColor(ui->labelName, color);
@@ -917,10 +917,10 @@ void DialogSplinePath::DataPoint(const VSplinePoint &p)
ui->plainTextEditAngle2F->blockSignals(true);
ui->plainTextEditLength2F->blockSignals(true);
- ui->plainTextEditAngle2F->setPlainText(qApp->TrVars()->FormulaToUser(p.Angle2Formula(),
+ ui->plainTextEditAngle2F->setPlainText(qApp->translateVariables()->FormulaToUser(p.Angle2Formula(),
qApp->Settings()->getOsSeparator()));
EvalAngle2();
- ui->plainTextEditLength2F->setPlainText(qApp->TrVars()->FormulaToUser(p.Length2Formula(),
+ ui->plainTextEditLength2F->setPlainText(qApp->translateVariables()->FormulaToUser(p.Length2Formula(),
qApp->Settings()->getOsSeparator()));
EvalLength2();
ui->plainTextEditAngle2F->blockSignals(false);
@@ -956,10 +956,10 @@ void DialogSplinePath::DataPoint(const VSplinePoint &p)
ui->plainTextEditAngle1F->blockSignals(true);
ui->plainTextEditLength1F->blockSignals(true);
- ui->plainTextEditAngle1F->setPlainText(qApp->TrVars()->FormulaToUser(p.Angle1Formula(),
+ ui->plainTextEditAngle1F->setPlainText(qApp->translateVariables()->FormulaToUser(p.Angle1Formula(),
qApp->Settings()->getOsSeparator()));
EvalAngle1();
- ui->plainTextEditLength1F->setPlainText(qApp->TrVars()->FormulaToUser(p.Length1Formula(),
+ ui->plainTextEditLength1F->setPlainText(qApp->translateVariables()->FormulaToUser(p.Length1Formula(),
qApp->Settings()->getOsSeparator()));
EvalLength1();
ui->plainTextEditAngle1F->blockSignals(false);
@@ -987,13 +987,13 @@ void DialogSplinePath::DataPoint(const VSplinePoint &p)
ui->plainTextEditAngle2F->blockSignals(true);
ui->plainTextEditLength2F->blockSignals(true);
- ui->plainTextEditAngle1F->setPlainText(qApp->TrVars()->FormulaToUser(p.Angle1Formula(),
+ ui->plainTextEditAngle1F->setPlainText(qApp->translateVariables()->FormulaToUser(p.Angle1Formula(),
qApp->Settings()->getOsSeparator()));
- ui->plainTextEditAngle2F->setPlainText(qApp->TrVars()->FormulaToUser(p.Angle2Formula(),
+ ui->plainTextEditAngle2F->setPlainText(qApp->translateVariables()->FormulaToUser(p.Angle2Formula(),
qApp->Settings()->getOsSeparator()));
- ui->plainTextEditLength1F->setPlainText(qApp->TrVars()->FormulaToUser(p.Length1Formula(),
+ ui->plainTextEditLength1F->setPlainText(qApp->translateVariables()->FormulaToUser(p.Length1Formula(),
qApp->Settings()->getOsSeparator()));
- ui->plainTextEditLength2F->setPlainText(qApp->TrVars()->FormulaToUser(p.Length2Formula(),
+ ui->plainTextEditLength2F->setPlainText(qApp->translateVariables()->FormulaToUser(p.Length2Formula(),
qApp->Settings()->getOsSeparator()));
EvalAngle1();
diff --git a/src/libs/vtools/dialogs/tools/dialogtool.cpp b/src/libs/vtools/dialogs/tools/dialogtool.cpp
index d53d666de66a..aff509231e2b 100644
--- a/src/libs/vtools/dialogs/tools/dialogtool.cpp
+++ b/src/libs/vtools/dialogs/tools/dialogtool.cpp
@@ -635,7 +635,7 @@ NodeInfo DialogTool::getNodeInfo(const VPieceNode &node, bool showNotch) const
if (node.GetTypeTool() != Tool::NodePoint)
{
int bias = 0;
- qApp->TrVars()->VariablesToUser(info.name, 0, obj->name(), bias);
+ qApp->translateVariables()->VariablesToUser(info.name, 0, obj->name(), bias);
if (node.GetReverse())
{
@@ -825,7 +825,7 @@ qreal DialogTool::Eval(const QString &text, bool &flag, QLabel *label, const QSt
QString formula = text;
formula.replace("\n", " ");
// Translate to internal look.
- formula = qApp->TrVars()->FormulaFromUser(formula, qApp->Settings()->getOsSeparator());
+ formula = qApp->translateVariables()->FormulaFromUser(formula, qApp->Settings()->getOsSeparator());
QScopedPointer cal(new Calculator());
result = cal->EvalFormula(data->DataVariables(), formula);
@@ -1051,7 +1051,7 @@ void DialogTool::PrepareList(QMap &list, quint32 id) const
QString newName = obj->name();
int bias = 0;
- if (qApp->TrVars()->VariablesToUser(newName, 0, obj->name(), bias))
+ if (qApp->translateVariables()->VariablesToUser(newName, 0, obj->name(), bias))
{
list[newName] = id;
}
diff --git a/src/libs/vtools/dialogs/tools/intersect_circles_dialog.cpp b/src/libs/vtools/dialogs/tools/intersect_circles_dialog.cpp
index ebcdfe297bf1..54b1ec921f0b 100644
--- a/src/libs/vtools/dialogs/tools/intersect_circles_dialog.cpp
+++ b/src/libs/vtools/dialogs/tools/intersect_circles_dialog.cpp
@@ -167,14 +167,14 @@ void IntersectCirclesDialog::SetSecondCircleCenterId(const quint32 &value)
//---------------------------------------------------------------------------------------------------------------------
QString IntersectCirclesDialog::GetFirstCircleRadius() const
{
- return qApp->TrVars()->TryFormulaFromUser(ui->plainTextEditCircle1Radius->toPlainText(),
+ return qApp->translateVariables()->TryFormulaFromUser(ui->plainTextEditCircle1Radius->toPlainText(),
qApp->Settings()->getOsSeparator());
}
//---------------------------------------------------------------------------------------------------------------------
void IntersectCirclesDialog::SetFirstCircleRadius(const QString &value)
{
- const QString formula = qApp->TrVars()->FormulaToUser(value, qApp->Settings()->getOsSeparator());
+ const QString formula = qApp->translateVariables()->FormulaToUser(value, qApp->Settings()->getOsSeparator());
ui->plainTextEditCircle1Radius->setPlainText(formula);
IntersectCirclesVisual *point = qobject_cast(vis);
@@ -187,14 +187,14 @@ void IntersectCirclesDialog::SetFirstCircleRadius(const QString &value)
//---------------------------------------------------------------------------------------------------------------------
QString IntersectCirclesDialog::GetSecondCircleRadius() const
{
- return qApp->TrVars()->TryFormulaFromUser(ui->plainTextEditCircle2Radius->toPlainText(),
+ return qApp->translateVariables()->TryFormulaFromUser(ui->plainTextEditCircle2Radius->toPlainText(),
qApp->Settings()->getOsSeparator());
}
//---------------------------------------------------------------------------------------------------------------------
void IntersectCirclesDialog::SetSecondCircleRadius(const QString &value)
{
- const QString formula = qApp->TrVars()->FormulaToUser(value, qApp->Settings()->getOsSeparator());
+ const QString formula = qApp->translateVariables()->FormulaToUser(value, qApp->Settings()->getOsSeparator());
ui->plainTextEditCircle2Radius->setPlainText(formula);
IntersectCirclesVisual *point = qobject_cast(vis);
diff --git a/src/libs/vtools/dialogs/tools/intersect_circletangent_dialog.cpp b/src/libs/vtools/dialogs/tools/intersect_circletangent_dialog.cpp
index 82bf9eac7d6d..9e4fa5e06d5e 100644
--- a/src/libs/vtools/dialogs/tools/intersect_circletangent_dialog.cpp
+++ b/src/libs/vtools/dialogs/tools/intersect_circletangent_dialog.cpp
@@ -137,14 +137,14 @@ void IntersectCircleTangentDialog::SetCircleCenterId(const quint32 &value)
//---------------------------------------------------------------------------------------------------------------------
QString IntersectCircleTangentDialog::GetCircleRadius() const
{
- return qApp->TrVars()->TryFormulaFromUser(ui->plainTextEditRadius->toPlainText(),
+ return qApp->translateVariables()->TryFormulaFromUser(ui->plainTextEditRadius->toPlainText(),
qApp->Settings()->getOsSeparator());
}
//---------------------------------------------------------------------------------------------------------------------
void IntersectCircleTangentDialog::SetCircleRadius(const QString &value)
{
- const QString formula = qApp->TrVars()->FormulaToUser(value, qApp->Settings()->getOsSeparator());
+ const QString formula = qApp->translateVariables()->FormulaToUser(value, qApp->Settings()->getOsSeparator());
// increase height if needed.
if (formula.length() > 80)
{
diff --git a/src/libs/vtools/dialogs/tools/piece/dialoginternalpath.cpp b/src/libs/vtools/dialogs/tools/piece/dialoginternalpath.cpp
index b09f4dc5fbac..e914fcfaea72 100644
--- a/src/libs/vtools/dialogs/tools/piece/dialoginternalpath.cpp
+++ b/src/libs/vtools/dialogs/tools/piece/dialoginternalpath.cpp
@@ -370,7 +370,7 @@ void DialogInternalPath::nodeChanged(int index)
{
this->expandWidthBeforeFormulaTextEdit();
}
- w1Formula = qApp->TrVars()->FormulaToUser(w1Formula, qApp->Settings()->getOsSeparator());
+ w1Formula = qApp->translateVariables()->FormulaToUser(w1Formula, qApp->Settings()->getOsSeparator());
ui->beforeWidthFormula_PlainTextEdit->setPlainText(w1Formula);
MoveCursorToEnd(ui->beforeWidthFormula_PlainTextEdit);
@@ -387,7 +387,7 @@ void DialogInternalPath::nodeChanged(int index)
{
this->expandWidthAfterFormulaTextEdit();
}
- w2Formula = qApp->TrVars()->FormulaToUser(w2Formula, qApp->Settings()->getOsSeparator());
+ w2Formula = qApp->translateVariables()->FormulaToUser(w2Formula, qApp->Settings()->getOsSeparator());
ui->afterWidthFormula_PlainTextEdit->setPlainText(w2Formula);
MoveCursorToEnd(ui->afterWidthFormula_PlainTextEdit);
@@ -1105,7 +1105,7 @@ void DialogInternalPath::setSeamAllowanceWidthFormula(const QString &formula)
return;
}
- const QString width = qApp->TrVars()->FormulaToUser(formula, qApp->Settings()->getOsSeparator());
+ const QString width = qApp->translateVariables()->FormulaToUser(formula, qApp->Settings()->getOsSeparator());
// increase height if needed.
if (width.length() > 80)
{
@@ -1162,7 +1162,7 @@ QString DialogInternalPath::getSeamAllowanceWidthFormula() const
{
QString width = ui->widthFormula_PlainTextEdit->toPlainText();
width.replace("\n", " ");
- return qApp->TrVars()->TryFormulaFromUser(width, qApp->Settings()->getOsSeparator());
+ return qApp->translateVariables()->TryFormulaFromUser(width, qApp->Settings()->getOsSeparator());
}
//---------------------------------------------------------------------------------------------------------------------
@@ -1257,7 +1257,7 @@ QString DialogInternalPath::getSeamAllowanceWidthFormulaBefore() const
{
QString width = ui->beforeWidthFormula_PlainTextEdit->toPlainText();
width.replace("\n", " ");
- return qApp->TrVars()->TryFormulaFromUser(width, qApp->Settings()->getOsSeparator());
+ return qApp->translateVariables()->TryFormulaFromUser(width, qApp->Settings()->getOsSeparator());
}
//---------------------------------------------------------------------------------------------------------------------
@@ -1265,7 +1265,7 @@ QString DialogInternalPath::getSeamAllowanceWidthFormulaAfter() const
{
QString width = ui->afterWidthFormula_PlainTextEdit->toPlainText();
width.replace("\n", " ");
- return qApp->TrVars()->TryFormulaFromUser(width, qApp->Settings()->getOsSeparator());
+ return qApp->translateVariables()->TryFormulaFromUser(width, qApp->Settings()->getOsSeparator());
}
//---------------------------------------------------------------------------------------------------------------------
diff --git a/src/libs/vtools/dialogs/tools/piece/pattern_piece_dialog.cpp b/src/libs/vtools/dialogs/tools/piece/pattern_piece_dialog.cpp
index 4973388e5966..559b8b2e0448 100644
--- a/src/libs/vtools/dialogs/tools/piece/pattern_piece_dialog.cpp
+++ b/src/libs/vtools/dialogs/tools/piece/pattern_piece_dialog.cpp
@@ -105,7 +105,7 @@ QString getFormulaFromUser(QPlainTextEdit *textEdit)
QString formula = textEdit->toPlainText();
formula.replace("\n", " ");
- return qApp->TrVars()->TryFormulaFromUser(formula, qApp->Settings()->getOsSeparator());
+ return qApp->translateVariables()->TryFormulaFromUser(formula, qApp->Settings()->getOsSeparator());
}
}
@@ -294,7 +294,7 @@ void PatternPieceDialog::SetPiece(const VPiece &piece)
setInLayout(piece.isInLayout());
setPieceLock(piece.isLocked());
- const QString width = qApp->TrVars()->FormulaToUser(piece.getSeamAllowanceWidthFormula(), qApp->Settings()->getOsSeparator());
+ const QString width = qApp->translateVariables()->FormulaToUser(piece.getSeamAllowanceWidthFormula(), qApp->Settings()->getOsSeparator());
ui->widthFormula_PlainTextEdit->setPlainText(width);
m_saWidth = piece.GetSAWidth();
@@ -1113,7 +1113,7 @@ void PatternPieceDialog::nodeChanged(int index)
QString w1Formula = node.GetFormulaSABefore();
enableDefaultButton(ui->beforeDefault_PushButton, w1Formula);
- w1Formula = qApp->TrVars()->FormulaToUser(w1Formula, qApp->Settings()->getOsSeparator());
+ w1Formula = qApp->translateVariables()->FormulaToUser(w1Formula, qApp->Settings()->getOsSeparator());
ui->beforeWidthFormula_PlainTextEdit->setPlainText(w1Formula);
MoveCursorToEnd(ui->beforeWidthFormula_PlainTextEdit);
@@ -1124,7 +1124,7 @@ void PatternPieceDialog::nodeChanged(int index)
QString w2Formula = node.GetFormulaSAAfter();
enableDefaultButton(ui->afterDefault_PushButton, w2Formula);
- w2Formula = qApp->TrVars()->FormulaToUser(w2Formula, qApp->Settings()->getOsSeparator());
+ w2Formula = qApp->translateVariables()->FormulaToUser(w2Formula, qApp->Settings()->getOsSeparator());
ui->afterWidthFormula_PlainTextEdit->setPlainText(w2Formula);
MoveCursorToEnd(ui->afterWidthFormula_PlainTextEdit);
@@ -1340,7 +1340,7 @@ void PatternPieceDialog::nodeAngleChanged(int index)
//---------------------------------------------------------------------------------------------------------------------
void PatternPieceDialog::enableDefaultBeforeButton()
{
- const QString allowance = qApp->TrVars()->FormulaToUser(currentSeamAllowance, qApp->Settings()->getOsSeparator());
+ const QString allowance = qApp->translateVariables()->FormulaToUser(currentSeamAllowance, qApp->Settings()->getOsSeparator());
ui->beforeWidthFormula_PlainTextEdit->setPlainText(allowance);
if (QPushButton *button = qobject_cast(sender()))
{
@@ -1351,7 +1351,7 @@ void PatternPieceDialog::enableDefaultBeforeButton()
//---------------------------------------------------------------------------------------------------------------------
void PatternPieceDialog::enableDefaultAfterButton()
{
- const QString allowance = qApp->TrVars()->FormulaToUser(currentSeamAllowance, qApp->Settings()->getOsSeparator());
+ const QString allowance = qApp->translateVariables()->FormulaToUser(currentSeamAllowance, qApp->Settings()->getOsSeparator());
ui->afterWidthFormula_PlainTextEdit->setPlainText(allowance);
if (QPushButton *button = qobject_cast(sender()))
{
@@ -1692,7 +1692,7 @@ void PatternPieceDialog::updateGrainlineValues()
try
{
formula.replace("\n", " ");
- formula = qApp->TrVars()->FormulaFromUser(formula, qApp->Settings()->getOsSeparator());
+ formula = qApp->translateVariables()->FormulaFromUser(formula, qApp->Settings()->getOsSeparator());
Calculator calculation;
qreal calculatedValue = calculation.EvalFormula(data->DataVariables(), formula);
if (qIsInf(calculatedValue) == true || qIsNaN(calculatedValue) == true)
@@ -1774,7 +1774,7 @@ void PatternPieceDialog::updatePieceLabelValues()
try
{
formula.replace("\n", " ");
- formula = qApp->TrVars()->FormulaFromUser(formula, qApp->Settings()->getOsSeparator());
+ formula = qApp->translateVariables()->FormulaFromUser(formula, qApp->Settings()->getOsSeparator());
Calculator calculation;
qreal calculatedValue = calculation.EvalFormula(data->DataVariables(), formula);
if (qIsInf(calculatedValue) == true || qIsNaN(calculatedValue) == true)
@@ -1859,7 +1859,7 @@ void PatternPieceDialog::updatePatternLabelValues()
try
{
formula.replace("\n", " ");
- formula = qApp->TrVars()->FormulaFromUser(formula, qApp->Settings()->getOsSeparator());
+ formula = qApp->translateVariables()->FormulaFromUser(formula, qApp->Settings()->getOsSeparator());
Calculator calculation;
qreal calculatedValue = calculation.EvalFormula(data->DataVariables(), formula);
if (qIsInf(calculatedValue) == true || qIsNaN(calculatedValue) == true)
@@ -1983,7 +1983,7 @@ void PatternPieceDialog::editGrainlineFormula()
EditFormulaDialog dialog(data, NULL_ID, this);
dialog.setWindowTitle(title);
- dialog.SetFormula(qApp->TrVars()->TryFormulaFromUser(labelFormula->toPlainText(), qApp->Settings()->getOsSeparator()));
+ dialog.SetFormula(qApp->translateVariables()->TryFormulaFromUser(labelFormula->toPlainText(), qApp->Settings()->getOsSeparator()));
dialog.setCheckZero(checkForZero);
if (dialog.exec() == QDialog::Accepted)
{
@@ -2040,7 +2040,7 @@ void PatternPieceDialog::editPieceLabelFormula()
EditFormulaDialog dialog(data, NULL_ID, this);
dialog.setWindowTitle(title);
- dialog.SetFormula(qApp->TrVars()->TryFormulaFromUser(labelFormula->toPlainText(), qApp->Settings()->getOsSeparator()));
+ dialog.SetFormula(qApp->translateVariables()->TryFormulaFromUser(labelFormula->toPlainText(), qApp->Settings()->getOsSeparator()));
dialog.setCheckZero(checkForZero);
if (dialog.exec() == QDialog::Accepted)
{
@@ -2100,7 +2100,7 @@ void PatternPieceDialog::editPatternLabelFormula()
EditFormulaDialog dialog(data, NULL_ID, this);
dialog.setWindowTitle(title);
- dialog.SetFormula(qApp->TrVars()->TryFormulaFromUser(labelFormula->toPlainText(), qApp->Settings()->getOsSeparator()));
+ dialog.SetFormula(qApp->translateVariables()->TryFormulaFromUser(labelFormula->toPlainText(), qApp->Settings()->getOsSeparator()));
dialog.setCheckZero(checkForZero);
if (dialog.exec() == QDialog::Accepted)
{
@@ -3239,13 +3239,13 @@ QString PatternPieceDialog::getSeamAllowanceWidthFormula() const
{
QString width = ui->widthFormula_PlainTextEdit->toPlainText();
width.replace("\n", " ");
- return qApp->TrVars()->TryFormulaFromUser(width, qApp->Settings()->getOsSeparator());
+ return qApp->translateVariables()->TryFormulaFromUser(width, qApp->Settings()->getOsSeparator());
}
//---------------------------------------------------------------------------------------------------------------------
void PatternPieceDialog::setSeamAllowanceWidthFormula(const QString &formula)
{
- const QString width = qApp->TrVars()->FormulaToUser(formula, qApp->Settings()->getOsSeparator());
+ const QString width = qApp->translateVariables()->FormulaToUser(formula, qApp->Settings()->getOsSeparator());
ui->widthFormula_PlainTextEdit->setPlainText(width);
PatternPieceVisual *path = qobject_cast(vis);
@@ -3294,7 +3294,7 @@ void PatternPieceDialog::setGrainlineAngle(QString angleFormula)
angleFormula = QString("0");
}
- const QString formula = qApp->TrVars()->FormulaToUser(angleFormula, qApp->Settings()->getOsSeparator());
+ const QString formula = qApp->translateVariables()->FormulaToUser(angleFormula, qApp->Settings()->getOsSeparator());
ui->rotationFormula_LineEdit->setPlainText(formula);
MoveCursorToEnd(ui->rotationFormula_LineEdit);
@@ -3308,7 +3308,7 @@ void PatternPieceDialog::setGrainlineLength(QString lengthFormula)
lengthFormula = QString().setNum(UnitConvertor(1, Unit::Cm, *data->GetPatternUnit()));
}
- const QString formula = qApp->TrVars()->FormulaToUser(lengthFormula, qApp->Settings()->getOsSeparator());
+ const QString formula = qApp->translateVariables()->FormulaToUser(lengthFormula, qApp->Settings()->getOsSeparator());
ui->lengthFormula_LineEdit->setPlainText(formula);
MoveCursorToEnd(ui->lengthFormula_LineEdit);
@@ -3322,7 +3322,7 @@ void PatternPieceDialog::setPieceLabelWidth(QString widthFormula)
widthFormula = QString().setNum(UnitConvertor(1, Unit::Cm, *data->GetPatternUnit()));
}
- const QString formula = qApp->TrVars()->FormulaToUser(widthFormula, qApp->Settings()->getOsSeparator());
+ const QString formula = qApp->translateVariables()->FormulaToUser(widthFormula, qApp->Settings()->getOsSeparator());
ui->pieceLabelWidthFormula_LineEdit->setPlainText(formula);
MoveCursorToEnd(ui->pieceLabelWidthFormula_LineEdit);
@@ -3336,7 +3336,7 @@ void PatternPieceDialog::setPieceLabelHeight(QString heightFormula)
heightFormula = QString().setNum(UnitConvertor(1, Unit::Cm, *data->GetPatternUnit()));
}
- const QString formula = qApp->TrVars()->FormulaToUser(heightFormula, qApp->Settings()->getOsSeparator());
+ const QString formula = qApp->translateVariables()->FormulaToUser(heightFormula, qApp->Settings()->getOsSeparator());
ui->pieceLabelHeightFormula_LineEdit->setPlainText(formula);
MoveCursorToEnd(ui->pieceLabelHeightFormula_LineEdit);
@@ -3350,7 +3350,7 @@ void PatternPieceDialog::setPieceLabelAngle(QString angleFormula)
angleFormula = QString("0");
}
- const QString formula = qApp->TrVars()->FormulaToUser(angleFormula, qApp->Settings()->getOsSeparator());
+ const QString formula = qApp->translateVariables()->FormulaToUser(angleFormula, qApp->Settings()->getOsSeparator());
ui->pieceLabelAngleFormula_LineEdit->setPlainText(formula);
MoveCursorToEnd(ui->pieceLabelAngleFormula_LineEdit);
@@ -3364,7 +3364,7 @@ void PatternPieceDialog::setPatternLabelWidth(QString widthFormula)
widthFormula = QString().setNum(UnitConvertor(1, Unit::Cm, *data->GetPatternUnit()));
}
- const QString formula = qApp->TrVars()->FormulaToUser(widthFormula, qApp->Settings()->getOsSeparator());
+ const QString formula = qApp->translateVariables()->FormulaToUser(widthFormula, qApp->Settings()->getOsSeparator());
ui->patternLabelWidthFormula_LineEdit->setPlainText(formula);
MoveCursorToEnd(ui->patternLabelWidthFormula_LineEdit);
@@ -3378,7 +3378,7 @@ void PatternPieceDialog::setPatternLabelHeight(QString heightFormula)
heightFormula = QString().setNum(UnitConvertor(1, Unit::Cm, *data->GetPatternUnit()));
}
- const QString formula = qApp->TrVars()->FormulaToUser(heightFormula, qApp->Settings()->getOsSeparator());
+ const QString formula = qApp->translateVariables()->FormulaToUser(heightFormula, qApp->Settings()->getOsSeparator());
ui->patternLabelHeightFormula_LineEdit->setPlainText(formula);
MoveCursorToEnd(ui->patternLabelHeightFormula_LineEdit);
@@ -3392,7 +3392,7 @@ void PatternPieceDialog::setPatternLabelAngle(QString angleFormula)
angleFormula = QString("0");
}
- const QString formula = qApp->TrVars()->FormulaToUser(angleFormula, qApp->Settings()->getOsSeparator());
+ const QString formula = qApp->translateVariables()->FormulaToUser(angleFormula, qApp->Settings()->getOsSeparator());
ui->patternLabelAngleFormula_LineEdit->setPlainText(formula);
MoveCursorToEnd(ui->patternLabelAngleFormula_LineEdit);
@@ -3567,6 +3567,6 @@ qreal PatternPieceDialog::getFormulaValue(QPlainTextEdit *text) const
Calculator calculation;
QString formula = text->toPlainText().simplified();
formula.replace("\n", " ");
- formula = qApp->TrVars()->FormulaFromUser(formula, qApp->Settings()->getOsSeparator());
+ formula = qApp->translateVariables()->FormulaFromUser(formula, qApp->Settings()->getOsSeparator());
return ToPixel(calculation.EvalFormula(data->DataVariables(), formula), *data->GetPatternUnit());
}
diff --git a/src/libs/vtools/tools/drawTools/operation/vtoolmove.cpp b/src/libs/vtools/tools/drawTools/operation/vtoolmove.cpp
index 0b1b2a5330d5..88f2e50cd820 100644
--- a/src/libs/vtools/tools/drawTools/operation/vtoolmove.cpp
+++ b/src/libs/vtools/tools/drawTools/operation/vtoolmove.cpp
@@ -506,9 +506,9 @@ void VToolMove::SetVisualization()
SCASSERT(visual != nullptr)
visual->setObjects(sourceToObjects(source));
- visual->SetAngle(qApp->TrVars()->FormulaToUser(formulaAngle, qApp->Settings()->getOsSeparator()));
- visual->SetLength(qApp->TrVars()->FormulaToUser(formulaLength, qApp->Settings()->getOsSeparator()));
- visual->setRotation(qApp->TrVars()->FormulaToUser(formulaRotation, qApp->Settings()->getOsSeparator()));
+ visual->SetAngle(qApp->translateVariables()->FormulaToUser(formulaAngle, qApp->Settings()->getOsSeparator()));
+ visual->SetLength(qApp->translateVariables()->FormulaToUser(formulaLength, qApp->Settings()->getOsSeparator()));
+ visual->setRotation(qApp->translateVariables()->FormulaToUser(formulaRotation, qApp->Settings()->getOsSeparator()));
visual->setOriginPointId(m_originPointId);
visual->RefreshGeometry();
}
diff --git a/src/libs/vtools/tools/drawTools/operation/vtoolrotation.cpp b/src/libs/vtools/tools/drawTools/operation/vtoolrotation.cpp
index d0a91ae9e48a..ce33ebe01c5c 100644
--- a/src/libs/vtools/tools/drawTools/operation/vtoolrotation.cpp
+++ b/src/libs/vtools/tools/drawTools/operation/vtoolrotation.cpp
@@ -349,7 +349,7 @@ void VToolRotation::SetVisualization()
visual->setObjects(sourceToObjects(source));
visual->SetOriginPointId(m_originPointId);
- visual->SetAngle(qApp->TrVars()->FormulaToUser(formulaAngle, qApp->Settings()->getOsSeparator()));
+ visual->SetAngle(qApp->translateVariables()->FormulaToUser(formulaAngle, qApp->Settings()->getOsSeparator()));
visual->RefreshGeometry();
}
}
diff --git a/src/libs/vtools/tools/drawTools/toolcurve/vtoolarc.cpp b/src/libs/vtools/tools/drawTools/toolcurve/vtoolarc.cpp
index c95fb9dc376d..fa40e9f429a5 100644
--- a/src/libs/vtools/tools/drawTools/toolcurve/vtoolarc.cpp
+++ b/src/libs/vtools/tools/drawTools/toolcurve/vtoolarc.cpp
@@ -426,7 +426,7 @@ void VToolArc::SetVisualization()
VisToolArc *visual = qobject_cast(vis);
SCASSERT(visual != nullptr)
- const VTranslateVars *trVars = qApp->TrVars();
+ const VTranslateVars *trVars = qApp->translateVariables();
visual->setObject1Id(arc->GetCenter().id());
visual->setRadius(trVars->FormulaToUser(arc->GetFormulaRadius(), qApp->Settings()->getOsSeparator()));
visual->setF1(trVars->FormulaToUser(arc->GetFormulaF1(), qApp->Settings()->getOsSeparator()));
diff --git a/src/libs/vtools/tools/drawTools/toolcurve/vtoolarcwithlength.cpp b/src/libs/vtools/tools/drawTools/toolcurve/vtoolarcwithlength.cpp
index 0cc50e890065..a29e1d5c234f 100644
--- a/src/libs/vtools/tools/drawTools/toolcurve/vtoolarcwithlength.cpp
+++ b/src/libs/vtools/tools/drawTools/toolcurve/vtoolarcwithlength.cpp
@@ -365,7 +365,7 @@ void VToolArcWithLength::SetVisualization()
VisToolArcWithLength *visual = qobject_cast(vis);
SCASSERT(visual != nullptr)
- const VTranslateVars *trVars = qApp->TrVars();
+ const VTranslateVars *trVars = qApp->translateVariables();
visual->setObject1Id(arc->GetCenter().id());
visual->setRadius(trVars->FormulaToUser(arc->GetFormulaRadius(), qApp->Settings()->getOsSeparator()));
visual->setF1(trVars->FormulaToUser(arc->GetFormulaF1(), qApp->Settings()->getOsSeparator()));
diff --git a/src/libs/vtools/tools/drawTools/toolcurve/vtoolellipticalarc.cpp b/src/libs/vtools/tools/drawTools/toolcurve/vtoolellipticalarc.cpp
index 235cf0c1afd9..0d9165f12c88 100644
--- a/src/libs/vtools/tools/drawTools/toolcurve/vtoolellipticalarc.cpp
+++ b/src/libs/vtools/tools/drawTools/toolcurve/vtoolellipticalarc.cpp
@@ -472,7 +472,7 @@ void VToolEllipticalArc::SetVisualization()
VisToolEllipticalArc *visual = qobject_cast(vis);
SCASSERT(visual != nullptr)
- const VTranslateVars *trVars = qApp->TrVars();
+ const VTranslateVars *trVars = qApp->translateVariables();
visual->setObject1Id(elArc->GetCenter().id());
visual->setRadius1(trVars->FormulaToUser(elArc->GetFormulaRadius1(), qApp->Settings()->getOsSeparator()));
visual->setRadius2(trVars->FormulaToUser(elArc->GetFormulaRadius2(), qApp->Settings()->getOsSeparator()));
diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutarc.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutarc.cpp
index 2491dba08250..777462722b96 100644
--- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutarc.cpp
+++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutarc.cpp
@@ -270,7 +270,7 @@ void VToolCutArc::SetVisualization()
SCASSERT(visual != nullptr)
visual->setObject1Id(curveCutId);
- visual->setLength(qApp->TrVars()->FormulaToUser(formula, qApp->Settings()->getOsSeparator()));
+ visual->setLength(qApp->translateVariables()->FormulaToUser(formula, qApp->Settings()->getOsSeparator()));
const QSharedPointer curve = VAbstractTool::data.GeometricObject(curveCutId);
visual->setLineStyle(lineTypeToPenStyle(curve->GetPenStyle()));
@@ -284,7 +284,7 @@ QString VToolCutArc::makeToolTip() const
{
const QSharedPointer arc = VAbstractTool::data.GeometricObject(curveCutId);
- const QString expression = qApp->TrVars()->FormulaToUser(formula, qApp->Settings()->getOsSeparator());
+ const QString expression = qApp->translateVariables()->FormulaToUser(formula, qApp->Settings()->getOsSeparator());
const qreal length = Visualization::FindVal(expression, VAbstractTool::data.DataVariables());
const QString arcStr = tr("Arc");
diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutspline.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutspline.cpp
index 06abb672e29d..32c6e5d10539 100644
--- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutspline.cpp
+++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutspline.cpp
@@ -270,7 +270,7 @@ void VToolCutSpline::SetVisualization()
SCASSERT(visual != nullptr)
visual->setObject1Id(curveCutId);
- visual->setLength(qApp->TrVars()->FormulaToUser(formula, qApp->Settings()->getOsSeparator()));
+ visual->setLength(qApp->translateVariables()->FormulaToUser(formula, qApp->Settings()->getOsSeparator()));
const QSharedPointer curve = VAbstractTool::data.GeometricObject(curveCutId);
visual->setLineStyle(lineTypeToPenStyle(curve->GetPenStyle()));
@@ -284,7 +284,7 @@ QString VToolCutSpline::makeToolTip() const
{
const auto spl = VAbstractTool::data.GeometricObject(curveCutId);
- const QString expression = qApp->TrVars()->FormulaToUser(formula, qApp->Settings()->getOsSeparator());
+ const QString expression = qApp->translateVariables()->FormulaToUser(formula, qApp->Settings()->getOsSeparator());
const qreal length = Visualization::FindVal(expression, VAbstractTool::data.DataVariables());
QPointF spl1p2, spl1p3, spl2p2, spl2p3;
diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutsplinepath.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutsplinepath.cpp
index 8c7e15fc9a3d..2b8e8944c16e 100644
--- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutsplinepath.cpp
+++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutsplinepath.cpp
@@ -357,7 +357,7 @@ void VToolCutSplinePath::SetVisualization()
SCASSERT(visual != nullptr)
visual->setObject1Id(curveCutId);
- visual->setLength(qApp->TrVars()->FormulaToUser(formula, qApp->Settings()->getOsSeparator()));
+ visual->setLength(qApp->translateVariables()->FormulaToUser(formula, qApp->Settings()->getOsSeparator()));
const QSharedPointer curve = VAbstractTool::data.GeometricObject(curveCutId);
visual->setLineStyle(lineTypeToPenStyle(curve->GetPenStyle()));
@@ -371,7 +371,7 @@ QString VToolCutSplinePath::makeToolTip() const
{
const auto splPath = VAbstractTool::data.GeometricObject(curveCutId);
- const QString expression = qApp->TrVars()->FormulaToUser(formula, qApp->Settings()->getOsSeparator());
+ const QString expression = qApp->translateVariables()->FormulaToUser(formula, qApp->Settings()->getOsSeparator());
const qreal length = Visualization::FindVal(expression, VAbstractTool::data.DataVariables());
VSplinePath *splPath1 = nullptr;
diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolalongline.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolalongline.cpp
index 4139c87121c5..4a3021975bd1 100644
--- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolalongline.cpp
+++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolalongline.cpp
@@ -183,7 +183,7 @@ void VToolAlongLine::SetVisualization()
SCASSERT(visual != nullptr)
visual->setObject1Id(basePointId);
visual->setObject2Id(secondPointId);
- visual->setLength(qApp->TrVars()->FormulaToUser(formulaLength, qApp->Settings()->getOsSeparator()));
+ visual->setLength(qApp->translateVariables()->FormulaToUser(formulaLength, qApp->Settings()->getOsSeparator()));
visual->setLineStyle(lineTypeToPenStyle(m_lineType));
visual->setLineWeight(m_lineWeight);
visual->RefreshGeometry();
diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolbisector.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolbisector.cpp
index affb476b4820..59dbcb02133a 100644
--- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolbisector.cpp
+++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolbisector.cpp
@@ -362,7 +362,7 @@ void VToolBisector::SetVisualization()
visual->setObject1Id(firstPointId);
visual->setObject2Id(basePointId);
visual->setObject3Id(thirdPointId);
- visual->setLength(qApp->TrVars()->FormulaToUser(formulaLength, qApp->Settings()->getOsSeparator()));
+ visual->setLength(qApp->translateVariables()->FormulaToUser(formulaLength, qApp->Settings()->getOsSeparator()));
visual->setLineStyle(lineTypeToPenStyle(m_lineType));
visual->setLineWeight(m_lineWeight);
visual->RefreshGeometry();
diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolcurveintersectaxis.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolcurveintersectaxis.cpp
index cc3f7253fbc0..1a3c90ad11d7 100644
--- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolcurveintersectaxis.cpp
+++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolcurveintersectaxis.cpp
@@ -383,7 +383,7 @@ void VToolCurveIntersectAxis::SetVisualization()
visual->setObject1Id(curveId);
visual->setAxisPointId(basePointId);
- visual->SetAngle(qApp->TrVars()->FormulaToUser(formulaAngle, qApp->Settings()->getOsSeparator()));
+ visual->SetAngle(qApp->translateVariables()->FormulaToUser(formulaAngle, qApp->Settings()->getOsSeparator()));
visual->setLineStyle(lineTypeToPenStyle(m_lineType));
visual->setLineWeight(m_lineWeight);
visual->RefreshGeometry();
diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolendline.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolendline.cpp
index e81eab5e6f54..6300b3519991 100644
--- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolendline.cpp
+++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolendline.cpp
@@ -290,8 +290,8 @@ void VToolEndLine::SetVisualization()
SCASSERT(visual != nullptr)
visual->setObject1Id(basePointId);
- visual->setLength(qApp->TrVars()->FormulaToUser(formulaLength, qApp->Settings()->getOsSeparator()));
- visual->SetAngle(qApp->TrVars()->FormulaToUser(formulaAngle, qApp->Settings()->getOsSeparator()));
+ visual->setLength(qApp->translateVariables()->FormulaToUser(formulaLength, qApp->Settings()->getOsSeparator()));
+ visual->SetAngle(qApp->translateVariables()->FormulaToUser(formulaAngle, qApp->Settings()->getOsSeparator()));
visual->setLineStyle(lineTypeToPenStyle(m_lineType));
visual->setLineWeight(m_lineWeight);
visual->RefreshGeometry();
diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollineintersectaxis.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollineintersectaxis.cpp
index edf321c2cb6e..8b8ff6ba238c 100644
--- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollineintersectaxis.cpp
+++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollineintersectaxis.cpp
@@ -380,7 +380,7 @@ void VToolLineIntersectAxis::SetVisualization()
visual->setObject1Id(firstPointId);
visual->setPoint2Id(secondPointId);
visual->setAxisPointId(basePointId);
- visual->SetAngle(qApp->TrVars()->FormulaToUser(formulaAngle, qApp->Settings()->getOsSeparator()));
+ visual->SetAngle(qApp->translateVariables()->FormulaToUser(formulaAngle, qApp->Settings()->getOsSeparator()));
visual->setLineStyle(lineTypeToPenStyle(m_lineType));
visual->setLineWeight(m_lineWeight);
visual->RefreshGeometry();
diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolnormal.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolnormal.cpp
index 8fa5d6b44234..f8174a059904 100644
--- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolnormal.cpp
+++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolnormal.cpp
@@ -335,7 +335,7 @@ void VToolNormal::SetVisualization()
visual->setObject1Id(basePointId);
visual->setObject2Id(secondPointId);
- visual->setLength(qApp->TrVars()->FormulaToUser(formulaLength, qApp->Settings()->getOsSeparator()));
+ visual->setLength(qApp->translateVariables()->FormulaToUser(formulaLength, qApp->Settings()->getOsSeparator()));
visual->SetAngle(angle);
visual->setLineStyle(lineTypeToPenStyle(m_lineType));
visual->setLineWeight(m_lineWeight);
diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolshoulderpoint.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolshoulderpoint.cpp
index 15443e18fdcb..6608dca6074b 100644
--- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolshoulderpoint.cpp
+++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolshoulderpoint.cpp
@@ -378,7 +378,7 @@ void VToolShoulderPoint::SetVisualization()
visual->setObject1Id(pShoulder);
visual->setLineP1Id(basePointId);
visual->setLineP2Id(p2Line);
- visual->setLength(qApp->TrVars()->FormulaToUser(formulaLength, qApp->Settings()->getOsSeparator()));
+ visual->setLength(qApp->translateVariables()->FormulaToUser(formulaLength, qApp->Settings()->getOsSeparator()));
visual->setLineStyle(lineTypeToPenStyle(m_lineType));
visual->setLineWeight(m_lineWeight);
visual->RefreshGeometry();
diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofcontact.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofcontact.cpp
index 907572a9246f..d0c1772ac2bd 100644
--- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofcontact.cpp
+++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofcontact.cpp
@@ -380,7 +380,7 @@ void VToolPointOfContact::SetVisualization()
visual->setObject1Id(firstPointId);
visual->setLineP2Id(secondPointId);
visual->setRadiusId(center);
- visual->setRadius(qApp->TrVars()->FormulaToUser(arcRadius, qApp->Settings()->getOsSeparator()));
+ visual->setRadius(qApp->translateVariables()->FormulaToUser(arcRadius, qApp->Settings()->getOsSeparator()));
visual->RefreshGeometry();
}
}
diff --git a/src/libs/vtools/tools/vabstracttool.cpp b/src/libs/vtools/tools/vabstracttool.cpp
index 56053393b5bf..5ce1b4113846 100644
--- a/src/libs/vtools/tools/vabstracttool.cpp
+++ b/src/libs/vtools/tools/vabstracttool.cpp
@@ -202,7 +202,7 @@ qreal VAbstractTool::CheckFormula(const quint32 &toolId, QString &formula, VCont
<< "Expression: " << error.GetExpr() << "\n"
<< "--------------------------------------";
- if (qApp->IsAppInGUIMode())
+ if (qApp->isAppInGUIMode())
{
QScopedPointer dialogUndo(new DialogUndo(qApp->getMainWindow()));
forever
diff --git a/src/libs/vtools/visualization/line/operation/vistoolmove.cpp b/src/libs/vtools/visualization/line/operation/vistoolmove.cpp
index c32b000cf34d..1d65e35a711b 100644
--- a/src/libs/vtools/visualization/line/operation/vistoolmove.cpp
+++ b/src/libs/vtools/visualization/line/operation/vistoolmove.cpp
@@ -211,7 +211,7 @@ void VisToolMove::RefreshGeometry()
{
Visualization::toolTip = tr("Length = %1%2, angle = %3°, Shift to constrain angle, "
"Mouse click - finish selecting a position")
- .arg(qApp->TrVars()->FormulaToUser(QString::number(qApp->fromPixel(tempLength)),
+ .arg(qApp->translateVariables()->FormulaToUser(QString::number(qApp->fromPixel(tempLength)),
qApp->Settings()->getOsSeparator()))
.arg(prefix)
.arg(tempAngle);
@@ -220,7 +220,7 @@ void VisToolMove::RefreshGeometry()
{
Visualization::toolTip = tr("Length = %1%2, angle = %3°, rotation angle = %4° Hold SHIFT to constrain angle,"
"CTRL - change rotation origin point, Mouse click - finish creating")
- .arg(qApp->TrVars()->FormulaToUser(QString::number(qApp->fromPixel(tempLength)),
+ .arg(qApp->translateVariables()->FormulaToUser(QString::number(qApp->fromPixel(tempLength)),
qApp->Settings()->getOsSeparator()))
.arg(prefix)
.arg(tempAngle)
diff --git a/src/libs/vtools/visualization/line/vistoolendline.cpp b/src/libs/vtools/visualization/line/vistoolendline.cpp
index 596892084f47..2535b018921d 100644
--- a/src/libs/vtools/visualization/line/vistoolendline.cpp
+++ b/src/libs/vtools/visualization/line/vistoolendline.cpp
@@ -105,7 +105,7 @@ void VisToolEndLine::RefreshGeometry()
Visualization::toolTip = tr("Point Length and Angle: angle = %1°, length = %2%3; "
"Hold SHIFT to constrain angle, Press ENTER to finish tool creation")
.arg(this->line().angle())
- .arg(qApp->TrVars()->FormulaToUser(QString::number(qApp->fromPixel(this->line().length())),
+ .arg(qApp->translateVariables()->FormulaToUser(QString::number(qApp->fromPixel(this->line().length())),
qApp->Settings()->getOsSeparator()))
.arg(prefix);
}
diff --git a/src/libs/vtools/visualization/visualization.cpp b/src/libs/vtools/visualization/visualization.cpp
index 2a63a68d0f2a..7420227d0f4a 100644
--- a/src/libs/vtools/visualization/visualization.cpp
+++ b/src/libs/vtools/visualization/visualization.cpp
@@ -196,7 +196,7 @@ qreal Visualization::FindVal(const QString &expression,
// Replace line return with spaces for calc if exist
QString formula = expression;
formula.replace("\n", " ");
- formula = qApp->TrVars()->FormulaFromUser(formula, qApp->Settings()->getOsSeparator());
+ formula = qApp->translateVariables()->FormulaFromUser(formula, qApp->Settings()->getOsSeparator());
QScopedPointer cal(new Calculator());
val = cal->EvalFormula(vars, formula);
diff --git a/src/test/Seamly2DTest/qttestmainlambda.cpp b/src/test/Seamly2DTest/qttestmainlambda.cpp
index 0d2c287fe3cf..6704e767b189 100644
--- a/src/test/Seamly2DTest/qttestmainlambda.cpp
+++ b/src/test/Seamly2DTest/qttestmainlambda.cpp
@@ -78,49 +78,49 @@
#include "../vmisc/vabstractapplication.h"
#include "../vmisc/projectversion.h"
-class TestVApplication : public VAbstractApplication
+class TestApplication2D : public VAbstractApplication
{
public:
- TestVApplication(int &argc, char ** argv);
- virtual ~TestVApplication() Q_DECL_EQ_DEFAULT;
+ TestApplication2D(int &argc, char ** argv);
+ virtual ~TestApplication2D() Q_DECL_EQ_DEFAULT;
- virtual const VTranslateVars *TrVars();
- virtual void OpenSettings();
- virtual bool IsAppInGUIMode() const;
- virtual void InitTrVars();
+ virtual const VTranslateVars *translateVariables();
+ virtual void openSettings();
+ virtual bool isAppInGUIMode() const;
+ virtual void initTranslateVariables();
};
//---------------------------------------------------------------------------------------------------------------------
-TestVApplication::TestVApplication(int &argc, char **argv)
+TestApplication2D::TestApplication2D(int &argc, char **argv)
: VAbstractApplication(argc, argv)
{
setApplicationName(VER_INTERNALNAME_2D_STR);
setOrganizationName(VER_COMPANYNAME_STR);
- OpenSettings();
+ openSettings();
}
//---------------------------------------------------------------------------------------------------------------------
-const VTranslateVars *TestVApplication::TrVars()
+const VTranslateVars *TestApplication2D::translateVariables()
{
return nullptr;
}
//---------------------------------------------------------------------------------------------------------------------
-void TestVApplication::OpenSettings()
+void TestApplication2D::openSettings()
{
settings = new VSettings(QSettings::IniFormat, QSettings::UserScope, QCoreApplication::organizationName(),
QCoreApplication::applicationName(), this);
}
//---------------------------------------------------------------------------------------------------------------------
-bool TestVApplication::IsAppInGUIMode() const
+bool TestApplication2D::isAppInGUIMode() const
{
return false;
}
//---------------------------------------------------------------------------------------------------------------------
-void TestVApplication::InitTrVars()
+void TestApplication2D::initTranslateVariables()
{
}
@@ -129,7 +129,7 @@ int main(int argc, char** argv)
{
Q_INIT_RESOURCE(schema);
- TestVApplication app( argc, argv );// For QPrinter
+ TestApplication2D app( argc, argv );// For QPrinter
int status = 0;
auto ASSERT_TEST = [&status, argc, argv](QObject* obj)