Add a widget to configure an environmentaspect with

Change-Id: I8e51271b9fd1d793662221bce28b227a0feb03da
Reviewed-by: Daniel Teske <daniel.teske@digia.com>

src/plugins/projectexplorer/environmentaspect.cpp

@@ -29,6 +29,7 @@
 
 #include "environmentaspect.h"
 
+#include "environmentaspectwidget.h"
 #include "target.h"
 
 #include <utils/qtcassert.h>
@@ -68,6 +69,11 @@ QString EnvironmentAspect::displayName() const
     return tr("Run Environment");
 }
 
+RunConfigWidget *EnvironmentAspect::createConfigurationWidget()
+{
+    return new EnvironmentAspectWidget(this);
+}
+
 int EnvironmentAspect::baseEnvironmentBase() const
 {
     if (m_base == -1) {

src/plugins/projectexplorer/environmentaspect.h

@@ -50,6 +50,8 @@ public:
     QVariantMap toMap() const;
     QString displayName() const;
 
+    RunConfigWidget *createConfigurationWidget();
+
     virtual RunConfiguration *runConfiguration() const { return m_runConfiguration; }
 
     virtual QList<int> possibleBaseEnvironments() const = 0;

src/plugins/projectexplorer/environmentaspectwidget.cpp

@@ -0,0 +1,151 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of Qt Creator.
+**
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights.  These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+****************************************************************************/
+
+#include "environmentaspectwidget.h"
+
+#include "environmentwidget.h"
+
+#include <utils/environment.h>
+#include <utils/qtcassert.h>
+
+#include <QComboBox>
+#include <QHBoxLayout>
+#include <QLabel>
+#include <QVBoxLayout>
+
+namespace ProjectExplorer {
+
+// --------------------------------------------------------------------
+// EnvironmentAspectWidget:
+// --------------------------------------------------------------------
+
+EnvironmentAspectWidget::EnvironmentAspectWidget(EnvironmentAspect *aspect, QWidget *additionalWidget) :
+    RunConfigWidget(),
+    m_aspect(aspect),
+    m_additionalWidget(additionalWidget)
+{
+    QTC_CHECK(m_aspect);
+
+    setContentsMargins(0, 0, 0, 0);
+    QVBoxLayout *topLayout = new QVBoxLayout(this);
+    topLayout->setMargin(0);
+
+    QWidget *baseEnvironmentWidget = new QWidget;
+    QHBoxLayout *baseLayout = new QHBoxLayout(baseEnvironmentWidget);
+    baseLayout->setMargin(0);
+    QLabel *label = new QLabel(tr("Base environment for this run configuration:"), this);
+    baseLayout->addWidget(label);
+    m_baseEnvironmentComboBox = new QComboBox;
+    QList<int> bases = m_aspect->possibleBaseEnvironments();
+    int currentBase = m_aspect->baseEnvironmentBase();
+    QString baseDisplayName;
+    foreach (int i, bases) {
+        const QString displayName = m_aspect->baseEnvironmentDisplayName(i);
+        m_baseEnvironmentComboBox->addItem(displayName, i);
+        if (i == currentBase) {
+            m_baseEnvironmentComboBox->setCurrentIndex(m_baseEnvironmentComboBox->count() - 1);
+            baseDisplayName = displayName;
+        }
+    }
+    if (m_baseEnvironmentComboBox->count() == 1)
+        m_baseEnvironmentComboBox->setEnabled(false);
+
+    connect(m_baseEnvironmentComboBox, SIGNAL(currentIndexChanged(int)),
+            this, SLOT(baseEnvironmentSelected(int)));
+
+    baseLayout->addWidget(m_baseEnvironmentComboBox);
+    baseLayout->addStretch(10);
+    if (additionalWidget)
+        baseLayout->addWidget(additionalWidget);
+
+    m_environmentWidget = new ProjectExplorer::EnvironmentWidget(this, baseEnvironmentWidget);
+    m_environmentWidget->setBaseEnvironment(m_aspect->baseEnvironment());
+    m_environmentWidget->setBaseEnvironmentText(baseDisplayName);
+    m_environmentWidget->setUserChanges(m_aspect->userEnvironmentChanges());
+    m_environmentWidget->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
+    topLayout->addWidget(m_environmentWidget);
+
+    connect(m_environmentWidget, SIGNAL(userChangesChanged()),
+            this, SLOT(userChangesEdited()));
+
+    connect(m_aspect, SIGNAL(baseEnvironmentChanged()), this, SLOT(changeBaseEnvironment()));
+    connect(m_aspect, SIGNAL(userEnvironmentChangesChanged(QList<Utils::EnvironmentItem>)),
+            this, SLOT(changeUserChanges(QList<Utils::EnvironmentItem>)));
+}
+
+QString EnvironmentAspectWidget::displayName() const
+{
+    return m_aspect->displayName();
+}
+
+EnvironmentAspect *EnvironmentAspectWidget::aspect() const
+{
+    return m_aspect;
+}
+
+QWidget *EnvironmentAspectWidget::additionalWidget() const
+{
+    return m_additionalWidget;
+}
+
+void EnvironmentAspectWidget::baseEnvironmentSelected(int idx)
+{
+    m_ignoreChange = true;
+    m_aspect->setBaseEnvironmentBase(m_baseEnvironmentComboBox->itemData(idx).toInt());
+    m_ignoreChange = false;
+}
+
+void EnvironmentAspectWidget::changeBaseEnvironment()
+{
+    if (m_ignoreChange)
+        return;
+
+    int base = m_aspect->baseEnvironmentBase();
+    for (int i = 0; i < m_baseEnvironmentComboBox->count(); ++i) {
+        if (m_baseEnvironmentComboBox->itemData(i).toInt() == base)
+            m_baseEnvironmentComboBox->setCurrentIndex(i);
+    }
+    m_environmentWidget->setBaseEnvironmentText(m_aspect->baseEnvironmentDisplayName(base));
+}
+
+void EnvironmentAspectWidget::userChangesEdited()
+{
+    m_ignoreChange = true;
+    m_aspect->setUserEnvironmentChanges(m_environmentWidget->userChanges());
+    m_ignoreChange = false;
+}
+
+void EnvironmentAspectWidget::changeUserChanges(QList<Utils::EnvironmentItem> changes)
+{
+    if (m_ignoreChange)
+        return;
+    m_environmentWidget->setUserChanges(changes);
+}
+
+} // namespace ProjectExplorer

src/plugins/projectexplorer/environmentaspectwidget.h

@@ -0,0 +1,83 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of Qt Creator.
+**
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights.  These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+****************************************************************************/
+
+#ifndef ENVIRONMENTASPECTWIDGET_H
+#define ENVIRONMENTASPECTWIDGET_H
+
+#include "projectexplorer_export.h"
+
+#include "environmentaspect.h"
+#include "runconfiguration.h"
+
+#include <utils/environment.h>
+
+#include <QList>
+#include <QVariantMap>
+
+QT_BEGIN_NAMESPACE
+class QComboBox;
+QT_END_NAMESPACE
+
+namespace Utils { class DetailsWidget; }
+
+namespace ProjectExplorer {
+
+class EnvironmentWidget;
+
+class PROJECTEXPLORER_EXPORT EnvironmentAspectWidget : public RunConfigWidget
+{
+    Q_OBJECT
+
+public:
+    EnvironmentAspectWidget(EnvironmentAspect *aspect, QWidget *additionalWidget = 0);
+
+    QString displayName() const;
+    virtual EnvironmentAspect *aspect() const;
+
+    QWidget *additionalWidget() const;
+
+private slots:
+    void baseEnvironmentSelected(int idx);
+    void changeBaseEnvironment();
+    void userChangesEdited();
+    void changeUserChanges(QList<Utils::EnvironmentItem> changes);
+
+private:
+    EnvironmentAspect *m_aspect;
+    bool m_ignoreChange;
+
+    QWidget *m_additionalWidget;
+    QComboBox *m_baseEnvironmentComboBox;
+    Utils::DetailsWidget *m_detailsContainer;
+    ProjectExplorer::EnvironmentWidget *m_environmentWidget;
+};
+
+} // namespace ProjectExplorer
+
+#endif // ENVIRONMENTASPECTWIDGET_H

src/plugins/projectexplorer/projectexplorer.pro

@@ -8,6 +8,7 @@ HEADERS += projectexplorer.h \
     ansifilterparser.h \
     clangparser.h \
     environmentaspect.h \
+    environmentaspectwidget.h \
     gcctoolchain.h \
     localapplicationrunconfiguration.h \
     projectexplorer_export.h \
@@ -134,6 +135,7 @@ SOURCES += projectexplorer.cpp \
     ansifilterparser.cpp \
     clangparser.cpp \
     environmentaspect.cpp \
+    environmentaspectwidget.cpp \
     gcctoolchain.cpp \
     localapplicationrunconfiguration.cpp \
     projectwindow.cpp \

src/plugins/projectexplorer/projectexplorer.qbs

@@ -96,6 +96,8 @@ QtcPlugin {
         "editorsettingspropertiespage.ui",
         "environmentaspect.cpp",
         "environmentaspect.h",
+        "environmentaspectwidget.cpp",
+        "environmentaspectwidget.h",
         "environmentitemswidget.cpp",
         "environmentitemswidget.h",
         "environmentwidget.cpp",