diff options
| author | Nikolai Kosjar <nikolai.kosjar@qt.io> | 2019-10-15 09:20:19 +0200 |
|---|---|---|
| committer | Nikolai Kosjar <nikolai.kosjar@qt.io> | 2019-12-03 13:22:46 +0000 |
| commit | 9a7f5e08fd170e032c726b55f26908d4fc2a7b96 (patch) | |
| tree | 835eb73c39ea60cb4b864503ab72fc47baa90306 /src/plugins/clangcodemodel | |
| parent | 3090e744c2cdfc29b95f5fdf71ad2e385bb7d3c2 (diff) | |
Clang: Polish ClangProjectSettingsWidget
* 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>
Diffstat (limited to 'src/plugins/clangcodemodel')
| -rw-r--r-- | src/plugins/clangcodemodel/clangprojectsettingswidget.cpp | 6 | ||||
| -rw-r--r-- | src/plugins/clangcodemodel/clangprojectsettingswidget.ui | 39 |
2 files changed, 31 insertions, 14 deletions
diff --git a/src/plugins/clangcodemodel/clangprojectsettingswidget.cpp b/src/plugins/clangcodemodel/clangprojectsettingswidget.cpp index 785f15778c..3b7741bad6 100644 --- a/src/plugins/clangcodemodel/clangprojectsettingswidget.cpp +++ b/src/plugins/clangcodemodel/clangprojectsettingswidget.cpp @@ -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, diff --git a/src/plugins/clangcodemodel/clangprojectsettingswidget.ui b/src/plugins/clangcodemodel/clangprojectsettingswidget.ui index fe5036ec11..e02000b791 100644 --- a/src/plugins/clangcodemodel/clangprojectsettingswidget.ui +++ b/src/plugins/clangcodemodel/clangprojectsettingswidget.ui @@ -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><a href="target">Open Global Settings</a></string> + </property> + </widget> </item> - </widget> + </layout> </item> <item> <widget class="QCheckBox" name="delayedTemplateParseCheckBox"> |