forked from qt-creator/qt-creator
Nim: Move NimbleTaskStepWidget closer to NimbleTaskStep
Next step towards NimbleTaskStep aspectification. Change-Id: Ifdb7d942e29ab99da01c6797d1edddd68afc5e30 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
@@ -24,8 +24,9 @@
|
||||
****************************************************************************/
|
||||
|
||||
#include "nimbletaskstep.h"
|
||||
#include "nimbletaskstepwidget.h"
|
||||
|
||||
#include "nimconstants.h"
|
||||
#include "nimblebuildsystem.h"
|
||||
#include "nimbleproject.h"
|
||||
|
||||
#include <projectexplorer/buildstep.h>
|
||||
@@ -33,13 +34,174 @@
|
||||
#include <projectexplorer/processparameters.h>
|
||||
#include <projectexplorer/projectexplorerconstants.h>
|
||||
|
||||
#include <utils/algorithm.h>
|
||||
#include <utils/fileutils.h>
|
||||
|
||||
#include <QFormLayout>
|
||||
#include <QLineEdit>
|
||||
#include <QListView>
|
||||
#include <QStandardItemModel>
|
||||
#include <QStandardPaths>
|
||||
|
||||
using namespace Nim;
|
||||
using namespace ProjectExplorer;
|
||||
|
||||
namespace Nim {
|
||||
|
||||
class NimbleTaskStepWidget : public BuildStepConfigWidget
|
||||
{
|
||||
Q_DECLARE_TR_FUNCTIONS(Nim::NimbleTaskStep)
|
||||
|
||||
public:
|
||||
explicit NimbleTaskStepWidget(NimbleTaskStep *buildStep);
|
||||
|
||||
void selectedTaskChanged(const QString &name)
|
||||
{
|
||||
auto taskStep = dynamic_cast<NimbleTaskStep *>(step());
|
||||
QTC_ASSERT(taskStep, return);
|
||||
taskStep->setTaskName(name);
|
||||
}
|
||||
|
||||
private:
|
||||
void updateTaskList();
|
||||
|
||||
void selectTask(const QString &name);
|
||||
|
||||
void onDataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight, const QVector<int> &roles);
|
||||
|
||||
void uncheckedAllDifferentFrom(QStandardItem *item);
|
||||
|
||||
QStandardItemModel m_tasks;
|
||||
bool m_selecting = false;
|
||||
};
|
||||
|
||||
NimbleTaskStepWidget::NimbleTaskStepWidget(NimbleTaskStep *bs)
|
||||
: BuildStepConfigWidget(bs)
|
||||
{
|
||||
auto taskArgumentsLineEdit = new QLineEdit(this);
|
||||
taskArgumentsLineEdit->setText(bs->taskArgs());
|
||||
|
||||
auto taskList = new QListView(this);
|
||||
taskList->setFrameShape(QFrame::StyledPanel);
|
||||
taskList->setSelectionMode(QAbstractItemView::NoSelection);
|
||||
taskList->setSelectionBehavior(QAbstractItemView::SelectRows);
|
||||
taskList->setModel(&m_tasks);
|
||||
|
||||
auto formLayout = new QFormLayout(this);
|
||||
formLayout->setSizeConstraint(QLayout::SetDefaultConstraint);
|
||||
formLayout->setFieldGrowthPolicy(QFormLayout::ExpandingFieldsGrow);
|
||||
|
||||
formLayout->addRow(tr("Task arguments:"), taskArgumentsLineEdit);
|
||||
formLayout->addRow(tr("Tasks:"), taskList);
|
||||
|
||||
auto buildSystem = dynamic_cast<NimbleBuildSystem *>(bs->buildSystem());
|
||||
QTC_ASSERT(buildSystem, return);
|
||||
|
||||
connect(&m_tasks, &QAbstractItemModel::dataChanged, this, &NimbleTaskStepWidget::onDataChanged);
|
||||
|
||||
updateTaskList();
|
||||
connect(buildSystem, &NimbleBuildSystem::tasksChanged, this, &NimbleTaskStepWidget::updateTaskList);
|
||||
|
||||
selectTask(bs->taskName());
|
||||
connect(bs, &NimbleTaskStep::taskNameChanged, this, &NimbleTaskStepWidget::selectTask);
|
||||
connect(bs, &NimbleTaskStep::taskNameChanged, this, &NimbleTaskStepWidget::recreateSummary);
|
||||
|
||||
connect(bs, &NimbleTaskStep::taskArgsChanged, taskArgumentsLineEdit, &QLineEdit::setText);
|
||||
connect(bs, &NimbleTaskStep::taskArgsChanged, this, &NimbleTaskStepWidget::recreateSummary);
|
||||
connect(taskArgumentsLineEdit, &QLineEdit::textChanged, bs ,&NimbleTaskStep::setTaskArgs);
|
||||
|
||||
setSummaryUpdater([this, bs] {
|
||||
return QString("<b>%1:</b> nimble %2 %3")
|
||||
.arg(displayName(), bs->taskName(), bs->taskArgs());
|
||||
});
|
||||
}
|
||||
|
||||
void NimbleTaskStepWidget::updateTaskList()
|
||||
{
|
||||
auto buildSystem = dynamic_cast<NimbleBuildSystem *>(step()->buildSystem());
|
||||
QTC_ASSERT(buildSystem, return);
|
||||
const std::vector<NimbleTask> &tasks = buildSystem->tasks();
|
||||
|
||||
QSet<QString> newTasks;
|
||||
for (const NimbleTask &t : tasks)
|
||||
newTasks.insert(t.name);
|
||||
|
||||
QSet<QString> currentTasks;
|
||||
for (int i = 0; i < m_tasks.rowCount(); ++i)
|
||||
currentTasks.insert(m_tasks.item(i)->text());
|
||||
|
||||
const QSet<QString> added = newTasks - currentTasks;
|
||||
const QSet<QString> removed = currentTasks - newTasks;
|
||||
|
||||
for (const QString &name : added) {
|
||||
auto item = new QStandardItem();
|
||||
item->setText(name);
|
||||
item->setCheckable(true);
|
||||
item->setCheckState(Qt::Unchecked);
|
||||
item->setEditable(false);
|
||||
item->setSelectable(false);
|
||||
m_tasks.appendRow(item);
|
||||
}
|
||||
|
||||
for (int i = m_tasks.rowCount() - 1; i >= 0; i--)
|
||||
if (removed.contains(m_tasks.item(i)->text()))
|
||||
m_tasks.removeRow(i);
|
||||
|
||||
m_tasks.sort(0);
|
||||
}
|
||||
|
||||
void NimbleTaskStepWidget::selectTask(const QString &name)
|
||||
{
|
||||
if (m_selecting)
|
||||
return;
|
||||
m_selecting = true;
|
||||
|
||||
QList<QStandardItem *> items = m_tasks.findItems(name);
|
||||
QStandardItem *item = items.empty() ? nullptr : items.front();
|
||||
uncheckedAllDifferentFrom(item);
|
||||
if (item)
|
||||
item->setCheckState(Qt::Checked);
|
||||
|
||||
selectedTaskChanged(name);
|
||||
|
||||
m_selecting = false;
|
||||
}
|
||||
|
||||
void NimbleTaskStepWidget::onDataChanged(const QModelIndex &topLeft,
|
||||
const QModelIndex &bottomRight,
|
||||
const QVector<int> &roles)
|
||||
{
|
||||
QTC_ASSERT(topLeft == bottomRight, return );
|
||||
if (!roles.contains(Qt::CheckStateRole))
|
||||
return;
|
||||
|
||||
auto item = m_tasks.itemFromIndex(topLeft);
|
||||
if (!item)
|
||||
return;
|
||||
|
||||
if (m_selecting)
|
||||
return;
|
||||
m_selecting = true;
|
||||
|
||||
if (item->checkState() == Qt::Checked) {
|
||||
uncheckedAllDifferentFrom(item);
|
||||
selectedTaskChanged(item->text());
|
||||
} else if (item->checkState() == Qt::Unchecked) {
|
||||
selectedTaskChanged(QString());
|
||||
}
|
||||
|
||||
m_selecting = false;
|
||||
}
|
||||
|
||||
void NimbleTaskStepWidget::uncheckedAllDifferentFrom(QStandardItem *toSkip)
|
||||
{
|
||||
for (int i = 0; i < m_tasks.rowCount(); ++i) {
|
||||
auto item = m_tasks.item(i);
|
||||
if (!item || item == toSkip)
|
||||
continue;
|
||||
item->setCheckState(Qt::Unchecked);
|
||||
}
|
||||
}
|
||||
|
||||
NimbleTaskStep::NimbleTaskStep(BuildStepList *parentList, Utils::Id id)
|
||||
: AbstractProcessStep(parentList, id)
|
||||
{
|
||||
@@ -118,6 +280,8 @@ bool NimbleTaskStep::validate()
|
||||
return true;
|
||||
}
|
||||
|
||||
// Factory
|
||||
|
||||
NimbleTaskStepFactory::NimbleTaskStepFactory()
|
||||
{
|
||||
registerStep<NimbleTaskStep>(Constants::C_NIMBLETASKSTEP_ID);
|
||||
@@ -128,3 +292,5 @@ NimbleTaskStepFactory::NimbleTaskStepFactory()
|
||||
setSupportedConfiguration(Constants::C_NIMBLEBUILDCONFIGURATION_ID);
|
||||
setRepeatable(true);
|
||||
}
|
||||
|
||||
} // Nim
|
||||
|
||||
Reference in New Issue
Block a user