Use canonical file paths for filenames in model (#275)

glabels/File.cpp

@@ -123,7 +123,7 @@ namespace glabels
 					newWindow->setModel( model );
 					newWindow->show();
 				}
-				model::Settings::addToRecentFileList( fileName );
+				model::Settings::addToRecentFileList( model->fileName() );
 
 				// Save CWD
 				mCwd = QFileInfo( fileName ).absolutePath();
@@ -163,7 +163,7 @@ namespace glabels
 					newWindow->setModel( model );
 					newWindow->show();
 				}
-				model::Settings::addToRecentFileList( fileName );
+				model::Settings::addToRecentFileList( model->fileName() );
 
 				// Save CWD
 				mCwd = QFileInfo( fileName ).absolutePath();
@@ -198,7 +198,6 @@ namespace glabels
 		}
 
 		model::XmlLabelCreator::writeFile( window->model(), window->model()->fileName() );
-		window->model()->clearModified();
 		model::Settings::addToRecentFileList( window->model()->fileName() );
 
 		// Save CWD
@@ -254,9 +253,7 @@ namespace glabels
 			}
 			
 			model::XmlLabelCreator::writeFile( window->model(), fileName );
-			window->model()->setFileName( fileName );
-			window->model()->clearModified();
-			model::Settings::addToRecentFileList( fileName );
+			model::Settings::addToRecentFileList( window->model()->fileName() );
 		
 			// Save CWD
 			mCwd = QFileInfo( fileName ).absolutePath();

glabels/main.cpp

@@ -23,6 +23,7 @@
 #include "model/FileUtil.h"
 #include "model/Db.h"
 #include "model/Model.h"
+#include "model/Settings.h"
 #include "model/Version.h"
 #include "model/XmlLabelParser.h"
 
@@ -116,11 +117,12 @@ int main( int argc, char **argv )
 		glabels::model::Model *model = glabels::model::XmlLabelParser::readFile( filename );
 		if ( model )
 		{
-			model->setFileName( filename );
 			auto *newWindow = new glabels::MainWindow();
 			newWindow->setModel( model );
 			newWindow->show();
 			openedFiles = true;
+
+			glabels::model::Settings::addToRecentFileList( model->fileName() );
 		}
 	}