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

Axivion: Redo toggling inline issues

Browse Source 
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:
Christian Stenger
2024-08-07 12:43:37 +02:00
parent 0497a09c97
commit 1726998244
2 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/axivion/axivionoutputpane.cpp
View File

@@ -18,6 +18,8 @@
#include <solutions/tasking/tasktreerunner.h> #include <solutions/tasking/tasktreerunner.h>
#include <texteditor/textdocument.h>
#include <utils/algorithm.h> #include <utils/algorithm.h>
#include <utils/guard.h> #include <utils/guard.h>
#include <utils/layoutbuilder.h> #include <utils/layoutbuilder.h>
@@ -852,14 +854,14 @@ public:
m_toggleIssues = new QToolButton(m_outputWidget); m_toggleIssues = new QToolButton(m_outputWidget);
m_toggleIssues->setIcon(Utils::Icons::WARNING_TOOLBAR.icon()); 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->setCheckable(true);
m_toggleIssues->setChecked(settings().highlightMarks()); m_toggleIssues->setChecked(true);
connect(m_toggleIssues, &QToolButton::toggled, this, [](bool checked) { connect(m_toggleIssues, &QToolButton::toggled, this, [](bool checked) {
settings().highlightMarks.setValue(checked); if (checked)
}); TextEditor::TextDocument::showMarksAnnotation("AxivionTextMark");
connect(&settings().highlightMarks, &BaseAspect::changed, this, [this] { else
m_toggleIssues->setChecked(settings().highlightMarks()); TextEditor::TextDocument::temporaryHideMarksAnnotation("AxivionTextMark");
}); });
} }

6
src/plugins/axivion/axivionplugin.cpp
View File

@@ -313,12 +313,6 @@ AxivionPluginPrivate::AxivionPluginPrivate()
connect(&m_networkAccessManager, &QNetworkAccessManager::sslErrors, connect(&m_networkAccessManager, &QNetworkAccessManager::sslErrors,
this, &AxivionPluginPrivate::handleSslErrors); this, &AxivionPluginPrivate::handleSslErrors);
#endif // ssl #endif // ssl
connect(&settings().highlightMarks, &BoolAspect::changed, this, [this] {
if (settings().highlightMarks())
handleOpenedDocs();
else
clearAllMarks();
});
} }
void AxivionPluginPrivate::handleSslErrors(QNetworkReply *reply, const QList<QSslError> &errors) void AxivionPluginPrivate::handleSslErrors(QNetworkReply *reply, const QList<QSslError> &errors)