diff options
author | Ivan Donchevskii <ivan.donchevskii@qt.io> | 2019-04-03 08:39:29 +0200 |
---|---|---|
committer | Ivan Donchevskii <ivan.donchevskii@qt.io> | 2019-04-03 12:02:31 +0000 |
commit | 17f87a6d821c63e0dfbcbd097326a8c69b858ee7 (patch) | |
tree | 7373bbb9c8180d463bf7808d08b0d4be4fd80230 /src/plugins/clangformat/clangformatconfigwidget.cpp | |
parent | ec15a93215d04f172c4de48495f13180a3f13ce1 (diff) |
ClangFormat: Disable configuration UI instead of hiding
This is the first step without strings change.
The next step is I201dbccb8b1f1738451f760af34cf588afb5f4d5.
Change-Id: Ic0ce6a5ab3e74303a71a7c0bd8188d0284a241eb
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Diffstat (limited to 'src/plugins/clangformat/clangformatconfigwidget.cpp')
-rw-r--r-- | src/plugins/clangformat/clangformatconfigwidget.cpp | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/src/plugins/clangformat/clangformatconfigwidget.cpp b/src/plugins/clangformat/clangformatconfigwidget.cpp index 42f8fbe5c9..4f2d77a6f7 100644 --- a/src/plugins/clangformat/clangformatconfigwidget.cpp +++ b/src/plugins/clangformat/clangformatconfigwidget.cpp @@ -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(); |