forked from qt-creator/qt-creator
Android: inline addnewavddialog.ui
Change-Id: Ib90981f8fb60b637deb03da5466f7aaa49369104 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
hjk
@@ -24,30 +24,39 @@
|
||||
****************************************************************************/
|
||||
|
||||
#include "avddialog.h"
|
||||
#include "androidsdkmanager.h"
|
||||
|
||||
#include "androidavdmanager.h"
|
||||
#include "androiddevice.h"
|
||||
#include "androidconstants.h"
|
||||
#include "androiddevice.h"
|
||||
#include "androidsdkmanager.h"
|
||||
|
||||
#include <projectexplorer/projectexplorerconstants.h>
|
||||
|
||||
#include <utils/algorithm.h>
|
||||
#include <utils/infolabel.h>
|
||||
#include <utils/layoutbuilder.h>
|
||||
#include <utils/qtcassert.h>
|
||||
#include <utils/tooltip/tooltip.h>
|
||||
#include <utils/utilsicons.h>
|
||||
#include <utils/qtcassert.h>
|
||||
|
||||
#include <QCheckBox>
|
||||
#include <QComboBox>
|
||||
#include <QDialogButtonBox>
|
||||
#include <QFutureWatcher>
|
||||
#include <QKeyEvent>
|
||||
#include <QMessageBox>
|
||||
#include <QToolTip>
|
||||
#include <QLineEdit>
|
||||
#include <QLoggingCategory>
|
||||
#include <QMessageBox>
|
||||
#include <QPushButton>
|
||||
#include <QSpinBox>
|
||||
#include <QToolTip>
|
||||
|
||||
using namespace Android;
|
||||
using namespace Android::Internal;
|
||||
using namespace Utils;
|
||||
|
||||
namespace Android::Internal {
|
||||
|
||||
namespace {
|
||||
static Q_LOGGING_CATEGORY(avdDialogLog, "qtc.android.avdDialog", QtWarningMsg)
|
||||
}
|
||||
|
||||
|
||||
AvdDialog::AvdDialog(const AndroidConfig &config, QWidget *parent)
|
||||
: QDialog(parent),
|
||||
@@ -55,38 +64,79 @@ AvdDialog::AvdDialog(const AndroidConfig &config, QWidget *parent)
|
||||
m_androidConfig(config),
|
||||
m_sdkManager(m_androidConfig)
|
||||
{
|
||||
m_avdDialog.setupUi(this);
|
||||
resize(800, 0);
|
||||
setWindowTitle(tr("Create new AVD"));
|
||||
|
||||
m_abiComboBox = new QComboBox;
|
||||
m_abiComboBox->addItems({
|
||||
ProjectExplorer::Constants::ANDROID_ABI_X86,
|
||||
ProjectExplorer::Constants::ANDROID_ABI_X86_64,
|
||||
ProjectExplorer::Constants::ANDROID_ABI_ARMEABI_V7A,
|
||||
ProjectExplorer::Constants::ANDROID_ABI_ARM64_V8A
|
||||
});
|
||||
|
||||
m_sdcardSizeSpinBox = new QSpinBox;
|
||||
m_sdcardSizeSpinBox->setSuffix(tr(" MiB"));
|
||||
m_sdcardSizeSpinBox->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
|
||||
m_sdcardSizeSpinBox->setRange(0, 1000000);
|
||||
m_sdcardSizeSpinBox->setValue(512);
|
||||
|
||||
m_nameLineEdit = new QLineEdit;
|
||||
m_nameLineEdit->setValidator(new QRegularExpressionValidator(m_allowedNameChars, this));
|
||||
m_nameLineEdit->installEventFilter(this);
|
||||
|
||||
m_targetApiComboBox = new QComboBox;
|
||||
|
||||
m_deviceDefinitionComboBox = new QComboBox;
|
||||
|
||||
m_warningText = new InfoLabel;
|
||||
m_warningText->setType(InfoLabel::Warning);
|
||||
m_warningText->setElideMode(Qt::ElideNone);
|
||||
|
||||
m_deviceDefinitionTypeComboBox = new QComboBox;
|
||||
|
||||
m_overwriteCheckBox = new QCheckBox(tr("Overwrite existing AVD name"));
|
||||
|
||||
m_buttonBox = new QDialogButtonBox(QDialogButtonBox::Cancel|QDialogButtonBox::Ok);
|
||||
|
||||
m_hideTipTimer.setInterval(2000);
|
||||
m_hideTipTimer.setSingleShot(true);
|
||||
|
||||
using namespace Layouting;
|
||||
const Break nl;
|
||||
|
||||
Column {
|
||||
Form {
|
||||
tr("Name:"), m_nameLineEdit, nl,
|
||||
tr("Device definition:"),
|
||||
Row { m_deviceDefinitionTypeComboBox, m_deviceDefinitionComboBox }, nl,
|
||||
tr("Architecture (ABI):"), m_abiComboBox, nl,
|
||||
tr("Target API:"), m_targetApiComboBox, nl,
|
||||
QString(), m_warningText, nl,
|
||||
tr("SD card size:"), m_sdcardSizeSpinBox, nl,
|
||||
QString(), m_overwriteCheckBox,
|
||||
},
|
||||
Stretch(),
|
||||
m_buttonBox
|
||||
}.attachTo(this);
|
||||
|
||||
connect(&m_hideTipTimer, &QTimer::timeout, this, &Utils::ToolTip::hide);
|
||||
connect(m_avdDialog.deviceDefinitionTypeComboBox, &QComboBox::currentIndexChanged,
|
||||
connect(m_deviceDefinitionTypeComboBox, &QComboBox::currentIndexChanged,
|
||||
this, &AvdDialog::updateDeviceDefinitionComboBox);
|
||||
connect(m_avdDialog.abiComboBox, &QComboBox::currentIndexChanged,
|
||||
connect(m_abiComboBox, &QComboBox::currentIndexChanged,
|
||||
this, &AvdDialog::updateApiLevelComboBox);
|
||||
connect(m_buttonBox, &QDialogButtonBox::accepted, this, &QDialog::accept);
|
||||
connect(m_buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject);
|
||||
|
||||
deviceTypeToStringMap.insert(AvdDialog::Phone, "Phone");
|
||||
deviceTypeToStringMap.insert(AvdDialog::Tablet, "Tablet");
|
||||
deviceTypeToStringMap.insert(AvdDialog::Automotive, "Automotive");
|
||||
deviceTypeToStringMap.insert(AvdDialog::TV, "TV");
|
||||
deviceTypeToStringMap.insert(AvdDialog::Wear, "Wear");
|
||||
|
||||
m_avdDialog.abiComboBox->addItems(QStringList({
|
||||
ProjectExplorer::Constants::ANDROID_ABI_X86,
|
||||
ProjectExplorer::Constants::ANDROID_ABI_X86_64,
|
||||
ProjectExplorer::Constants::ANDROID_ABI_ARMEABI_V7A,
|
||||
ProjectExplorer::Constants::ANDROID_ABI_ARM64_V8A}));
|
||||
|
||||
auto v = new QRegularExpressionValidator(m_allowedNameChars, this);
|
||||
m_avdDialog.nameLineEdit->setValidator(v);
|
||||
m_avdDialog.nameLineEdit->installEventFilter(this);
|
||||
|
||||
m_avdDialog.warningText->setType(Utils::InfoLabel::Warning);
|
||||
m_avdDialog.warningText->setElideMode(Qt::ElideNone);
|
||||
m_deviceTypeToStringMap.insert(AvdDialog::Phone, "Phone");
|
||||
m_deviceTypeToStringMap.insert(AvdDialog::Tablet, "Tablet");
|
||||
m_deviceTypeToStringMap.insert(AvdDialog::Automotive, "Automotive");
|
||||
m_deviceTypeToStringMap.insert(AvdDialog::TV, "TV");
|
||||
m_deviceTypeToStringMap.insert(AvdDialog::Wear, "Wear");
|
||||
|
||||
parseDeviceDefinitionsList();
|
||||
for (const QString &type : deviceTypeToStringMap)
|
||||
m_avdDialog.deviceDefinitionTypeComboBox->addItem(type);
|
||||
for (const QString &type : m_deviceTypeToStringMap)
|
||||
m_deviceDefinitionTypeComboBox->addItem(type);
|
||||
|
||||
updateApiLevelComboBox();
|
||||
}
|
||||
@@ -101,7 +151,7 @@ int AvdDialog::exec()
|
||||
result.abi = abi();
|
||||
result.deviceDefinition = deviceDefinition();
|
||||
result.sdcardSize = sdcardSize();
|
||||
result.overwrite = m_avdDialog.overwriteCheckBox->isChecked();
|
||||
result.overwrite = m_overwriteCheckBox->isChecked();
|
||||
|
||||
const AndroidAvdManager avdManager = AndroidAvdManager(m_androidConfig);
|
||||
QFutureWatcher<CreateAvdInfo> createAvdFutureWatcher;
|
||||
@@ -204,49 +254,49 @@ void AvdDialog::parseDeviceDefinitionsList()
|
||||
|
||||
void AvdDialog::updateDeviceDefinitionComboBox()
|
||||
{
|
||||
DeviceType curDeviceType = deviceTypeToStringMap.key(
|
||||
m_avdDialog.deviceDefinitionTypeComboBox->currentText());
|
||||
DeviceType curDeviceType = m_deviceTypeToStringMap.key(
|
||||
m_deviceDefinitionTypeComboBox->currentText());
|
||||
|
||||
m_avdDialog.deviceDefinitionComboBox->clear();
|
||||
m_deviceDefinitionComboBox->clear();
|
||||
for (const DeviceDefinitionStruct &item : qAsConst(m_deviceDefinitionsList)) {
|
||||
if (item.deviceType == curDeviceType)
|
||||
m_avdDialog.deviceDefinitionComboBox->addItem(item.name_id);
|
||||
m_deviceDefinitionComboBox->addItem(item.name_id);
|
||||
}
|
||||
m_avdDialog.deviceDefinitionComboBox->addItem("Custom");
|
||||
m_deviceDefinitionComboBox->addItem("Custom");
|
||||
|
||||
updateApiLevelComboBox();
|
||||
}
|
||||
|
||||
const SystemImage* AvdDialog::systemImage() const
|
||||
{
|
||||
return m_avdDialog.targetApiComboBox->currentData().value<SystemImage*>();
|
||||
return m_targetApiComboBox->currentData().value<SystemImage*>();
|
||||
}
|
||||
|
||||
QString AvdDialog::name() const
|
||||
{
|
||||
return m_avdDialog.nameLineEdit->text();
|
||||
return m_nameLineEdit->text();
|
||||
}
|
||||
|
||||
QString AvdDialog::abi() const
|
||||
{
|
||||
return m_avdDialog.abiComboBox->currentText();
|
||||
return m_abiComboBox->currentText();
|
||||
}
|
||||
|
||||
QString AvdDialog::deviceDefinition() const
|
||||
{
|
||||
return m_avdDialog.deviceDefinitionComboBox->currentText();
|
||||
return m_deviceDefinitionComboBox->currentText();
|
||||
}
|
||||
|
||||
int AvdDialog::sdcardSize() const
|
||||
{
|
||||
return m_avdDialog.sdcardSizeSpinBox->value();
|
||||
return m_sdcardSizeSpinBox->value();
|
||||
}
|
||||
|
||||
void AvdDialog::updateApiLevelComboBox()
|
||||
{
|
||||
SystemImageList installedSystemImages = m_sdkManager.installedSystemImages();
|
||||
DeviceType curDeviceType = deviceTypeToStringMap.key(
|
||||
m_avdDialog.deviceDefinitionTypeComboBox->currentText());
|
||||
DeviceType curDeviceType = m_deviceTypeToStringMap.key(
|
||||
m_deviceDefinitionTypeComboBox->currentText());
|
||||
|
||||
QString selectedAbi = abi();
|
||||
auto hasAbi = [selectedAbi](const SystemImage *image) {
|
||||
@@ -261,49 +311,49 @@ void AvdDialog::updateApiLevelComboBox()
|
||||
return image && deviceType == curDeviceType && hasAbi(image);
|
||||
});
|
||||
|
||||
m_avdDialog.targetApiComboBox->clear();
|
||||
m_targetApiComboBox->clear();
|
||||
for (SystemImage *image : qAsConst(filteredList)) {
|
||||
QString imageString = "android-" % QString::number(image->apiLevel());
|
||||
const QStringList imageSplits = image->sdkStylePath().split(';');
|
||||
if (imageSplits.size() == 4)
|
||||
imageString += QStringLiteral(" (%1)").arg(imageSplits.at(2));
|
||||
m_avdDialog.targetApiComboBox->addItem(imageString,
|
||||
m_targetApiComboBox->addItem(imageString,
|
||||
QVariant::fromValue<SystemImage *>(image));
|
||||
m_avdDialog.targetApiComboBox->setItemData(m_avdDialog.targetApiComboBox->count() - 1,
|
||||
m_targetApiComboBox->setItemData(m_targetApiComboBox->count() - 1,
|
||||
image->descriptionText(),
|
||||
Qt::ToolTipRole);
|
||||
}
|
||||
|
||||
if (installedSystemImages.isEmpty()) {
|
||||
m_avdDialog.targetApiComboBox->setEnabled(false);
|
||||
m_avdDialog.warningText->setVisible(true);
|
||||
m_avdDialog.warningText->setText(
|
||||
m_targetApiComboBox->setEnabled(false);
|
||||
m_warningText->setVisible(true);
|
||||
m_warningText->setText(
|
||||
tr("Cannot create a new AVD. No suitable Android system image is installed.<br/>"
|
||||
"Install a system image for the intended Android version from the SDK Manager."));
|
||||
m_avdDialog.buttonBox->button(QDialogButtonBox::Ok)->setEnabled(false);
|
||||
m_buttonBox->button(QDialogButtonBox::Ok)->setEnabled(false);
|
||||
} else if (filteredList.isEmpty()) {
|
||||
m_avdDialog.targetApiComboBox->setEnabled(false);
|
||||
m_avdDialog.warningText->setVisible(true);
|
||||
m_avdDialog.warningText->setText(tr("Cannot create an AVD for ABI %1.<br/>Install a system "
|
||||
m_targetApiComboBox->setEnabled(false);
|
||||
m_warningText->setVisible(true);
|
||||
m_warningText->setText(tr("Cannot create an AVD for ABI %1.<br/>Install a system "
|
||||
"image for it from the SDK Manager tab first.")
|
||||
.arg(abi()));
|
||||
m_avdDialog.buttonBox->button(QDialogButtonBox::Ok)->setEnabled(false);
|
||||
m_buttonBox->button(QDialogButtonBox::Ok)->setEnabled(false);
|
||||
} else {
|
||||
m_avdDialog.warningText->setVisible(false);
|
||||
m_avdDialog.targetApiComboBox->setEnabled(true);
|
||||
m_avdDialog.buttonBox->button(QDialogButtonBox::Ok)->setEnabled(true);
|
||||
m_warningText->setVisible(false);
|
||||
m_targetApiComboBox->setEnabled(true);
|
||||
m_buttonBox->button(QDialogButtonBox::Ok)->setEnabled(true);
|
||||
}
|
||||
}
|
||||
|
||||
bool AvdDialog::eventFilter(QObject *obj, QEvent *event)
|
||||
{
|
||||
if (obj == m_avdDialog.nameLineEdit && event->type() == QEvent::KeyPress) {
|
||||
if (obj == m_nameLineEdit && event->type() == QEvent::KeyPress) {
|
||||
auto ke = static_cast<QKeyEvent *>(event);
|
||||
const QString key = ke->text();
|
||||
if (!key.isEmpty() && !m_allowedNameChars.match(key).hasMatch()) {
|
||||
QPoint position = m_avdDialog.nameLineEdit->parentWidget()->mapToGlobal(m_avdDialog.nameLineEdit->geometry().bottomLeft());
|
||||
QPoint position = m_nameLineEdit->parentWidget()->mapToGlobal(m_nameLineEdit->geometry().bottomLeft());
|
||||
position -= Utils::ToolTip::offsetFromPosition();
|
||||
Utils::ToolTip::show(position, tr("Allowed characters are: a-z A-Z 0-9 and . _ -"), m_avdDialog.nameLineEdit);
|
||||
Utils::ToolTip::show(position, tr("Allowed characters are: a-z A-Z 0-9 and . _ -"), m_nameLineEdit);
|
||||
m_hideTipTimer.start();
|
||||
} else {
|
||||
m_hideTipTimer.stop();
|
||||
@@ -312,3 +362,5 @@ bool AvdDialog::eventFilter(QObject *obj, QEvent *event)
|
||||
}
|
||||
return QDialog::eventFilter(obj, event);
|
||||
}
|
||||
|
||||
} // Android::Internal
|
||||
|
||||
Reference in New Issue
Block a user