Mamanyonyo/atrooney-online-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into 'master'

Browse Source 
Fixed evidence not recognizing subfolder issue.

See merge request AttorneyOnline/AO2-Client!66
This commit is contained in:
oldmud0 2019-07-03 22:28:13 +00:00
commit 2ef6aecb0d
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/evidence.cpp
View File

@ -188,11 +188,12 @@ void Courtroom::on_evidence_image_name_edited()
void Courtroom::on_evidence_image_button_clicked() void Courtroom::on_evidence_image_button_clicked()
{ {
QDir dir(ao_app->get_base_path() + "evidence");
QFileDialog dialog(this); QFileDialog dialog(this);
dialog.setFileMode(QFileDialog::ExistingFile); dialog.setFileMode(QFileDialog::ExistingFile);
dialog.setNameFilter(tr("Images (*.png)")); dialog.setNameFilter(tr("Images (*.png)"));
dialog.setViewMode(QFileDialog::List); dialog.setViewMode(QFileDialog::List);
dialog.setDirectory(ao_app->get_base_path() + "evidence"); dialog.setDirectory(dir);
QStringList filenames; QStringList filenames;
@ -203,13 +204,8 @@ void Courtroom::on_evidence_image_button_clicked()
return; return;
QString filename = filenames.at(0); QString filename = filenames.at(0);
filename = dir.relativeFilePath(filename);
QStringList split_filename = filename.split("/");
filename = split_filename.at(split_filename.size() - 1);
ui_evidence_image_name->setText(filename); ui_evidence_image_name->setText(filename);
on_evidence_image_name_edited(); on_evidence_image_name_edited();
} }