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

ClangFormat: Show the global fallback style

Browse Source 
Fixes: QTCREATORBUG-22144
Change-Id: I201dbccb8b1f1738451f760af34cf588afb5f4d5
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
This commit is contained in:
Ivan Donchevskii
2019-03-15 14:30:51 +01:00
parent d2f2e9e218
commit d46ce1705f
2 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/plugins/clangformat/clangformatconfigwidget.cpp
View File

@@ -64,12 +64,15 @@ ClangFormatConfigWidget::ClangFormatConfigWidget(ProjectExplorer::Project *proje
if (m_project) {
m_ui->applyButton->show();
hideGlobalCheckboxes();
m_ui->fallbackConfig->hide();
m_ui->overrideDefault->setChecked(
m_project->namedSettings(Constants::OVERRIDE_FILE_ID).toBool());
} else {
m_ui->applyButton->hide();
showGlobalCheckboxes();
m_ui->overrideDefault->setChecked(ClangFormatSettings::instance().overrideDefaultFile());
m_ui->overrideDefault->setToolTip(
tr("Override Clang Format configuration file with the fallback configuration."));
}
connect(m_ui->overrideDefault, &QCheckBox::toggled, this, [this](bool checked) {
@@ -125,17 +128,12 @@ void ClangFormatConfigWidget::initialize()
if (lastItem->spacerItem())
m_ui->verticalLayout->removeItem(lastItem);
m_ui->clangFormatOptionsTable->setEnabled(true);
if (!m_ui->overrideDefault->isChecked()) {
if (m_project) {
m_ui->clangFormatOptionsTable->hide();
m_preview->hide();
m_ui->verticalLayout->addStretch(1);
return;
} else {
// Show the fallback configuration only globally.
m_ui->clangFormatOptionsTable->setEnabled(false);
}
if (!m_ui->overrideDefault->isChecked() && m_project) {
// Show the fallback configuration only globally.
m_ui->clangFormatOptionsTable->hide();
m_preview->hide();
m_ui->verticalLayout->addStretch(1);
return;
}
m_ui->clangFormatOptionsTable->show();