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

Android: reword and reformat the no AVD image warning

Browse Source 
Make the warning message shorter and enable elide right,
and place the warning right under the abi combobox.

Change-Id: I0163e5e48cbdf350948297a4b58ec712543516e5
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
This commit is contained in:
Assam Boudjelthia
2024-10-18 02:13:45 +03:00
parent f4582efd30
commit ac8ce27bbf
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/plugins/android/avddialog.cpp
View File

@@ -82,7 +82,7 @@ AvdDialog::AvdDialog(QWidget *parent)
m_warningText = new InfoLabel; m_warningText = new InfoLabel;
m_warningText->setType(InfoLabel::Warning); m_warningText->setType(InfoLabel::Warning);
m_warningText->setElideMode(Qt::ElideNone); m_warningText->setElideMode(Qt::ElideRight);
m_deviceDefinitionTypeComboBox = new QComboBox; m_deviceDefinitionTypeComboBox = new QComboBox;
@@ -98,8 +98,8 @@ AvdDialog::AvdDialog(QWidget *parent)
Column { Column {
Form { Form {
Tr::tr("Name:"), m_nameLineEdit, br, Tr::tr("Name:"), m_nameLineEdit, br,
Tr::tr("Architecture (ABI):"), m_abiComboBox, br, Tr::tr("Target ABI / API:"),
Tr::tr("Target API:"), m_targetApiComboBox, br, Row { m_abiComboBox, m_targetApiComboBox }, br,
QString(), m_warningText, br, QString(), m_warningText, br,
Tr::tr("Skin definition:"), Tr::tr("Skin definition:"),
Row { m_deviceDefinitionTypeComboBox, m_deviceDefinitionComboBox }, br, Row { m_deviceDefinitionTypeComboBox, m_deviceDefinitionComboBox }, br,
@@ -334,19 +334,19 @@ void AvdDialog::updateApiLevelComboBox()
Qt::ToolTipRole); Qt::ToolTipRole);
} }
const QString installRecommendationMsg = Tr::tr(
"Install a system image from the SDK Manager first.");
if (installedSystemImages.isEmpty()) { if (installedSystemImages.isEmpty()) {
m_targetApiComboBox->setEnabled(false); m_targetApiComboBox->setEnabled(false);
m_warningText->setVisible(true); m_warningText->setVisible(true);
m_warningText->setText( m_warningText->setText(Tr::tr("No system images found.") + " " + installRecommendationMsg);
Tr::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_buttonBox->button(QDialogButtonBox::Ok)->setEnabled(false); m_buttonBox->button(QDialogButtonBox::Ok)->setEnabled(false);
} else if (filteredList.isEmpty()) { } else if (filteredList.isEmpty()) {
m_targetApiComboBox->setEnabled(false); m_targetApiComboBox->setEnabled(false);
m_warningText->setVisible(true); m_warningText->setVisible(true);
m_warningText->setText(Tr::tr("Cannot create an AVD for ABI %1.<br/>Install a system " m_warningText->setText(Tr::tr("No system images found for %1.").arg(abi()) + " " +
"image for it from the SDK Manager tab first.") installRecommendationMsg);
.arg(abi()));
m_buttonBox->button(QDialogButtonBox::Ok)->setEnabled(false); m_buttonBox->button(QDialogButtonBox::Ok)->setEnabled(false);
} else { } else {
m_warningText->setVisible(false); m_warningText->setVisible(false);