forked from qt-creator/qt-creator
Clean up environmentmodel/widget
* Move the environment model code to utils and export it * rename the environmenteditmodel files to environmentwidget (which is the class they actually contain) Reviewed-by: dt
This commit is contained in:
Tobias Hunger
372
src/libs/utils/environmentmodel.cpp
Normal file
372
src/libs/utils/environmentmodel.cpp
Normal file
@@ -0,0 +1,372 @@
|
|||||||
|
/**************************************************************************
|
||||||
|
**
|
||||||
|
** This file is part of Qt Creator
|
||||||
|
**
|
||||||
|
** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
|
||||||
|
**
|
||||||
|
** Contact: Nokia Corporation (qt-info@nokia.com)
|
||||||
|
**
|
||||||
|
** No Commercial Usage
|
||||||
|
**
|
||||||
|
** This file contains pre-release code and may not be distributed.
|
||||||
|
** You may use this file in accordance with the terms and conditions
|
||||||
|
** contained in the Technology Preview License Agreement accompanying
|
||||||
|
** this package.
|
||||||
|
**
|
||||||
|
** 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, Nokia gives you certain additional
|
||||||
|
** rights. These rights are described in the Nokia Qt LGPL Exception
|
||||||
|
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
|
||||||
|
**
|
||||||
|
** If you have questions regarding the use of this file, please contact
|
||||||
|
** Nokia at qt-info@nokia.com.
|
||||||
|
**
|
||||||
|
**************************************************************************/
|
||||||
|
|
||||||
|
#include "environmentmodel.h"
|
||||||
|
|
||||||
|
#include <utils/environment.h>
|
||||||
|
|
||||||
|
#include <QtGui/QFont>
|
||||||
|
|
||||||
|
namespace Utils {
|
||||||
|
|
||||||
|
namespace Internal {
|
||||||
|
|
||||||
|
class EnvironmentModelPrivate
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
void updateResultEnvironment()
|
||||||
|
{
|
||||||
|
m_resultEnvironment = m_baseEnvironment;
|
||||||
|
m_resultEnvironment.modify(m_items);
|
||||||
|
// Add removed variables again and mark them as "<UNSET>" so
|
||||||
|
// that the user can actually see those removals:
|
||||||
|
foreach (const Utils::EnvironmentItem &item, m_items) {
|
||||||
|
if (item.unset) {
|
||||||
|
m_resultEnvironment.set(item.name, EnvironmentModel::tr("<UNSET>"));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
int findInChanges(const QString &name) const
|
||||||
|
{
|
||||||
|
for (int i=0; i<m_items.size(); ++i)
|
||||||
|
if (m_items.at(i).name == name)
|
||||||
|
return i;
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
int findInResultInsertPosition(const QString &name) const
|
||||||
|
{
|
||||||
|
Utils::Environment::const_iterator it;
|
||||||
|
int i = 0;
|
||||||
|
for (it = m_resultEnvironment.constBegin(); it != m_resultEnvironment.constEnd(); ++it, ++i)
|
||||||
|
if (m_resultEnvironment.key(it) > name)
|
||||||
|
return i;
|
||||||
|
return m_resultEnvironment.size();
|
||||||
|
}
|
||||||
|
|
||||||
|
int findInResult(const QString &name) const
|
||||||
|
{
|
||||||
|
Utils::Environment::const_iterator it;
|
||||||
|
int i = 0;
|
||||||
|
for (it = m_resultEnvironment.constBegin(); it != m_resultEnvironment.constEnd(); ++it, ++i)
|
||||||
|
if (m_resultEnvironment.key(it) == name)
|
||||||
|
return i;
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
Utils::Environment m_baseEnvironment;
|
||||||
|
Utils::Environment m_resultEnvironment;
|
||||||
|
QList<Utils::EnvironmentItem> m_items;
|
||||||
|
};
|
||||||
|
|
||||||
|
} // namespace Internal
|
||||||
|
|
||||||
|
EnvironmentModel::EnvironmentModel(QObject *parent) :
|
||||||
|
QAbstractTableModel(parent),
|
||||||
|
m_d(new Internal::EnvironmentModelPrivate)
|
||||||
|
{ }
|
||||||
|
|
||||||
|
EnvironmentModel::~EnvironmentModel()
|
||||||
|
{
|
||||||
|
delete m_d;
|
||||||
|
}
|
||||||
|
|
||||||
|
QString EnvironmentModel::indexToVariable(const QModelIndex &index) const
|
||||||
|
{
|
||||||
|
return m_d->m_resultEnvironment.key(m_d->m_resultEnvironment.constBegin() + index.row());
|
||||||
|
}
|
||||||
|
|
||||||
|
void EnvironmentModel::setBaseEnvironment(const Utils::Environment &env)
|
||||||
|
{
|
||||||
|
if (m_d->m_baseEnvironment == env)
|
||||||
|
return;
|
||||||
|
beginResetModel();
|
||||||
|
m_d->m_baseEnvironment = env;
|
||||||
|
m_d->updateResultEnvironment();
|
||||||
|
endResetModel();
|
||||||
|
}
|
||||||
|
|
||||||
|
int EnvironmentModel::rowCount(const QModelIndex &parent) const
|
||||||
|
{
|
||||||
|
if (parent.isValid())
|
||||||
|
return 0;
|
||||||
|
|
||||||
|
return m_d->m_resultEnvironment.size();
|
||||||
|
}
|
||||||
|
int EnvironmentModel::columnCount(const QModelIndex &parent) const
|
||||||
|
{
|
||||||
|
if (parent.isValid())
|
||||||
|
return 0;
|
||||||
|
|
||||||
|
return 2;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool EnvironmentModel::changes(const QString &name) const
|
||||||
|
{
|
||||||
|
return m_d->findInChanges(name) >= 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
QVariant EnvironmentModel::data(const QModelIndex &index, int role) const
|
||||||
|
{
|
||||||
|
if (!index.isValid())
|
||||||
|
return QVariant();
|
||||||
|
|
||||||
|
if (role == Qt::DisplayRole || role == Qt::EditRole || role == Qt::ToolTipRole) {
|
||||||
|
if (index.column() == 0) {
|
||||||
|
return m_d->m_resultEnvironment.key(m_d->m_resultEnvironment.constBegin() + index.row());
|
||||||
|
} else if (index.column() == 1) {
|
||||||
|
// Do not return "<UNSET>" when editing a previously unset variable:
|
||||||
|
if (role == Qt::EditRole) {
|
||||||
|
int pos = m_d->findInChanges(indexToVariable(index));
|
||||||
|
if (pos >= 0)
|
||||||
|
return m_d->m_items.at(pos).value;
|
||||||
|
}
|
||||||
|
return m_d->m_resultEnvironment.value(m_d->m_resultEnvironment.constBegin() + index.row());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (role == Qt::FontRole) {
|
||||||
|
// check whether this environment variable exists in m_d->m_items
|
||||||
|
if (changes(m_d->m_resultEnvironment.key(m_d->m_resultEnvironment.constBegin() + index.row()))) {
|
||||||
|
QFont f;
|
||||||
|
f.setBold(true);
|
||||||
|
return QVariant(f);
|
||||||
|
}
|
||||||
|
return QFont();
|
||||||
|
}
|
||||||
|
return QVariant();
|
||||||
|
}
|
||||||
|
|
||||||
|
Qt::ItemFlags EnvironmentModel::flags(const QModelIndex &index) const
|
||||||
|
{
|
||||||
|
Q_UNUSED(index)
|
||||||
|
return Qt::ItemIsSelectable | Qt::ItemIsEditable | Qt::ItemIsEnabled;
|
||||||
|
}
|
||||||
|
|
||||||
|
QVariant EnvironmentModel::headerData(int section, Qt::Orientation orientation, int role) const
|
||||||
|
{
|
||||||
|
if (orientation == Qt::Vertical || role != Qt::DisplayRole)
|
||||||
|
return QVariant();
|
||||||
|
return section == 0 ? tr("Variable") : tr("Value");
|
||||||
|
}
|
||||||
|
|
||||||
|
/// *****************
|
||||||
|
/// Utility functions
|
||||||
|
/// *****************
|
||||||
|
QModelIndex EnvironmentModel::variableToIndex(const QString &name) const
|
||||||
|
{
|
||||||
|
int row = m_d->findInResult(name);
|
||||||
|
if (row == -1)
|
||||||
|
return QModelIndex();
|
||||||
|
return index(row, 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
bool EnvironmentModel::setData(const QModelIndex &index, const QVariant &value, int role)
|
||||||
|
{
|
||||||
|
if (!index.isValid() || role != Qt::EditRole)
|
||||||
|
return false;
|
||||||
|
|
||||||
|
// ignore changes to already set values:
|
||||||
|
if (data(index, role) == value)
|
||||||
|
return true;
|
||||||
|
|
||||||
|
const QString oldName = data(this->index(index.row(), 0, QModelIndex())).toString();
|
||||||
|
const QString oldValue = data(this->index(index.row(), 1, QModelIndex())).toString();
|
||||||
|
int changesPos = m_d->findInChanges(oldName);
|
||||||
|
|
||||||
|
if (index.column() == 0) {
|
||||||
|
//fail if a variable with the same name already exists
|
||||||
|
#if defined(Q_OS_WIN)
|
||||||
|
const QString &newName = value.toString().toUpper();
|
||||||
|
#else
|
||||||
|
const QString &newName = value.toString();
|
||||||
|
#endif
|
||||||
|
// Does the new name exist already?
|
||||||
|
if (m_d->m_resultEnvironment.hasKey(newName))
|
||||||
|
return false;
|
||||||
|
|
||||||
|
Utils::EnvironmentItem newVariable(newName, oldValue);
|
||||||
|
|
||||||
|
if (changesPos != -1)
|
||||||
|
resetVariable(oldName); // restore the original base variable again
|
||||||
|
|
||||||
|
QModelIndex newIndex = addVariable(newVariable); // add the new variable
|
||||||
|
emit focusIndex(newIndex.sibling(newIndex.row(), 1)); // hint to focus on the value
|
||||||
|
return true;
|
||||||
|
} else if (index.column() == 1) {
|
||||||
|
// We are changing an existing value:
|
||||||
|
const QString stringValue = value.toString();
|
||||||
|
if (changesPos != -1) {
|
||||||
|
// We have already changed this value
|
||||||
|
if (stringValue == m_d->m_baseEnvironment.value(oldName)) {
|
||||||
|
// ... and now went back to the base value
|
||||||
|
m_d->m_items.removeAt(changesPos);
|
||||||
|
} else {
|
||||||
|
// ... and changed it again
|
||||||
|
m_d->m_items[changesPos].value = stringValue;
|
||||||
|
m_d->m_items[changesPos].unset = false;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
// Add a new change item:
|
||||||
|
m_d->m_items.append(Utils::EnvironmentItem(oldName, stringValue));
|
||||||
|
}
|
||||||
|
m_d->updateResultEnvironment();
|
||||||
|
emit dataChanged(index, index);
|
||||||
|
emit userChangesChanged();
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
QModelIndex EnvironmentModel::addVariable()
|
||||||
|
{
|
||||||
|
//: Name when inserting a new variable
|
||||||
|
return addVariable(Utils::EnvironmentItem(tr("<VARIABLE>"),
|
||||||
|
//: Value when inserting a new variable
|
||||||
|
tr("<VALUE>")));
|
||||||
|
}
|
||||||
|
|
||||||
|
QModelIndex EnvironmentModel::addVariable(const Utils::EnvironmentItem &item)
|
||||||
|
{
|
||||||
|
|
||||||
|
// Return existing index if the name is already in the result set:
|
||||||
|
int pos = m_d->findInResult(item.name);
|
||||||
|
if (pos >= 0 && pos < m_d->m_resultEnvironment.size())
|
||||||
|
return index(pos, 0, QModelIndex());
|
||||||
|
|
||||||
|
int insertPos = m_d->findInResultInsertPosition(item.name);
|
||||||
|
int changePos = m_d->findInChanges(item.name);
|
||||||
|
if (m_d->m_baseEnvironment.hasKey(item.name)) {
|
||||||
|
// We previously unset this!
|
||||||
|
Q_ASSERT(changePos >= 0);
|
||||||
|
// Do not insert a line here as we listed the variable as <UNSET> before!
|
||||||
|
Q_ASSERT(m_d->m_items.at(changePos).name == item.name);
|
||||||
|
Q_ASSERT(m_d->m_items.at(changePos).unset);
|
||||||
|
Q_ASSERT(m_d->m_items.at(changePos).value.isEmpty());
|
||||||
|
m_d->m_items[changePos] = item;
|
||||||
|
emit dataChanged(index(insertPos, 0, QModelIndex()), index(insertPos, 1, QModelIndex()));
|
||||||
|
} else {
|
||||||
|
// We add something that is not in the base environment
|
||||||
|
// Insert a new line!
|
||||||
|
beginInsertRows(QModelIndex(), insertPos, insertPos);
|
||||||
|
Q_ASSERT(changePos < 0);
|
||||||
|
m_d->m_items.append(item);
|
||||||
|
m_d->updateResultEnvironment();
|
||||||
|
endInsertRows();
|
||||||
|
}
|
||||||
|
emit userChangesChanged();
|
||||||
|
return index(insertPos, 0, QModelIndex());
|
||||||
|
}
|
||||||
|
|
||||||
|
void EnvironmentModel::resetVariable(const QString &name)
|
||||||
|
{
|
||||||
|
int rowInChanges = m_d->findInChanges(name);
|
||||||
|
if (rowInChanges < 0)
|
||||||
|
return;
|
||||||
|
|
||||||
|
int rowInResult = m_d->findInResult(name);
|
||||||
|
if (rowInResult < 0)
|
||||||
|
return;
|
||||||
|
|
||||||
|
if (m_d->m_baseEnvironment.hasKey(name)) {
|
||||||
|
m_d->m_items.removeAt(rowInChanges);
|
||||||
|
m_d->updateResultEnvironment();
|
||||||
|
emit dataChanged(index(rowInResult, 0, QModelIndex()), index(rowInResult, 1, QModelIndex()));
|
||||||
|
emit userChangesChanged();
|
||||||
|
} else {
|
||||||
|
// Remove the line completely!
|
||||||
|
beginRemoveRows(QModelIndex(), rowInResult, rowInResult);
|
||||||
|
m_d->m_items.removeAt(rowInChanges);
|
||||||
|
m_d->updateResultEnvironment();
|
||||||
|
endRemoveRows();
|
||||||
|
emit userChangesChanged();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void EnvironmentModel::unsetVariable(const QString &name)
|
||||||
|
{
|
||||||
|
// This does not change the number of rows as we will display a <UNSET>
|
||||||
|
// in place of the original variable!
|
||||||
|
int row = m_d->findInResult(name);
|
||||||
|
if (row < 0)
|
||||||
|
return;
|
||||||
|
|
||||||
|
// look in m_d->m_items for the variable
|
||||||
|
int pos = m_d->findInChanges(name);
|
||||||
|
if (pos != -1) {
|
||||||
|
m_d->m_items[pos].unset = true;
|
||||||
|
m_d->m_items[pos].value = QString();
|
||||||
|
m_d->updateResultEnvironment();
|
||||||
|
emit dataChanged(index(row, 0, QModelIndex()), index(row, 1, QModelIndex()));
|
||||||
|
emit userChangesChanged();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
Utils::EnvironmentItem item(name, QString());
|
||||||
|
item.unset = true;
|
||||||
|
m_d->m_items.append(item);
|
||||||
|
m_d->updateResultEnvironment();
|
||||||
|
emit dataChanged(index(row, 0, QModelIndex()), index(row, 1, QModelIndex()));
|
||||||
|
emit userChangesChanged();
|
||||||
|
}
|
||||||
|
|
||||||
|
bool EnvironmentModel::canUnset(const QString &name)
|
||||||
|
{
|
||||||
|
int pos = m_d->findInChanges(name);
|
||||||
|
if (pos != -1)
|
||||||
|
return m_d->m_items.at(pos).unset;
|
||||||
|
else
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool EnvironmentModel::canReset(const QString &name)
|
||||||
|
{
|
||||||
|
return m_d->m_baseEnvironment.hasKey(name);
|
||||||
|
}
|
||||||
|
|
||||||
|
QList<Utils::EnvironmentItem> EnvironmentModel::userChanges() const
|
||||||
|
{
|
||||||
|
return m_d->m_items;
|
||||||
|
}
|
||||||
|
|
||||||
|
void EnvironmentModel::setUserChanges(QList<Utils::EnvironmentItem> list)
|
||||||
|
{
|
||||||
|
// We assume nobody is reordering the items here.
|
||||||
|
if (list == m_d->m_items)
|
||||||
|
return;
|
||||||
|
beginResetModel();
|
||||||
|
m_d->m_items = list;
|
||||||
|
m_d->updateResultEnvironment();
|
||||||
|
endResetModel();
|
||||||
|
}
|
||||||
|
|
||||||
|
} // namespace Utils
|
||||||
90
src/libs/utils/environmentmodel.h
Normal file
90
src/libs/utils/environmentmodel.h
Normal file
@@ -0,0 +1,90 @@
|
|||||||
|
/**************************************************************************
|
||||||
|
**
|
||||||
|
** This file is part of Qt Creator
|
||||||
|
**
|
||||||
|
** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
|
||||||
|
**
|
||||||
|
** Contact: Nokia Corporation (qt-info@nokia.com)
|
||||||
|
**
|
||||||
|
** No Commercial Usage
|
||||||
|
**
|
||||||
|
** This file contains pre-release code and may not be distributed.
|
||||||
|
** You may use this file in accordance with the terms and conditions
|
||||||
|
** contained in the Technology Preview License Agreement accompanying
|
||||||
|
** this package.
|
||||||
|
**
|
||||||
|
** 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, Nokia gives you certain additional
|
||||||
|
** rights. These rights are described in the Nokia Qt LGPL Exception
|
||||||
|
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
|
||||||
|
**
|
||||||
|
** If you have questions regarding the use of this file, please contact
|
||||||
|
** Nokia at qt-info@nokia.com.
|
||||||
|
**
|
||||||
|
**************************************************************************/
|
||||||
|
|
||||||
|
#ifndef UTILS_ENVIRONMENTMODEL_H
|
||||||
|
#define UTILS_ENVIRONMENTMODEL_H
|
||||||
|
|
||||||
|
#include "utils_global.h"
|
||||||
|
|
||||||
|
#include <QtCore/QAbstractTableModel>
|
||||||
|
|
||||||
|
namespace Utils {
|
||||||
|
class Environment;
|
||||||
|
class EnvironmentItem;
|
||||||
|
|
||||||
|
namespace Internal {
|
||||||
|
class EnvironmentModelPrivate;
|
||||||
|
} // namespace Internal
|
||||||
|
|
||||||
|
class QTCREATOR_UTILS_EXPORT EnvironmentModel : public QAbstractTableModel
|
||||||
|
{
|
||||||
|
Q_OBJECT
|
||||||
|
|
||||||
|
public:
|
||||||
|
explicit EnvironmentModel(QObject *parent = 0);
|
||||||
|
~EnvironmentModel();
|
||||||
|
|
||||||
|
int rowCount(const QModelIndex &parent) const;
|
||||||
|
int columnCount(const QModelIndex &parent) const;
|
||||||
|
QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
|
||||||
|
bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole);
|
||||||
|
Qt::ItemFlags flags(const QModelIndex &index) const;
|
||||||
|
QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const;
|
||||||
|
|
||||||
|
QModelIndex addVariable();
|
||||||
|
QModelIndex addVariable(const Utils::EnvironmentItem &item);
|
||||||
|
void resetVariable(const QString &name);
|
||||||
|
void unsetVariable(const QString &name);
|
||||||
|
bool canUnset(const QString &name);
|
||||||
|
bool canReset(const QString &name);
|
||||||
|
QString indexToVariable(const QModelIndex &index) const;
|
||||||
|
QModelIndex variableToIndex(const QString &name) const;
|
||||||
|
bool changes(const QString &key) const;
|
||||||
|
void setBaseEnvironment(const Utils::Environment &env);
|
||||||
|
QList<Utils::EnvironmentItem> userChanges() const;
|
||||||
|
void setUserChanges(QList<Utils::EnvironmentItem> list);
|
||||||
|
|
||||||
|
signals:
|
||||||
|
void userChangesChanged();
|
||||||
|
/// Hint to the view where it should make sense to focus on next
|
||||||
|
// This is a hack since there is no way for a model to suggest
|
||||||
|
// the next interesting place to focus on to the view.
|
||||||
|
void focusIndex(const QModelIndex &index);
|
||||||
|
|
||||||
|
private:
|
||||||
|
Internal::EnvironmentModelPrivate *m_d;
|
||||||
|
};
|
||||||
|
|
||||||
|
} // namespace Utils
|
||||||
|
|
||||||
|
#endif // UTILS_ENVIRONMENTMODEL_H
|
||||||
@@ -8,6 +8,7 @@ INCLUDEPATH += $$PWD
|
|||||||
QT += network
|
QT += network
|
||||||
|
|
||||||
SOURCES += $$PWD/environment.cpp \
|
SOURCES += $$PWD/environment.cpp \
|
||||||
|
$$PWD/environmentmodel.cpp \
|
||||||
$$PWD/qtcprocess.cpp \
|
$$PWD/qtcprocess.cpp \
|
||||||
$$PWD/reloadpromptutils.cpp \
|
$$PWD/reloadpromptutils.cpp \
|
||||||
$$PWD/stringutils.cpp \
|
$$PWD/stringutils.cpp \
|
||||||
@@ -68,6 +69,7 @@ unix:!macx {
|
|||||||
SOURCES += $$PWD/unixutils.cpp
|
SOURCES += $$PWD/unixutils.cpp
|
||||||
}
|
}
|
||||||
HEADERS += $$PWD/environment.h \
|
HEADERS += $$PWD/environment.h \
|
||||||
|
$$PWD/environmentmodel.h \
|
||||||
$$PWD/qtcprocess.h \
|
$$PWD/qtcprocess.h \
|
||||||
$$PWD/utils_global.h \
|
$$PWD/utils_global.h \
|
||||||
$$PWD/reloadpromptutils.h \
|
$$PWD/reloadpromptutils.h \
|
||||||
|
|||||||
@@ -36,7 +36,7 @@
|
|||||||
|
|
||||||
#include <projectexplorer/applicationrunconfiguration.h>
|
#include <projectexplorer/applicationrunconfiguration.h>
|
||||||
#include <projectexplorer/persistentsettings.h>
|
#include <projectexplorer/persistentsettings.h>
|
||||||
#include <projectexplorer/environmenteditmodel.h>
|
#include <projectexplorer/environmentwidget.h>
|
||||||
#include <utils/environment.h>
|
#include <utils/environment.h>
|
||||||
#include <utils/pathchooser.h>
|
#include <utils/pathchooser.h>
|
||||||
#include <utils/detailswidget.h>
|
#include <utils/detailswidget.h>
|
||||||
|
|||||||
@@ -34,7 +34,7 @@
|
|||||||
#include "buildenvironmentwidget.h"
|
#include "buildenvironmentwidget.h"
|
||||||
|
|
||||||
#include "buildconfiguration.h"
|
#include "buildconfiguration.h"
|
||||||
#include "environmenteditmodel.h"
|
#include "environmentwidget.h"
|
||||||
|
|
||||||
#include <utils/qtcassert.h>
|
#include <utils/qtcassert.h>
|
||||||
|
|
||||||
|
|||||||
@@ -35,7 +35,7 @@
|
|||||||
#include "customexecutablerunconfiguration.h"
|
#include "customexecutablerunconfiguration.h"
|
||||||
#include "target.h"
|
#include "target.h"
|
||||||
#include "project.h"
|
#include "project.h"
|
||||||
#include "environmenteditmodel.h"
|
#include "environmentwidget.h"
|
||||||
|
|
||||||
#include <utils/detailswidget.h>
|
#include <utils/detailswidget.h>
|
||||||
#include <utils/environment.h>
|
#include <utils/environment.h>
|
||||||
|
|||||||
@@ -1,624 +0,0 @@
|
|||||||
/**************************************************************************
|
|
||||||
**
|
|
||||||
** This file is part of Qt Creator
|
|
||||||
**
|
|
||||||
** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
|
|
||||||
**
|
|
||||||
** Contact: Nokia Corporation (qt-info@nokia.com)
|
|
||||||
**
|
|
||||||
** No Commercial Usage
|
|
||||||
**
|
|
||||||
** This file contains pre-release code and may not be distributed.
|
|
||||||
** You may use this file in accordance with the terms and conditions
|
|
||||||
** contained in the Technology Preview License Agreement accompanying
|
|
||||||
** this package.
|
|
||||||
**
|
|
||||||
** 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, Nokia gives you certain additional
|
|
||||||
** rights. These rights are described in the Nokia Qt LGPL Exception
|
|
||||||
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
|
|
||||||
**
|
|
||||||
** If you have questions regarding the use of this file, please contact
|
|
||||||
** Nokia at qt-info@nokia.com.
|
|
||||||
**
|
|
||||||
**************************************************************************/
|
|
||||||
|
|
||||||
#include "environmenteditmodel.h"
|
|
||||||
|
|
||||||
#include <utils/detailswidget.h>
|
|
||||||
#include <utils/environment.h>
|
|
||||||
|
|
||||||
#include <QtGui/QTextDocument>
|
|
||||||
#include <QtGui/QVBoxLayout>
|
|
||||||
#include <QtGui/QHeaderView>
|
|
||||||
#include <QtGui/QToolButton>
|
|
||||||
|
|
||||||
#include <QtGui/QWidget>
|
|
||||||
#include <QtGui/QCheckBox>
|
|
||||||
#include <QtGui/QTableView>
|
|
||||||
#include <QtGui/QPushButton>
|
|
||||||
#include <QtGui/QLabel>
|
|
||||||
#include <QtGui/QStackedWidget>
|
|
||||||
|
|
||||||
#include <QtCore/QString>
|
|
||||||
#include <QtCore/QAbstractTableModel>
|
|
||||||
#include <QtCore/QDebug>
|
|
||||||
|
|
||||||
namespace ProjectExplorer {
|
|
||||||
|
|
||||||
class EnvironmentModel : public QAbstractTableModel
|
|
||||||
{
|
|
||||||
Q_OBJECT
|
|
||||||
public:
|
|
||||||
EnvironmentModel() {}
|
|
||||||
|
|
||||||
int rowCount(const QModelIndex &parent) const;
|
|
||||||
int columnCount(const QModelIndex &parent) const;
|
|
||||||
QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
|
|
||||||
bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole);
|
|
||||||
Qt::ItemFlags flags(const QModelIndex &index) const;
|
|
||||||
QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const;
|
|
||||||
|
|
||||||
QModelIndex addVariable();
|
|
||||||
QModelIndex addVariable(const Utils::EnvironmentItem &item);
|
|
||||||
void resetVariable(const QString &name);
|
|
||||||
void unsetVariable(const QString &name);
|
|
||||||
bool canUnset(const QString &name);
|
|
||||||
bool canReset(const QString &name);
|
|
||||||
QString indexToVariable(const QModelIndex &index) const;
|
|
||||||
QModelIndex variableToIndex(const QString &name) const;
|
|
||||||
bool changes(const QString &key) const;
|
|
||||||
void setBaseEnvironment(const Utils::Environment &env);
|
|
||||||
QList<Utils::EnvironmentItem> userChanges() const;
|
|
||||||
void setUserChanges(QList<Utils::EnvironmentItem> list);
|
|
||||||
|
|
||||||
signals:
|
|
||||||
void userChangesChanged();
|
|
||||||
/// Hint to the view where it should make sense to focus on next
|
|
||||||
// This is a hack since there is no way for a model to suggest
|
|
||||||
// the next interesting place to focus on to the view.
|
|
||||||
void focusIndex(const QModelIndex &index);
|
|
||||||
|
|
||||||
private:
|
|
||||||
void updateResultEnvironment();
|
|
||||||
int findInChanges(const QString &name) const;
|
|
||||||
int findInResultInsertPosition(const QString &name) const;
|
|
||||||
int findInResult(const QString &name) const;
|
|
||||||
|
|
||||||
Utils::Environment m_baseEnvironment;
|
|
||||||
Utils::Environment m_resultEnvironment;
|
|
||||||
QList<Utils::EnvironmentItem> m_items;
|
|
||||||
};
|
|
||||||
|
|
||||||
QString EnvironmentModel::indexToVariable(const QModelIndex &index) const
|
|
||||||
{
|
|
||||||
return m_resultEnvironment.key(m_resultEnvironment.constBegin() + index.row());
|
|
||||||
}
|
|
||||||
|
|
||||||
void EnvironmentModel::updateResultEnvironment()
|
|
||||||
{
|
|
||||||
m_resultEnvironment = m_baseEnvironment;
|
|
||||||
m_resultEnvironment.modify(m_items);
|
|
||||||
// Add removed variables again and mark them as "<UNSET>" so
|
|
||||||
// that the user can actually see those removals:
|
|
||||||
foreach (const Utils::EnvironmentItem &item, m_items) {
|
|
||||||
if (item.unset) {
|
|
||||||
m_resultEnvironment.set(item.name, tr("<UNSET>"));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void EnvironmentModel::setBaseEnvironment(const Utils::Environment &env)
|
|
||||||
{
|
|
||||||
if (m_baseEnvironment == env)
|
|
||||||
return;
|
|
||||||
beginResetModel();
|
|
||||||
m_baseEnvironment = env;
|
|
||||||
updateResultEnvironment();
|
|
||||||
endResetModel();
|
|
||||||
}
|
|
||||||
|
|
||||||
int EnvironmentModel::rowCount(const QModelIndex &parent) const
|
|
||||||
{
|
|
||||||
if (parent.isValid())
|
|
||||||
return 0;
|
|
||||||
|
|
||||||
return m_resultEnvironment.size();
|
|
||||||
}
|
|
||||||
int EnvironmentModel::columnCount(const QModelIndex &parent) const
|
|
||||||
{
|
|
||||||
if (parent.isValid())
|
|
||||||
return 0;
|
|
||||||
|
|
||||||
return 2;
|
|
||||||
}
|
|
||||||
|
|
||||||
bool EnvironmentModel::changes(const QString &name) const
|
|
||||||
{
|
|
||||||
return findInChanges(name) >= 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
QVariant EnvironmentModel::data(const QModelIndex &index, int role) const
|
|
||||||
{
|
|
||||||
if (!index.isValid())
|
|
||||||
return QVariant();
|
|
||||||
|
|
||||||
if (role == Qt::DisplayRole || role == Qt::EditRole || role == Qt::ToolTipRole) {
|
|
||||||
if (index.column() == 0) {
|
|
||||||
return m_resultEnvironment.key(m_resultEnvironment.constBegin() + index.row());
|
|
||||||
} else if (index.column() == 1) {
|
|
||||||
// Do not return "<UNSET>" when editing a previously unset variable:
|
|
||||||
if (role == Qt::EditRole) {
|
|
||||||
int pos = findInChanges(indexToVariable(index));
|
|
||||||
if (pos >= 0)
|
|
||||||
return m_items.at(pos).value;
|
|
||||||
}
|
|
||||||
return m_resultEnvironment.value(m_resultEnvironment.constBegin() + index.row());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (role == Qt::FontRole) {
|
|
||||||
// check whether this environment variable exists in m_items
|
|
||||||
if (changes(m_resultEnvironment.key(m_resultEnvironment.constBegin() + index.row()))) {
|
|
||||||
QFont f;
|
|
||||||
f.setBold(true);
|
|
||||||
return QVariant(f);
|
|
||||||
}
|
|
||||||
return QFont();
|
|
||||||
}
|
|
||||||
return QVariant();
|
|
||||||
}
|
|
||||||
|
|
||||||
Qt::ItemFlags EnvironmentModel::flags(const QModelIndex &index) const
|
|
||||||
{
|
|
||||||
Q_UNUSED(index)
|
|
||||||
return Qt::ItemIsSelectable | Qt::ItemIsEditable | Qt::ItemIsEnabled;
|
|
||||||
}
|
|
||||||
|
|
||||||
QVariant EnvironmentModel::headerData(int section, Qt::Orientation orientation, int role) const
|
|
||||||
{
|
|
||||||
if (orientation == Qt::Vertical || role != Qt::DisplayRole)
|
|
||||||
return QVariant();
|
|
||||||
return section == 0 ? tr("Variable") : tr("Value");
|
|
||||||
}
|
|
||||||
|
|
||||||
/// *****************
|
|
||||||
/// Utility functions
|
|
||||||
/// *****************
|
|
||||||
int EnvironmentModel::findInChanges(const QString &name) const
|
|
||||||
{
|
|
||||||
for (int i=0; i<m_items.size(); ++i)
|
|
||||||
if (m_items.at(i).name == name)
|
|
||||||
return i;
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
|
|
||||||
QModelIndex EnvironmentModel::variableToIndex(const QString &name) const
|
|
||||||
{
|
|
||||||
int row = findInResult(name);
|
|
||||||
if (row == -1)
|
|
||||||
return QModelIndex();
|
|
||||||
return index(row, 0);
|
|
||||||
}
|
|
||||||
|
|
||||||
int EnvironmentModel::findInResult(const QString &name) const
|
|
||||||
{
|
|
||||||
Utils::Environment::const_iterator it;
|
|
||||||
int i = 0;
|
|
||||||
for (it = m_resultEnvironment.constBegin(); it != m_resultEnvironment.constEnd(); ++it, ++i)
|
|
||||||
if (m_resultEnvironment.key(it) == name)
|
|
||||||
return i;
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
|
|
||||||
int EnvironmentModel::findInResultInsertPosition(const QString &name) const
|
|
||||||
{
|
|
||||||
Utils::Environment::const_iterator it;
|
|
||||||
int i = 0;
|
|
||||||
for (it = m_resultEnvironment.constBegin(); it != m_resultEnvironment.constEnd(); ++it, ++i)
|
|
||||||
if (m_resultEnvironment.key(it) > name)
|
|
||||||
return i;
|
|
||||||
return m_resultEnvironment.size();
|
|
||||||
}
|
|
||||||
|
|
||||||
bool EnvironmentModel::setData(const QModelIndex &index, const QVariant &value, int role)
|
|
||||||
{
|
|
||||||
if (!index.isValid() || role != Qt::EditRole)
|
|
||||||
return false;
|
|
||||||
|
|
||||||
// ignore changes to already set values:
|
|
||||||
if (data(index, role) == value)
|
|
||||||
return true;
|
|
||||||
|
|
||||||
const QString oldName = data(this->index(index.row(), 0, QModelIndex())).toString();
|
|
||||||
const QString oldValue = data(this->index(index.row(), 1, QModelIndex())).toString();
|
|
||||||
int changesPos = findInChanges(oldName);
|
|
||||||
|
|
||||||
if (index.column() == 0) {
|
|
||||||
//fail if a variable with the same name already exists
|
|
||||||
#if defined(Q_OS_WIN)
|
|
||||||
const QString &newName = value.toString().toUpper();
|
|
||||||
#else
|
|
||||||
const QString &newName = value.toString();
|
|
||||||
#endif
|
|
||||||
// Does the new name exist already?
|
|
||||||
if (m_resultEnvironment.hasKey(newName))
|
|
||||||
return false;
|
|
||||||
|
|
||||||
Utils::EnvironmentItem newVariable(newName, oldValue);
|
|
||||||
|
|
||||||
if (changesPos != -1)
|
|
||||||
resetVariable(oldName); // restore the original base variable again
|
|
||||||
|
|
||||||
QModelIndex newIndex = addVariable(newVariable); // add the new variable
|
|
||||||
emit focusIndex(newIndex.sibling(newIndex.row(), 1)); // hint to focus on the value
|
|
||||||
return true;
|
|
||||||
} else if (index.column() == 1) {
|
|
||||||
// We are changing an existing value:
|
|
||||||
const QString stringValue = value.toString();
|
|
||||||
if (changesPos != -1) {
|
|
||||||
// We have already changed this value
|
|
||||||
if (stringValue == m_baseEnvironment.value(oldName)) {
|
|
||||||
// ... and now went back to the base value
|
|
||||||
m_items.removeAt(changesPos);
|
|
||||||
} else {
|
|
||||||
// ... and changed it again
|
|
||||||
m_items[changesPos].value = stringValue;
|
|
||||||
m_items[changesPos].unset = false;
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
// Add a new change item:
|
|
||||||
m_items.append(Utils::EnvironmentItem(oldName, stringValue));
|
|
||||||
}
|
|
||||||
updateResultEnvironment();
|
|
||||||
emit dataChanged(index, index);
|
|
||||||
emit userChangesChanged();
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
QModelIndex EnvironmentModel::addVariable()
|
|
||||||
{
|
|
||||||
//: Name when inserting a new variable
|
|
||||||
return addVariable(Utils::EnvironmentItem(tr("<VARIABLE>"),
|
|
||||||
//: Value when inserting a new variable
|
|
||||||
tr("<VALUE>")));
|
|
||||||
}
|
|
||||||
|
|
||||||
QModelIndex EnvironmentModel::addVariable(const Utils::EnvironmentItem &item)
|
|
||||||
{
|
|
||||||
|
|
||||||
// Return existing index if the name is already in the result set:
|
|
||||||
int pos = findInResult(item.name);
|
|
||||||
if (pos >= 0 && pos < m_resultEnvironment.size())
|
|
||||||
return index(pos, 0, QModelIndex());
|
|
||||||
|
|
||||||
int insertPos = findInResultInsertPosition(item.name);
|
|
||||||
int changePos = findInChanges(item.name);
|
|
||||||
if (m_baseEnvironment.hasKey(item.name)) {
|
|
||||||
// We previously unset this!
|
|
||||||
Q_ASSERT(changePos >= 0);
|
|
||||||
// Do not insert a line here as we listed the variable as <UNSET> before!
|
|
||||||
Q_ASSERT(m_items.at(changePos).name == item.name);
|
|
||||||
Q_ASSERT(m_items.at(changePos).unset);
|
|
||||||
Q_ASSERT(m_items.at(changePos).value.isEmpty());
|
|
||||||
m_items[changePos] = item;
|
|
||||||
emit dataChanged(index(insertPos, 0, QModelIndex()), index(insertPos, 1, QModelIndex()));
|
|
||||||
} else {
|
|
||||||
// We add something that is not in the base environment
|
|
||||||
// Insert a new line!
|
|
||||||
beginInsertRows(QModelIndex(), insertPos, insertPos);
|
|
||||||
Q_ASSERT(changePos < 0);
|
|
||||||
m_items.append(item);
|
|
||||||
updateResultEnvironment();
|
|
||||||
endInsertRows();
|
|
||||||
}
|
|
||||||
emit userChangesChanged();
|
|
||||||
return index(insertPos, 0, QModelIndex());
|
|
||||||
}
|
|
||||||
|
|
||||||
void EnvironmentModel::resetVariable(const QString &name)
|
|
||||||
{
|
|
||||||
int rowInChanges = findInChanges(name);
|
|
||||||
if (rowInChanges < 0)
|
|
||||||
return;
|
|
||||||
|
|
||||||
int rowInResult = findInResult(name);
|
|
||||||
if (rowInResult < 0)
|
|
||||||
return;
|
|
||||||
|
|
||||||
if (m_baseEnvironment.hasKey(name)) {
|
|
||||||
m_items.removeAt(rowInChanges);
|
|
||||||
updateResultEnvironment();
|
|
||||||
emit dataChanged(index(rowInResult, 0, QModelIndex()), index(rowInResult, 1, QModelIndex()));
|
|
||||||
emit userChangesChanged();
|
|
||||||
} else {
|
|
||||||
// Remove the line completely!
|
|
||||||
beginRemoveRows(QModelIndex(), rowInResult, rowInResult);
|
|
||||||
m_items.removeAt(rowInChanges);
|
|
||||||
updateResultEnvironment();
|
|
||||||
endRemoveRows();
|
|
||||||
emit userChangesChanged();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void EnvironmentModel::unsetVariable(const QString &name)
|
|
||||||
{
|
|
||||||
// This does not change the number of rows as we will display a <UNSET>
|
|
||||||
// in place of the original variable!
|
|
||||||
int row = findInResult(name);
|
|
||||||
if (row < 0)
|
|
||||||
return;
|
|
||||||
|
|
||||||
// look in m_items for the variable
|
|
||||||
int pos = findInChanges(name);
|
|
||||||
if (pos != -1) {
|
|
||||||
m_items[pos].unset = true;
|
|
||||||
m_items[pos].value = QString();
|
|
||||||
updateResultEnvironment();
|
|
||||||
emit dataChanged(index(row, 0, QModelIndex()), index(row, 1, QModelIndex()));
|
|
||||||
emit userChangesChanged();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
Utils::EnvironmentItem item(name, QString());
|
|
||||||
item.unset = true;
|
|
||||||
m_items.append(item);
|
|
||||||
updateResultEnvironment();
|
|
||||||
emit dataChanged(index(row, 0, QModelIndex()), index(row, 1, QModelIndex()));
|
|
||||||
emit userChangesChanged();
|
|
||||||
}
|
|
||||||
|
|
||||||
bool EnvironmentModel::canUnset(const QString &name)
|
|
||||||
{
|
|
||||||
int pos = findInChanges(name);
|
|
||||||
if (pos != -1)
|
|
||||||
return m_items.at(pos).unset;
|
|
||||||
else
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
bool EnvironmentModel::canReset(const QString &name)
|
|
||||||
{
|
|
||||||
return m_baseEnvironment.hasKey(name);
|
|
||||||
}
|
|
||||||
|
|
||||||
QList<Utils::EnvironmentItem> EnvironmentModel::userChanges() const
|
|
||||||
{
|
|
||||||
return m_items;
|
|
||||||
}
|
|
||||||
|
|
||||||
void EnvironmentModel::setUserChanges(QList<Utils::EnvironmentItem> list)
|
|
||||||
{
|
|
||||||
// We assume nobody is reordering the items here.
|
|
||||||
if (list == m_items)
|
|
||||||
return;
|
|
||||||
beginResetModel();
|
|
||||||
m_items = list;
|
|
||||||
updateResultEnvironment();
|
|
||||||
endResetModel();
|
|
||||||
}
|
|
||||||
|
|
||||||
////
|
|
||||||
// EnvironmentWidget::EnvironmentWidget
|
|
||||||
////
|
|
||||||
|
|
||||||
struct EnvironmentWidgetPrivate {
|
|
||||||
EnvironmentModel *m_model;
|
|
||||||
|
|
||||||
QString m_baseEnvironmentText;
|
|
||||||
Utils::DetailsWidget *m_detailsContainer;
|
|
||||||
QTableView *m_environmentView;
|
|
||||||
QPushButton *m_editButton;
|
|
||||||
QPushButton *m_addButton;
|
|
||||||
QPushButton *m_resetButton;
|
|
||||||
QPushButton *m_unsetButton;
|
|
||||||
};
|
|
||||||
|
|
||||||
EnvironmentWidget::EnvironmentWidget(QWidget *parent, QWidget *additionalDetailsWidget)
|
|
||||||
: QWidget(parent), d(new EnvironmentWidgetPrivate)
|
|
||||||
{
|
|
||||||
d->m_model = new EnvironmentModel();
|
|
||||||
connect(d->m_model, SIGNAL(userChangesChanged()),
|
|
||||||
this, SIGNAL(userChangesChanged()));
|
|
||||||
connect(d->m_model, SIGNAL(modelReset()),
|
|
||||||
this, SLOT(invalidateCurrentIndex()));
|
|
||||||
|
|
||||||
connect(d->m_model, SIGNAL(focusIndex(QModelIndex)),
|
|
||||||
this, SLOT(focusIndex(QModelIndex)));
|
|
||||||
|
|
||||||
QVBoxLayout *vbox = new QVBoxLayout(this);
|
|
||||||
vbox->setContentsMargins(0, 0, 0, 0);
|
|
||||||
|
|
||||||
d->m_detailsContainer = new Utils::DetailsWidget(this);
|
|
||||||
|
|
||||||
QWidget *details = new QWidget(d->m_detailsContainer);
|
|
||||||
d->m_detailsContainer->setWidget(details);
|
|
||||||
details->setVisible(false);
|
|
||||||
|
|
||||||
QVBoxLayout *vbox2 = new QVBoxLayout(details);
|
|
||||||
vbox2->setMargin(0);
|
|
||||||
|
|
||||||
if (additionalDetailsWidget)
|
|
||||||
vbox2->addWidget(additionalDetailsWidget);
|
|
||||||
|
|
||||||
QHBoxLayout *horizontalLayout = new QHBoxLayout();
|
|
||||||
horizontalLayout->setMargin(0);
|
|
||||||
d->m_environmentView = new QTableView(this);
|
|
||||||
d->m_environmentView->setModel(d->m_model);
|
|
||||||
d->m_environmentView->setMinimumHeight(400);
|
|
||||||
d->m_environmentView->setGridStyle(Qt::NoPen);
|
|
||||||
d->m_environmentView->horizontalHeader()->setStretchLastSection(true);
|
|
||||||
d->m_environmentView->horizontalHeader()->setResizeMode(0, QHeaderView::ResizeToContents);
|
|
||||||
d->m_environmentView->horizontalHeader()->setHighlightSections(false);
|
|
||||||
d->m_environmentView->verticalHeader()->hide();
|
|
||||||
QFontMetrics fm(font());
|
|
||||||
d->m_environmentView->verticalHeader()->setDefaultSectionSize(qMax(static_cast<int>(fm.height() * 1.2), fm.height() + 4));
|
|
||||||
d->m_environmentView->setSelectionMode(QAbstractItemView::SingleSelection);
|
|
||||||
horizontalLayout->addWidget(d->m_environmentView);
|
|
||||||
|
|
||||||
QVBoxLayout *buttonLayout = new QVBoxLayout();
|
|
||||||
|
|
||||||
d->m_editButton = new QPushButton(this);
|
|
||||||
d->m_editButton->setText(tr("&Edit"));
|
|
||||||
buttonLayout->addWidget(d->m_editButton);
|
|
||||||
|
|
||||||
d->m_addButton = new QPushButton(this);
|
|
||||||
d->m_addButton->setText(tr("&Add"));
|
|
||||||
buttonLayout->addWidget(d->m_addButton);
|
|
||||||
|
|
||||||
d->m_resetButton = new QPushButton(this);
|
|
||||||
d->m_resetButton->setEnabled(false);
|
|
||||||
d->m_resetButton->setText(tr("&Reset"));
|
|
||||||
buttonLayout->addWidget(d->m_resetButton);
|
|
||||||
|
|
||||||
d->m_unsetButton = new QPushButton(this);
|
|
||||||
d->m_unsetButton->setEnabled(false);
|
|
||||||
d->m_unsetButton->setText(tr("&Unset"));
|
|
||||||
buttonLayout->addWidget(d->m_unsetButton);
|
|
||||||
|
|
||||||
QSpacerItem *verticalSpacer = new QSpacerItem(20, 40, QSizePolicy::Minimum, QSizePolicy::Expanding);
|
|
||||||
buttonLayout->addItem(verticalSpacer);
|
|
||||||
horizontalLayout->addLayout(buttonLayout);
|
|
||||||
vbox2->addLayout(horizontalLayout);
|
|
||||||
|
|
||||||
vbox->addWidget(d->m_detailsContainer);
|
|
||||||
|
|
||||||
connect(d->m_model, SIGNAL(dataChanged(const QModelIndex&, const QModelIndex&)),
|
|
||||||
this, SLOT(updateButtons()));
|
|
||||||
|
|
||||||
connect(d->m_editButton, SIGNAL(clicked(bool)),
|
|
||||||
this, SLOT(editEnvironmentButtonClicked()));
|
|
||||||
connect(d->m_addButton, SIGNAL(clicked(bool)),
|
|
||||||
this, SLOT(addEnvironmentButtonClicked()));
|
|
||||||
connect(d->m_resetButton, SIGNAL(clicked(bool)),
|
|
||||||
this, SLOT(removeEnvironmentButtonClicked()));
|
|
||||||
connect(d->m_unsetButton, SIGNAL(clicked(bool)),
|
|
||||||
this, SLOT(unsetEnvironmentButtonClicked()));
|
|
||||||
connect(d->m_environmentView->selectionModel(), SIGNAL(currentChanged(QModelIndex,QModelIndex)),
|
|
||||||
this, SLOT(environmentCurrentIndexChanged(QModelIndex)));
|
|
||||||
|
|
||||||
connect(d->m_model, SIGNAL(userChangesChanged()), this, SLOT(updateSummaryText()));
|
|
||||||
}
|
|
||||||
|
|
||||||
EnvironmentWidget::~EnvironmentWidget()
|
|
||||||
{
|
|
||||||
delete d->m_model;
|
|
||||||
d->m_model = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
void EnvironmentWidget::focusIndex(const QModelIndex &index)
|
|
||||||
{
|
|
||||||
d->m_environmentView->setCurrentIndex(index);
|
|
||||||
d->m_environmentView->setFocus();
|
|
||||||
}
|
|
||||||
|
|
||||||
void EnvironmentWidget::setBaseEnvironment(const Utils::Environment &env)
|
|
||||||
{
|
|
||||||
d->m_model->setBaseEnvironment(env);
|
|
||||||
}
|
|
||||||
|
|
||||||
void EnvironmentWidget::setBaseEnvironmentText(const QString &text)
|
|
||||||
{
|
|
||||||
d->m_baseEnvironmentText = text;
|
|
||||||
updateSummaryText();
|
|
||||||
}
|
|
||||||
|
|
||||||
QList<Utils::EnvironmentItem> EnvironmentWidget::userChanges() const
|
|
||||||
{
|
|
||||||
return d->m_model->userChanges();
|
|
||||||
}
|
|
||||||
|
|
||||||
void EnvironmentWidget::setUserChanges(const QList<Utils::EnvironmentItem> &list)
|
|
||||||
{
|
|
||||||
d->m_model->setUserChanges(list);
|
|
||||||
updateSummaryText();
|
|
||||||
}
|
|
||||||
|
|
||||||
void EnvironmentWidget::updateSummaryText()
|
|
||||||
{
|
|
||||||
QString text;
|
|
||||||
const QList<Utils::EnvironmentItem> &list = d->m_model->userChanges();
|
|
||||||
foreach (const Utils::EnvironmentItem &item, list) {
|
|
||||||
if (item.name != EnvironmentModel::tr("<VARIABLE>")) {
|
|
||||||
text.append("<br>");
|
|
||||||
if (item.unset)
|
|
||||||
text.append(tr("Unset <b>%1</b>").arg(Qt::escape(item.name)));
|
|
||||||
else
|
|
||||||
text.append(tr("Set <b>%1</b> to <b>%2</b>").arg(Qt::escape(item.name), Qt::escape(item.value)));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (text.isEmpty())
|
|
||||||
text.prepend(tr("Using <b>%1</b>").arg(d->m_baseEnvironmentText));
|
|
||||||
else
|
|
||||||
text.prepend(tr("Using <b>%1</b> and").arg(d->m_baseEnvironmentText));
|
|
||||||
|
|
||||||
d->m_detailsContainer->setSummaryText(text);
|
|
||||||
}
|
|
||||||
|
|
||||||
void EnvironmentWidget::updateButtons()
|
|
||||||
{
|
|
||||||
environmentCurrentIndexChanged(d->m_environmentView->currentIndex());
|
|
||||||
}
|
|
||||||
|
|
||||||
void EnvironmentWidget::editEnvironmentButtonClicked()
|
|
||||||
{
|
|
||||||
d->m_environmentView->edit(d->m_environmentView->currentIndex());
|
|
||||||
}
|
|
||||||
|
|
||||||
void EnvironmentWidget::addEnvironmentButtonClicked()
|
|
||||||
{
|
|
||||||
QModelIndex index = d->m_model->addVariable();
|
|
||||||
d->m_environmentView->setCurrentIndex(index);
|
|
||||||
d->m_environmentView->edit(index);
|
|
||||||
}
|
|
||||||
|
|
||||||
void EnvironmentWidget::removeEnvironmentButtonClicked()
|
|
||||||
{
|
|
||||||
const QString &name = d->m_model->indexToVariable(d->m_environmentView->currentIndex());
|
|
||||||
d->m_model->resetVariable(name);
|
|
||||||
}
|
|
||||||
|
|
||||||
// unset in Merged Environment Mode means, unset if it comes from the base environment
|
|
||||||
// or remove when it is just a change we added
|
|
||||||
void EnvironmentWidget::unsetEnvironmentButtonClicked()
|
|
||||||
{
|
|
||||||
const QString &name = d->m_model->indexToVariable(d->m_environmentView->currentIndex());
|
|
||||||
if (!d->m_model->canReset(name))
|
|
||||||
d->m_model->resetVariable(name);
|
|
||||||
else
|
|
||||||
d->m_model->unsetVariable(name);
|
|
||||||
}
|
|
||||||
|
|
||||||
void EnvironmentWidget::environmentCurrentIndexChanged(const QModelIndex ¤t)
|
|
||||||
{
|
|
||||||
if (current.isValid()) {
|
|
||||||
d->m_editButton->setEnabled(true);
|
|
||||||
const QString &name = d->m_model->indexToVariable(current);
|
|
||||||
bool modified = d->m_model->canReset(name) && d->m_model->changes(name);
|
|
||||||
bool unset = d->m_model->canUnset(name);
|
|
||||||
d->m_resetButton->setEnabled(modified || unset);
|
|
||||||
d->m_unsetButton->setEnabled(!unset);
|
|
||||||
} else {
|
|
||||||
d->m_editButton->setEnabled(false);
|
|
||||||
d->m_resetButton->setEnabled(false);
|
|
||||||
d->m_unsetButton->setEnabled(false);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void EnvironmentWidget::invalidateCurrentIndex()
|
|
||||||
{
|
|
||||||
environmentCurrentIndexChanged(QModelIndex());
|
|
||||||
}
|
|
||||||
|
|
||||||
} // namespace ProjectExplorer
|
|
||||||
|
|
||||||
#include "environmenteditmodel.moc"
|
|
||||||
264
src/plugins/projectexplorer/environmentwidget.cpp
Normal file
264
src/plugins/projectexplorer/environmentwidget.cpp
Normal file
@@ -0,0 +1,264 @@
|
|||||||
|
/**************************************************************************
|
||||||
|
**
|
||||||
|
** This file is part of Qt Creator
|
||||||
|
**
|
||||||
|
** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
|
||||||
|
**
|
||||||
|
** Contact: Nokia Corporation (qt-info@nokia.com)
|
||||||
|
**
|
||||||
|
** No Commercial Usage
|
||||||
|
**
|
||||||
|
** This file contains pre-release code and may not be distributed.
|
||||||
|
** You may use this file in accordance with the terms and conditions
|
||||||
|
** contained in the Technology Preview License Agreement accompanying
|
||||||
|
** this package.
|
||||||
|
**
|
||||||
|
** 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, Nokia gives you certain additional
|
||||||
|
** rights. These rights are described in the Nokia Qt LGPL Exception
|
||||||
|
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
|
||||||
|
**
|
||||||
|
** If you have questions regarding the use of this file, please contact
|
||||||
|
** Nokia at qt-info@nokia.com.
|
||||||
|
**
|
||||||
|
**************************************************************************/
|
||||||
|
|
||||||
|
#include "environmentwidget.h"
|
||||||
|
|
||||||
|
#include <utils/detailswidget.h>
|
||||||
|
#include <utils/environment.h>
|
||||||
|
#include <utils/environmentmodel.h>
|
||||||
|
|
||||||
|
#include <QtCore/QString>
|
||||||
|
#include <QtGui/QHeaderView>
|
||||||
|
#include <QtGui/QPushButton>
|
||||||
|
#include <QtGui/QTableView>
|
||||||
|
#include <QtGui/QTextDocument> // for Qt::escape
|
||||||
|
#include <QtGui/QVBoxLayout>
|
||||||
|
|
||||||
|
namespace ProjectExplorer {
|
||||||
|
|
||||||
|
////
|
||||||
|
// EnvironmentWidget::EnvironmentWidget
|
||||||
|
////
|
||||||
|
|
||||||
|
class EnvironmentWidgetPrivate
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
Utils::EnvironmentModel *m_model;
|
||||||
|
|
||||||
|
QString m_baseEnvironmentText;
|
||||||
|
Utils::DetailsWidget *m_detailsContainer;
|
||||||
|
QTableView *m_environmentView;
|
||||||
|
QPushButton *m_editButton;
|
||||||
|
QPushButton *m_addButton;
|
||||||
|
QPushButton *m_resetButton;
|
||||||
|
QPushButton *m_unsetButton;
|
||||||
|
};
|
||||||
|
|
||||||
|
EnvironmentWidget::EnvironmentWidget(QWidget *parent, QWidget *additionalDetailsWidget)
|
||||||
|
: QWidget(parent), d(new EnvironmentWidgetPrivate)
|
||||||
|
{
|
||||||
|
d->m_model = new Utils::EnvironmentModel();
|
||||||
|
connect(d->m_model, SIGNAL(userChangesChanged()),
|
||||||
|
this, SIGNAL(userChangesChanged()));
|
||||||
|
connect(d->m_model, SIGNAL(modelReset()),
|
||||||
|
this, SLOT(invalidateCurrentIndex()));
|
||||||
|
|
||||||
|
connect(d->m_model, SIGNAL(focusIndex(QModelIndex)),
|
||||||
|
this, SLOT(focusIndex(QModelIndex)));
|
||||||
|
|
||||||
|
QVBoxLayout *vbox = new QVBoxLayout(this);
|
||||||
|
vbox->setContentsMargins(0, 0, 0, 0);
|
||||||
|
|
||||||
|
d->m_detailsContainer = new Utils::DetailsWidget(this);
|
||||||
|
|
||||||
|
QWidget *details = new QWidget(d->m_detailsContainer);
|
||||||
|
d->m_detailsContainer->setWidget(details);
|
||||||
|
details->setVisible(false);
|
||||||
|
|
||||||
|
QVBoxLayout *vbox2 = new QVBoxLayout(details);
|
||||||
|
vbox2->setMargin(0);
|
||||||
|
|
||||||
|
if (additionalDetailsWidget)
|
||||||
|
vbox2->addWidget(additionalDetailsWidget);
|
||||||
|
|
||||||
|
QHBoxLayout *horizontalLayout = new QHBoxLayout();
|
||||||
|
horizontalLayout->setMargin(0);
|
||||||
|
d->m_environmentView = new QTableView(this);
|
||||||
|
d->m_environmentView->setModel(d->m_model);
|
||||||
|
d->m_environmentView->setMinimumHeight(400);
|
||||||
|
d->m_environmentView->setGridStyle(Qt::NoPen);
|
||||||
|
d->m_environmentView->horizontalHeader()->setStretchLastSection(true);
|
||||||
|
d->m_environmentView->horizontalHeader()->setResizeMode(0, QHeaderView::ResizeToContents);
|
||||||
|
d->m_environmentView->horizontalHeader()->setHighlightSections(false);
|
||||||
|
d->m_environmentView->verticalHeader()->hide();
|
||||||
|
QFontMetrics fm(font());
|
||||||
|
d->m_environmentView->verticalHeader()->setDefaultSectionSize(qMax(static_cast<int>(fm.height() * 1.2), fm.height() + 4));
|
||||||
|
d->m_environmentView->setSelectionMode(QAbstractItemView::SingleSelection);
|
||||||
|
horizontalLayout->addWidget(d->m_environmentView);
|
||||||
|
|
||||||
|
QVBoxLayout *buttonLayout = new QVBoxLayout();
|
||||||
|
|
||||||
|
d->m_editButton = new QPushButton(this);
|
||||||
|
d->m_editButton->setText(tr("&Edit"));
|
||||||
|
buttonLayout->addWidget(d->m_editButton);
|
||||||
|
|
||||||
|
d->m_addButton = new QPushButton(this);
|
||||||
|
d->m_addButton->setText(tr("&Add"));
|
||||||
|
buttonLayout->addWidget(d->m_addButton);
|
||||||
|
|
||||||
|
d->m_resetButton = new QPushButton(this);
|
||||||
|
d->m_resetButton->setEnabled(false);
|
||||||
|
d->m_resetButton->setText(tr("&Reset"));
|
||||||
|
buttonLayout->addWidget(d->m_resetButton);
|
||||||
|
|
||||||
|
d->m_unsetButton = new QPushButton(this);
|
||||||
|
d->m_unsetButton->setEnabled(false);
|
||||||
|
d->m_unsetButton->setText(tr("&Unset"));
|
||||||
|
buttonLayout->addWidget(d->m_unsetButton);
|
||||||
|
|
||||||
|
QSpacerItem *verticalSpacer = new QSpacerItem(20, 40, QSizePolicy::Minimum, QSizePolicy::Expanding);
|
||||||
|
buttonLayout->addItem(verticalSpacer);
|
||||||
|
horizontalLayout->addLayout(buttonLayout);
|
||||||
|
vbox2->addLayout(horizontalLayout);
|
||||||
|
|
||||||
|
vbox->addWidget(d->m_detailsContainer);
|
||||||
|
|
||||||
|
connect(d->m_model, SIGNAL(dataChanged(const QModelIndex&, const QModelIndex&)),
|
||||||
|
this, SLOT(updateButtons()));
|
||||||
|
|
||||||
|
connect(d->m_editButton, SIGNAL(clicked(bool)),
|
||||||
|
this, SLOT(editEnvironmentButtonClicked()));
|
||||||
|
connect(d->m_addButton, SIGNAL(clicked(bool)),
|
||||||
|
this, SLOT(addEnvironmentButtonClicked()));
|
||||||
|
connect(d->m_resetButton, SIGNAL(clicked(bool)),
|
||||||
|
this, SLOT(removeEnvironmentButtonClicked()));
|
||||||
|
connect(d->m_unsetButton, SIGNAL(clicked(bool)),
|
||||||
|
this, SLOT(unsetEnvironmentButtonClicked()));
|
||||||
|
connect(d->m_environmentView->selectionModel(), SIGNAL(currentChanged(QModelIndex,QModelIndex)),
|
||||||
|
this, SLOT(environmentCurrentIndexChanged(QModelIndex)));
|
||||||
|
|
||||||
|
connect(d->m_model, SIGNAL(userChangesChanged()), this, SLOT(updateSummaryText()));
|
||||||
|
}
|
||||||
|
|
||||||
|
EnvironmentWidget::~EnvironmentWidget()
|
||||||
|
{
|
||||||
|
delete d->m_model;
|
||||||
|
d->m_model = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
void EnvironmentWidget::focusIndex(const QModelIndex &index)
|
||||||
|
{
|
||||||
|
d->m_environmentView->setCurrentIndex(index);
|
||||||
|
d->m_environmentView->setFocus();
|
||||||
|
}
|
||||||
|
|
||||||
|
void EnvironmentWidget::setBaseEnvironment(const Utils::Environment &env)
|
||||||
|
{
|
||||||
|
d->m_model->setBaseEnvironment(env);
|
||||||
|
}
|
||||||
|
|
||||||
|
void EnvironmentWidget::setBaseEnvironmentText(const QString &text)
|
||||||
|
{
|
||||||
|
d->m_baseEnvironmentText = text;
|
||||||
|
updateSummaryText();
|
||||||
|
}
|
||||||
|
|
||||||
|
QList<Utils::EnvironmentItem> EnvironmentWidget::userChanges() const
|
||||||
|
{
|
||||||
|
return d->m_model->userChanges();
|
||||||
|
}
|
||||||
|
|
||||||
|
void EnvironmentWidget::setUserChanges(const QList<Utils::EnvironmentItem> &list)
|
||||||
|
{
|
||||||
|
d->m_model->setUserChanges(list);
|
||||||
|
updateSummaryText();
|
||||||
|
}
|
||||||
|
|
||||||
|
void EnvironmentWidget::updateSummaryText()
|
||||||
|
{
|
||||||
|
QString text;
|
||||||
|
const QList<Utils::EnvironmentItem> &list = d->m_model->userChanges();
|
||||||
|
foreach (const Utils::EnvironmentItem &item, list) {
|
||||||
|
if (item.name != Utils::EnvironmentModel::tr("<VARIABLE>")) {
|
||||||
|
text.append("<br>");
|
||||||
|
if (item.unset)
|
||||||
|
text.append(tr("Unset <b>%1</b>").arg(Qt::escape(item.name)));
|
||||||
|
else
|
||||||
|
text.append(tr("Set <b>%1</b> to <b>%2</b>").arg(Qt::escape(item.name), Qt::escape(item.value)));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (text.isEmpty())
|
||||||
|
text.prepend(tr("Using <b>%1</b>").arg(d->m_baseEnvironmentText));
|
||||||
|
else
|
||||||
|
text.prepend(tr("Using <b>%1</b> and").arg(d->m_baseEnvironmentText));
|
||||||
|
|
||||||
|
d->m_detailsContainer->setSummaryText(text);
|
||||||
|
}
|
||||||
|
|
||||||
|
void EnvironmentWidget::updateButtons()
|
||||||
|
{
|
||||||
|
environmentCurrentIndexChanged(d->m_environmentView->currentIndex());
|
||||||
|
}
|
||||||
|
|
||||||
|
void EnvironmentWidget::editEnvironmentButtonClicked()
|
||||||
|
{
|
||||||
|
d->m_environmentView->edit(d->m_environmentView->currentIndex());
|
||||||
|
}
|
||||||
|
|
||||||
|
void EnvironmentWidget::addEnvironmentButtonClicked()
|
||||||
|
{
|
||||||
|
QModelIndex index = d->m_model->addVariable();
|
||||||
|
d->m_environmentView->setCurrentIndex(index);
|
||||||
|
d->m_environmentView->edit(index);
|
||||||
|
}
|
||||||
|
|
||||||
|
void EnvironmentWidget::removeEnvironmentButtonClicked()
|
||||||
|
{
|
||||||
|
const QString &name = d->m_model->indexToVariable(d->m_environmentView->currentIndex());
|
||||||
|
d->m_model->resetVariable(name);
|
||||||
|
}
|
||||||
|
|
||||||
|
// unset in Merged Environment Mode means, unset if it comes from the base environment
|
||||||
|
// or remove when it is just a change we added
|
||||||
|
void EnvironmentWidget::unsetEnvironmentButtonClicked()
|
||||||
|
{
|
||||||
|
const QString &name = d->m_model->indexToVariable(d->m_environmentView->currentIndex());
|
||||||
|
if (!d->m_model->canReset(name))
|
||||||
|
d->m_model->resetVariable(name);
|
||||||
|
else
|
||||||
|
d->m_model->unsetVariable(name);
|
||||||
|
}
|
||||||
|
|
||||||
|
void EnvironmentWidget::environmentCurrentIndexChanged(const QModelIndex ¤t)
|
||||||
|
{
|
||||||
|
if (current.isValid()) {
|
||||||
|
d->m_editButton->setEnabled(true);
|
||||||
|
const QString &name = d->m_model->indexToVariable(current);
|
||||||
|
bool modified = d->m_model->canReset(name) && d->m_model->changes(name);
|
||||||
|
bool unset = d->m_model->canUnset(name);
|
||||||
|
d->m_resetButton->setEnabled(modified || unset);
|
||||||
|
d->m_unsetButton->setEnabled(!unset);
|
||||||
|
} else {
|
||||||
|
d->m_editButton->setEnabled(false);
|
||||||
|
d->m_resetButton->setEnabled(false);
|
||||||
|
d->m_unsetButton->setEnabled(false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void EnvironmentWidget::invalidateCurrentIndex()
|
||||||
|
{
|
||||||
|
environmentCurrentIndexChanged(QModelIndex());
|
||||||
|
}
|
||||||
|
|
||||||
|
} // namespace ProjectExplorer
|
||||||
@@ -31,8 +31,8 @@
|
|||||||
**
|
**
|
||||||
**************************************************************************/
|
**************************************************************************/
|
||||||
|
|
||||||
#ifndef ENVIRONMENTEDITMODEL_H
|
#ifndef ENVIRONMENTWIDGET_H
|
||||||
#define ENVIRONMENTEDITMODEL_H
|
#define ENVIRONMENTWIDGET_H
|
||||||
|
|
||||||
#include "projectexplorer_export.h"
|
#include "projectexplorer_export.h"
|
||||||
|
|
||||||
@@ -46,7 +46,7 @@ class EnvironmentItem;
|
|||||||
}
|
}
|
||||||
|
|
||||||
namespace ProjectExplorer {
|
namespace ProjectExplorer {
|
||||||
struct EnvironmentWidgetPrivate;
|
class EnvironmentWidgetPrivate;
|
||||||
|
|
||||||
class PROJECTEXPLORER_EXPORT EnvironmentWidget : public QWidget
|
class PROJECTEXPLORER_EXPORT EnvironmentWidget : public QWidget
|
||||||
{
|
{
|
||||||
@@ -82,4 +82,4 @@ private:
|
|||||||
|
|
||||||
} // namespace ProjectExplorer
|
} // namespace ProjectExplorer
|
||||||
|
|
||||||
#endif // ENVIRONMENTEDITMODEL_H
|
#endif // ENVIRONMENTWIDGET_H
|
||||||
@@ -49,7 +49,7 @@ HEADERS += projectexplorer.h \
|
|||||||
buildconfiguration.h \
|
buildconfiguration.h \
|
||||||
iprojectproperties.h \
|
iprojectproperties.h \
|
||||||
buildsettingspropertiespage.h \
|
buildsettingspropertiespage.h \
|
||||||
environmenteditmodel.h \
|
environmentwidget.h \
|
||||||
processstep.h \
|
processstep.h \
|
||||||
editorconfiguration.h \
|
editorconfiguration.h \
|
||||||
editorsettingspropertiespage.h \
|
editorsettingspropertiespage.h \
|
||||||
@@ -135,7 +135,7 @@ SOURCES += projectexplorer.cpp \
|
|||||||
buildstep.cpp \
|
buildstep.cpp \
|
||||||
buildconfiguration.cpp \
|
buildconfiguration.cpp \
|
||||||
buildsettingspropertiespage.cpp \
|
buildsettingspropertiespage.cpp \
|
||||||
environmenteditmodel.cpp \
|
environmentwidget.cpp \
|
||||||
processstep.cpp \
|
processstep.cpp \
|
||||||
abstractprocessstep.cpp \
|
abstractprocessstep.cpp \
|
||||||
editorconfiguration.cpp \
|
editorconfiguration.cpp \
|
||||||
|
|||||||
@@ -37,7 +37,7 @@
|
|||||||
#include "qmlproject.h"
|
#include "qmlproject.h"
|
||||||
|
|
||||||
#include <coreplugin/icore.h>
|
#include <coreplugin/icore.h>
|
||||||
#include <projectexplorer/environmenteditmodel.h>
|
#include <projectexplorer/environmentwidget.h>
|
||||||
#include <projectexplorer/projectexplorer.h>
|
#include <projectexplorer/projectexplorer.h>
|
||||||
#include <utils/debuggerlanguagechooser.h>
|
#include <utils/debuggerlanguagechooser.h>
|
||||||
#include <utils/detailswidget.h>
|
#include <utils/detailswidget.h>
|
||||||
|
|||||||
@@ -46,7 +46,7 @@
|
|||||||
|
|
||||||
#include <coreplugin/coreconstants.h>
|
#include <coreplugin/coreconstants.h>
|
||||||
#include <coreplugin/icore.h>
|
#include <coreplugin/icore.h>
|
||||||
#include <projectexplorer/environmenteditmodel.h>
|
#include <projectexplorer/environmentwidget.h>
|
||||||
#include <qt4projectmanager/qt4buildconfiguration.h>
|
#include <qt4projectmanager/qt4buildconfiguration.h>
|
||||||
#include <qt4projectmanager/qt4target.h>
|
#include <qt4projectmanager/qt4target.h>
|
||||||
#include <utils/detailswidget.h>
|
#include <utils/detailswidget.h>
|
||||||
|
|||||||
@@ -48,7 +48,7 @@
|
|||||||
#include <coreplugin/variablemanager.h>
|
#include <coreplugin/variablemanager.h>
|
||||||
#include <coreplugin/ifile.h>
|
#include <coreplugin/ifile.h>
|
||||||
#include <projectexplorer/buildstep.h>
|
#include <projectexplorer/buildstep.h>
|
||||||
#include <projectexplorer/environmenteditmodel.h>
|
#include <projectexplorer/environmentwidget.h>
|
||||||
#include <projectexplorer/persistentsettings.h>
|
#include <projectexplorer/persistentsettings.h>
|
||||||
#include <utils/qtcassert.h>
|
#include <utils/qtcassert.h>
|
||||||
#include <utils/qtcprocess.h>
|
#include <utils/qtcprocess.h>
|
||||||
|
|||||||
Reference in New Issue
Block a user