From e317aa50dccca351cf2965e6fa7a07572496012d Mon Sep 17 00:00:00 2001 From: Anton Midyukov Date: Fri, 21 Feb 2025 09:08:15 +0300 Subject: [PATCH] Improvement of internationalization Signed-off-by: Anton Midyukov --- qucs/dialogs/qucssettingsdialog.cpp | 18 +++++++++--------- qucs/dialogs/tuner.cpp | 16 ++++++++-------- qucs/qucs_init.cpp | 6 +++--- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/qucs/dialogs/qucssettingsdialog.cpp b/qucs/dialogs/qucssettingsdialog.cpp index 41626617..24471c80 100644 --- a/qucs/dialogs/qucssettingsdialog.cpp +++ b/qucs/dialogs/qucssettingsdialog.cpp @@ -380,42 +380,42 @@ QucsSettingsDialog::QucsSettingsDialog(QucsApp *parent) locationsGrid->addWidget(new QLabel(tr("Qucs Home:"), locationsTab) ,1,0); homeEdit = new QLineEdit(locationsTab); locationsGrid->addWidget(homeEdit,1,1); - QPushButton *HomeButt = new QPushButton("Browse"); + QPushButton *HomeButt = new QPushButton(tr("Browse")); locationsGrid->addWidget(HomeButt, 1, 2); connect(HomeButt, SIGNAL(clicked()), SLOT(slotHomeDirBrowse())); locationsGrid->addWidget(new QLabel(tr("AdmsXml Path:"), locationsTab) ,2,0); admsXmlEdit = new QLineEdit(locationsTab); locationsGrid->addWidget(admsXmlEdit,2,1); - QPushButton *AdmsXmlButt = new QPushButton("Browse"); + QPushButton *AdmsXmlButt = new QPushButton(tr("Browse")); locationsGrid->addWidget(AdmsXmlButt, 2, 2); connect(AdmsXmlButt, SIGNAL(clicked()), SLOT(slotAdmsXmlDirBrowse())); locationsGrid->addWidget(new QLabel(tr("ASCO Path:"), locationsTab) ,3,0); ascoEdit = new QLineEdit(locationsTab); locationsGrid->addWidget(ascoEdit,3,1); - QPushButton *ascoButt = new QPushButton("Browse"); + QPushButton *ascoButt = new QPushButton(tr("Browse")); locationsGrid->addWidget(ascoButt, 3, 2); connect(ascoButt, SIGNAL(clicked()), SLOT(slotAscoDirBrowse())); locationsGrid->addWidget(new QLabel(tr("Octave Path:"), locationsTab) ,4,0); octaveEdit = new QLineEdit(locationsTab); locationsGrid->addWidget(octaveEdit,4,1); - QPushButton *OctaveButt = new QPushButton("Browse"); + QPushButton *OctaveButt = new QPushButton(tr("Browse")); locationsGrid->addWidget(OctaveButt, 4, 2); connect(OctaveButt, SIGNAL(clicked()), SLOT(slotOctaveDirBrowse())); locationsGrid->addWidget(new QLabel(tr("OpenVAF Path:"), locationsTab) ,5,0); OpenVAFEdit = new QLineEdit(locationsTab); locationsGrid->addWidget(OpenVAFEdit,5,1); - QPushButton *OpenVAFButt = new QPushButton("Browse"); + QPushButton *OpenVAFButt = new QPushButton(tr("Browse")); locationsGrid->addWidget(OpenVAFButt, 5, 2); connect(OpenVAFButt, SIGNAL(clicked()), SLOT(slotOpenVAFDirBrowse())); locationsGrid->addWidget(new QLabel(tr("RF Layout Path:"), locationsTab) ,6,0); RFLayoutEdit = new QLineEdit(locationsTab); locationsGrid->addWidget(RFLayoutEdit,6,1); - QPushButton *RFLButt = new QPushButton("Browse"); + QPushButton *RFLButt = new QPushButton(tr("Browse")); locationsGrid->addWidget(RFLButt, 6, 2); connect(RFLButt, SIGNAL(clicked()), SLOT(slotRFLayoutDirBrowse())); @@ -441,15 +441,15 @@ QucsSettingsDialog::QucsSettingsDialog(QucsApp *parent) connect(pathsTableWidget, SIGNAL(itemSelectionChanged()), SLOT(slotPathSelectionChanged())); locationsGrid->addWidget(pathsTableWidget,7,0,3,2); - QPushButton *AddPathButt = new QPushButton("Add Path"); + QPushButton *AddPathButt = new QPushButton(tr("Add Path")); locationsGrid->addWidget(AddPathButt, 7, 2); connect(AddPathButt, SIGNAL(clicked()), SLOT(slotAddPath())); - QPushButton *AddPathSubFolButt = new QPushButton("Add Path With SubFolders"); + QPushButton *AddPathSubFolButt = new QPushButton(tr("Add Path With SubFolders")); locationsGrid->addWidget(AddPathSubFolButt, 8, 2); connect(AddPathSubFolButt, SIGNAL(clicked()), SLOT(slotAddPathWithSubFolders())); - RemovePathButt = new QPushButton("Remove Path"); + RemovePathButt = new QPushButton(tr("Remove Path")); // disable button if no paths in the table are selected RemovePathButt->setEnabled(false); locationsGrid->addWidget(RemovePathButt , 9, 2); diff --git a/qucs/dialogs/tuner.cpp b/qucs/dialogs/tuner.cpp index b5118143..9b9d5e15 100644 --- a/qucs/dialogs/tuner.cpp +++ b/qucs/dialogs/tuner.cpp @@ -450,7 +450,7 @@ void tunerElement::slotStepChanged() if (!ok) { - QMessageBox::warning(this, "ERROR", "Entered step is not correct", QMessageBox::Ok); + QMessageBox::warning(this, tr("ERROR"), tr("Entered step is not correct"), QMessageBox::Ok); //Restore previous step QString val = misc::num2str(stepValue); int index = 5;//By default, no scaling @@ -507,7 +507,7 @@ void tunerElement::slotValueChanged(bool simulate) ValueUnitsCombobox->blockSignals(true); if (!ok || (v < 0)) { - QMessageBox::warning(this, "ERROR", "Value not correct", QMessageBox::Ok); + QMessageBox::warning(this, tr("ERROR"), tr("Value not correct"), QMessageBox::Ok); //Restore values QString val = misc::num2str(numValue); int index = 5;//By default, no scaling @@ -663,8 +663,8 @@ TunerDialog::TunerDialog(QWidget *_w, QWidget *parent) : { setAttribute(Qt::WA_DeleteOnClose);//This attribute forces the widget to be destroyed after closing qDebug() << "Tuner::TunerDialog"; - this->setObjectName("Tuner"); - this->setWindowTitle("Tuner"); + this->setObjectName(tr("Tuner")); + this->setWindowTitle(tr("Tuner")); gbox = new QGridLayout(); this->setLayout(gbox); @@ -673,10 +673,10 @@ TunerDialog::TunerDialog(QWidget *_w, QWidget *parent) : QGridLayout * buttonsLayout = new QGridLayout(); ButtonsPanel->setLayout(buttonsLayout); - closeButton = new QPushButton("Close", this); - updateValues = new QPushButton("Update Values", this); + closeButton = new QPushButton(tr("Close"), this); + updateValues = new QPushButton(tr("Update Values"), this); updateValues->setEnabled(false);//It doesn't make sense to activate it at first... only when at least a tuning element is active... - resetValues = new QPushButton("Reset Values", this); + resetValues = new QPushButton(tr("Reset Values"), this); resetValues->setEnabled(false); //When pressing the Enter key at the Maxium lineedit focus is automatically set to the reset button leading to @@ -700,7 +700,7 @@ TunerDialog::TunerDialog(QWidget *_w, QWidget *parent) : progressBar->setVisible(false); gbox->addWidget(progressBar, 2, 0); - info->showMessage("Please select a component to tune"); + info->showMessage(tr("Please select a component to tune")); setMinimumWidth(300);//Otherwise, it won't fit the "help" text... valuesUpdated = false; connect(closeButton, SIGNAL(released()), this, SLOT(close())); diff --git a/qucs/qucs_init.cpp b/qucs/qucs_init.cpp index 161894dd..59009b45 100644 --- a/qucs/qucs_init.cpp +++ b/qucs/qucs_init.cpp @@ -553,10 +553,10 @@ void QucsApp::initActions() simulate->setWhatsThis(tr("Simulate\n\nSimulates the current schematic")); connect(simulate, SIGNAL(triggered()), SLOT(slotSimulate())); - tune = new QAction(QIcon((":/bitmaps/svg/tune.svg")),"Tune", this); + tune = new QAction(QIcon((":/bitmaps/svg/tune.svg")),tr("Tune"), this); tune->setShortcut(Qt::Key_F3); - tune->setStatusTip("Tuner"); - tune->setWhatsThis("Allows to live tune variables and show the result in the dataview"); + tune->setStatusTip(tr("Tuner")); + tune->setWhatsThis(tr("Allows to live tune variables and show the result in the dataview")); tune->setCheckable(true); connect(tune, SIGNAL(toggled(bool)), SLOT(slotTune(bool)));