From ff4758ead84ee34fa93a70500d149bbf78220c73 Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Fri, 27 Sep 2024 15:23:12 +0200 Subject: [PATCH] Axivion: Use inverse logic Change-Id: Id7e5f3498b1f7ac95bd896532ea9a88f1fc123d1 Reviewed-by: Jarek Kobus --- src/plugins/axivion/axivion.qrc | 2 ++ src/plugins/axivion/axivionperspective.cpp | 18 ++++++++++-------- src/plugins/axivion/axivionplugin.cpp | 18 +++++++++--------- src/plugins/axivion/axivionplugin.h | 2 +- src/plugins/axivion/images/marker.png | Bin 0 -> 445 bytes src/plugins/axivion/images/marker@2x.png | Bin 0 -> 793 bytes 6 files changed, 22 insertions(+), 18 deletions(-) create mode 100644 src/plugins/axivion/images/marker.png create mode 100644 src/plugins/axivion/images/marker@2x.png diff --git a/src/plugins/axivion/axivion.qrc b/src/plugins/axivion/axivion.qrc index 3b730d38c34..d033d711acf 100644 --- a/src/plugins/axivion/axivion.qrc +++ b/src/plugins/axivion/axivion.qrc @@ -16,6 +16,8 @@ images/button-SV@2x.png images/error.png images/error@2x.png + images/marker.png + images/marker@2x.png images/nodata.png images/nodata@2x.png images/sortAsc.png diff --git a/src/plugins/axivion/axivionperspective.cpp b/src/plugins/axivion/axivionperspective.cpp index 336c672accb..5133ee6e8db 100644 --- a/src/plugins/axivion/axivionperspective.cpp +++ b/src/plugins/axivion/axivionperspective.cpp @@ -60,6 +60,8 @@ using namespace Utils; namespace Axivion::Internal { +static const Icon MARKER_ICON({{":/axivion/images/marker.png", Theme::IconsBaseColor}}); + static QPixmap trendIcon(qint64 added, qint64 removed) { static const QPixmap unchanged = Utils::Icons::NEXT.pixmap(); @@ -844,13 +846,13 @@ void AxivionPerspective::initPerspective() reinitDashboardList({}); }); - auto disableInlineIssuesAct = new QAction(this); - disableInlineIssuesAct->setIcon(ProjectExplorer::Icons::BUILDSTEP_DISABLE_TOOLBAR.icon()); - disableInlineIssuesAct->setToolTip(Tr::tr("Disable inline issues")); - disableInlineIssuesAct->setCheckable(true); - disableInlineIssuesAct->setChecked(false); - connect(disableInlineIssuesAct, &QAction::toggled, - this, [](bool checked) { disableInlineIssues(checked); }); + auto showIssuesAct = new QAction(this); + showIssuesAct->setIcon(MARKER_ICON.icon()); + showIssuesAct->setToolTip(Tr::tr("Show inline issues")); + showIssuesAct->setCheckable(true); + showIssuesAct->setChecked(true); + connect(showIssuesAct, &QAction::toggled, + this, [](bool checked) { enableInlineIssues(checked); }); auto toggleIssuesAct = new QAction(this); toggleIssuesAct->setIcon(Utils::Icons::WARNING_TOOLBAR.icon()); toggleIssuesAct->setToolTip(Tr::tr("Show issue annotations inline")); @@ -871,7 +873,7 @@ void AxivionPerspective::initPerspective() addToolBarAction(reloadDataAct); addToolbarSeparator(); - addToolBarAction(disableInlineIssuesAct); + addToolBarAction(showIssuesAct); addToolBarAction(toggleIssuesAct); addToolbarSeparator(); addToolBarAction(m_showFilterHelp); // FIXME move to IssuesWidget when named filters are added diff --git a/src/plugins/axivion/axivionplugin.cpp b/src/plugins/axivion/axivionplugin.cpp index a42ef16ad28..c419a5d8b9e 100644 --- a/src/plugins/axivion/axivionplugin.cpp +++ b/src/plugins/axivion/axivionplugin.cpp @@ -214,7 +214,7 @@ public: void clearAllMarks(); void updateExistingMarks(); void handleIssuesForFile(const Dto::FileViewDto &fileView); - void disableInlineIssues(bool disable); + void enableInlineIssues(bool enable); void fetchIssueInfo(const QString &id); void onSessionLoaded(const QString &sessionName); @@ -1015,16 +1015,16 @@ void AxivionPluginPrivate::handleIssuesForFile(const Dto::FileViewDto &fileView) } } -void AxivionPluginPrivate::disableInlineIssues(bool disable) +void AxivionPluginPrivate::enableInlineIssues(bool enable) { - if (m_inlineIssuesEnabled != disable) + if (m_inlineIssuesEnabled == enable) return; - m_inlineIssuesEnabled = !disable; + m_inlineIssuesEnabled = enable; - if (disable) - clearAllMarks(); - else + if (enable) handleOpenedDocs(); + else + clearAllMarks(); } static constexpr char SV_PROJECTNAME[] = "Axivion.ProjectName"; @@ -1124,10 +1124,10 @@ void setAnalysisVersion(const QString &version) dd->handleOpenedDocs(); } -void disableInlineIssues(bool disable) +void enableInlineIssues(bool enable) { QTC_ASSERT(dd, return); - dd->disableInlineIssues(disable); + dd->enableInlineIssues(enable); } Utils::FilePath findFileForIssuePath(const Utils::FilePath &issuePath) diff --git a/src/plugins/axivion/axivionplugin.h b/src/plugins/axivion/axivionplugin.h index 950b3b47dd0..a3f26652fb7 100644 --- a/src/plugins/axivion/axivionplugin.h +++ b/src/plugins/axivion/axivionplugin.h @@ -92,7 +92,7 @@ void switchActiveDashboardId(const Utils::Id &toDashboardId); const Utils::Id activeDashboardId(); const std::optional currentDashboardInfo(); void setAnalysisVersion(const QString &version); -void disableInlineIssues(bool disable); +void enableInlineIssues(bool enable); Utils::FilePath findFileForIssuePath(const Utils::FilePath &issuePath); diff --git a/src/plugins/axivion/images/marker.png b/src/plugins/axivion/images/marker.png new file mode 100644 index 0000000000000000000000000000000000000000..d6ca3e907df7c11a6144d3542257aef7bbbb711a GIT binary patch literal 445 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7Sc;uILpV4%IBGajIv5xj zI14-?iy0XBj({-ZRBb+K1_lPn64!{5;QX|b^2DN4hVt@qz0ADq;^f4FRK5J7^x5xh zq!<_&tvp>ELo9liPB!d1I-Y~0oC1nV&g9<)7lmb9>^}drV?E{#cN~V5X12aYMG| zM#*R0mrPPuUsYnr&AFX6Ep>fiR>S9?Yo_U*epF$z?Da0GCq+B2FpG7wG6rxQT%<8& z|LwOTDLZ4XG25J1W@t;yurcLeVtPBanGA3wv1 z&obL@`~F;hnKQ_X;XsDTs{Kxp(?pyE7z@qLn2zAPWScB3KVI(ZYilbi%%wHk&+3&rypPICC_9{m-+@_#|@tU8W%Wn z@Xd;J{J}25@_gw+6_>w_eHNdJ7d>FlSC+n0yY2bncew@PYfheydjDJIM)hGqhK9P0 zNAB~eD;d3vo#D4UWcAe*SF-|_UshC7>Oby0NhQ!kO11mwqVob$*%mU79z9|TTP^Cc zTekbJ zZA098_Vw3STi0B*o6rBZ?!JYC+T=i!Z4o*iYLj>D+js2gQ&m4dKZUMEk8;dro3a^5 z@NC$+^{9l`q?Z1E{Kn}E8BhX_17I~Z_A|BCU@S{ zp6Yc+_MLOc`skrxc%1X*2j;A*E2#VdbmuU zu63ZsF5P7H)m2;zOpIrr{lfg_%^QPTzkl!6I&k~8^x~Z{dVd)vsTkfmd-m+D4=+o+ z%FD}p>MANu#6Ozr7dcJT|I5{@Qy=}Qv2$0NnDETp-2CFpk{#O<-a3o)9~YIM9--5A z{J6W1nsCqY?>gLkP(iHw=yyhj1vhh&l9Qc_cW88Fm`Fvf*~-Y^pf&Xp&ji2aTW@8t zOZ2+kxO+F0w|r-e1Yf&7KLf+|?b}x|eEimW$0)82