feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

ProjectExplorer: Inline makestep.ui

Browse Source 
A step towards aspectification.

Change-Id: I1eeb0ff3623b6cfd0b564825548309a1307846ac
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2020-07-09 17:25:55 +02:00
parent bfd49fe5ce
commit ec7e9e649b
6 changed files with 227 additions and 319 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/projectexplorer/CMakeLists.txt
View File

@@ -115,7 +115,7 @@ add_qtc_plugin(ProjectExplorer
lldparser.cpp lldparser.h
linuxiccparser.cpp linuxiccparser.h
localenvironmentaspect.cpp localenvironmentaspect.h
makestep.cpp makestep.h makestep.ui
makestep.cpp makestep.h
miniprojecttargetselector.cpp miniprojecttargetselector.h
msvcparser.cpp msvcparser.h
msvctoolchain.cpp msvctoolchain.h

379
src/plugins/projectexplorer/makestep.cpp
View File

@@ -24,7 +24,6 @@
****************************************************************************/
#include "makestep.h"
#include "ui_makestep.h"
#include "buildconfiguration.h"
#include "gnumakeparser.h"
@@ -40,9 +39,16 @@
#include <utils/environment.h>
#include <utils/hostosinfo.h>
#include <utils/optional.h>
#include <utils/pathchooser.h>
#include <utils/qtcprocess.h>
#include <utils/utilsicons.h>
#include <QCheckBox>
#include <QFormLayout>
#include <QLabel>
#include <QLineEdit>
#include <QListWidget>
#include <QSpinBox>
#include <QThread>
using namespace Core;
@@ -58,6 +64,222 @@ const char JOBCOUNT_SUFFIX[] = ".JobCount";
const char MAKEFLAGS[] = "MAKEFLAGS";
namespace ProjectExplorer {
namespace Internal {
class MakeStepConfigWidget : public BuildStepConfigWidget
{
Q_DECLARE_TR_FUNCTIONS(ProjectExplorer::MakeStep)
public:
explicit MakeStepConfigWidget(MakeStep *makeStep);
private:
void itemChanged(QListWidgetItem *item);
void makeLineEditTextEdited();
void makeArgumentsLineEditTextEdited();
void updateDetails();
void setUserJobCountVisible(bool visible);
void setUserJobCountEnabled(bool enabled);
MakeStep *m_makeStep;
QLabel *m_makeLabel;
Utils::PathChooser *m_makeLineEdit;
QLabel *m_makeArgumentsLabel;
QLineEdit *m_makeArgumentsLineEdit;
QLabel *m_jobsLabel;
QLabel *m_targetsLabel;
QListWidget *m_targetsList;
QSpinBox *m_userJobCount;
QCheckBox *m_overrideMakeflags;
QLabel *m_nonOverrideWarning;
QCheckBox *m_disableInSubDirsCheckBox;
};
MakeStepConfigWidget::MakeStepConfigWidget(MakeStep *makeStep)
: BuildStepConfigWidget(makeStep), m_makeStep(makeStep)
{
m_makeLabel = new QLabel(tr("Override %1:"), this);
m_makeLineEdit = new PathChooser(this);
m_makeLineEdit->setExpectedKind(PathChooser::ExistingCommand);
m_makeLineEdit->setBaseDirectory(FilePath::fromString(PathChooser::homePath()));
m_makeLineEdit->setHistoryCompleter("PE.MakeCommand.History");
m_makeLineEdit->setPath(m_makeStep->makeCommand().toString());
auto makeArgumentsLabel = new QLabel(tr("Make arguments:"), this);
m_makeArgumentsLineEdit = new QLineEdit(this);
m_makeArgumentsLineEdit->setText(m_makeStep->userArguments());
m_jobsLabel = new QLabel(this);
m_jobsLabel->setText(tr("Parallel jobs:"));
m_targetsLabel = new QLabel(this);
m_targetsLabel->setText(tr("Targets:"));
m_targetsList = new QListWidget(this);
m_userJobCount = new QSpinBox(this);
m_userJobCount->setMinimum(1);
m_userJobCount->setMaximum(999);
m_overrideMakeflags = new QCheckBox(tr("Override MAKEFLAGS"), this);
m_nonOverrideWarning = new QLabel(this);
m_nonOverrideWarning->setToolTip("<html><body><p>" +
tr("<code>MAKEFLAGS</code> specifies parallel jobs. Check \"%1\" to override.")
.arg(m_overrideMakeflags->text()) + "</p></body></html>");
m_nonOverrideWarning->setPixmap(Icons::WARNING.pixmap());
auto disableInSubDirsLabel = new QLabel(tr("Disable in subdirectories:"), this);
m_disableInSubDirsCheckBox = new QCheckBox(this);
m_disableInSubDirsCheckBox->setToolTip(tr("Runs this step only for a top-level build."));
auto jobLayout = new QHBoxLayout;
jobLayout->addWidget(m_userJobCount);
jobLayout->addWidget(m_overrideMakeflags);
jobLayout->addWidget(m_nonOverrideWarning);
auto formLayout = new QFormLayout(this);
formLayout->setFieldGrowthPolicy(QFormLayout::ExpandingFieldsGrow);
formLayout->setContentsMargins(0, 0, 0, 0);
formLayout->addRow(m_makeLabel, m_makeLineEdit);
formLayout->addRow(makeArgumentsLabel, m_makeArgumentsLineEdit);
formLayout->addRow(m_jobsLabel, jobLayout);
formLayout->addRow(disableInSubDirsLabel, m_disableInSubDirsCheckBox);
formLayout->addRow(m_targetsLabel, m_targetsList);
if (!makeStep->disablingForSubdirsSupported()) {
disableInSubDirsLabel->hide();
m_disableInSubDirsCheckBox->hide();
} else {
connect(m_disableInSubDirsCheckBox, &QCheckBox::toggled, this, [this] {
m_makeStep->setEnabledForSubDirs(!m_disableInSubDirsCheckBox->isChecked());
});
}
const auto availableTargets = makeStep->availableTargets();
for (const QString &target : availableTargets) {
auto item = new QListWidgetItem(target, m_targetsList);
item->setFlags(item->flags() | Qt::ItemIsUserCheckable);
item->setCheckState(m_makeStep->buildsTarget(item->text()) ? Qt::Checked : Qt::Unchecked);
}
if (availableTargets.isEmpty()) {
m_targetsLabel->hide();
m_targetsList->hide();
}
updateDetails();
connect(m_targetsList, &QListWidget::itemChanged,
this, &MakeStepConfigWidget::itemChanged);
connect(m_makeLineEdit, &Utils::PathChooser::rawPathChanged,
this, &MakeStepConfigWidget::makeLineEditTextEdited);
connect(m_makeArgumentsLineEdit, &QLineEdit::textEdited,
this, &MakeStepConfigWidget::makeArgumentsLineEditTextEdited);
connect(m_userJobCount, QOverload<int>::of(&QSpinBox::valueChanged), this, [this](int value) {
m_makeStep->setJobCount(value);
updateDetails();
});
connect(m_overrideMakeflags, &QCheckBox::stateChanged, this, [this](int state) {
m_makeStep->setJobCountOverrideMakeflags(state == Qt::Checked);
updateDetails();
});
connect(ProjectExplorerPlugin::instance(), &ProjectExplorerPlugin::settingsChanged,
this, &MakeStepConfigWidget::updateDetails);
connect(m_makeStep->target(), &Target::kitChanged,
this, &MakeStepConfigWidget::updateDetails);
connect(m_makeStep->buildConfiguration(), &BuildConfiguration::environmentChanged,
this, &MakeStepConfigWidget::updateDetails);
connect(m_makeStep->buildConfiguration(), &BuildConfiguration::buildDirectoryChanged,
this, &MakeStepConfigWidget::updateDetails);
connect(m_makeStep->target(), &Target::parsingFinished,
this, &MakeStepConfigWidget::updateDetails);
Core::VariableChooser::addSupportForChildWidgets(this, m_makeStep->macroExpander());
}
void MakeStepConfigWidget::setUserJobCountVisible(bool visible)
{
m_jobsLabel->setVisible(visible);
m_userJobCount->setVisible(visible);
m_overrideMakeflags->setVisible(visible);
}
void MakeStepConfigWidget::setUserJobCountEnabled(bool enabled)
{
m_jobsLabel->setEnabled(enabled);
m_userJobCount->setEnabled(enabled);
m_overrideMakeflags->setEnabled(enabled);
}
void MakeStepConfigWidget::updateDetails()
{
BuildConfiguration *bc = m_makeStep->buildConfiguration();
const QString defaultMake = m_makeStep->defaultMakeCommand().toString();
if (defaultMake.isEmpty())
m_makeLabel->setText(tr("Make:"));
else
m_makeLabel->setText(tr("Override %1:").arg(QDir::toNativeSeparators(defaultMake)));
const CommandLine make = m_makeStep->effectiveMakeCommand(MakeStep::Display);
if (make.executable().isEmpty()) {
setSummaryText(tr("<b>Make:</b> %1").arg(MakeStep::msgNoMakeCommand()));
return;
}
if (!bc) {
setSummaryText(tr("<b>Make:</b> No build configuration."));
return;
}
setUserJobCountVisible(m_makeStep->isJobCountSupported());
setUserJobCountEnabled(!m_makeStep->userArgsContainsJobCount());
m_userJobCount->setValue(m_makeStep->jobCount());
m_overrideMakeflags->setCheckState(
m_makeStep->jobCountOverridesMakeflags() ? Qt::Checked : Qt::Unchecked);
m_nonOverrideWarning->setVisible(m_makeStep->makeflagsJobCountMismatch()
&& !m_makeStep->jobCountOverridesMakeflags());
m_disableInSubDirsCheckBox->setChecked(!m_makeStep->enabledForSubDirs());
ProcessParameters param;
param.setMacroExpander(m_makeStep->macroExpander());
param.setWorkingDirectory(m_makeStep->buildDirectory());
param.setCommandLine(make);
param.setEnvironment(m_makeStep->buildEnvironment());
if (param.commandMissing())
setSummaryText(tr("<b>Make:</b> %1 not found in the environment.")
.arg(param.command().executable().toUserOutput())); // Override display text
else
setSummaryText(param.summaryInWorkdir(displayName()));
}
void MakeStepConfigWidget::itemChanged(QListWidgetItem *item)
{
m_makeStep->setBuildTarget(item->text(), item->checkState() & Qt::Checked);
updateDetails();
}
void MakeStepConfigWidget::makeLineEditTextEdited()
{
m_makeStep->setMakeCommand(FilePath::fromString(m_makeLineEdit->rawPath()));
updateDetails();
}
void MakeStepConfigWidget::makeArgumentsLineEditTextEdited()
{
m_makeStep->setUserArguments(m_makeArgumentsLineEdit->text());
updateDetails();
}
} // Internal
MakeStep::MakeStep(BuildStepList *parent, Utils::Id id)
: AbstractProcessStep(parent, id),
@@ -346,7 +568,7 @@ CommandLine MakeStep::effectiveMakeCommand(MakeCommandType type) const
BuildStepConfigWidget *MakeStep::createConfigWidget()
{
return new MakeStepConfigWidget(this);
return new Internal::MakeStepConfigWidget(this);
}
bool MakeStep::buildsTarget(const QString &target) const
@@ -370,155 +592,4 @@ QStringList MakeStep::availableTargets() const
return m_availableTargets;
}
//
// GenericMakeStepConfigWidget
//
MakeStepConfigWidget::MakeStepConfigWidget(MakeStep *makeStep)
: BuildStepConfigWidget(makeStep), m_makeStep(makeStep)
{
m_ui = new Internal::Ui::MakeStep;
m_ui->setupUi(this);
if (!makeStep->disablingForSubdirsSupported()) {
m_ui->disableInSubDirsLabel->hide();
m_ui->disableInSubDirsCheckBox->hide();
} else {
connect(m_ui->disableInSubDirsCheckBox, &QCheckBox::toggled, this, [this] {
m_makeStep->setEnabledForSubDirs(!m_ui->disableInSubDirsCheckBox->isChecked());
});
}
const auto availableTargets = makeStep->availableTargets();
for (const QString &target : availableTargets) {
auto item = new QListWidgetItem(target, m_ui->targetsList);
item->setFlags(item->flags() | Qt::ItemIsUserCheckable);
item->setCheckState(m_makeStep->buildsTarget(item->text()) ? Qt::Checked : Qt::Unchecked);
}
if (availableTargets.isEmpty()) {
m_ui->targetsLabel->hide();
m_ui->targetsList->hide();
}
m_ui->makeLineEdit->setExpectedKind(Utils::PathChooser::ExistingCommand);
m_ui->makeLineEdit->setBaseDirectory(FilePath::fromString(PathChooser::homePath()));
m_ui->makeLineEdit->setHistoryCompleter("PE.MakeCommand.History");
m_ui->makeLineEdit->setPath(m_makeStep->makeCommand().toString());
m_ui->makeArgumentsLineEdit->setText(m_makeStep->userArguments());
m_ui->nonOverrideWarning->setToolTip("<html><body><p>" +
tr("<code>MAKEFLAGS</code> specifies parallel jobs. Check \"%1\" to override.")
.arg(m_ui->overrideMakeflags->text()) + "</p></body></html>");
m_ui->nonOverrideWarning->setPixmap(Utils::Icons::WARNING.pixmap());
updateDetails();
connect(m_ui->targetsList, &QListWidget::itemChanged,
this, &MakeStepConfigWidget::itemChanged);
connect(m_ui->makeLineEdit, &Utils::PathChooser::rawPathChanged,
this, &MakeStepConfigWidget::makeLineEditTextEdited);
connect(m_ui->makeArgumentsLineEdit, &QLineEdit::textEdited,
this, &MakeStepConfigWidget::makeArgumentsLineEditTextEdited);
connect(m_ui->userJobCount, QOverload<int>::of(&QSpinBox::valueChanged), this, [this](int value) {
m_makeStep->setJobCount(value);
updateDetails();
});
connect(m_ui->overrideMakeflags, &QCheckBox::stateChanged, this, [this](int state) {
m_makeStep->setJobCountOverrideMakeflags(state == Qt::Checked);
updateDetails();
});
connect(ProjectExplorerPlugin::instance(), &ProjectExplorerPlugin::settingsChanged,
this, &MakeStepConfigWidget::updateDetails);
connect(m_makeStep->target(), &Target::kitChanged,
this, &MakeStepConfigWidget::updateDetails);
connect(m_makeStep->buildConfiguration(), &BuildConfiguration::environmentChanged,
this, &MakeStepConfigWidget::updateDetails);
connect(m_makeStep->buildConfiguration(), &BuildConfiguration::buildDirectoryChanged,
this, &MakeStepConfigWidget::updateDetails);
connect(m_makeStep->target(), &Target::parsingFinished,
this, &MakeStepConfigWidget::updateDetails);
Core::VariableChooser::addSupportForChildWidgets(this, m_makeStep->macroExpander());
}
MakeStepConfigWidget::~MakeStepConfigWidget()
{
delete m_ui;
}
void MakeStepConfigWidget::setUserJobCountVisible(bool visible)
{
m_ui->jobsLabel->setVisible(visible);
m_ui->userJobCount->setVisible(visible);
m_ui->overrideMakeflags->setVisible(visible);
}
void MakeStepConfigWidget::setUserJobCountEnabled(bool enabled)
{
m_ui->jobsLabel->setEnabled(enabled);
m_ui->userJobCount->setEnabled(enabled);
m_ui->overrideMakeflags->setEnabled(enabled);
}
void MakeStepConfigWidget::updateDetails()
{
BuildConfiguration *bc = m_makeStep->buildConfiguration();
const QString defaultMake = m_makeStep->defaultMakeCommand().toString();
if (defaultMake.isEmpty())
m_ui->makeLabel->setText(tr("Make:"));
else
m_ui->makeLabel->setText(tr("Override %1:").arg(QDir::toNativeSeparators(defaultMake)));
const CommandLine make = m_makeStep->effectiveMakeCommand(MakeStep::Display);
if (make.executable().isEmpty()) {
setSummaryText(tr("<b>Make:</b> %1").arg(MakeStep::msgNoMakeCommand()));
return;
}
if (!bc) {
setSummaryText(tr("<b>Make:</b> No build configuration."));
return;
}
setUserJobCountVisible(m_makeStep->isJobCountSupported());
setUserJobCountEnabled(!m_makeStep->userArgsContainsJobCount());
m_ui->userJobCount->setValue(m_makeStep->jobCount());
m_ui->overrideMakeflags->setCheckState(
m_makeStep->jobCountOverridesMakeflags() ? Qt::Checked : Qt::Unchecked);
m_ui->nonOverrideWarning->setVisible(m_makeStep->makeflagsJobCountMismatch()
&& !m_makeStep->jobCountOverridesMakeflags());
m_ui->disableInSubDirsCheckBox->setChecked(!m_makeStep->enabledForSubDirs());
ProcessParameters param;
param.setMacroExpander(m_makeStep->macroExpander());
param.setWorkingDirectory(m_makeStep->buildDirectory());
param.setCommandLine(make);
param.setEnvironment(m_makeStep->buildEnvironment());
if (param.commandMissing())
setSummaryText(tr("<b>Make:</b> %1 not found in the environment.")
.arg(param.command().executable().toUserOutput())); // Override display text
else
setSummaryText(param.summaryInWorkdir(displayName()));
}
void MakeStepConfigWidget::itemChanged(QListWidgetItem *item)
{
m_makeStep->setBuildTarget(item->text(), item->checkState() & Qt::Checked);
updateDetails();
}
void MakeStepConfigWidget::makeLineEditTextEdited()
{
m_makeStep->setMakeCommand(FilePath::fromString(m_ui->makeLineEdit->rawPath()));
updateDetails();
}
void MakeStepConfigWidget::makeArgumentsLineEditTextEdited()
{
m_makeStep->setUserArguments(m_ui->makeArgumentsLineEdit->text());
updateDetails();
}
} // namespace GenericProjectManager
} // namespace ProjectExplorer

