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

ClangFormat: Disable configuration UI instead of hiding

Browse Source 
This is the first step without strings change.
The next step is I201dbccb8b1f1738451f760af34cf588afb5f4d5.

Change-Id: Ic0ce6a5ab3e74303a71a7c0bd8188d0284a241eb
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
This commit is contained in:
Ivan Donchevskii
2019-04-03 08:39:29 +02:00
parent ec15a93215
commit 17f87a6d82
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -125,11 +125,17 @@ void ClangFormatConfigWidget::initialize()
if (lastItem->spacerItem())
m_ui->verticalLayout->removeItem(lastItem);
m_ui->clangFormatOptionsTable->setEnabled(true);
if (!m_ui->overrideDefault->isChecked()) {
m_ui->clangFormatOptionsTable->hide();
m_preview->hide();
m_ui->verticalLayout->addStretch(1);
return;
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);
}
}
m_ui->clangFormatOptionsTable->show();
@@ -190,7 +196,7 @@ void ClangFormatConfigWidget::apply()
}
settings.write();
if (!m_ui->overrideDefault->isChecked())
if (!m_ui->clangFormatOptionsTable->isVisible())
return;
const QString text = m_ui->clangFormatOptionsTable->toPlainText();