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

ClangFormat: Change Override check box name and ToolTip

Browse Source 
Change-Id: I3d80ca3c2fd9dd6210220eca0db1ecec5dad9f0e
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
Artem Sokolovskii
2023-04-04 14:01:10 +02:00
parent 2c3373172b
commit e0be80a19d
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -36,7 +36,7 @@ ClangFormatGlobalConfigWidget::ClangFormatGlobalConfigWidget(ProjectExplorer::Pr
m_indentingOrFormatting = new QComboBox(this); m_indentingOrFormatting = new QComboBox(this);
m_formatWhileTyping = new QCheckBox(Tr::tr("Format while typing")); m_formatWhileTyping = new QCheckBox(Tr::tr("Format while typing"));
m_formatOnSave = new QCheckBox(Tr::tr("Format edited code on file save")); m_formatOnSave = new QCheckBox(Tr::tr("Format edited code on file save"));
m_overrideDefault = new QCheckBox(Tr::tr("Override Clang Format configuration file")); m_overrideDefault = new QCheckBox(Tr::tr("Override .clang-format file"));
m_useGlobalSettings = new QCheckBox(Tr::tr("Use global settings")); m_useGlobalSettings = new QCheckBox(Tr::tr("Use global settings"));
m_useGlobalSettings->hide(); m_useGlobalSettings->hide();
@@ -160,8 +160,15 @@ void ClangFormatGlobalConfigWidget::initOverrideCheckBox()
connect(m_indentingOrFormatting, &QComboBox::currentIndexChanged, connect(m_indentingOrFormatting, &QComboBox::currentIndexChanged,
this, setEnableOverrideCheckBox); this, setEnableOverrideCheckBox);
m_overrideDefault->setToolTip( m_overrideDefault->setToolTip(Tr::tr(
Tr::tr("Override Clang Format configuration file with the chosen configuration.")); "When this option is enabled, ClangFormat will use a\n"
"user-specified configuration from the widget below,\n"
"instead of the project .clang-format file. You can\n"
"customize the formatting options for your code by\n"
"adjusting the settings in the widget. Note that any\n"
"changes made there will only affect the current\n"
"configuration, and will not modify the project\n"
".clang-format file."));
m_overrideDefault->setChecked(getProjectOverriddenSettings(m_project)); m_overrideDefault->setChecked(getProjectOverriddenSettings(m_project));