Merge 7a617e72bd into 27474b0822

a few small corrections
ComboBox change sorting
2026-06-14 17:03:13 +02:00 · 2024-12-31 07:58:03 +00:00 · 2024-12-31 08:40:56 +01:00 · 2024-12-31 08:40:03 +01:00 · 2024-12-31 08:32:41 +01:00 · 2024-12-27 15:00:44 +01:00
10 changed files with 468 additions and 455 deletions
@@ -9056,47 +9056,47 @@ Möchten Sie sie ersetzen?</translation>
    <message>
        <location filename="../sources/qetinformation.cpp" line="272"/>
        <source>Bloc auxiliaire 1</source>
-        <translation>Zusatzinfo 1</translation>
+        <translation>Zusatzinfo Zusatzartikel 1</translation>
    </message>
    <message>
        <location filename="../sources/qetinformation.cpp" line="273"/>
        <source>Description textuelle auxiliaire 1</source>
-        <translation type="unfinished"></translation>
+        <translation>Artikelbeschreibung Zusatzartikel 1</translation>
    </message>
    <message>
        <location filename="../sources/qetinformation.cpp" line="274"/>
        <source>Numéro d&apos;article auxiliaire 1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Artikelnummer Zusatzartikel 1</translation>
    </message>
    <message>
        <location filename="../sources/qetinformation.cpp" line="275"/>
        <source>Fabricant auxiliaire 1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Hersteller Zusatzartikel 1</translation>
    </message>
    <message>
        <location filename="../sources/qetinformation.cpp" line="276"/>
        <source>Numéro de commande auxiliaire 1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Bestellnummer Zusatzartikel 1</translation>
    </message>
    <message>
        <location filename="../sources/qetinformation.cpp" line="277"/>
        <source>Numéro interne auxiliaire 1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Interne Nummer Zusatzartikel 1</translation>
    </message>
    <message>
        <location filename="../sources/qetinformation.cpp" line="278"/>
        <source>Fournisseur auxiliaire 1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Lieferant Zusatzartikel 1</translation>
    </message>
    <message>
        <location filename="../sources/qetinformation.cpp" line="279"/>
        <source>Quantité auxiliaire 1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Menge Zusatzartikel 1</translation>
    </message>
    <message>
        <location filename="../sources/qetinformation.cpp" line="280"/>
        <source>Unité auxiliaire 1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Einheit Zusatzartikel 1</translation>
    </message>
    <message>
        <location filename="../sources/qetinformation.cpp" line="281"/>
@@ -9106,132 +9106,132 @@ Möchten Sie sie ersetzen?</translation>
    <message>
        <location filename="../sources/qetinformation.cpp" line="282"/>
        <source>Description textuelle auxiliaire 2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Artikelbeschreibung Zusatzartikel 2</translation>
    </message>
    <message>
        <location filename="../sources/qetinformation.cpp" line="283"/>
        <source>Numéro d&apos;article auxiliaire 2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Artikelnummer Zusatzartikel 2</translation>
    </message>
    <message>
        <location filename="../sources/qetinformation.cpp" line="284"/>
        <source>Fabricant auxiliaire 2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Hersteller Zusatzartikel 2</translation>
    </message>
    <message>
        <location filename="../sources/qetinformation.cpp" line="285"/>
        <source>Numéro de commande auxiliaire 2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Bestellnummer Zusatzartikel 2</translation>
    </message>
    <message>
        <location filename="../sources/qetinformation.cpp" line="286"/>
        <source>Numéro interne auxiliaire 2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Interne Nummer Zusatzartikel 2</translation>
    </message>
    <message>
        <location filename="../sources/qetinformation.cpp" line="287"/>
        <source>Fournisseur auxiliaire 2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Lieferant Zusatzartikel 2</translation>
    </message>
    <message>
        <location filename="../sources/qetinformation.cpp" line="288"/>
        <source>Quantité auxiliaire 2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Menge Zusatzartikel 2</translation>
    </message>
    <message>
        <location filename="../sources/qetinformation.cpp" line="289"/>
        <source>Unité auxiliaire 2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Einheit Zusatzartikel 2</translation>
    </message>
    <message>
        <location filename="../sources/qetinformation.cpp" line="290"/>
        <source>Bloc auxiliaire 3</source>
-        <translation type="unfinished">Zusatzinfo 3</translation>
+        <translation type="unfinished">Zusatzinfo Zusatzartikel 3</translation>
    </message>
    <message>
        <location filename="../sources/qetinformation.cpp" line="291"/>
        <source>Description textuelle auxiliaire 3</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Artikelbeschreibung Zusatzartikel 3</translation>
    </message>
    <message>
        <location filename="../sources/qetinformation.cpp" line="292"/>
        <source>Numéro d&apos;article auxiliaire 3</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Artikelnummer Zusatzartikel 3</translation>
    </message>
    <message>
        <location filename="../sources/qetinformation.cpp" line="293"/>
        <source>Fabricant auxiliaire 3</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Hersteller Zusatzartikel 3</translation>
    </message>
    <message>
        <location filename="../sources/qetinformation.cpp" line="294"/>
        <source>Numéro de commande auxiliaire 3</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Bestellnummer Zusatzartikel 3</translation>
    </message>
    <message>
        <location filename="../sources/qetinformation.cpp" line="295"/>
        <source>Numéro interne auxiliaire 3</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Interne Nummer Zusatzartikel 3</translation>
    </message>
    <message>
        <location filename="../sources/qetinformation.cpp" line="296"/>
        <source>Fournisseur auxiliaire 3</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Lieferant Zusatzartikel 3</translation>
    </message>
    <message>
        <location filename="../sources/qetinformation.cpp" line="297"/>
        <source>Quantité auxiliaire 3</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Menge Zusatzartikel 3</translation>
    </message>
    <message>
        <location filename="../sources/qetinformation.cpp" line="298"/>
        <source>Unité auxiliaire 3</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Einheit Zusatzartikel 3</translation>
    </message>
    <message>
        <location filename="../sources/qetinformation.cpp" line="299"/>
        <source>Bloc auxiliaire 4</source>
