4040#include " projectfile.h"
4141#include " projectfiledialog.h"
4242#include " report.h"
43+ #include " resultstree.h"
4344#include " resultsview.h"
4445#include " scratchpad.h"
4546#include " settings.h"
@@ -230,10 +231,13 @@ MainWindow::MainWindow(TranslationHandler* th, QSettings* settings) :
230231 loadSettings ();
231232
232233 mThread ->initialize (mUI ->mResults );
233- if (mProjectFile )
234+ if (mProjectFile ) {
235+ enableProjectActions (true );
234236 formatAndSetTitle (tr (" Project:" ) + ' ' + mProjectFile ->getFilename ());
235- else
237+ } else {
238+ enableProjectActions (false );
236239 formatAndSetTitle ();
240+ }
237241
238242 mUI ->mActionComplianceReport ->setVisible (isCppcheckPremium ());
239243
@@ -242,7 +246,6 @@ MainWindow::MainWindow(TranslationHandler* th, QSettings* settings) :
242246 mUI ->mActionPrint ->setShortcut (QKeySequence::Print);
243247 enableResultsButtons ();
244248 enableProjectOpenActions (true );
245- enableProjectActions (false );
246249
247250 // Must setup MRU menu before CLI param handling as it can load a
248251 // project file and update MRU menu.
@@ -263,9 +266,6 @@ MainWindow::MainWindow(TranslationHandler* th, QSettings* settings) :
263266 handleCLIParams (args);
264267 }
265268
266- mUI ->mActionCloseProjectFile ->setEnabled (mProjectFile != nullptr );
267- mUI ->mActionEditProjectFile ->setEnabled (mProjectFile != nullptr );
268-
269269 for (int i = 0 ; i < mPlatforms .getCount (); i++) {
270270 PlatformData platform = mPlatforms .mPlatforms [i];
271271 auto *action = new QAction (this );
@@ -588,6 +588,7 @@ void MainWindow::doAnalyzeProject(ImportProject p, const bool checkLibrary, cons
588588 }
589589
590590 mUI ->mResults ->clear (true );
591+ mUI ->mResults ->setResultsSource (ResultsTree::ResultsSource::Analysis);
591592 mThread ->clearFiles ();
592593
593594 mUI ->mResults ->checkingStarted (p.fileSettings .size ());
@@ -651,6 +652,7 @@ void MainWindow::doAnalyzeFiles(const QStringList &files, const bool checkLibrar
651652 QStringList fileNames = pathList.getFileList ();
652653
653654 mUI ->mResults ->clear (true );
655+ mUI ->mResults ->setResultsSource (ResultsTree::ResultsSource::Analysis);
654656 mThread ->clearFiles ();
655657
656658 if (fileNames.isEmpty ()) {
@@ -1486,6 +1488,7 @@ void MainWindow::loadResults(const QString &selectedFile)
14861488 closeProjectFile ();
14871489 mIsLogfileLoaded = true ;
14881490 mUI ->mResults ->clear (true );
1491+ mUI ->mResults ->setResultsSource (ResultsTree::ResultsSource::Log);
14891492 mUI ->mActionReanalyzeModified ->setEnabled (false );
14901493 mUI ->mActionReanalyzeAll ->setEnabled (false );
14911494 mUI ->mResults ->readErrorsXml (selectedFile);
@@ -1776,7 +1779,6 @@ void MainWindow::stopAnalysis()
17761779{
17771780 mThread ->stop ();
17781781 mUI ->mResults ->stopAnalysis ();
1779- mUI ->mResults ->disableProgressbar ();
17801782 const QString &lastResults = getLastResults ();
17811783 if (!lastResults.isEmpty ()) {
17821784 mUI ->mResults ->updateFromOldReport (lastResults);
@@ -1830,8 +1832,10 @@ void MainWindow::loadProjectFile(const QString &filePath)
18301832 addProjectMRU (filePath);
18311833
18321834 mIsLogfileLoaded = false ;
1833- mUI ->mActionCloseProjectFile ->setEnabled (true );
1834- mUI ->mActionEditProjectFile ->setEnabled (true );
1835+ mUI ->mResults ->setResultsSource (ResultsTree::ResultsSource::Analysis);
1836+ mUI ->mActionReanalyzeModified ->setEnabled (true );
1837+ mUI ->mActionReanalyzeAll ->setEnabled (true );
1838+ enableProjectActions (true );
18351839 delete mProjectFile ;
18361840 mProjectFile = new ProjectFile (filePath, this );
18371841 mProjectFile ->setActiveProject ();
0 commit comments