26
src/plugins/projectexplorer/makestep.h
View File

@@ -29,16 +29,10 @@
#include <utils/fileutils.h>
QT_FORWARD_DECLARE_CLASS(QListWidgetItem);
namespace Utils { class Environment; }
namespace ProjectExplorer {
namespace Internal {
namespace Ui { class MakeStep; }
} // namespace Internal
class PROJECTEXPLORER_EXPORT MakeStep : public ProjectExplorer::AbstractProcessStep
{
Q_OBJECT
@@ -111,24 +105,4 @@ private:
bool m_enabledForSubDirs = true;
};
class PROJECTEXPLORER_EXPORT MakeStepConfigWidget : public ProjectExplorer::BuildStepConfigWidget
{
Q_OBJECT
public:
explicit MakeStepConfigWidget(MakeStep *makeStep);
~MakeStepConfigWidget() override;
private:
void itemChanged(QListWidgetItem *item);
void makeLineEditTextEdited();
void makeArgumentsLineEditTextEdited();
void updateDetails();
void setUserJobCountVisible(bool visible);
void setUserJobCountEnabled(bool enabled);
Internal::Ui::MakeStep *m_ui;
MakeStep *m_makeStep;
};
} // namespace GenericProjectManager

136
src/plugins/projectexplorer/makestep.ui
View File

