forked from qt-creator/qt-creator
ProjectExplorer: Change BuildStepConfigWidget::summaryWidget()
From a virtual function to a normal one backed by a real data member. That's essentially what several re-implementations did, the other ones used a fixed value instead. Change-Id: I61e45f1d4f7f0f80fe2eb1f2729785f37e7bb803 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
@@ -63,6 +63,7 @@ AndroidBuildApkInnerWidget::AndroidBuildApkInnerWidget(AndroidBuildApkStep *step
|
|||||||
{
|
{
|
||||||
m_ui->setupUi(this);
|
m_ui->setupUi(this);
|
||||||
setDisplayName(tr("<b>Build Android APK</b>"));
|
setDisplayName(tr("<b>Build Android APK</b>"));
|
||||||
|
setSummaryText(displayName());
|
||||||
|
|
||||||
// Target sdk combobox
|
// Target sdk combobox
|
||||||
const int minApiSupported = AndroidManager::apiLevelRange().first;
|
const int minApiSupported = AndroidManager::apiLevelRange().first;
|
||||||
@@ -134,11 +135,6 @@ AndroidBuildApkInnerWidget::~AndroidBuildApkInnerWidget()
|
|||||||
delete m_ui;
|
delete m_ui;
|
||||||
}
|
}
|
||||||
|
|
||||||
QString AndroidBuildApkInnerWidget::summaryText() const
|
|
||||||
{
|
|
||||||
return displayName();
|
|
||||||
}
|
|
||||||
|
|
||||||
void AndroidBuildApkInnerWidget::setTargetSdk(const QString &sdk)
|
void AndroidBuildApkInnerWidget::setTargetSdk(const QString &sdk)
|
||||||
{
|
{
|
||||||
m_step->setBuildTargetSdk(sdk);
|
m_step->setBuildTargetSdk(sdk);
|
||||||
@@ -230,6 +226,7 @@ AndroidBuildApkWidget::AndroidBuildApkWidget(AndroidBuildApkStep *step) :
|
|||||||
m_step(step)
|
m_step(step)
|
||||||
{
|
{
|
||||||
setDisplayName(tr("<b>Build Android APK</b>"));
|
setDisplayName(tr("<b>Build Android APK</b>"));
|
||||||
|
setSummaryText(tr("<b>Build Android APK</b>"));
|
||||||
|
|
||||||
m_extraLibraryListModel = new AndroidExtraLibraryListModel(m_step->target(), this);
|
m_extraLibraryListModel = new AndroidExtraLibraryListModel(m_step->target(), this);
|
||||||
|
|
||||||
@@ -321,10 +318,5 @@ void AndroidBuildApkWidget::checkEnableRemoveButton()
|
|||||||
m_removeAndroidExtraLibButton->setEnabled(m_androidExtraLibsListView->selectionModel()->hasSelection());
|
m_removeAndroidExtraLibButton->setEnabled(m_androidExtraLibsListView->selectionModel()->hasSelection());
|
||||||
}
|
}
|
||||||
|
|
||||||
QString AndroidBuildApkWidget::summaryText() const
|
|
||||||
{
|
|
||||||
return tr("<b>Build Android APK</b>");
|
|
||||||
}
|
|
||||||
|
|
||||||
} // Internal
|
} // Internal
|
||||||
} // Android
|
} // Android
|
||||||
|
@@ -63,7 +63,6 @@ private:
|
|||||||
void updateKeyStorePath(const QString &path);
|
void updateKeyStorePath(const QString &path);
|
||||||
void signPackageCheckBoxToggled(bool checked);
|
void signPackageCheckBoxToggled(bool checked);
|
||||||
|
|
||||||
QString summaryText() const override;
|
|
||||||
void setCertificates();
|
void setCertificates();
|
||||||
|
|
||||||
Ui::AndroidBuildApkWidget *m_ui;
|
Ui::AndroidBuildApkWidget *m_ui;
|
||||||
@@ -85,8 +84,6 @@ private:
|
|||||||
void removeAndroidExtraLib();
|
void removeAndroidExtraLib();
|
||||||
void checkEnableRemoveButton();
|
void checkEnableRemoveButton();
|
||||||
|
|
||||||
QString summaryText() const final;
|
|
||||||
|
|
||||||
private:
|
private:
|
||||||
QListView *m_androidExtraLibsListView = nullptr;
|
QListView *m_androidExtraLibsListView = nullptr;
|
||||||
QToolButton *m_removeAndroidExtraLibButton = nullptr;
|
QToolButton *m_removeAndroidExtraLibButton = nullptr;
|
||||||
|
@@ -42,6 +42,7 @@ AndroidDeployQtWidget::AndroidDeployQtWidget(AndroidDeployQtStep *step)
|
|||||||
{
|
{
|
||||||
m_ui->setupUi(this);
|
m_ui->setupUi(this);
|
||||||
setDisplayName(tr("<b>Deploy configurations</b>"));
|
setDisplayName(tr("<b>Deploy configurations</b>"));
|
||||||
|
setSummaryText(displayName());
|
||||||
|
|
||||||
m_ui->uninstallPreviousPackage->setChecked(m_step->uninstallPreviousPackage() > AndroidDeployQtStep::Keep);
|
m_ui->uninstallPreviousPackage->setChecked(m_step->uninstallPreviousPackage() > AndroidDeployQtStep::Keep);
|
||||||
m_ui->uninstallPreviousPackage->setEnabled(m_step->uninstallPreviousPackage() != AndroidDeployQtStep::ForceUnintall);
|
m_ui->uninstallPreviousPackage->setEnabled(m_step->uninstallPreviousPackage() != AndroidDeployQtStep::ForceUnintall);
|
||||||
@@ -61,11 +62,6 @@ AndroidDeployQtWidget::~AndroidDeployQtWidget()
|
|||||||
delete m_ui;
|
delete m_ui;
|
||||||
}
|
}
|
||||||
|
|
||||||
QString AndroidDeployQtWidget::summaryText() const
|
|
||||||
{
|
|
||||||
return displayName();
|
|
||||||
}
|
|
||||||
|
|
||||||
void AndroidDeployQtWidget::installMinistro()
|
void AndroidDeployQtWidget::installMinistro()
|
||||||
{
|
{
|
||||||
QString packagePath =
|
QString packagePath =
|
||||||
|
@@ -51,8 +51,6 @@ private:
|
|||||||
void cleanLibsOnDevice();
|
void cleanLibsOnDevice();
|
||||||
void resetDefaultDevices();
|
void resetDefaultDevices();
|
||||||
|
|
||||||
QString summaryText() const override;
|
|
||||||
|
|
||||||
Ui::AndroidDeployQtWidget *m_ui;
|
Ui::AndroidDeployQtWidget *m_ui;
|
||||||
AndroidDeployQtStep *m_step;
|
AndroidDeployQtStep *m_step;
|
||||||
};
|
};
|
||||||
|
@@ -129,11 +129,7 @@ AndroidPackageInstallationStepWidget::AndroidPackageInstallationStepWidget(Andro
|
|||||||
: BuildStepConfigWidget(step, false)
|
: BuildStepConfigWidget(step, false)
|
||||||
{
|
{
|
||||||
setDisplayName(tr("Make install"));
|
setDisplayName(tr("Make install"));
|
||||||
}
|
setSummaryText("<b>" + tr("Make install") + "</b>");
|
||||||
|
|
||||||
QString AndroidPackageInstallationStepWidget::summaryText() const
|
|
||||||
{
|
|
||||||
return "<b>" + tr("Make install") + "</b>";
|
|
||||||
}
|
}
|
||||||
|
|
||||||
//
|
//
|
||||||
|
@@ -58,8 +58,6 @@ class AndroidPackageInstallationStepWidget : public ProjectExplorer::BuildStepCo
|
|||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
public:
|
public:
|
||||||
AndroidPackageInstallationStepWidget(AndroidPackageInstallationStep *step);
|
AndroidPackageInstallationStepWidget(AndroidPackageInstallationStep *step);
|
||||||
|
|
||||||
QString summaryText() const override;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
class AndroidPackageInstallationFactory: public ProjectExplorer::BuildStepFactory
|
class AndroidPackageInstallationFactory: public ProjectExplorer::BuildStepFactory
|
||||||
|
@@ -176,11 +176,6 @@ AutogenStepConfigWidget::AutogenStepConfigWidget(AutogenStep *autogenStep) :
|
|||||||
this, &AutogenStepConfigWidget::updateDetails);
|
this, &AutogenStepConfigWidget::updateDetails);
|
||||||
}
|
}
|
||||||
|
|
||||||
QString AutogenStepConfigWidget::summaryText() const
|
|
||||||
{
|
|
||||||
return m_summaryText;
|
|
||||||
}
|
|
||||||
|
|
||||||
void AutogenStepConfigWidget::updateDetails()
|
void AutogenStepConfigWidget::updateDetails()
|
||||||
{
|
{
|
||||||
BuildConfiguration *bc = m_autogenStep->buildConfiguration();
|
BuildConfiguration *bc = m_autogenStep->buildConfiguration();
|
||||||
@@ -192,6 +187,6 @@ void AutogenStepConfigWidget::updateDetails()
|
|||||||
param.setWorkingDirectory(projectDir);
|
param.setWorkingDirectory(projectDir);
|
||||||
param.setCommand("./autogen.sh");
|
param.setCommand("./autogen.sh");
|
||||||
param.setArguments(m_autogenStep->additionalArguments());
|
param.setArguments(m_autogenStep->additionalArguments());
|
||||||
m_summaryText = param.summary(displayName());
|
|
||||||
emit updateSummary();
|
setSummaryText(param.summary(displayName()));
|
||||||
}
|
}
|
||||||
|
@@ -111,13 +111,10 @@ class AutogenStepConfigWidget : public ProjectExplorer::BuildStepConfigWidget
|
|||||||
public:
|
public:
|
||||||
AutogenStepConfigWidget(AutogenStep *autogenStep);
|
AutogenStepConfigWidget(AutogenStep *autogenStep);
|
||||||
|
|
||||||
QString summaryText() const override;
|
|
||||||
|
|
||||||
private:
|
private:
|
||||||
void updateDetails();
|
void updateDetails();
|
||||||
|
|
||||||
AutogenStep *m_autogenStep;
|
AutogenStep *m_autogenStep;
|
||||||
QString m_summaryText;
|
|
||||||
QLineEdit *m_additionalArguments;
|
QLineEdit *m_additionalArguments;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@@ -169,11 +169,6 @@ AutoreconfStepConfigWidget::AutoreconfStepConfigWidget(AutoreconfStep *autorecon
|
|||||||
this, &AutoreconfStepConfigWidget::updateDetails);
|
this, &AutoreconfStepConfigWidget::updateDetails);
|
||||||
}
|
}
|
||||||
|
|
||||||
QString AutoreconfStepConfigWidget::summaryText() const
|
|
||||||
{
|
|
||||||
return m_summaryText;
|
|
||||||
}
|
|
||||||
|
|
||||||
void AutoreconfStepConfigWidget::updateDetails()
|
void AutoreconfStepConfigWidget::updateDetails()
|
||||||
{
|
{
|
||||||
BuildConfiguration *bc = m_autoreconfStep->buildConfiguration();
|
BuildConfiguration *bc = m_autoreconfStep->buildConfiguration();
|
||||||
@@ -185,6 +180,6 @@ void AutoreconfStepConfigWidget::updateDetails()
|
|||||||
param.setWorkingDirectory(projectDir);
|
param.setWorkingDirectory(projectDir);
|
||||||
param.setCommand("autoreconf");
|
param.setCommand("autoreconf");
|
||||||
param.setArguments(m_autoreconfStep->additionalArguments());
|
param.setArguments(m_autoreconfStep->additionalArguments());
|
||||||
m_summaryText = param.summary(displayName());
|
|
||||||
emit updateSummary();
|
setSummaryText(param.summary(displayName()));
|
||||||
}
|
}
|
||||||
|
@@ -110,13 +110,10 @@ class AutoreconfStepConfigWidget : public ProjectExplorer::BuildStepConfigWidget
|
|||||||
public:
|
public:
|
||||||
AutoreconfStepConfigWidget(AutoreconfStep *autoreconfStep);
|
AutoreconfStepConfigWidget(AutoreconfStep *autoreconfStep);
|
||||||
|
|
||||||
QString summaryText() const override;
|
|
||||||
|
|
||||||
private:
|
private:
|
||||||
void updateDetails();
|
void updateDetails();
|
||||||
|
|
||||||
AutoreconfStep *m_autoreconfStep;
|
AutoreconfStep *m_autoreconfStep;
|
||||||
QString m_summaryText;
|
|
||||||
QLineEdit *m_additionalArguments;
|
QLineEdit *m_additionalArguments;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@@ -194,11 +194,6 @@ ConfigureStepConfigWidget::ConfigureStepConfigWidget(ConfigureStep *configureSte
|
|||||||
this, &ConfigureStepConfigWidget::updateDetails);
|
this, &ConfigureStepConfigWidget::updateDetails);
|
||||||
}
|
}
|
||||||
|
|
||||||
QString ConfigureStepConfigWidget::summaryText() const
|
|
||||||
{
|
|
||||||
return m_summaryText;
|
|
||||||
}
|
|
||||||
|
|
||||||
void ConfigureStepConfigWidget::updateDetails()
|
void ConfigureStepConfigWidget::updateDetails()
|
||||||
{
|
{
|
||||||
BuildConfiguration *bc = m_configureStep->buildConfiguration();
|
BuildConfiguration *bc = m_configureStep->buildConfiguration();
|
||||||
@@ -209,6 +204,6 @@ void ConfigureStepConfigWidget::updateDetails()
|
|||||||
param.setWorkingDirectory(bc->buildDirectory().toString());
|
param.setWorkingDirectory(bc->buildDirectory().toString());
|
||||||
param.setCommand(projectDirRelativeToBuildDir(bc) + "configure");
|
param.setCommand(projectDirRelativeToBuildDir(bc) + "configure");
|
||||||
param.setArguments(m_configureStep->additionalArguments());
|
param.setArguments(m_configureStep->additionalArguments());
|
||||||
m_summaryText = param.summaryInWorkdir(displayName());
|
|
||||||
emit updateSummary();
|
setSummaryText(param.summaryInWorkdir(displayName()));
|
||||||
}
|
}
|
||||||
|
@@ -111,13 +111,10 @@ class ConfigureStepConfigWidget : public ProjectExplorer::BuildStepConfigWidget
|
|||||||
public:
|
public:
|
||||||
ConfigureStepConfigWidget(ConfigureStep *configureStep);
|
ConfigureStepConfigWidget(ConfigureStep *configureStep);
|
||||||
|
|
||||||
QString summaryText() const override;
|
|
||||||
|
|
||||||
private:
|
private:
|
||||||
void updateDetails();
|
void updateDetails();
|
||||||
|
|
||||||
ConfigureStep *m_configureStep;
|
ConfigureStep *m_configureStep;
|
||||||
QString m_summaryText;
|
|
||||||
QLineEdit *m_additionalArguments;
|
QLineEdit *m_additionalArguments;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@@ -525,8 +525,7 @@ void CMakeBuildStepConfigWidget::updateDetails()
|
|||||||
{
|
{
|
||||||
BuildConfiguration *bc = m_buildStep->buildConfiguration();
|
BuildConfiguration *bc = m_buildStep->buildConfiguration();
|
||||||
if (!bc) {
|
if (!bc) {
|
||||||
m_summaryText = tr("<b>No build configuration found on this kit.</b>");
|
setSummaryText(tr("<b>No build configuration found on this kit.</b>"));
|
||||||
emit updateSummary();
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -536,14 +535,8 @@ void CMakeBuildStepConfigWidget::updateDetails()
|
|||||||
param.setWorkingDirectory(bc->buildDirectory().toString());
|
param.setWorkingDirectory(bc->buildDirectory().toString());
|
||||||
param.setCommand(m_buildStep->cmakeCommand());
|
param.setCommand(m_buildStep->cmakeCommand());
|
||||||
param.setArguments(m_buildStep->allArguments(0));
|
param.setArguments(m_buildStep->allArguments(0));
|
||||||
m_summaryText = param.summary(displayName());
|
|
||||||
|
|
||||||
emit updateSummary();
|
setSummaryText(param.summary(displayName()));
|
||||||
}
|
|
||||||
|
|
||||||
QString CMakeBuildStepConfigWidget::summaryText() const
|
|
||||||
{
|
|
||||||
return m_summaryText;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
//
|
//
|
||||||
|
@@ -120,7 +120,6 @@ class CMakeBuildStepConfigWidget : public ProjectExplorer::BuildStepConfigWidget
|
|||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
public:
|
public:
|
||||||
CMakeBuildStepConfigWidget(CMakeBuildStep *buildStep);
|
CMakeBuildStepConfigWidget(CMakeBuildStep *buildStep);
|
||||||
QString summaryText() const override;
|
|
||||||
|
|
||||||
private:
|
private:
|
||||||
void itemChanged(QListWidgetItem*);
|
void itemChanged(QListWidgetItem*);
|
||||||
@@ -132,7 +131,6 @@ private:
|
|||||||
CMakeBuildStep *m_buildStep;
|
CMakeBuildStep *m_buildStep;
|
||||||
QLineEdit *m_toolArguments;
|
QLineEdit *m_toolArguments;
|
||||||
QListWidget *m_buildTargetsList;
|
QListWidget *m_buildTargetsList;
|
||||||
QString m_summaryText;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
class CMakeBuildStepFactory : public ProjectExplorer::BuildStepFactory
|
class CMakeBuildStepFactory : public ProjectExplorer::BuildStepFactory
|
||||||
|
@@ -259,13 +259,8 @@ void IosBuildStepConfigWidget::updateDetails()
|
|||||||
param.setEnvironment(bc->environment());
|
param.setEnvironment(bc->environment());
|
||||||
param.setCommand(m_buildStep->buildCommand());
|
param.setCommand(m_buildStep->buildCommand());
|
||||||
param.setArguments(Utils::QtcProcess::joinArgs(m_buildStep->allArguments()));
|
param.setArguments(Utils::QtcProcess::joinArgs(m_buildStep->allArguments()));
|
||||||
m_summaryText = param.summary(displayName());
|
|
||||||
emit updateSummary();
|
|
||||||
}
|
|
||||||
|
|
||||||
QString IosBuildStepConfigWidget::summaryText() const
|
setSummaryText(param.summary(displayName()));
|
||||||
{
|
|
||||||
return m_summaryText;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void IosBuildStepConfigWidget::buildArgumentsChanged()
|
void IosBuildStepConfigWidget::buildArgumentsChanged()
|
||||||
|
@@ -77,7 +77,6 @@ class IosBuildStepConfigWidget : public ProjectExplorer::BuildStepConfigWidget
|
|||||||
public:
|
public:
|
||||||
IosBuildStepConfigWidget(IosBuildStep *buildStep);
|
IosBuildStepConfigWidget(IosBuildStep *buildStep);
|
||||||
~IosBuildStepConfigWidget();
|
~IosBuildStepConfigWidget();
|
||||||
QString summaryText() const override;
|
|
||||||
|
|
||||||
private:
|
private:
|
||||||
void buildArgumentsChanged();
|
void buildArgumentsChanged();
|
||||||
@@ -87,7 +86,6 @@ private:
|
|||||||
|
|
||||||
Ui::IosBuildStep *m_ui;
|
Ui::IosBuildStep *m_ui;
|
||||||
IosBuildStep *m_buildStep;
|
IosBuildStep *m_buildStep;
|
||||||
QString m_summaryText;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
class IosBuildStepFactory : public ProjectExplorer::BuildStepFactory
|
class IosBuildStepFactory : public ProjectExplorer::BuildStepFactory
|
||||||
|
@@ -40,6 +40,7 @@ IosDeployStepWidget::IosDeployStepWidget(IosDeployStep *step) :
|
|||||||
m_step(step)
|
m_step(step)
|
||||||
{
|
{
|
||||||
setDisplayName(QString::fromLatin1("<b>%1</b>").arg(m_step->displayName()));
|
setDisplayName(QString::fromLatin1("<b>%1</b>").arg(m_step->displayName()));
|
||||||
|
setSummaryText(displayName());
|
||||||
ui->setupUi(this);
|
ui->setupUi(this);
|
||||||
connect(m_step, &ProjectExplorer::ProjectConfiguration::displayNameChanged,
|
connect(m_step, &ProjectExplorer::ProjectConfiguration::displayNameChanged,
|
||||||
this, &ProjectExplorer::BuildStepConfigWidget::updateSummary);
|
this, &ProjectExplorer::BuildStepConfigWidget::updateSummary);
|
||||||
@@ -50,10 +51,5 @@ IosDeployStepWidget::~IosDeployStepWidget()
|
|||||||
delete ui;
|
delete ui;
|
||||||
}
|
}
|
||||||
|
|
||||||
QString IosDeployStepWidget::summaryText() const
|
|
||||||
{
|
|
||||||
return displayName();
|
|
||||||
}
|
|
||||||
|
|
||||||
} // namespace Internal
|
} // namespace Internal
|
||||||
} // namespace Ios
|
} // namespace Ios
|
||||||
|
@@ -43,8 +43,6 @@ public:
|
|||||||
~IosDeployStepWidget();
|
~IosDeployStepWidget();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
QString summaryText() const override;
|
|
||||||
|
|
||||||
Ui::IosDeployStepWidget *ui;
|
Ui::IosDeployStepWidget *ui;
|
||||||
IosDeployStep *m_step;
|
IosDeployStep *m_step;
|
||||||
};
|
};
|
||||||
|
@@ -277,13 +277,8 @@ void IosDsymBuildStepConfigWidget::updateDetails()
|
|||||||
param.setEnvironment(bc->environment());
|
param.setEnvironment(bc->environment());
|
||||||
param.setCommand(m_buildStep->command());
|
param.setCommand(m_buildStep->command());
|
||||||
param.setArguments(Utils::QtcProcess::joinArgs(m_buildStep->arguments()));
|
param.setArguments(Utils::QtcProcess::joinArgs(m_buildStep->arguments()));
|
||||||
m_summaryText = param.summary(displayName());
|
|
||||||
emit updateSummary();
|
|
||||||
}
|
|
||||||
|
|
||||||
QString IosDsymBuildStepConfigWidget::summaryText() const
|
setSummaryText(param.summary(displayName()));
|
||||||
{
|
|
||||||
return m_summaryText;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void IosDsymBuildStepConfigWidget::commandChanged()
|
void IosDsymBuildStepConfigWidget::commandChanged()
|
||||||
|
@@ -74,7 +74,6 @@ class IosDsymBuildStepConfigWidget : public ProjectExplorer::BuildStepConfigWidg
|
|||||||
public:
|
public:
|
||||||
IosDsymBuildStepConfigWidget(IosDsymBuildStep *buildStep);
|
IosDsymBuildStepConfigWidget(IosDsymBuildStep *buildStep);
|
||||||
~IosDsymBuildStepConfigWidget();
|
~IosDsymBuildStepConfigWidget();
|
||||||
QString summaryText() const override;
|
|
||||||
|
|
||||||
private:
|
private:
|
||||||
void commandChanged();
|
void commandChanged();
|
||||||
@@ -84,7 +83,6 @@ private:
|
|||||||
|
|
||||||
Ui::IosPresetBuildStep *m_ui;
|
Ui::IosPresetBuildStep *m_ui;
|
||||||
IosDsymBuildStep *m_buildStep;
|
IosDsymBuildStep *m_buildStep;
|
||||||
QString m_summaryText;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
class IosDsymBuildStepFactory : public ProjectExplorer::BuildStepFactory
|
class IosDsymBuildStepFactory : public ProjectExplorer::BuildStepFactory
|
||||||
|
@@ -46,6 +46,7 @@ NimCompilerBuildStepConfigWidget::NimCompilerBuildStepConfigWidget(NimCompilerBu
|
|||||||
m_ui->setupUi(this);
|
m_ui->setupUi(this);
|
||||||
|
|
||||||
setDisplayName(tr(Constants::C_NIMCOMPILERBUILDSTEPWIDGET_DISPLAY));
|
setDisplayName(tr(Constants::C_NIMCOMPILERBUILDSTEPWIDGET_DISPLAY));
|
||||||
|
setSummaryText(tr(Constants::C_NIMCOMPILERBUILDSTEPWIDGET_SUMMARY));
|
||||||
|
|
||||||
// Connect the project signals
|
// Connect the project signals
|
||||||
auto project = static_cast<NimProject *>(m_buildStep->project());
|
auto project = static_cast<NimProject *>(m_buildStep->project());
|
||||||
@@ -69,11 +70,6 @@ NimCompilerBuildStepConfigWidget::NimCompilerBuildStepConfigWidget(NimCompilerBu
|
|||||||
|
|
||||||
NimCompilerBuildStepConfigWidget::~NimCompilerBuildStepConfigWidget() = default;
|
NimCompilerBuildStepConfigWidget::~NimCompilerBuildStepConfigWidget() = default;
|
||||||
|
|
||||||
QString NimCompilerBuildStepConfigWidget::summaryText() const
|
|
||||||
{
|
|
||||||
return tr(Constants::C_NIMCOMPILERBUILDSTEPWIDGET_SUMMARY);
|
|
||||||
}
|
|
||||||
|
|
||||||
void NimCompilerBuildStepConfigWidget::onTargetChanged(int index)
|
void NimCompilerBuildStepConfigWidget::onTargetChanged(int index)
|
||||||
{
|
{
|
||||||
Q_UNUSED(index);
|
Q_UNUSED(index);
|
||||||
|
@@ -41,8 +41,6 @@ public:
|
|||||||
NimCompilerBuildStepConfigWidget(NimCompilerBuildStep *buildStep);
|
NimCompilerBuildStepConfigWidget(NimCompilerBuildStep *buildStep);
|
||||||
~NimCompilerBuildStepConfigWidget();
|
~NimCompilerBuildStepConfigWidget();
|
||||||
|
|
||||||
QString summaryText() const override;
|
|
||||||
|
|
||||||
private:
|
private:
|
||||||
void updateUi();
|
void updateUi();
|
||||||
void updateCommandLineText();
|
void updateCommandLineText();
|
||||||
|
@@ -41,6 +41,7 @@ NimCompilerCleanStepConfigWidget::NimCompilerCleanStepConfigWidget(NimCompilerCl
|
|||||||
{
|
{
|
||||||
m_ui->setupUi(this);
|
m_ui->setupUi(this);
|
||||||
setDisplayName(tr(Constants::C_NIMCOMPILERCLEANSTEPWIDGET_DISPLAY));
|
setDisplayName(tr(Constants::C_NIMCOMPILERCLEANSTEPWIDGET_DISPLAY));
|
||||||
|
setSummaryText(tr(Constants::C_NIMCOMPILERCLEANSTEPWIDGET_SUMMARY));
|
||||||
connect(cleanStep->buildConfiguration(), &BuildConfiguration::buildDirectoryChanged,
|
connect(cleanStep->buildConfiguration(), &BuildConfiguration::buildDirectoryChanged,
|
||||||
this, &NimCompilerCleanStepConfigWidget::updateUi);
|
this, &NimCompilerCleanStepConfigWidget::updateUi);
|
||||||
updateUi();
|
updateUi();
|
||||||
@@ -48,11 +49,6 @@ NimCompilerCleanStepConfigWidget::NimCompilerCleanStepConfigWidget(NimCompilerCl
|
|||||||
|
|
||||||
NimCompilerCleanStepConfigWidget::~NimCompilerCleanStepConfigWidget() = default;
|
NimCompilerCleanStepConfigWidget::~NimCompilerCleanStepConfigWidget() = default;
|
||||||
|
|
||||||
QString NimCompilerCleanStepConfigWidget::summaryText() const
|
|
||||||
{
|
|
||||||
return tr(Constants::C_NIMCOMPILERCLEANSTEPWIDGET_SUMMARY);
|
|
||||||
}
|
|
||||||
|
|
||||||
void NimCompilerCleanStepConfigWidget::updateUi()
|
void NimCompilerCleanStepConfigWidget::updateUi()
|
||||||
{
|
{
|
||||||
auto buildDiretory = step()->buildConfiguration()->buildDirectory();
|
auto buildDiretory = step()->buildConfiguration()->buildDirectory();
|
||||||
|
@@ -42,8 +42,6 @@ public:
|
|||||||
|
|
||||||
~NimCompilerCleanStepConfigWidget();
|
~NimCompilerCleanStepConfigWidget();
|
||||||
|
|
||||||
QString summaryText() const override;
|
|
||||||
|
|
||||||
private:
|
private:
|
||||||
void updateUi();
|
void updateUi();
|
||||||
|
|
||||||
|
@@ -369,18 +369,19 @@ BuildStepConfigWidget::BuildStepConfigWidget(BuildStep *step, bool showWidget)
|
|||||||
: m_step(step), m_showWidget(showWidget)
|
: m_step(step), m_showWidget(showWidget)
|
||||||
{
|
{
|
||||||
m_displayName = step->displayName();
|
m_displayName = step->displayName();
|
||||||
|
m_summaryText = "<b>" + m_displayName + "</b>";
|
||||||
connect(m_step, &ProjectConfiguration::displayNameChanged,
|
connect(m_step, &ProjectConfiguration::displayNameChanged,
|
||||||
this, &BuildStepConfigWidget::updateSummary);
|
this, &BuildStepConfigWidget::updateSummary);
|
||||||
}
|
}
|
||||||
|
|
||||||
QString BuildStepConfigWidget::summaryText() const
|
QString BuildStepConfigWidget::summaryText() const
|
||||||
{
|
{
|
||||||
return "<b>" + displayName() + "</b>";
|
return m_summaryText;
|
||||||
}
|
}
|
||||||
|
|
||||||
QString BuildStepConfigWidget::displayName() const
|
QString BuildStepConfigWidget::displayName() const
|
||||||
{
|
{
|
||||||
return m_step->displayName();
|
return m_displayName;
|
||||||
}
|
}
|
||||||
|
|
||||||
void BuildStepConfigWidget::setDisplayName(const QString &displayName)
|
void BuildStepConfigWidget::setDisplayName(const QString &displayName)
|
||||||
@@ -388,4 +389,12 @@ void BuildStepConfigWidget::setDisplayName(const QString &displayName)
|
|||||||
m_displayName = displayName;
|
m_displayName = displayName;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void BuildStepConfigWidget::setSummaryText(const QString &summaryText)
|
||||||
|
{
|
||||||
|
if (summaryText != m_summaryText) {
|
||||||
|
m_summaryText = summaryText;
|
||||||
|
updateSummary();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
} // ProjectExplorer
|
} // ProjectExplorer
|
||||||
|
@@ -173,13 +173,13 @@ class PROJECTEXPLORER_EXPORT BuildStepConfigWidget : public QWidget
|
|||||||
public:
|
public:
|
||||||
BuildStepConfigWidget(BuildStep *step, bool showWidget = true);
|
BuildStepConfigWidget(BuildStep *step, bool showWidget = true);
|
||||||
|
|
||||||
virtual QString summaryText() const;
|
QString summaryText() const;
|
||||||
|
|
||||||
QString displayName() const;
|
QString displayName() const;
|
||||||
BuildStep *step() const { return m_step; }
|
BuildStep *step() const { return m_step; }
|
||||||
bool showWidget() const { return m_showWidget; }
|
bool showWidget() const { return m_showWidget; }
|
||||||
|
|
||||||
void setDisplayName(const QString &displayName);
|
void setDisplayName(const QString &displayName);
|
||||||
|
void setSummaryText(const QString &summaryText);
|
||||||
|
|
||||||
signals:
|
signals:
|
||||||
void updateSummary();
|
void updateSummary();
|
||||||
@@ -188,6 +188,7 @@ private:
|
|||||||
BuildStep *m_step = nullptr;
|
BuildStep *m_step = nullptr;
|
||||||
const bool m_showWidget = true;
|
const bool m_showWidget = true;
|
||||||
QString m_displayName;
|
QString m_displayName;
|
||||||
|
QString m_summaryText;
|
||||||
};
|
};
|
||||||
|
|
||||||
} // namespace ProjectExplorer
|
} // namespace ProjectExplorer
|
||||||
|
@@ -406,14 +406,6 @@ MakeStepConfigWidget::~MakeStepConfigWidget()
|
|||||||
delete m_ui;
|
delete m_ui;
|
||||||
}
|
}
|
||||||
|
|
||||||
void MakeStepConfigWidget::setSummaryText(const QString &text)
|
|
||||||
{
|
|
||||||
if (text == m_summaryText)
|
|
||||||
return;
|
|
||||||
m_summaryText = text;
|
|
||||||
emit updateSummary();
|
|
||||||
}
|
|
||||||
|
|
||||||
void MakeStepConfigWidget::setUserJobCountVisible(bool visible)
|
void MakeStepConfigWidget::setUserJobCountVisible(bool visible)
|
||||||
{
|
{
|
||||||
m_ui->jobsLabel->setVisible(visible);
|
m_ui->jobsLabel->setVisible(visible);
|
||||||
@@ -461,11 +453,6 @@ void MakeStepConfigWidget::updateDetails()
|
|||||||
setSummaryText(param.summaryInWorkdir(displayName()));
|
setSummaryText(param.summaryInWorkdir(displayName()));
|
||||||
}
|
}
|
||||||
|
|
||||||
QString MakeStepConfigWidget::summaryText() const
|
|
||||||
{
|
|
||||||
return m_summaryText;
|
|
||||||
}
|
|
||||||
|
|
||||||
void MakeStepConfigWidget::itemChanged(QListWidgetItem *item)
|
void MakeStepConfigWidget::itemChanged(QListWidgetItem *item)
|
||||||
{
|
{
|
||||||
m_makeStep->setBuildTarget(item->text(), item->checkState() & Qt::Checked);
|
m_makeStep->setBuildTarget(item->text(), item->checkState() & Qt::Checked);
|
||||||
|
@@ -100,19 +100,15 @@ public:
|
|||||||
explicit MakeStepConfigWidget(MakeStep *makeStep);
|
explicit MakeStepConfigWidget(MakeStep *makeStep);
|
||||||
~MakeStepConfigWidget() override;
|
~MakeStepConfigWidget() override;
|
||||||
|
|
||||||
QString summaryText() const override;
|
|
||||||
|
|
||||||
private:
|
private:
|
||||||
void itemChanged(QListWidgetItem *item);
|
void itemChanged(QListWidgetItem *item);
|
||||||
void makeLineEditTextEdited();
|
void makeLineEditTextEdited();
|
||||||
void makeArgumentsLineEditTextEdited();
|
void makeArgumentsLineEditTextEdited();
|
||||||
void updateDetails();
|
void updateDetails();
|
||||||
void setSummaryText(const QString &text);
|
|
||||||
void setUserJobCountVisible(bool visible);
|
void setUserJobCountVisible(bool visible);
|
||||||
|
|
||||||
Internal::Ui::MakeStep *m_ui;
|
Internal::Ui::MakeStep *m_ui;
|
||||||
MakeStep *m_makeStep;
|
MakeStep *m_makeStep;
|
||||||
QString m_summaryText;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
} // namespace GenericProjectManager
|
} // namespace GenericProjectManager
|
||||||
|
@@ -68,7 +68,6 @@ class QbsBuildStepConfigWidget : public ProjectExplorer::BuildStepConfigWidget
|
|||||||
public:
|
public:
|
||||||
QbsBuildStepConfigWidget(QbsBuildStep *step);
|
QbsBuildStepConfigWidget(QbsBuildStep *step);
|
||||||
~QbsBuildStepConfigWidget() override;
|
~QbsBuildStepConfigWidget() override;
|
||||||
QString summaryText() const override;
|
|
||||||
|
|
||||||
private:
|
private:
|
||||||
void updateState();
|
void updateState();
|
||||||
@@ -115,7 +114,6 @@ private:
|
|||||||
};
|
};
|
||||||
|
|
||||||
QList<Property> m_propertyCache;
|
QList<Property> m_propertyCache;
|
||||||
QString m_summary;
|
|
||||||
bool m_ignoreChange;
|
bool m_ignoreChange;
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -596,11 +594,6 @@ QbsBuildStepConfigWidget::~QbsBuildStepConfigWidget()
|
|||||||
delete m_ui;
|
delete m_ui;
|
||||||
}
|
}
|
||||||
|
|
||||||
QString QbsBuildStepConfigWidget::summaryText() const
|
|
||||||
{
|
|
||||||
return m_summary;
|
|
||||||
}
|
|
||||||
|
|
||||||
void QbsBuildStepConfigWidget::updateState()
|
void QbsBuildStepConfigWidget::updateState()
|
||||||
{
|
{
|
||||||
if (!m_ignoreChange) {
|
if (!m_ignoreChange) {
|
||||||
@@ -632,11 +625,7 @@ void QbsBuildStepConfigWidget::updateState()
|
|||||||
command.append(' ').append(Constants::QBS_CONFIG_QUICK_DEBUG_KEY).append(":true");
|
command.append(' ').append(Constants::QBS_CONFIG_QUICK_DEBUG_KEY).append(":true");
|
||||||
m_ui->commandLineTextEdit->setPlainText(command);
|
m_ui->commandLineTextEdit->setPlainText(command);
|
||||||
|
|
||||||
QString summary = tr("<b>Qbs:</b> %1").arg(command);
|
setSummaryText(tr("<b>Qbs:</b> %1").arg(command));
|
||||||
if (m_summary != summary) {
|
|
||||||
m_summary = summary;
|
|
||||||
emit updateSummary();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void QbsBuildStepConfigWidget::updateQmlDebuggingOption()
|
void QbsBuildStepConfigWidget::updateQmlDebuggingOption()
|
||||||
|
@@ -245,11 +245,6 @@ QbsCleanStepConfigWidget::~QbsCleanStepConfigWidget()
|
|||||||
delete m_ui;
|
delete m_ui;
|
||||||
}
|
}
|
||||||
|
|
||||||
QString QbsCleanStepConfigWidget::summaryText() const
|
|
||||||
{
|
|
||||||
return m_summary;
|
|
||||||
}
|
|
||||||
|
|
||||||
void QbsCleanStepConfigWidget::updateState()
|
void QbsCleanStepConfigWidget::updateState()
|
||||||
{
|
{
|
||||||
m_ui->dryRunCheckBox->setChecked(m_step->dryRun());
|
m_ui->dryRunCheckBox->setChecked(m_step->dryRun());
|
||||||
@@ -259,11 +254,7 @@ void QbsCleanStepConfigWidget::updateState()
|
|||||||
->equivalentCommandLine(m_step);
|
->equivalentCommandLine(m_step);
|
||||||
m_ui->commandLineTextEdit->setPlainText(command);
|
m_ui->commandLineTextEdit->setPlainText(command);
|
||||||
|
|
||||||
QString summary = tr("<b>Qbs:</b> %1").arg(command);
|
setSummaryText(tr("<b>Qbs:</b> %1").arg(command));
|
||||||
if (m_summary != summary) {
|
|
||||||
m_summary = summary;
|
|
||||||
emit updateSummary();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void QbsCleanStepConfigWidget::changeDryRun(bool dr)
|
void QbsCleanStepConfigWidget::changeDryRun(bool dr)
|
||||||
|
@@ -96,7 +96,6 @@ class QbsCleanStepConfigWidget : public ProjectExplorer::BuildStepConfigWidget
|
|||||||
public:
|
public:
|
||||||
QbsCleanStepConfigWidget(QbsCleanStep *step);
|
QbsCleanStepConfigWidget(QbsCleanStep *step);
|
||||||
~QbsCleanStepConfigWidget() override;
|
~QbsCleanStepConfigWidget() override;
|
||||||
QString summaryText() const override;
|
|
||||||
|
|
||||||
private:
|
private:
|
||||||
void updateState();
|
void updateState();
|
||||||
@@ -108,7 +107,6 @@ private:
|
|||||||
Ui::QbsCleanStepConfigWidget *m_ui;
|
Ui::QbsCleanStepConfigWidget *m_ui;
|
||||||
|
|
||||||
QbsCleanStep *m_step;
|
QbsCleanStep *m_step;
|
||||||
QString m_summary;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
class QbsCleanStepFactory : public ProjectExplorer::BuildStepFactory
|
class QbsCleanStepFactory : public ProjectExplorer::BuildStepFactory
|
||||||
|
@@ -283,11 +283,6 @@ QbsInstallStepConfigWidget::~QbsInstallStepConfigWidget()
|
|||||||
delete m_ui;
|
delete m_ui;
|
||||||
}
|
}
|
||||||
|
|
||||||
QString QbsInstallStepConfigWidget::summaryText() const
|
|
||||||
{
|
|
||||||
return m_summary;
|
|
||||||
}
|
|
||||||
|
|
||||||
void QbsInstallStepConfigWidget::updateState()
|
void QbsInstallStepConfigWidget::updateState()
|
||||||
{
|
{
|
||||||
if (!m_ignoreChange) {
|
if (!m_ignoreChange) {
|
||||||
@@ -301,11 +296,7 @@ void QbsInstallStepConfigWidget::updateState()
|
|||||||
|
|
||||||
m_ui->commandLineTextEdit->setPlainText(command);
|
m_ui->commandLineTextEdit->setPlainText(command);
|
||||||
|
|
||||||
QString summary = tr("<b>Qbs:</b> %1").arg(command);
|
setSummaryText(tr("<b>Qbs:</b> %1").arg(command));
|
||||||
if (m_summary != summary) {
|
|
||||||
m_summary = summary;
|
|
||||||
emit updateSummary();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void QbsInstallStepConfigWidget::changeRemoveFirst(bool rf)
|
void QbsInstallStepConfigWidget::changeRemoveFirst(bool rf)
|
||||||
|
@@ -99,7 +99,6 @@ class QbsInstallStepConfigWidget : public ProjectExplorer::BuildStepConfigWidget
|
|||||||
public:
|
public:
|
||||||
QbsInstallStepConfigWidget(QbsInstallStep *step);
|
QbsInstallStepConfigWidget(QbsInstallStep *step);
|
||||||
~QbsInstallStepConfigWidget() override;
|
~QbsInstallStepConfigWidget() override;
|
||||||
QString summaryText() const override;
|
|
||||||
|
|
||||||
private:
|
private:
|
||||||
void updateState();
|
void updateState();
|
||||||
@@ -112,7 +111,6 @@ private:
|
|||||||
Ui::QbsInstallStepConfigWidget *m_ui;
|
Ui::QbsInstallStepConfigWidget *m_ui;
|
||||||
|
|
||||||
QbsInstallStep *m_step;
|
QbsInstallStep *m_step;
|
||||||
QString m_summary;
|
|
||||||
bool m_ignoreChange;
|
bool m_ignoreChange;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@@ -616,11 +616,6 @@ QMakeStepConfigWidget::~QMakeStepConfigWidget()
|
|||||||
delete m_ui;
|
delete m_ui;
|
||||||
}
|
}
|
||||||
|
|
||||||
QString QMakeStepConfigWidget::summaryText() const
|
|
||||||
{
|
|
||||||
return m_summaryText;
|
|
||||||
}
|
|
||||||
|
|
||||||
void QMakeStepConfigWidget::qtVersionChanged()
|
void QMakeStepConfigWidget::qtVersionChanged()
|
||||||
{
|
{
|
||||||
updateSummaryLabel();
|
updateSummaryLabel();
|
||||||
@@ -833,14 +828,6 @@ void QMakeStepConfigWidget::recompileMessageBoxFinished(int button)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void QMakeStepConfigWidget::setSummaryText(const QString &text)
|
|
||||||
{
|
|
||||||
if (text == m_summaryText)
|
|
||||||
return;
|
|
||||||
m_summaryText = text;
|
|
||||||
emit updateSummary();
|
|
||||||
}
|
|
||||||
|
|
||||||
////
|
////
|
||||||
// QMakeStepFactory
|
// QMakeStepFactory
|
||||||
////
|
////
|
||||||
|
@@ -198,7 +198,6 @@ class QMakeStepConfigWidget : public ProjectExplorer::BuildStepConfigWidget
|
|||||||
public:
|
public:
|
||||||
QMakeStepConfigWidget(QMakeStep *step);
|
QMakeStepConfigWidget(QMakeStep *step);
|
||||||
~QMakeStepConfigWidget() override;
|
~QMakeStepConfigWidget() override;
|
||||||
QString summaryText() const override;
|
|
||||||
|
|
||||||
private:
|
private:
|
||||||
// slots for handling buildconfiguration/step signals
|
// slots for handling buildconfiguration/step signals
|
||||||
@@ -224,11 +223,8 @@ private:
|
|||||||
void updateQtQuickCompilerOption();
|
void updateQtQuickCompilerOption();
|
||||||
void updateEffectiveQMakeCall();
|
void updateEffectiveQMakeCall();
|
||||||
|
|
||||||
void setSummaryText(const QString &);
|
|
||||||
|
|
||||||
Internal::Ui::QMakeStep *m_ui = nullptr;
|
Internal::Ui::QMakeStep *m_ui = nullptr;
|
||||||
QMakeStep *m_step = nullptr;
|
QMakeStep *m_step = nullptr;
|
||||||
QString m_summaryText;
|
|
||||||
bool m_ignoreChange = false;
|
bool m_ignoreChange = false;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user