From ca3f113377f85296538f42c355ab2308c05ca982 Mon Sep 17 00:00:00 2001 From: cents02 Date: Mon, 1 Jul 2019 18:50:30 +0000 Subject: [PATCH 1/2] Fixed evidence not recognizing subfolder issue. Can support 1 folder tho. --- src/evidence.cpp | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/evidence.cpp b/src/evidence.cpp index 4e79664..14234d8 100644 --- a/src/evidence.cpp +++ b/src/evidence.cpp @@ -205,8 +205,16 @@ void Courtroom::on_evidence_image_button_clicked() QString filename = filenames.at(0); QStringList split_filename = filename.split("/"); + if(split_filename.at(split_filename.size() - 2) == "evidence") + { + filename = split_filename.at(split_filename.size() - 1); + } + else { + + filename = split_filename.at(split_filename.size() - 2) + "/" + split_filename.at(split_filename.size() - 1); + } + - filename = split_filename.at(split_filename.size() - 1); ui_evidence_image_name->setText(filename); From d07dd1d5fe42f0120d4d5ff1050fcd082123b2e9 Mon Sep 17 00:00:00 2001 From: cents02 Date: Wed, 3 Jul 2019 08:48:04 +0000 Subject: [PATCH 2/2] Permanent and not temporary solution for evidence. Supports up to infite subfolders. --- src/evidence.cpp | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/src/evidence.cpp b/src/evidence.cpp index 14234d8..ebef749 100644 --- a/src/evidence.cpp +++ b/src/evidence.cpp @@ -188,11 +188,12 @@ void Courtroom::on_evidence_image_name_edited() void Courtroom::on_evidence_image_button_clicked() { + QDir dir(ao_app->get_base_path() + "evidence"); QFileDialog dialog(this); dialog.setFileMode(QFileDialog::ExistingFile); dialog.setNameFilter(tr("Images (*.png)")); dialog.setViewMode(QFileDialog::List); - dialog.setDirectory(ao_app->get_base_path() + "evidence"); + dialog.setDirectory(dir); QStringList filenames; @@ -203,21 +204,8 @@ void Courtroom::on_evidence_image_button_clicked() return; QString filename = filenames.at(0); - - QStringList split_filename = filename.split("/"); - if(split_filename.at(split_filename.size() - 2) == "evidence") - { - filename = split_filename.at(split_filename.size() - 1); - } - else { - - filename = split_filename.at(split_filename.size() - 2) + "/" + split_filename.at(split_filename.size() - 1); - } - - - + filename = dir.relativeFilePath(filename); ui_evidence_image_name->setText(filename); - on_evidence_image_name_edited(); }