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

ClangFormat: Fix missing label in project settings

Browse Source 
Fixes: QTCREATORBUG-29323
Change-Id: Ia8c89ec6b8c745cac2bcb13a149667d9c3e08496
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
Artem Sokolovskii
2023-06-27 10:34:37 +02:00
parent 41fcca5cdd
commit 646eb5118b
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/clangformat/clangformatglobalconfigwidget.cpp
View File

@@ -80,7 +80,6 @@ ClangFormatGlobalConfigWidget::ClangFormatGlobalConfigWidget(
initFileSizeThresholdSpinBox(); initFileSizeThresholdSpinBox();
if (project) { if (project) {
m_formattingModeLabel->hide();
m_formatOnSave->hide(); m_formatOnSave->hide();
m_formatWhileTyping->hide(); m_formatWhileTyping->hide();
@@ -135,6 +134,11 @@ void ClangFormatGlobalConfigWidget::initUseGlobalSettingsCheckBox()
const auto enableProjectSettings = [this] { const auto enableProjectSettings = [this] {
const bool isDisabled = m_project && m_useGlobalSettings->isChecked(); const bool isDisabled = m_project && m_useGlobalSettings->isChecked();
m_indentingOrFormatting->setDisabled(isDisabled); m_indentingOrFormatting->setDisabled(isDisabled);
m_formattingModeLabel->setDisabled(isDisabled);
m_projectHasClangFormat->setDisabled(
isDisabled
|| (m_indentingOrFormatting->currentIndex()
== static_cast<int>(ClangFormatSettings::Mode::Disable)));
m_overrideDefault->setDisabled(isDisabled m_overrideDefault->setDisabled(isDisabled
|| (m_indentingOrFormatting->currentIndex() || (m_indentingOrFormatting->currentIndex()
== static_cast<int>(ClangFormatSettings::Mode::Disable))); == static_cast<int>(ClangFormatSettings::Mode::Disable)));
@@ -156,8 +160,10 @@ void ClangFormatGlobalConfigWidget::initFileSizeThresholdSpinBox()
m_fileSizeThresholdSpinBox->setMaximum(std::numeric_limits<int>::max()); m_fileSizeThresholdSpinBox->setMaximum(std::numeric_limits<int>::max());
m_fileSizeThresholdSpinBox->setSuffix(" KB"); m_fileSizeThresholdSpinBox->setSuffix(" KB");
m_fileSizeThresholdSpinBox->setValue(ClangFormatSettings::instance().fileSizeThreshold()); m_fileSizeThresholdSpinBox->setValue(ClangFormatSettings::instance().fileSizeThreshold());
if (m_project) if (m_project) {
m_fileSizeThresholdSpinBox->hide(); m_fileSizeThresholdSpinBox->hide();
m_fileSizeThresholdLabel->hide();
}
connect(m_indentingOrFormatting, &QComboBox::currentIndexChanged, this, [this](int index) { connect(m_indentingOrFormatting, &QComboBox::currentIndexChanged, this, [this](int index) {
m_fileSizeThresholdLabel->setEnabled( m_fileSizeThresholdLabel->setEnabled(
@@ -198,6 +204,7 @@ void ClangFormatGlobalConfigWidget::initOverrideCheckBox()
auto setEnableOverrideCheckBox = [this, setTemporarilyReadOnly](int index) { auto setEnableOverrideCheckBox = [this, setTemporarilyReadOnly](int index) {
bool isDisable = index == static_cast<int>(ClangFormatSettings::Mode::Disable); bool isDisable = index == static_cast<int>(ClangFormatSettings::Mode::Disable);
m_overrideDefault->setDisabled(isDisable); m_overrideDefault->setDisabled(isDisable);
m_projectHasClangFormat->setDisabled(isDisable);
setTemporarilyReadOnly(); setTemporarilyReadOnly();
}; };