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

Android: Simplify implementation of aspect for extra commands

Browse Source 
Change-Id: Ic8bd75d8d6cb183772d96263837f1ed307c5dc5f
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
hjk
2021-03-11 17:26:53 +01:00
parent 3deba648cf
commit 904f59a744
2 changed files with 10 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/plugins/android/androidrunconfiguration.cpp
View File

@@ -69,43 +69,27 @@ void BaseStringListAspect::addToLayout(LayoutBuilder &builder)
{
QTC_CHECK(!m_widget);
m_widget = new AdbCommandsWidget;
m_widget->setCommandList(m_value);
m_widget->setTitleText(m_label);
m_widget->setCommandList(value());
m_widget->setTitleText(labelText());
builder.addItem(m_widget.data());
connect(m_widget.data(), &AdbCommandsWidget::commandsChanged, this, [this] {
m_value = m_widget->commandsList();
BaseAspect::setValue(m_widget->commandsList());
emit changed();
});
}
void BaseStringListAspect::fromMap(const QVariantMap &map)
{
m_value = map.value(settingsKey()).toStringList();
}
void BaseStringListAspect::toMap(QVariantMap &data) const
{
saveToMap(data, m_value, QStringList(), settingsKey());
}
QStringList BaseStringListAspect::value() const
{
return m_value;
return BaseAspect::value().toStringList();
}
void BaseStringListAspect::setValue(const QStringList &value)
{
m_value = value;
BaseAspect::setValue(value);
if (m_widget)
m_widget->setCommandList(m_value);
m_widget->setCommandList(value);
}
void BaseStringListAspect::setLabel(const QString &label)
{
m_label = label;
}
AndroidRunConfiguration::AndroidRunConfiguration(Target *target, Utils::Id id)
: RunConfiguration(target, id)
{
@@ -141,12 +125,14 @@ AndroidRunConfiguration::AndroidRunConfiguration(Target *target, Utils::Id id)
auto preStartShellCmdAspect = addAspect<BaseStringListAspect>();
preStartShellCmdAspect->setId(Constants::ANDROID_PRESTARTSHELLCMDLIST);
preStartShellCmdAspect->setSettingsKey("Android.PreStartShellCmdListKey");
preStartShellCmdAspect->setLabel(tr("Shell commands to run on Android device before application launch."));
preStartShellCmdAspect->setLabelText(
tr("Shell commands to run on Android device before application launch."));
auto postStartShellCmdAspect = addAspect<BaseStringListAspect>();
postStartShellCmdAspect->setId(Constants::ANDROID_POSTFINISHSHELLCMDLIST);
postStartShellCmdAspect->setSettingsKey("Android.PostStartShellCmdListKey");
postStartShellCmdAspect->setLabel(tr("Shell commands to run on Android device after application quits."));
postStartShellCmdAspect->setLabelText(
tr("Shell commands to run on Android device after application quits."));
setUpdater([this, target] {
const BuildTargetInfo bti = buildTargetInfo();