kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2026-03-04 12:49:59 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Change function QETApp::elementTranslatedInfoKey

Browse Source 
Use the function QETInformation::translatedInfoKey(const QString &info)
instead of QETApp::elementTranslatedInfoKey(const QString &info).

The final goal is to remove all information from the QETApp and use
instea QETInformation who is dedicated to this
This commit is contained in:
Claveau Joshua
2020-11-08 19:16:02 +01:00
parent 7882c5734a
commit 6f60156e00
10 changed files with 18 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sources/ui/bomexportdialog.cpp
View File

@@ -20,6 +20,7 @@
#include "elementquerywidget.h"
#include "qetproject.h"
#include "qetapp.h"
#include "qetinformation.h"
#include <QMessageBox>
#include <QSqlError>
@@ -122,7 +123,7 @@ QString BOMExportDialog::getBom()
} else if (field_name == "designation_qty") {
header_name << tr("Quantité numéro d'article", "Special field with name : designation quantity");
} else {
header_name << QETApp::elementTranslatedInfoKey(field_name);
header_name << QETInformation::translatedInfoKey(field_name);
if (header_name.isEmpty()) {
header_name << QETApp::diagramTranslatedInfoKey(field_name);
}

3
sources/ui/compositetexteditdialog.cpp
View File

@@ -6,6 +6,7 @@
#include "element.h"
#include "qetapp.h"
#include "conductor.h"
#include "qetinformation.h"
CompositeTextEditDialog::CompositeTextEditDialog(DynamicElementTextItem *text, QWidget *parent) :
QDialog(parent),
@@ -66,7 +67,7 @@ void CompositeTextEditDialog::setUpComboBox()
//the value of the combo box are always alphabetically sorted
QMap <QString, QString> info_map;
for(const QString& str : qstrl) {
info_map.insert(QETApp::elementTranslatedInfoKey(str), QETApp::elementInfoToVar(str));
info_map.insert(QETInformation::translatedInfoKey(str), QETApp::elementInfoToVar(str));
}
for(const QString& key : info_map.keys()) {
ui->m_info_cb->addItem(key, info_map.value(key));

7
sources/ui/elementinfowidget.cpp
View File

@@ -22,6 +22,7 @@
#include "diagram.h"
#include "elementinfopartwidget.h"
#include "element.h"
#include "qetinformation.h"
/**
@brief ElementInfoWidget::ElementInfoWidget
@@ -177,9 +178,9 @@ void ElementInfoWidget::disableLiveEdit()
*/
void ElementInfoWidget::buildInterface()
{
foreach (QString str, QETApp::elementInfoKeys())
for (auto str : QETApp::elementInfoKeys())
{
ElementInfoPartWidget *eipw = new ElementInfoPartWidget(str, QETApp::elementTranslatedInfoKey(str), this);
ElementInfoPartWidget *eipw = new ElementInfoPartWidget(str, QETInformation::translatedInfoKey(str), this);
ui->scroll_vlayout->addWidget(eipw);
m_eipw_list << eipw;
}
@@ -194,7 +195,7 @@ void ElementInfoWidget::buildInterface()
*/
ElementInfoPartWidget *ElementInfoWidget::infoPartWidgetForKey(const QString &key) const
{
foreach (ElementInfoPartWidget *eipw, m_eipw_list)
for (auto eipw : m_eipw_list)
{
if (eipw->key() == key)
return eipw;