From d4f742e7e6558b42b86d3599fe0fa10badb962ed Mon Sep 17 00:00:00 2001
From: Jim Evins <evins@snaught.com>
Date: Thu, 8 Aug 2019 07:57:12 -0400
Subject: [PATCH] Display image filenames as relative paths.

---
 glabels/ObjectEditor.cpp  |  4 +++-
 translations/glabels_C.ts | 16 ----------------
 2 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/glabels/ObjectEditor.cpp b/glabels/ObjectEditor.cpp
index c69bd75..206eff6 100644
--- a/glabels/ObjectEditor.cpp
+++ b/glabels/ObjectEditor.cpp
@@ -36,6 +36,7 @@
 #include "merge/Merge.h"
 
 #include <QFileDialog>
+#include <QDir>
 #include <QtMath>
 #include <QtDebug>
 
@@ -129,7 +130,8 @@ namespace glabels
 			}
 			else
 			{
-				imageFilenameLineEdit->setText( filenameNode.data() );
+				QString fn = QDir(mModel->dir()).relativeFilePath( filenameNode.data() );
+				imageFilenameLineEdit->setText( fn );
 			}
 
 			mBlocked = false;			
diff --git a/translations/glabels_C.ts b/translations/glabels_C.ts
index 426a73d..575f40d 100644
--- a/translations/glabels_C.ts
+++ b/translations/glabels_C.ts
@@ -1156,10 +1156,6 @@
         <source>Custom color...</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Use key</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Custom Color</source>
         <translation type="unfinished"></translation>
@@ -1169,10 +1165,6 @@
         <extracomment>%1 = color specification in hex. String must not contain a colon (:).</extracomment>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Custom color #%1</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Use substitution field</source>
         <translation type="unfinished"></translation>
@@ -1934,14 +1926,6 @@
         <source>Shadow</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Insert Field</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Selected File...</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Insert substitution field</source>
         <translation type="unfinished"></translation>