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

Merge pull request #314 from ChuckNr11/master

Browse Source 
ElementEditor elmt_info_cb sorting changed
This commit is contained in:
Laurent Trinques
2024-12-19 10:41:58 +01:00
committed by GitHub
parent 31c0267cd5 c7481011e8
commit 3dd512b587
7 changed files with 63 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
sources/editor/ui/dynamictextfieldeditor.cpp
View File

@@ -226,15 +226,9 @@ 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(strl[i], QETInformation::translatedInfoKey(strl[i]));
}
}
void DynamicTextFieldEditor::on_m_x_sb_editingFinished()

2
sources/editor/ui/elementpropertieseditorwidget.cpp
View File

@@ -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);
}
}

3
sources/qetinformation.cpp
View File

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

30
sources/qetinformation.h
View File

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

11
sources/ui/compositetexteditdialog.cpp
View File

@@ -68,15 +68,8 @@ 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(qstrl[i], QETInformation::translatedInfoKey(qstrl[i]));
}
}

13
sources/ui/dynamicelementtextmodel.cpp
View File

@@ -1622,18 +1622,13 @@ QWidget *DynamicTextItemDelegate::createEditor(
DynamicElementTextItem *deti = detm->textFromIndex(index);
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(strl[i], QETInformation::translatedInfoKey(strl[i]));
}
return qcb;
}