Changeset 833

Timestamp:

08/18/08 01:48:20 (3 months ago)

Author:

liamstask

Message:

- clean the source files if a new project's config info is different from the previous one

Location:

mcbuilder/trunk

Files:

• include/ProjectInfo.h (modified) (2 diffs)
• src/MainWindow.cpp (modified) (2 diffs)
• src/ProjectInfo.cpp (modified) (6 diffs)

mcbuilder/trunk/include/ProjectInfo.h

@@ -80 +80 @@
     int tcpServers() { return tcpServerEdit->text().toInt(); }
     bool load();
+    bool diffProjects( QString newProjectPath, bool saveUiToFile = false );
     
   public slots:
@@ -90 +91 @@
     MainWindow *mainWindow;
     ProjectManager projectManager;
-    QString projectFilePath( );
+    QString projectFilePath( QString projectPath );
     bool configChanged;
     void setNetworkSectionEnabled(bool state);

mcbuilder/trunk/src/MainWindow.cpp

@@ -77 +77 @@
   connect(editor->document(), SIGNAL(contentsChanged()),this, SLOT(onDocumentModified()));
   connect(outputConsole, SIGNAL(itemDoubleClicked(QListWidgetItem*)),this, SLOT(onConsoleDoubleClick(QListWidgetItem*)));
-  connect(projInfo, SIGNAL(projectInfoUpdated()), builder, SLOT(onProjectUpdated()));
   
   // menu actions 
@@ -529 +528 @@
     setWindowTitle( projectName + "[*] - mcbuilder");
     updateRecentProjects(projectPath);
+    if(projInfo->diffProjects(projectPath))
+      builder->clean(projectPath);
     projInfo->load();
     buildLog->clear();

mcbuilder/trunk/src/ProjectInfo.cpp

@@ -85 +85 @@
   
   // read the ProjectInfo file
-  QFile file(projectFilePath());
+  QFile file(projectFilePath(proj));
   if(file.open(QIODevice::ReadOnly|QFile::Text))
   {
@@ -160 +160 @@
 void ProjectInfo::applyChanges( )
 {
-  QFile file(projectFilePath());
+  if( diffProjects( projectFilePath(mainWindow->currentProjectPath()), true ) )
+    emit projectInfoUpdated();
+  accept();
+}
+
+/*
+  Determine whether the ProjectInfo for a new project is
+  different than the existing project, optionally saving the
+  values currently in the UI to the project file.
+*/
+bool ProjectInfo::diffProjects( QString newProjectPath, bool saveUiToFile )
+{
+  if(versionEdit->text().isEmpty()) // check the version box as a sample...if this is empty, we don't have anything loaded so don't bother checking
+    return false;
+  bool changed = false;
+  QFile file(projectFilePath(newProjectPath));
   if(file.open(QIODevice::ReadWrite|QFile::Text))
   {
@@ -166 +181 @@
     if(projectFile.setContent(&file))
     {
-      bool changed = false;
       // to get at the actual text of an element, you need to grab its child,
       // which will be a QDomText node
@@ -243 +257 @@
       }
       
-      if(changed)
-        emit projectInfoUpdated();
-      
-      file.resize(0); // clear out the current contents so we can update them, since we opened as read/write
-      file.write(projectFile.toByteArray(2));
+      if(saveUiToFile)
+      {
+        file.resize(0); // clear out the current contents so we can update them, since we opened as read/write
+        file.write(projectFile.toByteArray(2));
+      }
     }
     file.close();
   }
-  accept();
+  return changed;
 }
 
@@ -258 +272 @@
   for the current project.
 */
-QString ProjectInfo::projectFilePath( )
-{
-  QDir projectDir(mainWindow->currentProjectPath());
-  QString projectName = projectDir.dirName();
-  // filename should not have spaces
-  return projectDir.filePath(projectName.remove(" ") + ".xml"); 
+QString ProjectInfo::projectFilePath( QString projectPath )
+{
+  QDir projectDir(projectPath);
+  return projectDir.filePath(projectDir.dirName() + ".xml"); 
 }
 
@@ -357 +369 @@
 void ProjectInfo::onRemoveFileRequest(QString filename)
 {
-  QFile projectFile(projectFilePath( ));
+  QFile projectFile(projectFilePath(mainWindow->currentProjectPath()));
   QDir projectDir(mainWindow->currentProjectPath());
   if(projectManager.removeFromProjectFile(projectDir.path(), filename))