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

CppTools: Change QComboBox in diagnostic settings to QListWidget

Browse Source 
ComboBox gives an impression of selecting one of
the entries which is not the case for this widget.

Change-Id: I83f94def7553d4ceaec5ba957765f4494dc3d610
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
This commit is contained in:
Ivan Donchevskii
2018-05-11 14:53:17 +02:00
parent 92fdbdc404
commit f6d1d5b41e
2 changed files with 40 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/plugins/cpptools/clangdiagnosticconfigswidget.cpp
View File

@@ -246,7 +246,7 @@ void ClangDiagnosticConfigsWidget::syncConfigChooserToModel(const Core::Id &conf
{
disconnectConfigChooserCurrentIndex();
m_ui->configChooserComboBox->clear();
m_ui->configChooserList->clear();
m_selectedConfigIndex = std::max(std::min(m_selectedConfigIndex,
m_diagnosticConfigsModel.size() - 1),
0);
@@ -256,7 +256,7 @@ void ClangDiagnosticConfigsWidget::syncConfigChooserToModel(const Core::Id &conf
const ClangDiagnosticConfig &config = m_diagnosticConfigsModel.at(i);
const QString displayName
= ClangDiagnosticConfigsModel::displayNameWithBuiltinIndication(config);
m_ui->configChooserComboBox->addItem(displayName, config.id().toSetting());
m_ui->configChooserList->addItem(displayName);
if (configToSelect == config.id())
m_selectedConfigIndex = i;
@@ -264,7 +264,7 @@ void ClangDiagnosticConfigsWidget::syncConfigChooserToModel(const Core::Id &conf
connectConfigChooserCurrentIndex();
m_ui->configChooserComboBox->setCurrentIndex(m_selectedConfigIndex);
m_ui->configChooserList->setCurrentRow(m_selectedConfigIndex);
}
void ClangDiagnosticConfigsWidget::syncOtherWidgetsToComboBox()
@@ -372,7 +372,7 @@ void ClangDiagnosticConfigsWidget::updateConfig(const ClangDiagnosticConfig &con
bool ClangDiagnosticConfigsWidget::isConfigChooserEmpty() const
{
return m_ui->configChooserComboBox->count() == 0;
return m_ui->configChooserList->count() == 0;
}
void ClangDiagnosticConfigsWidget::setDiagnosticOptions(const QString &options)
@@ -441,17 +441,13 @@ void ClangDiagnosticConfigsWidget::connectClazyRadioButtonClicked(QRadioButton *
void ClangDiagnosticConfigsWidget::connectConfigChooserCurrentIndex()
{
connect(m_ui->configChooserComboBox,
static_cast<void(QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
this,
connect(m_ui->configChooserList, &QListWidget::currentRowChanged, this,
&ClangDiagnosticConfigsWidget::onCurrentConfigChanged);
}
void ClangDiagnosticConfigsWidget::disconnectConfigChooserCurrentIndex()
{
disconnect(m_ui->configChooserComboBox,
static_cast<void(QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
this,
disconnect(m_ui->configChooserList, &QListWidget::currentRowChanged, this,
&ClangDiagnosticConfigsWidget::onCurrentConfigChanged);
}

60
src/plugins/cpptools/clangdiagnosticconfigswidget.ui
View File

@@ -15,33 +15,46 @@
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
<layout class="QHBoxLayout" name="horizontalLayout_3">
<item>
<widget class="QComboBox" name="configChooserComboBox">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
<widget class="QListWidget" name="configChooserList"/>
</item>
<item>
<widget class="QPushButton" name="copyButton">
<property name="text">
<string>Copy...</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="removeButton">
<property name="text">
<string>Remove</string>
</property>
</widget>
<layout class="QVBoxLayout" name="verticalLayout_3">
<item>
<widget class="QPushButton" name="copyButton">
<property name="text">
<string>Copy...</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="removeButton">
<property name="text">
<string>Remove</string>
</property>
</widget>
</item>
<item>
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout"/>
</item>
<item>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
@@ -82,11 +95,6 @@
</item>
</layout>
</widget>
<tabstops>
<tabstop>configChooserComboBox</tabstop>
<tabstop>copyButton</tabstop>
<tabstop>removeButton</tabstop>
</tabstops>
<resources/>
<connections/>
</ui>