Merge branch 'master' into 2.7

1 files changed, 5 insertions, 9 deletions

diff --git a/src/evidence.cpp b/src/evidence.cpp
index 4e796642..341bed0f 100644
--- a/src/evidence.cpp
+++ b/src/evidence.cpp
@@ -22,7 +22,7 @@ void Courtroom::construct_evidence()
   ui_evidence_delete = new AOButton(ui_evidence_overlay, ao_app);
   ui_evidence_image_name = new AOLineEdit(ui_evidence_overlay);
   ui_evidence_image_button = new AOButton(ui_evidence_overlay, ao_app);
-  ui_evidence_image_button->setText("Choose..");
+  ui_evidence_image_button->setText(tr("Choose..."));
   ui_evidence_x = new AOButton(ui_evidence_overlay, ao_app);
 
   ui_evidence_description = new AOTextEdit(ui_evidence_overlay);
@@ -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,13 +204,8 @@ void Courtroom::on_evidence_image_button_clicked()
     return;
 
   QString filename = filenames.at(0);
-
-  QStringList split_filename = filename.split("/");
-
-  filename = split_filename.at(split_filename.size() - 1);
-
+  filename = dir.relativeFilePath(filename);
   ui_evidence_image_name->setText(filename);
-
   on_evidence_image_name_edited();
 }
 
@@ -269,7 +265,7 @@ void Courtroom::on_evidence_hover(int p_id, bool p_state)
   if (p_state)
   {
     if (final_id == local_evidence_list.size())
-      ui_evidence_name->setText("Add new evidence...");
+      ui_evidence_name->setText(tr("Add new evidence..."));
     else if (final_id < local_evidence_list.size())
       ui_evidence_name->setText(local_evidence_list.at(final_id).name);
   }