Changeset 840

Timestamp:

08/19/08 11:00:04 (3 months ago)

Author:

liamstask

Message:

- make sure config file is compared/loaded at the appropriate moment
- adjust Builder and MainWindow? to reflect changes

Location:

mcbuilder/trunk

Files:

• include/ProjectInfo.h (modified) (1 diff)
• src/Builder.cpp (modified) (4 diffs)
• src/MainWindow.cpp (modified) (2 diffs)
• src/ProjectInfo.cpp (modified) (1 diff)

mcbuilder/trunk/include/ProjectInfo.h

@@ -79 +79 @@
     int tcpSockets() { return tcpSocketEdit->text().toInt(); }
     int tcpServers() { return tcpServerEdit->text().toInt(); }
-    bool load();
+    bool load( QString projectPath );
     bool diffProjects( QString newProjectPath, bool saveUiToFile = false );
-    
-  public slots:
-    bool loadAndShow();
   
   signals:

mcbuilder/trunk/src/Builder.cpp

@@ -52 +52 @@
   loadDependencies(LIBRARIES_DIR, currentProjectPath);      // this loads up the list of libraries this project depends on
   if(compareConfigFile(currentProjectPath))
-  {
     createConfigFile(currentProjectPath);      // create a config file based on the Properties for this project
-    qDebug("builder - creating/updating config file");
-  }
   createMakefile(currentProjectPath);        // create a Makefile for this project, given the dependencies
   buildStep = BUILD;
@@ -65 +62 @@
   start(makePath + "make");
   QString buildmsg("***************************************************************\n");
-  buildmsg += "  mcbuilder - building " + dir.dirName() + "\n";
+  buildmsg += tr("  mcbuilder - building ") + dir.dirName() + "\n";
   buildmsg += QDateTime::currentDateTime().toString("  MMM d, yyyy h:m ap") + "\n";
   buildmsg += "***************************************************************";
@@ -76 +73 @@
 void Builder::clean(QString projectName)
 {
-  currentProjectPath = projectName;
-  QDir buildDir(ensureBuildDirExists(currentProjectPath));
+  QDir buildDir(ensureBuildDirExists(projectName));
   setWorkingDirectory(buildDir.path());
-  if(!buildDir.exists("Makefile"))
-    createMakefile(currentProjectPath);
+  if(compareConfigFile(projectName))
+    createConfigFile(projectName);      // create a config file based on the Properties for this project
+  createMakefile(currentProjectPath);
   buildStep = CLEAN;
   QStringList args = QStringList() << "clean";
@@ -345 +342 @@
   if(configFile.open(QIODevice::WriteOnly|QFile::Text))
   {
+    qDebug("builder - creating/updating config file");
     QTextStream tofile(&configFile);
     tofile << "/*****************************************************************************************" << endl << endl;

mcbuilder/trunk/src/MainWindow.cpp

@@ -528 +528 @@
     setWindowTitle( projectName + "[*] - mcbuilder");
     updateRecentProjects(projectPath);
-    if(projInfo->diffProjects(projectPath))
+    // diff projects before loading the new one in
+    bool clean = projInfo->diffProjects(projectPath);
+    projInfo->load(projectPath); // but load the new one in before we clean, so the proper config and Makefiles are created
+    if(clean)
       builder->clean(projectPath);
-    projInfo->load();
     buildLog->clear();
   }
@@ -778 +780 @@
   if(currentProject.isEmpty())
     return statusBar()->showMessage( tr("Open a project first, or create a new one from the File menu."), 3500 );
-  if( !projInfo->loadAndShow() )
+  if( !projInfo->load(currentProject) )
   {
     QDir dir(currentProject);
     return statusBar()->showMessage( tr("Couldn't find/open project properties for ") + dir.dirName(), 3500 );
   }
+  else
+    projInfo->show();
 }
 

mcbuilder/trunk/src/ProjectInfo.cpp

@@ -61 +61 @@
 
 /*
-  Read the project ProjectInfo from the project profile, load them into
-  the ProjectInfo dialog and show it.
-*/
-bool ProjectInfo::loadAndShow( )
-{
-  load();
-  show();
-  return true;
-}
-
-/*
   Read the project's ProjectInfo from the project file
   and load them into the UI.
 */  
-bool ProjectInfo::load()
-{
-  QString proj = mainWindow->currentProjectPath();
-  if(proj.isEmpty())
+bool ProjectInfo::load( QString projectPath )
+{
+  if(projectPath.isEmpty())
     return false;
-  QDir projectDir(proj);
-  QString projectName = projectDir.dirName();
-  setWindowTitle(projectName + " - Project Info");
+  QDir projectDir(projectPath);
+  setWindowTitle(projectDir.dirName() + " - Project Info");
   
   // read the ProjectInfo file
-  QFile file(projectFilePath(proj));
+  QFile file(projectFilePath(projectPath));
   if(file.open(QIODevice::ReadOnly|QFile::Text))
   {