Some refactoring regarding saving.

--HG--
branch : dfighter-tools

code/studio/src/plugins/gui_editor/gui_editor_window.cpp

@@ -212,6 +212,7 @@ namespace GUIEditor
 		std::string wnd = d.getWindowName().toUtf8().constData();
 		std::string mg = std::string( "ui:" ) + proj;
 		std::string dir = d.getProjectDirectory().toUtf8().constData();
+		_lastDir = dir.c_str();
 		std::string uiFile = "ui_" + proj + ".xml";
 
 		bool b = GUICtrl->createNewGUI( proj, wnd );
@@ -228,7 +229,7 @@ namespace GUIEditor
 		projectFiles.projectName = proj;
 		projectFiles.masterGroup = mg;
 		projectFiles.activeGroup = std::string( "ui:" ) + proj + ":" + wnd;
-		projectFiles.version = NEW;
+		projectFiles.version = SProjectFiles::NEW;
 		projectFiles.guiFiles.push_back( uiFile );
 		projectWindow->setupFiles( projectFiles );
 
@@ -278,8 +279,23 @@ namespace GUIEditor
 		// Can't save old projects any further, since the widgets are in multiple files in them
 		// using templates, styles and whatnot. There's no way to restore the original XML structure
 		// after it's loaded
-		if( projectParser.getProjectVersion() == OLD )
+		if( projectFiles.version == SProjectFiles::OLD )
 			return;
+
+		std::string f = _lastDir.toUtf8().constData();
+		f += "/";
+		f += projectFiles.guiFiles[ 0 ];
+
+		WidgetSerializer widgetSerializer;
+		widgetSerializer.setFile( f );
+		widgetSerializer.setActiveGroup( projectFiles.activeGroup );
+		if( !widgetSerializer.serialize( projectFiles.masterGroup ) )
+		{
+			QMessageBox::critical( this,
+							tr( "Failed to save project" ),
+							tr( "There was an error while trying to save the project." ) );
+			return;
+		}
 	}
 
 	void GUIEditorWindow::saveAs()
@@ -292,42 +308,22 @@ namespace GUIEditor
 
 		if( dir.isEmpty() )
 			return;
+		_lastDir = dir;
 
+		if( projectFiles.version == SProjectFiles::OLD )
+		{
 			projectFiles.guiFiles.clear();
 			projectFiles.guiFiles.push_back( "ui_" + projectFiles.projectName + ".xml"  );
-		projectFiles.version = NEW;
+			projectFiles.version = SProjectFiles::NEW;
 
-		QString newFile =
-			dir + "/" + projectFiles.projectName.c_str() + ".xml";
-
-		CProjectFileSerializer serializer;
-		serializer.setFile( newFile.toUtf8().constData() );
-		if( !serializer.serialize( projectFiles ) )
-		{
-			QMessageBox::critical( this,
-							tr( "Failed to save project" ),
-							tr( "There was an error while trying to save the project." ) );
-			return;
 		}
 
-		std::string guiFile =
-			std::string( dir.toUtf8().constData() ) + "/" + "ui_" + projectFiles.projectName + ".xml";
-
-		WidgetSerializer widgetSerializer;
-		widgetSerializer.setFile( guiFile );
-		widgetSerializer.setActiveGroup( projectFiles.activeGroup );
-		if( !widgetSerializer.serialize( projectFiles.masterGroup ) )
-		{
-			QMessageBox::critical( this,
-							tr( "Failed to save project" ),
-							tr( "There was an error while trying to save the project." ) );
-			return;
-		}
-
-		QMessageBox::information( this,
-						tr( "Save successful" ),
-						tr( "Project saved successfully!" ) );
+		currentProjectFile = _lastDir;
+		currentProjectFile += "/";
+		currentProjectFile += projectFiles.projectName.c_str();
+		currentProjectFile += ".xml";
 
+		save();
 	}
 
 	void GUIEditorWindow::reset()

code/studio/src/plugins/gui_editor/project_file_parser.cpp

@@ -63,7 +63,7 @@ namespace GUIEditor
 	unsigned long CProjectFileParser::getProjectVersion() const
 	{
 		if( !loaded )
-			return OLD;
+			return SProjectFiles::OLD;
 
 		return files.version;
 	}
@@ -71,7 +71,7 @@ namespace GUIEditor
 	void CProjectFileParser::clear()
 	{
 		files.projectName = "";
-		files.version = OLD;
+		files.version = SProjectFiles::OLD;
 		files.activeGroup = "";
 		files.guiFiles.clear();
 		files.mapFiles.clear();

code/studio/src/plugins/gui_editor/project_file_serializer.cpp

@@ -25,7 +25,7 @@ namespace GUIEditor
 		if( fileName.empty() )
 			return false;
 
-		if( project.version >= MAX_PROJECTFILE_VERSION )
+		if( project.version >= SProjectFiles::MAX_PROJECTFILE_VERSION )
 			return false;
 
 		out.open( fileName.c_str() );

code/studio/src/plugins/gui_editor/project_files.h

@@ -23,6 +23,10 @@
 
 namespace GUIEditor
 {
+	struct SProjectFiles
+	{
+	public:
+
 		enum ProjectVersion
 		{
 			OLD = 0,
@@ -30,9 +34,6 @@ namespace GUIEditor
 			MAX_PROJECTFILE_VERSION
 		};
 
-	struct SProjectFiles
-	{
-	public:
 		std::string projectName;
 		unsigned long version;
 		std::string masterGroup;