diff --git a/lang/qet_de.ts b/lang/qet_de.ts
index c06457355..0f8198ac9 100644
--- a/lang/qet_de.ts
+++ b/lang/qet_de.ts
@@ -9056,47 +9056,47 @@ Möchten Sie sie ersetzen?
Bloc auxiliaire 1
- Zusatzinfo 1
+ Zusatzinfo Zusatzartikel 1
Description textuelle auxiliaire 1
-
+ Artikelbeschreibung Zusatzartikel 1
Numéro d'article auxiliaire 1
-
+ Artikelnummer Zusatzartikel 1
Fabricant auxiliaire 1
-
+ Hersteller Zusatzartikel 1
Numéro de commande auxiliaire 1
-
+ Bestellnummer Zusatzartikel 1
Numéro interne auxiliaire 1
-
+ Interne Nummer Zusatzartikel 1
Fournisseur auxiliaire 1
-
+ Lieferant Zusatzartikel 1
Quantité auxiliaire 1
-
+ Menge Zusatzartikel 1
Unité auxiliaire 1
-
+ Einheit Zusatzartikel 1
@@ -9106,132 +9106,132 @@ Möchten Sie sie ersetzen?
Description textuelle auxiliaire 2
-
+ Artikelbeschreibung Zusatzartikel 2
Numéro d'article auxiliaire 2
-
+ Artikelnummer Zusatzartikel 2
Fabricant auxiliaire 2
-
+ Hersteller Zusatzartikel 2
Numéro de commande auxiliaire 2
-
+ Bestellnummer Zusatzartikel 2
Numéro interne auxiliaire 2
-
+ Interne Nummer Zusatzartikel 2
Fournisseur auxiliaire 2
-
+ Lieferant Zusatzartikel 2
Quantité auxiliaire 2
-
+ Menge Zusatzartikel 2
Unité auxiliaire 2
-
+ Einheit Zusatzartikel 2
Bloc auxiliaire 3
- Zusatzinfo 3
+ Zusatzinfo Zusatzartikel 3
Description textuelle auxiliaire 3
-
+ Artikelbeschreibung Zusatzartikel 3
Numéro d'article auxiliaire 3
-
+ Artikelnummer Zusatzartikel 3
Fabricant auxiliaire 3
-
+ Hersteller Zusatzartikel 3
Numéro de commande auxiliaire 3
-
+ Bestellnummer Zusatzartikel 3
Numéro interne auxiliaire 3
-
+ Interne Nummer Zusatzartikel 3
Fournisseur auxiliaire 3
-
+ Lieferant Zusatzartikel 3
Quantité auxiliaire 3
-
+ Menge Zusatzartikel 3
Unité auxiliaire 3
-
+ Einheit Zusatzartikel 3
Bloc auxiliaire 4
- Zusatzinfo 4
+ Zusatzinfo Zusatzartikel 4
Description textuelle auxiliaire 4
-
+ Artikelbeschreibung Zusatzartikel 4
Numéro d'article auxiliaire 4
-
+ Artikelnummer Zusatzartikel 4
Fabricant auxiliaire 4
-
+ Hersteller Zusatzartikel 4
Numéro de commande auxiliaire 4
-
+ Bestellnummer Zusatzartikel 4
Numéro interne auxiliaire 4
-
+ Interne Nummer Zusatzartikel 4
Fournisseur auxiliaire 4
-
+ Lieferant Zusatzartikel 4
Quantité auxiliaire 4
-
+ Menge Zusatzartikel 3
Unité auxiliaire 4
-
+ Einheit Zusatzartikel 4
diff --git a/sources/editor/ui/dynamictextfieldeditor.cpp b/sources/editor/ui/dynamictextfieldeditor.cpp
index 15c3872e3..e0b3d8c88 100644
--- a/sources/editor/ui/dynamictextfieldeditor.cpp
+++ b/sources/editor/ui/dynamictextfieldeditor.cpp
@@ -226,15 +226,10 @@ void DynamicTextFieldEditor::fillInfoComboBox()
else {
strl = QETInformation::elementInfoKeys();
}
- //We use a QMap because the keys of the map are sorted, then no matter the current local,
- //the value of the combo box are always alphabetically sorted
- QMap info_map;
- for(const QString& str : strl)
- info_map.insert(QETInformation::translatedInfoKey(str), str);
-
- for (const QString& key : info_map.keys())
- ui -> m_elmt_info_cb -> addItem(key, info_map.value(key));
+ for (int i=0; i m_elmt_info_cb -> addItem(QETInformation::translatedInfoKey(strl[i]), strl[i]);
+ }
}
void DynamicTextFieldEditor::on_m_x_sb_editingFinished()
@@ -369,7 +364,12 @@ void DynamicTextFieldEditor::on_m_text_from_cb_activated(int index) {
void DynamicTextFieldEditor::on_m_composite_text_pb_clicked()
{
- CompositeTextEditDialog ctd(m_text_field.data() -> compositeText(), this);
+ bool isReport = false;
+ if (elementEditor()->elementScene()->elementData().m_type & ElementData::AllReport) {
+ isReport = true;
+ }
+
+ CompositeTextEditDialog ctd(m_text_field.data() -> compositeText(), isReport, this);
if(ctd.exec()) {
QString ct = ctd.plainText();
for (int i = 0; i < m_parts.length(); i++) {
diff --git a/sources/editor/ui/elementpropertieseditorwidget.cpp b/sources/editor/ui/elementpropertieseditorwidget.cpp
index 7c590040c..d69fe56a9 100644
--- a/sources/editor/ui/elementpropertieseditorwidget.cpp
+++ b/sources/editor/ui/elementpropertieseditorwidget.cpp
@@ -205,6 +205,8 @@ void ElementPropertiesEditorWidget::populateTree()
QETInformation::translatedInfoKey(key));
qtwi->setData(0, Qt::UserRole, key);
qtwi->setText(1, m_data.m_informations.value(key).toString());
+ // Adjust column width
+ ui->m_tree->resizeColumnToContents(0);
}
}
diff --git a/sources/qetinformation.cpp b/sources/qetinformation.cpp
index 6ff5fbbb5..361337fbf 100644
--- a/sources/qetinformation.cpp
+++ b/sources/qetinformation.cpp
@@ -312,6 +312,7 @@ QStringList QETInformation::elementEditorElementInfoKeys()
{
QStringList list = { ELMT_LABEL,
ELMT_PLANT,
+ ELMT_LOCATION,
ELMT_COMMENT,
ELMT_FUNCTION,
ELMT_DESCRIPTION,
@@ -322,8 +323,6 @@ QStringList QETInformation::elementEditorElementInfoKeys()
ELMT_SUPPLIER,
ELMT_QUANTITY,
ELMT_UNITY,
- ELMT_LOCATION,
- ELMT_PLANT,
ELMT_AUX1,
ELMT_DESCRIPTION_AUX1,
ELMT_DESIGNATION_AUX1,
diff --git a/sources/qetinformation.h b/sources/qetinformation.h
index 34946d639..c4c48e9f0 100644
--- a/sources/qetinformation.h
+++ b/sources/qetinformation.h
@@ -49,39 +49,39 @@ namespace QETInformation
static QString ELMT_LOCATION = "location";
static QString ELMT_AUX1 = "auxiliary1";
static QString ELMT_DESCRIPTION_AUX1 = "description_auxiliary1";
- static QString ELMT_DESIGNATION_AUX1 = "designation_auxiliary1 ";
+ static QString ELMT_DESIGNATION_AUX1 = "designation_auxiliary1";
static QString ELMT_MANUFACTURER_AUX1 = "manufacturer_auxiliary1";
static QString ELMT_MANUFACTURER_REF_AUX1 = "manufacturer_reference_auxiliary1";
- static QString ELMT_MACHINE_MANUFACTURER_REF_AUX1 = "machine_manufacturer_reference_auxiliary1 ";
- static QString ELMT_SUPPLIER_AUX1 = "supplier_auxiliary1 ";
- static QString ELMT_QUANTITY_AUX1 = "quantity_auxiliary1 ";
+ static QString ELMT_MACHINE_MANUFACTURER_REF_AUX1 = "machine_manufacturer_reference_auxiliary1";
+ static QString ELMT_SUPPLIER_AUX1 = "supplier_auxiliary1";
+ static QString ELMT_QUANTITY_AUX1 = "quantity_auxiliary1";
static QString ELMT_UNITY_AUX1 = "unity_auxiliary1";
static QString ELMT_AUX2 = "auxiliary2";
static QString ELMT_DESCRIPTION_AUX2 = "description_auxiliary2";
- static QString ELMT_DESIGNATION_AUX2 = "designation_auxiliary2 ";
+ static QString ELMT_DESIGNATION_AUX2 = "designation_auxiliary2";
static QString ELMT_MANUFACTURER_AUX2 = "manufacturer_auxiliary2";
static QString ELMT_MANUFACTURER_REF_AUX2 = "manufacturer_reference_auxiliary2";
static QString ELMT_MACHINE_MANUFACTURER_REF_AUX2 = "machine_manufacturer_reference_auxiliary2";
- static QString ELMT_SUPPLIER_AUX2 = "supplier_auxiliary2 ";
- static QString ELMT_QUANTITY_AUX2 = "quantity_auxiliary2 ";
+ static QString ELMT_SUPPLIER_AUX2 = "supplier_auxiliary2";
+ static QString ELMT_QUANTITY_AUX2 = "quantity_auxiliary2";
static QString ELMT_UNITY_AUX2 = "unity_auxiliary2";
static QString ELMT_AUX3 = "auxiliary3";
static QString ELMT_DESCRIPTION_AUX3 = "description_auxiliary3";
- static QString ELMT_DESIGNATION_AUX3 = "designation_auxiliary3 ";
+ static QString ELMT_DESIGNATION_AUX3 = "designation_auxiliary3";
static QString ELMT_MANUFACTURER_AUX3 = "manufacturer_auxiliary3";
static QString ELMT_MANUFACTURER_REF_AUX3 = "manufacturer_reference_auxiliary3";
- static QString ELMT_MACHINE_MANUFACTURER_REF_AUX3 = "machine_manufacturer_reference_auxiliary3 ";
- static QString ELMT_SUPPLIER_AUX3 = "supplier_auxiliary3 ";
- static QString ELMT_QUANTITY_AUX3 = "quantity_auxiliary3 ";
+ static QString ELMT_MACHINE_MANUFACTURER_REF_AUX3 = "machine_manufacturer_reference_auxiliary3";
+ static QString ELMT_SUPPLIER_AUX3 = "supplier_auxiliary3";
+ static QString ELMT_QUANTITY_AUX3 = "quantity_auxiliary3";
static QString ELMT_UNITY_AUX3 = "unity_auxiliary3";
static QString ELMT_AUX4 = "auxiliary4";
static QString ELMT_DESCRIPTION_AUX4 = "description_auxiliary4";
- static QString ELMT_DESIGNATION_AUX4 = "designation_auxiliary4 ";
+ static QString ELMT_DESIGNATION_AUX4 = "designation_auxiliary4";
static QString ELMT_MANUFACTURER_AUX4 = "manufacturer_auxiliary4";
static QString ELMT_MANUFACTURER_REF_AUX4 = "manufacturer_reference_auxiliary4";
- static QString ELMT_MACHINE_MANUFACTURER_REF_AUX4 = "machine_manufacturer_reference_auxiliary4 ";
- static QString ELMT_SUPPLIER_AUX4 = "supplier_auxiliary4 ";
- static QString ELMT_QUANTITY_AUX4 = "quantity_auxiliary4 ";
+ static QString ELMT_MACHINE_MANUFACTURER_REF_AUX4 = "machine_manufacturer_reference_auxiliary4";
+ static QString ELMT_SUPPLIER_AUX4 = "supplier_auxiliary4";
+ static QString ELMT_QUANTITY_AUX4 = "quantity_auxiliary4";
static QString ELMT_UNITY_AUX4 = "unity_auxiliary4";
diff --git a/sources/ui/compositetexteditdialog.cpp b/sources/ui/compositetexteditdialog.cpp
index 045615e3d..3e0deca34 100644
--- a/sources/ui/compositetexteditdialog.cpp
+++ b/sources/ui/compositetexteditdialog.cpp
@@ -18,10 +18,15 @@ CompositeTextEditDialog::CompositeTextEditDialog(DynamicElementTextItem *text, Q
m_default_text = m_text->compositeText();
ui->m_plain_text_edit->setPlainText(m_default_text);
ui->m_plain_text_edit->setPlaceholderText(tr("Entrée votre texte composé ici, en vous aidant des variables disponible"));
- setUpComboBox();
+ bool report = false;
+ if ((m_text) &&(m_text->parentElement()->linkType()) & (Element::AllReport))
+ {
+ report = true;
+ }
+ setUpComboBox(report);
}
-CompositeTextEditDialog::CompositeTextEditDialog(QString text, QWidget *parent) :
+CompositeTextEditDialog::CompositeTextEditDialog(QString text, bool report, QWidget *parent) :
QDialog(parent),
ui(new Ui::CompositeTextEditDialog)
{
@@ -29,7 +34,7 @@ CompositeTextEditDialog::CompositeTextEditDialog(QString text, QWidget *parent)
m_default_text = std::move(text);
ui->m_plain_text_edit->setPlainText(m_default_text);
ui->m_plain_text_edit->setPlaceholderText(tr("Entrée votre texte composé ici, en vous aidant des variables disponible"));
- setUpComboBox();
+ setUpComboBox(report);
}
CompositeTextEditDialog::~CompositeTextEditDialog()
@@ -50,13 +55,9 @@ QString CompositeTextEditDialog::plainText() const
@brief CompositeTextEditDialog::setUpComboBox
Add the available element information in the combo box
*/
-void CompositeTextEditDialog::setUpComboBox()
+void CompositeTextEditDialog::setUpComboBox(bool is_report)
{
QStringList qstrl;
- bool is_report = false;
- if (m_text && m_text->parentElement()->linkType() & Element::AllReport) {
- is_report = true;
- }
if(is_report) //Special treatment for text owned by a folio report
{
@@ -68,15 +69,9 @@ void CompositeTextEditDialog::setUpComboBox()
qstrl.removeAll("formula");
}
- //We use a QMap because the keys of the map are sorted, then no matter the current local,
- //the value of the combo box are always alphabetically sorted
- QMap info_map;
- for(const QString& str : qstrl) {
- info_map.insert(QETInformation::translatedInfoKey(str),
- is_report ? QETInformation::folioReportInfoToVar(str) : QETInformation::elementInfoToVar(str));
- }
- for(const QString& key : info_map.keys()) {
- ui->m_info_cb->addItem(key, info_map.value(key));
+ for (int i=0; i m_info_cb -> addItem(QETInformation::translatedInfoKey(qstrl[i]),
+ is_report ? QETInformation::folioReportInfoToVar(qstrl[i]) : QETInformation::elementInfoToVar(qstrl[i]));
}
}
diff --git a/sources/ui/compositetexteditdialog.h b/sources/ui/compositetexteditdialog.h
index c2653a65c..31d0e0d65 100644
--- a/sources/ui/compositetexteditdialog.h
+++ b/sources/ui/compositetexteditdialog.h
@@ -22,7 +22,7 @@ class CompositeTextEditDialog : public QDialog
public:
explicit CompositeTextEditDialog(DynamicElementTextItem *text, QWidget *parent = nullptr);
- explicit CompositeTextEditDialog(QString text, QWidget *parent = nullptr);
+ explicit CompositeTextEditDialog(QString text, bool report, QWidget *parent = nullptr);
~CompositeTextEditDialog() override;
QString plainText() const;
@@ -34,7 +34,7 @@ class CompositeTextEditDialog : public QDialog
void focusInEvent(QFocusEvent *event) override;
private :
- void setUpComboBox();
+ void setUpComboBox(bool is_report);
QString infoToVar(const QString& info) const;
private:
diff --git a/sources/ui/dynamicelementtextmodel.cpp b/sources/ui/dynamicelementtextmodel.cpp
index 95b224446..8b837ad33 100644
--- a/sources/ui/dynamicelementtextmodel.cpp
+++ b/sources/ui/dynamicelementtextmodel.cpp
@@ -1623,17 +1623,12 @@ QWidget *DynamicTextItemDelegate::createEditor(
if(!deti)
break;
- //We use a QMap because the keys of the map are sorted, then no matter the current local,
- //the value of the combo box are always alphabetically sorted
- QMap info_map;
- for(const QString& str : availableInfo(deti)) {
- info_map.insert(QETInformation::translatedInfoKey(str), str);
- }
-
QComboBox *qcb = new QComboBox(parent);
qcb->setObjectName("info_text");
- for (const QString& key : info_map.keys()) {
- qcb->addItem(key, info_map.value(key));
+
+ QStringList strl = availableInfo(deti);
+ for (int i=0; i addItem(QETInformation::translatedInfoKey(strl[i]), strl[i]);
}
return qcb;
}