From c4f459b6cce6382cbd7c1960a6738a5a8a45ab8c Mon Sep 17 00:00:00 2001 From: Lernos Date: Sun, 5 Jun 2022 19:32:09 +0300 Subject: [PATCH] UTF-8 support and human sorting for evidence (#781) --- src/evidence.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/evidence.cpp b/src/evidence.cpp index a34f5fe..76d16af 100644 --- a/src/evidence.cpp +++ b/src/evidence.cpp @@ -739,6 +739,7 @@ void Courtroom::on_evidence_save_clicked() ui_evidence_name->setText(""); QSettings inventory(p_path, QSettings::IniFormat); + inventory.setIniCodec("UTF-8"); inventory.clear(); for (int i = 0; i < local_evidence_list.size(); i++) { inventory.beginGroup(QString::number(i)); @@ -765,8 +766,14 @@ void Courtroom::on_evidence_load_clicked() ui_evidence_name->setText(""); QSettings inventory(p_path, QSettings::IniFormat); + inventory.setIniCodec("UTF-8"); local_evidence_list.clear(); - foreach (QString evi, inventory.childGroups()) { + QMap sorted_evi; + for (const auto &s : inventory.childGroups()) { + sorted_evi[s.toInt()] = s; + } + QStringList evilist(sorted_evi.values()); + for (const QString &evi : evilist) { if (evi == "General") continue;