GUI: Check the project after creation.

kimmov · kimmov · commit 1f4e1e0ffe77 · 2011-08-24T22:41:48.000+03:00
Earlier the GUI (project) went into some weird state after creating
a new project. The project could not be checked in any discoverable
way.

This commit fixes the above bug by automatically checking the new
project after the project dialog is closed. I think this is what
most users expect to happen.
diff --git a/gui/mainwindow.cpp b/gui/mainwindow.cpp
@@ -856,8 +856,16 @@ void MainWindow::LoadProjectFile(const QString &filePath)
     mUI.mActionEditProjectFile->setEnabled(true);
     delete mProject;
     mProject = new Project(filePath, this);
-    mProject->Open();
-    const QString rootpath = mProject->GetProjectFile()->GetRootPath();
+    CheckProject(mProject);
+}
+
+void MainWindow::CheckProject(Project *project)
+{
+    if (!project->IsOpen())
+        project->Open();
+
+    QFileInfo inf(project->Filename());
+    const QString rootpath = project->GetProjectFile()->GetRootPath();
 
     // If the root path is not given or is not "current dir", use project
     // file's location directory as root path
@@ -866,7 +874,7 @@ void MainWindow::LoadProjectFile(const QString &filePath)
     else
         mCurrentDirectory = rootpath;
 
-    QStringList paths = mProject->GetProjectFile()->GetCheckPaths();
+    QStringList paths = project->GetProjectFile()->GetCheckPaths();
 
     // If paths not given then check the root path (which may be the project
     // file's location, see above). This is to keep the compatibility with
@@ -911,6 +919,7 @@ void MainWindow::NewProjectFile()
         mProject->Edit();
     }
     AddProjectMRU(filepath);
+    CheckProject(mProject);
 }
 
 void MainWindow::CloseProjectFile()
diff --git a/gui/mainwindow.h b/gui/mainwindow.h
@@ -169,6 +169,12 @@ public slots:
     */
     void Save();
 
+    /**
+      * @brief Check the project.
+      * @param project Pointer to the project to check.
+      */
+    void CheckProject(Project *project);
+
     /**
     * @brief Slot to create new project file..
     *
diff --git a/gui/project.cpp b/gui/project.cpp
@@ -47,11 +47,21 @@ Project::~Project()
     delete mPFile;
 }
 
+QString Project::Filename() const
+{
+    return mFilename;
+}
+
 void Project::SetFilename(const QString &filename)
 {
     mFilename = filename;
 }
 
+bool Project::IsOpen() const
+{
+    return mPFile != NULL;
+}
+
 bool Project::Open()
 {
     mPFile = new ProjectFile(mFilename, this);
diff --git a/gui/project.h b/gui/project.h
@@ -41,12 +41,25 @@ class Project : public QObject
     Project(const QString &filename, QWidget *parent = 0);
     ~Project();
 
+    /**
+      * @brief Return the filename of the project.
+      * @return Project's filename.
+      */
+    QString Filename() const;
+
     /**
     * @brief Set filename for the project file.
     * @param filename Filename.
     */
     void SetFilename(const QString &filename);
 
+    /**
+      * @brief Is the project open?
+      * The project is considered to be open if it has an opened project file.
+      * @return true if the project is open, false otherwise.
+      */
+    bool IsOpen() const;
+
     /**
     * @brief Open existing project file.
     */

Original file line number	Diff line number	Diff line change
`@@ -47,11 +47,21 @@ Project::~Project()`
`47`	`47`	`delete mPFile;`
`48`	`48`	`}`
`49`	`49`
	`50`	`+QString Project::Filename() const`
	`51`	`+{`
	`52`	`+ return mFilename;`
	`53`	`+}`
	`54`	`+`
`50`	`55`	`void Project::SetFilename(const QString &filename)`
`51`	`56`	`{`
`52`	`57`	`mFilename = filename;`
`53`	`58`	`}`
`54`	`59`
	`60`	`+bool Project::IsOpen() const`
	`61`	`+{`
	`62`	`+ return mPFile != NULL;`
	`63`	`+}`
	`64`	`+`
`55`	`65`	`bool Project::Open()`
`56`	`66`	`{`
`57`	`67`	`mPFile = new ProjectFile(mFilename, this);`