QbsProjectManager: Allow users to override profile properties.

Creator derives its qbs profiles from the kits and overwrites them as it sees fit, which means users cannot set custom properties by editing the respective settings files or using the normal qbs command-line tools. Therefore, we need to provide them with a way to do this from Creator itself. For this purpose, we introduce a settings page where a user can add or override qbs properties per kit. The resulting "diff" is then applied whenever the profiles are written, so qbs will take the custom properties into account. Change-Id: I909f5243c65647f62c91a2afa242fd531ddaf915 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2014-10-31 14:51:55 +01:00
parent 5d8c0f9c88
commit bdb9a14de0
14 changed files with 752 additions and 6 deletions
--- a/src/plugins/qbsprojectmanager/customqbspropertiesdialog.cpp
+++ b/src/plugins/qbsprojectmanager/customqbspropertiesdialog.cpp
@@ -0,0 +1,104 @@
+/****************************************************************************
+**
+** Copyright (C) 2014 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://www.qt.io/licensing.  For further information
+** use the contact form at http://www.qt.io/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 or version 3 as published by the Free
+** Software Foundation and appearing in the file LICENSE.LGPLv21 and
+** LICENSE.LGPLv3 included in the packaging of this file.  Please review the
+** following information to ensure the GNU Lesser General Public License
+** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+** 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 "customqbspropertiesdialog.h"
+#include "ui_customqbspropertiesdialog.h"
+
+#include <utils/algorithm.h>
+#include <utils/qtcassert.h>
+
+#include <QTableWidgetItem>
+
+namespace QbsProjectManager {
+namespace Internal {
+
+CustomQbsPropertiesDialog::CustomQbsPropertiesDialog(const QVariantMap &properties, QWidget *parent)
+    : QDialog(parent), m_ui(new Ui::CustomQbsPropertiesDialog)
+{
+    m_ui->setupUi(this);
+    m_ui->propertiesTable->setRowCount(properties.count());
+    m_ui->propertiesTable->setHorizontalHeaderLabels(QStringList() << tr("Key") << tr("Value"));
+    int currentRow = 0;
+    for (QVariantMap::ConstIterator it = properties.constBegin(); it != properties.constEnd();
+         ++it) {
+        QTableWidgetItem * const nameItem = new QTableWidgetItem;
+        nameItem->setData(Qt::DisplayRole, it.key());
+        m_ui->propertiesTable->setItem(currentRow, 0, nameItem);
+        QTableWidgetItem * const valueItem = new QTableWidgetItem;
+        valueItem->setData(Qt::DisplayRole, it.value());
+        m_ui->propertiesTable->setItem(currentRow, 1, valueItem);
+        ++currentRow;
+    }
+    connect(m_ui->addButton, SIGNAL(clicked()), SLOT(addProperty()));
+    connect(m_ui->removeButton, SIGNAL(clicked()), SLOT(removeSelectedProperty()));
+    connect(m_ui->propertiesTable, SIGNAL(currentItemChanged(QTableWidgetItem*,QTableWidgetItem*)),
+            SLOT(handleCurrentItemChanged()));
+    handleCurrentItemChanged();
+}
+
+QVariantMap CustomQbsPropertiesDialog::properties() const
+{
+    QVariantMap properties;
+    for (int row = 0; row < m_ui->propertiesTable->rowCount(); ++row) {
+        const QTableWidgetItem * const nameItem = m_ui->propertiesTable->item(row, 0);
+        const QString name = nameItem->text();
+        if (name.isEmpty())
+            continue;
+        properties.insert(name, m_ui->propertiesTable->item(row, 1)->text());
+    }
+    return properties;
+}
+
+CustomQbsPropertiesDialog::~CustomQbsPropertiesDialog()
+{
+    delete m_ui;
+}
+
+void CustomQbsPropertiesDialog::addProperty()
+{
+    const int row = m_ui->propertiesTable->rowCount();
+    m_ui->propertiesTable->insertRow(row);
+    m_ui->propertiesTable->setItem(row, 0, new QTableWidgetItem);
+    m_ui->propertiesTable->setItem(row, 1, new QTableWidgetItem);
+}
+
+void CustomQbsPropertiesDialog::removeSelectedProperty()
+{
+    const QTableWidgetItem * const currentItem = m_ui->propertiesTable->currentItem();
+    QTC_ASSERT(currentItem, return);
+    m_ui->propertiesTable->removeRow(currentItem->row());
+}
+
+void CustomQbsPropertiesDialog::handleCurrentItemChanged()
+{
+    m_ui->removeButton->setEnabled(m_ui->propertiesTable->currentItem());
+}
+
+} // namespace Internal
+} // namespace QbsProjectManager