From 9811f95aa7a4384d5fe21233b9019dd13a01c979 Mon Sep 17 00:00:00 2001
From: Christian Kandeler <christian.kandeler@qt.io>
Date: Mon, 25 Nov 2019 12:46:08 +0100
Subject: [PATCH] Project Aspects: Provide alternative display style for
 selection aspect

Typically, a combo box is preferred to radio buttons.

Change-Id: I685d9c1773e4188252139fb7c784fd7b61e62c8f
Reviewed-by: hjk <hjk@qt.io>
---
 .../projectconfigurationaspects.cpp           | 60 ++++++++++++++-----
 .../projectconfigurationaspects.h             |  3 +
 2 files changed, 47 insertions(+), 16 deletions(-)

diff --git a/src/plugins/projectexplorer/projectconfigurationaspects.cpp b/src/plugins/projectexplorer/projectconfigurationaspects.cpp
index 6c4d4c1a348..7549c498016 100644
--- a/src/plugins/projectexplorer/projectconfigurationaspects.cpp
+++ b/src/plugins/projectexplorer/projectconfigurationaspects.cpp
@@ -38,6 +38,7 @@
 #include <utils/qtcprocess.h>
 
 #include <QCheckBox>
+#include <QComboBox>
 #include <QLabel>
 #include <QLineEdit>
 #include <QFormLayout>
@@ -67,9 +68,14 @@ class BaseSelectionAspectPrivate
 public:
     int m_value = 0;
     int m_defaultValue = 0;
+    BaseSelectionAspect::DisplayStyle m_displayStyle
+            = BaseSelectionAspect::DisplayStyle::RadioButtons;
     struct Option { QString displayName; QString tooltip; };
     QVector<Option> m_options;
-    QList<QPointer<QRadioButton>> m_buttons; // Owned by configuration widget
+
+    // These are all owned by the configuration widget.
+    QList<QPointer<QRadioButton>> m_buttons;
+    QPointer<QComboBox> m_comboBox;
     QPointer<QButtonGroup> m_buttonGroup;
 };
 
@@ -445,22 +451,36 @@ BaseSelectionAspect::~BaseSelectionAspect() = default;
 void BaseSelectionAspect::addToLayout(LayoutBuilder &builder)
 {
     QTC_CHECK(d->m_buttonGroup == nullptr);
-    d->m_buttonGroup = new QButtonGroup;
-    d->m_buttonGroup->setExclusive(true);
-
+    QTC_CHECK(!d->m_comboBox);
     QTC_ASSERT(d->m_buttons.isEmpty(), d->m_buttons.clear());
-    for (int i = 0, n = d->m_options.size(); i < n; ++i) {
-        const Internal::BaseSelectionAspectPrivate::Option &option = d->m_options.at(i);
-        auto button = new QRadioButton(option.displayName);
-        button->setChecked(i == d->m_value);
-        button->setToolTip(option.tooltip);
-        builder.addItems(QString(), button);
-        d->m_buttons.append(button);
-        d->m_buttonGroup->addButton(button);
-        connect(button, &QAbstractButton::clicked, this, [this, i] {
-            d->m_value = i;
-            emit changed();
-        });
+
+    switch (d->m_displayStyle) {
+    case DisplayStyle::RadioButtons:
+        d->m_buttonGroup = new QButtonGroup;
+        d->m_buttonGroup->setExclusive(true);
+        for (int i = 0, n = d->m_options.size(); i < n; ++i) {
+            const Internal::BaseSelectionAspectPrivate::Option &option = d->m_options.at(i);
+            auto button = new QRadioButton(option.displayName);
+            button->setChecked(i == d->m_value);
+            button->setToolTip(option.tooltip);
+            builder.addItems(QString(), button);
+            d->m_buttons.append(button);
+            d->m_buttonGroup->addButton(button);
+            connect(button, &QAbstractButton::clicked, this, [this, i] {
+                d->m_value = i;
+                emit changed();
+            });
+        }
+        break;
+    case DisplayStyle::ComboBox:
+        d->m_comboBox = new QComboBox;
+        for (int i = 0, n = d->m_options.size(); i < n; ++i)
+            d->m_comboBox->addItem(d->m_options.at(i).displayName);
+        connect(d->m_comboBox.data(), QOverload<int>::of(&QComboBox::activated), this,
+                [this](int index) { d->m_value = index; emit changed(); });
+        d->m_comboBox->setCurrentIndex(d->m_value);
+        builder.addItems(new QLabel(displayName()), d->m_comboBox.data());
+        break;
     }
 }
 
@@ -484,6 +504,11 @@ void BaseSelectionAspect::setDefaultValue(int defaultValue)
     d->m_defaultValue = defaultValue;
 }
 
+void BaseSelectionAspect::setDisplayStyle(BaseSelectionAspect::DisplayStyle style)
+{
+    d->m_displayStyle = style;
+}
+
 int BaseSelectionAspect::value() const
 {
     return d->m_value;
@@ -494,6 +519,9 @@ void BaseSelectionAspect::setValue(int value)
     d->m_value = value;
     if (d->m_buttonGroup && 0 <= value && value < d->m_buttons.size())
         d->m_buttons.at(value)->setChecked(true);
+    else if (d->m_comboBox) {
+        d->m_comboBox->setCurrentIndex(value);
+    }
 }
 
 void BaseSelectionAspect::addOption(const QString &displayName, const QString &toolTip)
diff --git a/src/plugins/projectexplorer/projectconfigurationaspects.h b/src/plugins/projectexplorer/projectconfigurationaspects.h
index 540ae635e8b..8b572e4b67a 100644
--- a/src/plugins/projectexplorer/projectconfigurationaspects.h
+++ b/src/plugins/projectexplorer/projectconfigurationaspects.h
@@ -91,6 +91,9 @@ public:
     int defaultValue() const;
     void setDefaultValue(int defaultValue);
 
+    enum class DisplayStyle { RadioButtons, ComboBox };
+    void setDisplayStyle(DisplayStyle style);
+
     void addOption(const QString &displayName, const QString &toolTip = {});
 
     void fromMap(const QVariantMap &map) override;