UTF-8 support and human sorting for evidence (#781)

1 files changed, 8 insertions, 1 deletions

diff --git a/src/evidence.cpp b/src/evidence.cpp
index a34f5fe1..76d16aff 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<int, QString> 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;