feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

ClangTools: Add next/back buttons also for tidy/clazy

Browse Source 
...copy/pasted from the static analyzer tool, which will vanish soon.

Change-Id: I33b6fb8519f9b84d0af3b5ca12c33d66d510c6bb
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
This commit is contained in:
Nikolai Kosjar
2018-05-11 10:12:11 +02:00
parent a10cd337c7
commit 5b5ff37b6f
2 changed files with 29 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/plugins/clangtools/clangtidyclazytool.cpp
View File

@@ -86,6 +86,22 @@ ClangTidyClazyTool::ClangTidyClazyTool()
this, &ClangTidyClazyTool::handleStateUpdate); this, &ClangTidyClazyTool::handleStateUpdate);
} }
// Go to previous diagnostic
auto action = new QAction(this);
action->setDisabled(true);
action->setIcon(Utils::Icons::PREV_TOOLBAR.icon());
action->setToolTip(tr("Go to previous diagnostic."));
connect(action, &QAction::triggered, m_diagnosticView, &DetailedErrorView::goBack);
m_goBack = action;
// Go to next diagnostic
action = new QAction(this);
action->setDisabled(true);
action->setIcon(Utils::Icons::NEXT_TOOLBAR.icon());
action->setToolTip(tr("Go to next diagnostic."));
connect(action, &QAction::triggered, m_diagnosticView, &DetailedErrorView::goNext);
m_goNext = action;
ActionContainer *menu = ActionManager::actionContainer(Debugger::Constants::M_DEBUG_ANALYZER); ActionContainer *menu = ActionManager::actionContainer(Debugger::Constants::M_DEBUG_ANALYZER);
const QString toolTip = tr("Clang-Tidy and Clazy use a customized Clang executable from the " const QString toolTip = tr("Clang-Tidy and Clazy use a customized Clang executable from the "
"Clang project to search for errors and warnings."); "Clang project to search for errors and warnings.");
@@ -95,7 +111,7 @@ ClangTidyClazyTool::ClangTidyClazyTool()
{{ClangTidyClazyDockId, m_diagnosticView, {}, Perspective::SplitVertical}} {{ClangTidyClazyDockId, m_diagnosticView, {}, Perspective::SplitVertical}}
)); ));
auto *action = new QAction(tr("Clang-Tidy and Clazy..."), this); action = new QAction(tr("Clang-Tidy and Clazy..."), this);
action->setToolTip(toolTip); action->setToolTip(toolTip);
menu->addAction(ActionManager::registerAction(action, "ClangTidyClazy.Action"), menu->addAction(ActionManager::registerAction(action, "ClangTidyClazy.Action"),
Debugger::Constants::G_ANALYZER_TOOLS); Debugger::Constants::G_ANALYZER_TOOLS);
@@ -108,6 +124,8 @@ ClangTidyClazyTool::ClangTidyClazyTool()
ToolbarDescription tidyClazyToolbar; ToolbarDescription tidyClazyToolbar;
tidyClazyToolbar.addAction(m_startAction); tidyClazyToolbar.addAction(m_startAction);
tidyClazyToolbar.addAction(m_stopAction); tidyClazyToolbar.addAction(m_stopAction);
tidyClazyToolbar.addAction(m_goBack);
tidyClazyToolbar.addAction(m_goNext);
Debugger::registerToolbar(ClangTidyClazyPerspectiveId, tidyClazyToolbar); Debugger::registerToolbar(ClangTidyClazyPerspectiveId, tidyClazyToolbar);
updateRunActions(); updateRunActions();
@@ -190,9 +208,16 @@ void ClangTidyClazyTool::updateRunActions()
void ClangTidyClazyTool::handleStateUpdate() void ClangTidyClazyTool::handleStateUpdate()
{ {
QTC_ASSERT(m_goBack, return);
QTC_ASSERT(m_goNext, return);
QTC_ASSERT(m_diagnosticModel, return); QTC_ASSERT(m_diagnosticModel, return);
QTC_ASSERT(m_diagnosticFilterModel, return);
const int issuesFound = m_diagnosticModel->diagnostics().count(); const int issuesFound = m_diagnosticModel->diagnostics().count();
const int issuesVisible = m_diagnosticFilterModel->rowCount();
m_goBack->setEnabled(issuesVisible > 1);
m_goNext->setEnabled(issuesVisible > 1);
QString message; QString message;
if (m_running) if (m_running)
message = tr("Clang-Tidy and Clazy are running."); message = tr("Clang-Tidy and Clazy are running.");

3
src/plugins/clangtools/clangtidyclazytool.h
View File

@@ -57,6 +57,9 @@ private:
void updateRunActions(); void updateRunActions();
DiagnosticFilterModel *m_diagnosticFilterModel = nullptr; DiagnosticFilterModel *m_diagnosticFilterModel = nullptr;
QAction *m_goBack = nullptr;
QAction *m_goNext = nullptr;
}; };
} // namespace Internal } // namespace Internal