Merge pull request #317 from qelectrotech/revert-314-master

Revert "ElementEditor elmt_info_cb sorting changed"

lang/qet_de.ts

@@ -9056,182 +9056,182 @@ Möchten Sie sie ersetzen?</translation>
     <message>
         <location filename="../sources/qetinformation.cpp" line="272"/>
         <source>Bloc auxiliaire 1</source>
-        <translation>Zusatzinfo Zusatzartikel 1</translation>
+        <translation>Zusatzinfo 1</translation>
     </message>
     <message>
         <location filename="../sources/qetinformation.cpp" line="273"/>
         <source>Description textuelle auxiliaire 1</source>
-        <translation>Artikelbeschreibung Zusatzartikel 1</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sources/qetinformation.cpp" line="274"/>
         <source>Numéro d&apos;article auxiliaire 1</source>
-        <translation>Artikelnummer Zusatzartikel 1</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sources/qetinformation.cpp" line="275"/>
         <source>Fabricant auxiliaire 1</source>
-        <translation>Hersteller Zusatzartikel 1</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sources/qetinformation.cpp" line="276"/>
         <source>Numéro de commande auxiliaire 1</source>
-        <translation>Bestellnummer Zusatzartikel 1</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sources/qetinformation.cpp" line="277"/>
         <source>Numéro interne auxiliaire 1</source>
-        <translation>Interne Nummer Zusatzartikel 1</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sources/qetinformation.cpp" line="278"/>
         <source>Fournisseur auxiliaire 1</source>
-        <translation>Lieferant Zusatzartikel 1</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sources/qetinformation.cpp" line="279"/>
         <source>Quantité auxiliaire 1</source>
-        <translation>Menge Zusatzartikel 1</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sources/qetinformation.cpp" line="280"/>
         <source>Unité auxiliaire 1</source>
-        <translation>Einheit Zusatzartikel 1</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sources/qetinformation.cpp" line="281"/>
         <source>Bloc auxiliaire 2</source>
-        <translation>Zusatzinfo Zusatzartikel 2</translation>
+        <translation>Zusatzinfo 2</translation>
     </message>
     <message>
         <location filename="../sources/qetinformation.cpp" line="282"/>
         <source>Description textuelle auxiliaire 2</source>
-        <translation>Artikelbeschreibung Zusatzartikel 2</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sources/qetinformation.cpp" line="283"/>
         <source>Numéro d&apos;article auxiliaire 2</source>
-        <translation>Artikelnummer Zusatzartikel 2</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sources/qetinformation.cpp" line="284"/>
         <source>Fabricant auxiliaire 2</source>
-        <translation>Hersteller Zusatzartikel 2</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sources/qetinformation.cpp" line="285"/>
         <source>Numéro de commande auxiliaire 2</source>
-        <translation>Bestellnummer Zusatzartikel 2</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sources/qetinformation.cpp" line="286"/>
         <source>Numéro interne auxiliaire 2</source>
-        <translation>Interne Nummer Zusatzartikel 2</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sources/qetinformation.cpp" line="287"/>
         <source>Fournisseur auxiliaire 2</source>
-        <translation>Lieferant Zusatzartikel 2</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sources/qetinformation.cpp" line="288"/>
         <source>Quantité auxiliaire 2</source>
-        <translation>Menge Zusatzartikel 2</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sources/qetinformation.cpp" line="289"/>
         <source>Unité auxiliaire 2</source>
-        <translation>Einheit Zusatzartikel 2</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sources/qetinformation.cpp" line="290"/>
         <source>Bloc auxiliaire 3</source>
-        <translation>Zusatzinfo Zusatzartikel 3</translation>
+        <translation type="unfinished">Zusatzinfo 3</translation>
     </message>
     <message>
         <location filename="../sources/qetinformation.cpp" line="291"/>
         <source>Description textuelle auxiliaire 3</source>
-        <translation>Artikelbeschreibung Zusatzartikel 3</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sources/qetinformation.cpp" line="292"/>
         <source>Numéro d&apos;article auxiliaire 3</source>
-        <translation>Artikelnummer Zusatzartikel 3</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sources/qetinformation.cpp" line="293"/>
         <source>Fabricant auxiliaire 3</source>
-        <translation>Hersteller Zusatzartikel 3</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sources/qetinformation.cpp" line="294"/>
         <source>Numéro de commande auxiliaire 3</source>
-        <translation>Bestellnummer Zusatzartikel 3</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sources/qetinformation.cpp" line="295"/>
         <source>Numéro interne auxiliaire 3</source>
