From b6bef44f6160f3027962f9c151a6472ce08aa0af Mon Sep 17 00:00:00 2001
From: Kimmo Varis <kimmov@gmail.com>
Date: Wed, 25 Aug 2010 18:54:45 +0300
Subject: [PATCH] GUI: Fix enabling project closing action.

Project closing action was not enabled when the project file was
opened from the checked directory. Also update the window caption to
contain project file name that was opened from the checked
directory.
---
 gui/mainwindow.cpp | 28 ++++++++++++++++------------
 gui/mainwindow.h   |  6 ++++++
 2 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/gui/mainwindow.cpp b/gui/mainwindow.cpp
index f5b26ee6e..5347b208c 100644
--- a/gui/mainwindow.cpp
+++ b/gui/mainwindow.cpp
@@ -101,6 +101,7 @@ MainWindow::MainWindow() :
     mUI.mActionClearResults->setEnabled(false);
     mUI.mActionSave->setEnabled(false);
     mUI.mActionRecheck->setEnabled(false);
+    EnableProjectActions(false);
 
     QStringList args = QCoreApplication::arguments();
     //Remove the application itself
@@ -233,12 +234,10 @@ void MainWindow::DoCheckFiles(const QStringList &files)
     EnableCheckButtons(false);
     mUI.mActionSettings->setEnabled(false);
     mUI.mActionOpenXML->setEnabled(false);
-    mUI.mActionNewProjectFile->setEnabled(false);
-    mUI.mActionOpenProjectFile->setEnabled(false);
-
     mUI.mResults->SetCheckDirectory(checkPath);
 
     Settings checkSettings = GetCppcheckSettings();
+    EnableProjectActions(false);
     mThread->Check(checkSettings, false);
 }
 
@@ -313,12 +312,14 @@ bool MainWindow::GetCheckProject()
         // Format project filename (directory name + .cppcheck) and load
         // the project file if it is found.
         QStringList parts = mCurrentDirectory.split("/");
-        QString projfile = mCurrentDirectory + "/" + parts[parts.count() - 1] + ".cppcheck";
+        const QString filename = parts[parts.count() - 1] + ".cppcheck";;
+        const QString projfile = mCurrentDirectory + "/" + filename;
         if (QFile::exists(projfile))
         {
             qDebug() << "Opening project file: " << projfile;
             mProject = new Project();
             mProject->SetFilename(projfile);
+            FormatAndSetTitle(tr("Project: ") + QString(" ") + filename);
             return mProject->Open();
         }
     }
@@ -385,8 +386,7 @@ void MainWindow::CheckDone()
     EnableCheckButtons(true);
     mUI.mActionSettings->setEnabled(true);
     mUI.mActionOpenXML->setEnabled(true);
-    mUI.mActionNewProjectFile->setEnabled(false);
-    mUI.mActionOpenProjectFile->setEnabled(false);
+    EnableProjectActions(true);
 
     if (mUI.mResults->HasResults())
     {
@@ -702,7 +702,7 @@ void MainWindow::OpenProjectFile()
     {
         QFileInfo inf(filepath);
         const QString filename = inf.fileName();
-        FormatAndSetTitle(tr("Project:") + QString(" ") + filename);
+        FormatAndSetTitle(tr("Project: ") + QString(" ") + filename);
 
         mUI.mActionCloseProjectFile->setEnabled(true);
         mUI.mActionEditProjectFile->setEnabled(true);
@@ -745,11 +745,10 @@ void MainWindow::NewProjectFile()
 
     if (!filepath.isEmpty())
     {
-        mUI.mActionCloseProjectFile->setEnabled(true);
-        mUI.mActionEditProjectFile->setEnabled(true);
+        EnableProjectActions(true);
         QFileInfo inf(filepath);
         const QString filename = inf.fileName();
-        FormatAndSetTitle(tr("Project:") + QString(" ") + filename);
+        FormatAndSetTitle(tr("Project: ") + QString(" ") + filename);
 
         delete mProject;
         mProject = new Project(filepath, this);
@@ -762,8 +761,7 @@ void MainWindow::CloseProjectFile()
 {
     delete mProject;
     mProject = NULL;
-    mUI.mActionCloseProjectFile->setEnabled(false);
-    mUI.mActionEditProjectFile->setEnabled(false);
+    EnableProjectActions(false);
     FormatAndSetTitle();
 }
 
@@ -799,3 +797,9 @@ void MainWindow::Log(const QString &logline)
         mLogView->AppendLine(logline);
     }
 }
+
+void MainWindow::EnableProjectActions(bool enable)
+{
+    mUI.mActionCloseProjectFile->setEnabled(enable);
+    mUI.mActionEditProjectFile->setEnabled(enable);
+}
diff --git a/gui/mainwindow.h b/gui/mainwindow.h
index 2aec55a53..a8863b93d 100644
--- a/gui/mainwindow.h
+++ b/gui/mainwindow.h
@@ -305,6 +305,12 @@ protected:
     */
     void OpenHtmlHelpContents();
 
+    /**
+    * @brief Enable or disable project file actions.
+    * @param enable If true then actions are enabled.
+    */
+    void EnableProjectActions(bool enable);
+
     /**
     * @brief Program settings
     *