forked from qt-creator/qt-creator
Axivion: Redo toggling inline issues
Toggling annotations and enabling highlighting on the
scrollbar are different things.
Kind of reverts 2a4c8af193
.
Change-Id: I2d33bbc51c355653b8b9ab9feaf6044be681669e
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
This commit is contained in:
@@ -18,6 +18,8 @@
|
||||
|
||||
#include <solutions/tasking/tasktreerunner.h>
|
||||
|
||||
#include <texteditor/textdocument.h>
|
||||
|
||||
#include <utils/algorithm.h>
|
||||
#include <utils/guard.h>
|
||||
#include <utils/layoutbuilder.h>
|
||||
@@ -852,14 +854,14 @@ public:
|
||||
|
||||
m_toggleIssues = new QToolButton(m_outputWidget);
|
||||
m_toggleIssues->setIcon(Utils::Icons::WARNING_TOOLBAR.icon());
|
||||
m_toggleIssues->setToolTip(Tr::tr("Show issue markers inline"));
|
||||
m_toggleIssues->setToolTip(Tr::tr("Show issue annotations inline"));
|
||||
m_toggleIssues->setCheckable(true);
|
||||
m_toggleIssues->setChecked(settings().highlightMarks());
|
||||
m_toggleIssues->setChecked(true);
|
||||
connect(m_toggleIssues, &QToolButton::toggled, this, [](bool checked) {
|
||||
settings().highlightMarks.setValue(checked);
|
||||
});
|
||||
connect(&settings().highlightMarks, &BaseAspect::changed, this, [this] {
|
||||
m_toggleIssues->setChecked(settings().highlightMarks());
|
||||
if (checked)
|
||||
TextEditor::TextDocument::showMarksAnnotation("AxivionTextMark");
|
||||
else
|
||||
TextEditor::TextDocument::temporaryHideMarksAnnotation("AxivionTextMark");
|
||||
});
|
||||
}
|
||||
|
||||
|
@@ -313,12 +313,6 @@ AxivionPluginPrivate::AxivionPluginPrivate()
|
||||
connect(&m_networkAccessManager, &QNetworkAccessManager::sslErrors,
|
||||
this, &AxivionPluginPrivate::handleSslErrors);
|
||||
#endif // ssl
|
||||
connect(&settings().highlightMarks, &BoolAspect::changed, this, [this] {
|
||||
if (settings().highlightMarks())
|
||||
handleOpenedDocs();
|
||||
else
|
||||
clearAllMarks();
|
||||
});
|
||||
}
|
||||
|
||||
void AxivionPluginPrivate::handleSslErrors(QNetworkReply *reply, const QList<QSslError> &errors)
|
||||
|
Reference in New Issue
Block a user