@@ -1,136 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>ProjectExplorer::Internal::MakeStep</class>
<widget class="QWidget" name="ProjectExplorer::Internal::MakeStep">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>422</width>
<height>279</height>
</rect>
</property>
<layout class="QFormLayout" name="formLayout">
<property name="fieldGrowthPolicy">
<enum>QFormLayout::ExpandingFieldsGrow</enum>
</property>
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item row="0" column="0">
<widget class="QLabel" name="makeLabel">
<property name="text">
<string>Override %1:</string>
</property>
<property name="buddy">
<cstring>makeLineEdit</cstring>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="Utils::PathChooser" name="makeLineEdit" native="true"/>
</item>
<item row="1" column="0">
<widget class="QLabel" name="makeArgumentsLabel">
<property name="text">
<string>Make arguments:</string>
</property>
<property name="buddy">
<cstring>makeArgumentsLineEdit</cstring>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QLineEdit" name="makeArgumentsLineEdit"/>
</item>
<item row="2" column="0">
<widget class="QLabel" name="jobsLabel">
<property name="text">
<string>Parallel jobs:</string>
</property>
</widget>
</item>
<item row="4" column="0">
<widget class="QLabel" name="targetsLabel">
<property name="text">
<string>Targets:</string>
</property>
<property name="buddy">
<cstring>targetsList</cstring>
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="QListWidget" name="targetsList"/>
</item>
<item row="2" column="1">
<layout class="QHBoxLayout" name="jobLayout">
<item>
<widget class="QSpinBox" name="userJobCount">
<property name="minimum">
<number>1</number>
</property>
<property name="maximum">
<number>999</number>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="overrideMakeflags">
<property name="text">
<string>Override MAKEFLAGS</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="nonOverrideWarning">
<property name="text">
<string/>
</property>
</widget>
</item>
</layout>
</item>
<item row="3" column="0">
<widget class="QLabel" name="disableInSubDirsLabel">
<property name="toolTip">
<string/>
</property>
<property name="text">
<string>Disable in subdirectories:</string>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QCheckBox" name="disableInSubDirsCheckBox">
<property name="toolTip">
<string>Runs this step only for a top-level build.</string>
</property>
</widget>
</item>
</layout>
</widget>
<customwidgets>
<customwidget>
<class>Utils::PathChooser</class>
<extends>QWidget</extends>
<header location="global">utils/pathchooser.h</header>
<container>1</container>
<slots>
<signal>editingFinished()</signal>
<signal>browsingFinished()</signal>
</slots>
</customwidget>
</customwidgets>
<resources/>
<connections/>
</ui>

1
src/plugins/projectexplorer/projectexplorer.pro
View File

@@ -325,7 +325,6 @@ FORMS += \
devicesupport/devicesettingswidget.ui \
devicesupport/devicetestdialog.ui \
customparserconfigdialog.ui \
makestep.ui
WINSOURCES += \
windebuginterface.cpp \

2
src/plugins/projectexplorer/projectexplorer.qbs
View File

@@ -96,7 +96,7 @@ Project {
"lldparser.cpp", "lldparser.h",
"linuxiccparser.cpp", "linuxiccparser.h",
"localenvironmentaspect.cpp", "localenvironmentaspect.h",
"makestep.cpp", "makestep.h", "makestep.ui",
"makestep.cpp", "makestep.h",
"miniprojecttargetselector.cpp", "miniprojecttargetselector.h",
"msvcparser.cpp", "msvcparser.h",
"namedwidget.cpp", "namedwidget.h",