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

Clang: Polish ClangProjectSettingsWidget

Browse Source 
* Add link to global settings
* Use same labels in custom/global combo box as ClangTools

Change-Id: Ie5cf9e94f034323cfafe58d33216c410ec3270ad
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
This commit is contained in:
Nikolai Kosjar
2019-10-15 09:20:19 +02:00
parent 3090e744c2
commit 9a7f5e08fd
2 changed files with 31 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/clangcodemodel/clangprojectsettingswidget.cpp
View File

@@ -33,6 +33,7 @@
#include <cpptools/clangdiagnosticconfig.h>
#include <cpptools/clangdiagnosticconfigswidget.h>
#include <cpptools/cppcodemodelsettings.h>
#include <cpptools/cpptoolsconstants.h>
#include <cpptools/cpptoolsreuse.h>
#include <utils/hostosinfo.h>
@@ -56,6 +57,11 @@ ClangProjectSettingsWidget::ClangProjectSettingsWidget(ProjectExplorer::Project
m_ui.delayedTemplateParseCheckBox->setVisible(Utils::HostOsInfo::isWindowsHost());
// Links
connect(m_ui.gotoGlobalSettingsLabel, &QLabel::linkActivated, [](const QString &) {
Core::ICore::showOptionsDialog(CppTools::Constants::CPP_CODE_MODEL_SETTINGS_ID);
});
connect(m_ui.clangDiagnosticConfigsSelectionWidget,
&ClangDiagnosticConfigsSelectionWidget::changed,
this,

39
src/plugins/clangcodemodel/clangprojectsettingswidget.ui
View File

@@ -15,24 +15,35 @@
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QComboBox" name="globalOrCustomComboBox">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<property name="text">
<string>Global</string>
</property>
<widget class="QComboBox" name="globalOrCustomComboBox">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<item>
<property name="text">
<string>Use Global Settings</string>
</property>
</item>
<item>
<property name="text">
<string>Use Customized Settings</string>
</property>
</item>
</widget>
</item>
<item>
<property name="text">
<string>Custom</string>
</property>
<widget class="QLabel" name="gotoGlobalSettingsLabel">
<property name="text">
<string>&lt;a href=&quot;target&quot;&gt;Open Global Settings&lt;/a&gt;</string>
</property>
</widget>
</item>
</widget>
</layout>
</item>
<item>
<widget class="QCheckBox" name="delayedTemplateParseCheckBox">