-        <translation>Interne Nummer Zusatzartikel 3</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sources/qetinformation.cpp" line="296"/>
         <source>Fournisseur auxiliaire 3</source>
-        <translation>Lieferant Zusatzartikel 3</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sources/qetinformation.cpp" line="297"/>
         <source>Quantité auxiliaire 3</source>
-        <translation>Menge Zusatzartikel 3</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sources/qetinformation.cpp" line="298"/>
         <source>Unité auxiliaire 3</source>
-        <translation>Einheit Zusatzartikel 3</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sources/qetinformation.cpp" line="299"/>
         <source>Bloc auxiliaire 4</source>
-        <translation>Zusatzinfo Zusatzartikel 4</translation>
+        <translation type="unfinished">Zusatzinfo 4</translation>
     </message>
     <message>
         <location filename="../sources/qetinformation.cpp" line="300"/>
         <source>Description textuelle auxiliaire 4</source>
-        <translation>Artikelbeschreibung Zusatzartikel 4</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sources/qetinformation.cpp" line="301"/>
         <source>Numéro d&apos;article auxiliaire 4</source>
-        <translation>Artikelnummer Zusatzartikel 4</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sources/qetinformation.cpp" line="302"/>
         <source>Fabricant auxiliaire 4</source>
-        <translation>Hersteller Zusatzartikel 4</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sources/qetinformation.cpp" line="303"/>
         <source>Numéro de commande auxiliaire 4</source>
-        <translation>Bestellnummer Zusatzartikel 4</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sources/qetinformation.cpp" line="304"/>
         <source>Numéro interne auxiliaire 4</source>
-        <translation>Interne Nummer Zusatzartikel 4</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sources/qetinformation.cpp" line="305"/>
         <source>Fournisseur auxiliaire 4</source>
-        <translation>Lieferant Zusatzartikel 4</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sources/qetinformation.cpp" line="306"/>
         <source>Quantité auxiliaire 4</source>
-        <translation>Menge Zusatzartikel 4</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sources/qetinformation.cpp" line="307"/>
         <source>Unité auxiliaire 4</source>
-        <translation>Einheit Zusatzartikel 4</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sources/qetinformation.cpp" line="257"/>

sources/editor/ui/dynamictextfieldeditor.cpp

@@ -226,9 +226,15 @@ void DynamicTextFieldEditor::fillInfoComboBox()
 	else {
 		strl = QETInformation::elementInfoKeys();
 	}
-	for (int i=0; i<strl.size();++i) {
-		ui -> m_elmt_info_cb -> addItem(strl[i], QETInformation::translatedInfoKey(strl[i]));
-	}
+		//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));
 }
 
 void DynamicTextFieldEditor::on_m_x_sb_editingFinished()

sources/editor/ui/elementpropertieseditorwidget.cpp

@@ -205,8 +205,6 @@ 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);
 	}
 }
 

sources/qetinformation.cpp

@@ -312,7 +312,6 @@ QStringList QETInformation::elementEditorElementInfoKeys()
 {
 	QStringList list = { ELMT_LABEL,
 						 ELMT_PLANT,
-						 ELMT_LOCATION,
 						 ELMT_COMMENT,
 						 ELMT_FUNCTION,
 						 ELMT_DESCRIPTION,
@@ -323,6 +322,8 @@ QStringList QETInformation::elementEditorElementInfoKeys()
 						 ELMT_SUPPLIER,
 						 ELMT_QUANTITY,
 						 ELMT_UNITY,
+						 ELMT_LOCATION,
+						 ELMT_PLANT,
 						 ELMT_AUX1,
 						 ELMT_DESCRIPTION_AUX1,
 						 ELMT_DESIGNATION_AUX1,

sources/ui/compositetexteditdialog.cpp

@@ -68,8 +68,15 @@ void CompositeTextEditDialog::setUpComboBox()
 		qstrl.removeAll("formula");
 	}
 	
-	for (int i=0; i<qstrl.size();++i) {
-		ui -> m_info_cb -> addItem(qstrl[i], QETInformation::translatedInfoKey(qstrl[i]));
+		//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));
 	}
 }
 

sources/ui/dynamicelementtextmodel.cpp

@@ -1623,12 +1623,17 @@ 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");
-
-			QStringList strl = availableInfo(deti);
-			for (int i=0; i<strl.size();++i) {
-				qcb -> addItem(strl[i], QETInformation::translatedInfoKey(strl[i]));
+			for (const QString& key : info_map.keys()) {
+				qcb->addItem(key, info_map.value(key));
 			}
 			return qcb;
 		}