realAscot/qelectrotech-source-mirror
realAscot/qelectrotech-source-mirror
1
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2025-09-14 20:33:05 +02:00
Code Packages Releases 1 Activity

Try to fix https://github.com/qelectrotech/qelectrotech-source-mirror/

Browse Source 
pull/314
This commit is contained in:
Laurent Trinques 2024-12-22 14:25:30 +01:00
parent fef351df8b
commit 3992c60c45
2 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -222,10 +222,6 @@ void DynamicTextFieldEditor::fillInfoComboBox()
if(type & ElementData::AllReport) { if(type & ElementData::AllReport) {
strl = QETInformation::folioReportInfoKeys(); strl = QETInformation::folioReportInfoKeys();
}
else {
strl = QETInformation::elementInfoKeys();
}
//We use a QMap because the keys of the map are sorted, then no matter the current local, //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 //the value of the combo box are always alphabetically sorted
QMap <QString, QString> info_map; QMap <QString, QString> info_map;
@ -235,6 +231,13 @@ void DynamicTextFieldEditor::fillInfoComboBox()
for (const QString& key : info_map.keys()) for (const QString& key : info_map.keys())
ui -> m_elmt_info_cb -> addItem(key, info_map.value(key)); ui -> m_elmt_info_cb -> addItem(key, info_map.value(key));
}
else {
strl = QETInformation::elementInfoKeys();
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() void DynamicTextFieldEditor::on_m_x_sb_editingFinished()

11
sources/ui/compositetexteditdialog.cpp
View File

@ -67,16 +67,9 @@ void CompositeTextEditDialog::setUpComboBox()
qstrl = QETInformation::elementInfoKeys(); qstrl = QETInformation::elementInfoKeys();
qstrl.removeAll("formula"); 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));
} }
} }