New FileUtil::makeRelativeIfInDir func; label parser_3 barcode map; unit tests

2019-08-26 03:00:32 +01:00
parent e8daa8aa48
commit 7e44bbdc06
37 changed files with 2613 additions and 55 deletions
@@ -30,6 +30,7 @@
 #include "model/ModelImageObject.h"
 #include "model/ModelLineObject.h"
 #include "model/ModelTextObject.h"
+#include "model/FileUtil.h"
 #include "model/Settings.h"
 #include "model/Size.h"

@@ -130,7 +131,7 @@ namespace glabels
 			}
 			else
 			{
-				QString fn = mModel->dir().relativeFilePath( filenameNode.data() );
+				QString fn = model::FileUtil::makeRelativeIfInDir( mModel->dir(), filenameNode.data() );
 				imageFilenameLineEdit->setText( fn );
 			}