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

McuSupport: Inline FlashAndRunConfiguration

Browse Source 
Add a tr() to the label.

Change-Id: Iefacd6c6646b9f5e5124d907d0516ebc5556ae76
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
hjk
2020-02-11 10:44:04 +01:00
parent 783967f550
commit 8d0361a8c9
2 changed files with 19 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/plugins/mcusupport/mcusupportrunconfiguration.cpp
View File

@@ -62,22 +62,28 @@ static QStringList flashAndRunArgs(const Target *target)
return {"--build", ".", "--target", targetName}; return {"--build", ".", "--target", targetName};
} }
FlashAndRunConfiguration::FlashAndRunConfiguration(Target *target, Core::Id id) class FlashAndRunConfiguration final : public RunConfiguration
: RunConfiguration(target, id)
{ {
auto flashAndRunParameters = addAspect<BaseStringAspect>(); Q_DECLARE_TR_FUNCTIONS(McuSupport::Internal::FlashAndRunConfiguration)
flashAndRunParameters->setLabelText("Flash and run CMake parameters:");
flashAndRunParameters->setDisplayStyle(BaseStringAspect::TextEditDisplay);
flashAndRunParameters->setSettingsKey("FlashAndRunConfiguration.Parameters");
setUpdater([target, flashAndRunParameters] { public:
flashAndRunParameters->setValue(flashAndRunArgs(target).join(' ')); FlashAndRunConfiguration(Target *target, Core::Id id)
}); : RunConfiguration(target, id)
{
auto flashAndRunParameters = addAspect<BaseStringAspect>();
flashAndRunParameters->setLabelText(tr("Flash and run CMake parameters:"));
flashAndRunParameters->setDisplayStyle(BaseStringAspect::TextEditDisplay);
flashAndRunParameters->setSettingsKey("FlashAndRunConfiguration.Parameters");
update(); setUpdater([target, flashAndRunParameters] {
flashAndRunParameters->setValue(flashAndRunArgs(target).join(' '));
});
connect(target->project(), &Project::displayNameChanged, this, &RunConfiguration::update); update();
}
connect(target->project(), &Project::displayNameChanged, this, &RunConfiguration::update);
}
};
class FlashAndRunWorker : public SimpleTargetRunner class FlashAndRunWorker : public SimpleTargetRunner
{ {

10
src/plugins/mcusupport/mcusupportrunconfiguration.h
View File

@@ -31,20 +31,12 @@
namespace McuSupport { namespace McuSupport {
namespace Internal { namespace Internal {
class McuSupportRunConfigurationFactory : public ProjectExplorer::FixedRunConfigurationFactory class McuSupportRunConfigurationFactory final : public ProjectExplorer::FixedRunConfigurationFactory
{ {
public: public:
McuSupportRunConfigurationFactory(); McuSupportRunConfigurationFactory();
}; };
class FlashAndRunConfiguration : public ProjectExplorer::RunConfiguration
{
Q_OBJECT
public:
FlashAndRunConfiguration(ProjectExplorer::Target *target, Core::Id id);
};
ProjectExplorer::RunWorkerFactory::WorkerCreator makeFlashAndRunWorker(); ProjectExplorer::RunWorkerFactory::WorkerCreator makeFlashAndRunWorker();
} // namespace Internal } // namespace Internal