-        <translation type="unfinished">Zusatzinfo 4</translation>
+        <translation type="unfinished">Zusatzinfo Zusatzartikel 4</translation>
    </message>
    <message>
        <location filename="../sources/qetinformation.cpp" line="300"/>
        <source>Description textuelle auxiliaire 4</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Artikelbeschreibung Zusatzartikel 4</translation>
    </message>
    <message>
        <location filename="../sources/qetinformation.cpp" line="301"/>
        <source>Numéro d&apos;article auxiliaire 4</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Artikelnummer Zusatzartikel 4</translation>
    </message>
    <message>
        <location filename="../sources/qetinformation.cpp" line="302"/>
        <source>Fabricant auxiliaire 4</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Hersteller Zusatzartikel 4</translation>
    </message>
    <message>
        <location filename="../sources/qetinformation.cpp" line="303"/>
        <source>Numéro de commande auxiliaire 4</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Bestellnummer Zusatzartikel 4</translation>
    </message>
    <message>
        <location filename="../sources/qetinformation.cpp" line="304"/>
        <source>Numéro interne auxiliaire 4</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Interne Nummer Zusatzartikel 4</translation>
    </message>
    <message>
        <location filename="../sources/qetinformation.cpp" line="305"/>
        <source>Fournisseur auxiliaire 4</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Lieferant Zusatzartikel 4</translation>
    </message>
    <message>
        <location filename="../sources/qetinformation.cpp" line="306"/>
        <source>Quantité auxiliaire 4</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Menge Zusatzartikel 3</translation>
    </message>
    <message>
        <location filename="../sources/qetinformation.cpp" line="307"/>
        <source>Unité auxiliaire 4</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Einheit Zusatzartikel 4</translation>
    </message>
    <message>
        <location filename="../sources/qetinformation.cpp" line="257"/>
@@ -62,7 +62,7 @@
 * supplier_auxiliary2
 * quantity_auxiliary2
 * unity_auxiliary2
- * auxiliary3                     -> auxiliary 1 of element
+ * auxiliary3                     -> auxiliary 3 of element
 * description_auxiliary3
 * designation_auxiliary3
 * manufacturer_auxiliary3
@@ -71,7 +71,7 @@
 * supplier_auxiliary3
 * quantity_auxiliary3
 * unity_auxiliary3
- * auxiliary4                     -> auxiliary 1 of element
+ * auxiliary4                     -> auxiliary 4 of element
 * description_auxiliary4
 * designation_auxiliary4
 * manufacturer_auxiliary4
@@ -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 <QString, QString> 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<strl.size();++i) {
+		ui -> m_elmt_info_cb -> addItem(QETInformation::translatedInfoKey(strl[i]), strl[i]);
+	}
 }

 void DynamicTextFieldEditor::on_m_x_sb_editingFinished()
@@ -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);
 	}
 }

@@ -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,
@@ -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";


@@ -68,15 +68,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 <QString, QString> 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<qstrl.size();++i) {
+		ui -> m_info_cb -> addItem(QETInformation::translatedInfoKey(qstrl[i]),
+								   is_report ? QETInformation::folioReportInfoToVar(qstrl[i]) : QETInformation::elementInfoToVar(qstrl[i]));
 	}
 }

@@ -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 <QString, QString> 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<strl.size();++i) {
+				qcb -> addItem(QETInformation::translatedInfoKey(strl[i]), strl[i]);
 			}
 			return qcb;
 		}
Author	SHA1	Message	Date
ChuckNr11	78de585504	Merge `7a617e72bd` into `27474b0822`	2024-12-31 07:58:03 +00:00
Achim	7a617e72bd	a few small corrections	2024-12-31 08:40:56 +01:00
Achim	e73aa3b84d	ComboBox change sorting alphabetical sorting in the ComboBox changed according to the order in the elementInfoKeys list	2024-12-31 08:40:03 +01:00
Achim	8e0c3f4252	german language file adapted	2024-12-31 08:32:41 +01:00
Laurent Trinques	27474b0822	Refresh translation binary	2024-12-27 15:00:44 +01:00
Laurent Trinques	d6dcc85157	Update qet_be.ts	2024-12-27 14:59:06 +01:00
Laurent Trinques	b2dc6ba738	Add be-nl translation, thanks Ronny	2024-12-27 14:16:31 +01:00
Laurent Trinques	31ed09f185	Revert "Try to fix https://github.com/qelectrotech/qelectrotech-source-mirror/" This reverts commit `3992c60c45`.	2024-12-22 16:17:32 +01:00
Laurent Trinques	3992c60c45	Try to fix https://github.com/qelectrotech/qelectrotech-source-mirror/ pull/314	2024-12-22 14:25:30 +01:00
Laurent Trinques	fef351df8b	Typo	2024-12-22 08:44:19 +01:00
Laurent Trinques	fa322af060	Merge pull request #317 from qelectrotech/revert-314-master Revert "ElementEditor elmt_info_cb sorting changed"	2024-12-21 13:22:10 +01:00