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

Android: Use new auto aspect layout handling

Browse Source 
Change-Id: I6e439a94f3d158d2f57ccb5c271c01c12b34eae0
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
This commit is contained in:
hjk
2018-09-06 17:14:49 +02:00
parent 0d687b7292
commit 02d8dde4c9
1 changed files with 5 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -121,6 +121,10 @@ AndroidRunConfiguration::AndroidRunConfiguration(Target *target, Core::Id id)
amStartArgsAspect->setDisplayStyle(BaseStringAspect::LineEditDisplay); amStartArgsAspect->setDisplayStyle(BaseStringAspect::LineEditDisplay);
amStartArgsAspect->setHistoryCompleter("Android.AmStartArgs.History"); amStartArgsAspect->setHistoryCompleter("Android.AmStartArgs.History");
auto warning = addAspect<BaseStringAspect>();
warning->setLabelPixmap(Icons::WARNING.pixmap());
warning->setValue(tr("If the \"am start\" options conflict, the application might not start."));
auto preStartShellCmdAspect = addAspect<BaseStringListAspect>(); auto preStartShellCmdAspect = addAspect<BaseStringListAspect>();
preStartShellCmdAspect->setId(Constants::ANDROID_PRESTARTSHELLCMDLIST); preStartShellCmdAspect->setId(Constants::ANDROID_PRESTARTSHELLCMDLIST);
preStartShellCmdAspect->setSettingsKey("Android.PreStartShellCmdListKey"); preStartShellCmdAspect->setSettingsKey("Android.PreStartShellCmdListKey");
@@ -139,23 +143,7 @@ AndroidRunConfiguration::AndroidRunConfiguration(Target *target, Core::Id id)
QWidget *AndroidRunConfiguration::createConfigurationWidget() QWidget *AndroidRunConfiguration::createConfigurationWidget()
{ {
auto widget = new QWidget; auto wrapped = RunConfiguration::createConfigurationWidget();
auto layout = new QFormLayout(widget);
extraAspect<ArgumentsAspect>()->addToConfigurationLayout(layout);
extraAspect(Constants::ANDROID_AMSTARTARGS)->addToConfigurationLayout(layout);
auto warningIconLabel = new QLabel;
warningIconLabel->setPixmap(Utils::Icons::WARNING.pixmap());
auto warningLabel = new QLabel(tr("If the \"am start\" options conflict, the application might not start."));
layout->addRow(warningIconLabel, warningLabel);
extraAspect(Constants::ANDROID_PRESTARTSHELLCMDLIST)->addToConfigurationLayout(layout);
extraAspect(Constants::ANDROID_POSTFINISHSHELLCMDLIST)->addToConfigurationLayout(layout);
extraAspect<AndroidRunEnvironmentAspect>()->addToConfigurationLayout(layout);
auto wrapped = wrapWidget(widget);
auto detailsWidget = qobject_cast<DetailsWidget *>(wrapped); auto detailsWidget = qobject_cast<DetailsWidget *>(wrapped);
QTC_ASSERT(detailsWidget, return wrapped); QTC_ASSERT(detailsWidget, return wrapped);
detailsWidget->setState(DetailsWidget::Expanded); detailsWidget->setState(DetailsWidget::Expanded);