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

ClangTools: Use Utils::InfoLabel in ClangDiagnosticConfigsWidget

Browse Source 
Task-number: QTCREATORBUG-23346
Change-Id: I39016adae451c5212643e412d5700b89915cb2e4
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
This commit is contained in:
Alessandro Portale
2019-12-20 09:08:57 +01:00
parent 0a54b94660
commit 8a1daa15fa
2 changed files with 20 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/plugins/cpptools/clangdiagnosticconfigswidget.cpp
View File

@@ -31,7 +31,6 @@
#include <utils/executeondestruction.h> #include <utils/executeondestruction.h>
#include <utils/treemodel.h> #include <utils/treemodel.h>
#include <utils/utilsicons.h>
#include <QInputDialog> #include <QInputDialog>
#include <QPushButton> #include <QPushButton>
@@ -309,9 +308,9 @@ void ClangDiagnosticConfigsWidget::sync()
m_clangBaseChecksWidget->setEnabled(!config.isReadOnly()); m_clangBaseChecksWidget->setEnabled(!config.isReadOnly());
if (config.isReadOnly()) { if (config.isReadOnly()) {
m_ui->infoIcon->setPixmap(Utils::Icons::INFO.pixmap()); m_ui->infoLabel->setType(Utils::InfoLabel::Information);
m_ui->infoLabel->setText(tr("Copy this configuration to customize it.")); m_ui->infoLabel->setText(tr("Copy this configuration to customize it."));
m_ui->infoLabel->setStyleSheet(QString()); m_ui->infoLabel->setFilled(false);
} }
syncExtraWidgets(config); syncExtraWidgets(config);
@@ -334,21 +333,15 @@ void ClangDiagnosticConfigsWidget::setDiagnosticOptions(const QString &options)
void ClangDiagnosticConfigsWidget::updateValidityWidgets(const QString &errorMessage) void ClangDiagnosticConfigsWidget::updateValidityWidgets(const QString &errorMessage)
{ {
QString validationResult;
const Utils::Icon *icon = nullptr;
QString styleSheet;
if (errorMessage.isEmpty()) { if (errorMessage.isEmpty()) {
icon = &Utils::Icons::INFO; m_ui->infoLabel->setType(Utils::InfoLabel::Information);
validationResult = tr("Configuration passes sanity checks."); m_ui->infoLabel->setText(tr("Configuration passes sanity checks."));
m_ui->infoLabel->setFilled(false);
} else { } else {
icon = &Utils::Icons::CRITICAL; m_ui->infoLabel->setType(Utils::InfoLabel::Error);
validationResult = tr("%1").arg(errorMessage); m_ui->infoLabel->setText(tr("%1").arg(errorMessage));
styleSheet = "color: red;"; m_ui->infoLabel->setFilled(true);
} }
m_ui->infoIcon->setPixmap(icon->pixmap());
m_ui->infoLabel->setText(validationResult);
m_ui->infoLabel->setStyleSheet(styleSheet);
} }
void ClangDiagnosticConfigsWidget::connectClangOnlyOptionsChanged() void ClangDiagnosticConfigsWidget::connectClangOnlyOptionsChanged()

33
src/plugins/cpptools/clangdiagnosticconfigswidget.ui
View File

@@ -62,36 +62,12 @@
<item> <item>
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QVBoxLayout" name="verticalLayout">
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout_2"> <widget class="Utils::InfoLabel" name="infoLabel">
<item>
<widget class="QLabel" name="infoIcon">
<property name="text">
<string>InfoIcon</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="infoLabel">
<property name="text"> <property name="text">
<string>InfoText</string> <string>InfoText</string>
</property> </property>
</widget> </widget>
</item> </item>
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item> <item>
<widget class="QTabWidget" name="tabWidget"/> <widget class="QTabWidget" name="tabWidget"/>
</item> </item>
@@ -99,6 +75,13 @@
</item> </item>
</layout> </layout>
</widget> </widget>
<customwidgets>
<customwidget>
<class>Utils::InfoLabel</class>
<extends>QLabel</extends>
<header location="global">utils/infolabel.h</header>
</customwidget>
</customwidgets>
<resources/> <resources/>
<connections/> <connections/>
</ui> </ui>