Display image filenames as relative paths.

Author: j-evins

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;			

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>