forked from qt-creator/qt-creator
ClangFormat: Move global settings in main page
The settings: indenting instead formatting, format while typing, format edited on file save are moved to Code Style page. Change-Id: I28787b44602ce288961c778fe704ad2a1a05913f Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
@@ -66,6 +66,10 @@ CodeStyleEditor::CodeStyleEditor(ICodeStylePreferencesFactory *factory,
|
||||
font.setItalic(true);
|
||||
label->setFont(font);
|
||||
label->setWordWrap(true);
|
||||
m_additionalGlobalSettingsWidget = factory->createAdditionalGlobalSettings(project, parent);
|
||||
if (m_additionalGlobalSettingsWidget)
|
||||
m_layout->addWidget(m_additionalGlobalSettingsWidget);
|
||||
|
||||
m_layout->addWidget(selector);
|
||||
m_layout->addWidget(m_preview);
|
||||
m_layout->addWidget(label);
|
||||
@@ -98,3 +102,11 @@ void CodeStyleEditor::updatePreview()
|
||||
}
|
||||
tc.endEditBlock();
|
||||
}
|
||||
|
||||
void CodeStyleEditor::apply()
|
||||
{
|
||||
if (!m_additionalGlobalSettingsWidget)
|
||||
return;
|
||||
|
||||
m_additionalGlobalSettingsWidget->apply();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user