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

Merge remote-tracking branch 'origin/4.6'

Browse Source 
Conflicts:
	src/plugins/coreplugin/helpmanager.cpp

Change-Id: I2feb60ec0afb2f22f75dc137a01c3fa217b299d8
This commit is contained in:
Eike Ziller
2018-02-23 10:56:52 +01:00
parent 31a55b0247 09a7247bfc
commit 7c3cfa166d
85 changed files with 1122 additions and 402 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -255,7 +255,13 @@ void ClangDiagnosticConfigsWidget::syncOtherWidgetsToComboBox()
? m_notAcceptedOptions.value(config.id())
: config.clangOptions().join(QLatin1Char(' '));
setDiagnosticOptions(options);
m_clangBaseChecks->diagnosticOptionsTextEdit->setReadOnly(config.isReadOnly());
m_clangBaseChecksWidget->setEnabled(!config.isReadOnly());
if (config.isReadOnly()) {
m_ui->infoIcon->setPixmap(Utils::Icons::INFO.pixmap());
m_ui->infoLabel->setText(tr("Copy this configuration to customize it."));
m_ui->infoLabel->setStyleSheet(QString());
}
syncClangTidyWidgets(config);
syncClazyWidgets(config);
@@ -326,14 +332,13 @@ void ClangDiagnosticConfigsWidget::setDiagnosticOptions(const QString &options)
{
if (options != m_clangBaseChecks->diagnosticOptionsTextEdit->document()->toPlainText()) {
disconnectDiagnosticOptionsChanged();
m_clangBaseChecks->diagnosticOptionsTextEdit->document()->setPlainText(options);
const QString errorMessage
= validateDiagnosticOptions(normalizeDiagnosticInputOptions(options));
updateValidityWidgets(errorMessage);
connectDiagnosticOptionsChanged();
}
const QString errorMessage
= validateDiagnosticOptions(normalizeDiagnosticInputOptions(options));
updateValidityWidgets(errorMessage);
}
void ClangDiagnosticConfigsWidget::updateValidityWidgets(const QString &errorMessage)
@@ -350,9 +355,9 @@ void ClangDiagnosticConfigsWidget::updateValidityWidgets(const QString &errorMes
styleSheet = "color: red;";
}
m_ui->validationResultIcon->setPixmap(icon->pixmap());
m_ui->validationResultLabel->setText(validationResult);
m_ui->validationResultLabel->setStyleSheet(styleSheet);
m_ui->infoIcon->setPixmap(icon->pixmap());
m_ui->infoLabel->setText(validationResult);
m_ui->infoLabel->setStyleSheet(styleSheet);
}
void ClangDiagnosticConfigsWidget::connectClangTidyItemChanged()

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

@@ -47,16 +47,16 @@
<item>
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="QLabel" name="validationResultIcon">
<widget class="QLabel" name="infoIcon">
<property name="text">
<string>ValidationIcon</string>
<string>InfoIcon</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="validationResultLabel">
<widget class="QLabel" name="infoLabel">
<property name="text">
<string>ValidationText</string>
<string>InfoText</string>
</property>
</widget>
</item>