forked from qt-creator/qt-creator
Android: add refresh button for AVD list
* Added refresh button * Moved startUpdateAvd() from updateUI() to AndroidSettingsWidget() to avoid long load of AVD Manager UI. Task-number: QTCREATORBUG-23284 Change-Id: I5128184f90437527d0a4a877bd277de1e6dbfad7 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
@@ -286,6 +286,8 @@ AndroidSettingsWidget::AndroidSettingsWidget()
|
|||||||
|
|
||||||
connect(&m_virtualDevicesWatcher, &QFutureWatcherBase::finished,
|
connect(&m_virtualDevicesWatcher, &QFutureWatcherBase::finished,
|
||||||
this, &AndroidSettingsWidget::updateAvds);
|
this, &AndroidSettingsWidget::updateAvds);
|
||||||
|
connect(m_ui->AVDRefreshPushButton, &QAbstractButton::clicked,
|
||||||
|
this, &AndroidSettingsWidget::startUpdateAvd);
|
||||||
connect(&m_futureWatcher, &QFutureWatcherBase::finished,
|
connect(&m_futureWatcher, &QFutureWatcherBase::finished,
|
||||||
this, &AndroidSettingsWidget::avdAdded);
|
this, &AndroidSettingsWidget::avdAdded);
|
||||||
connect(m_ui->NDKLocationPathChooser, &Utils::PathChooser::rawPathChanged,
|
connect(m_ui->NDKLocationPathChooser, &Utils::PathChooser::rawPathChanged,
|
||||||
@@ -324,6 +326,8 @@ AndroidSettingsWidget::AndroidSettingsWidget()
|
|||||||
// Reloading SDK packages is still synchronous. Use zero timer to let settings dialog open
|
// Reloading SDK packages is still synchronous. Use zero timer to let settings dialog open
|
||||||
// first.
|
// first.
|
||||||
QTimer::singleShot(0, std::bind(&AndroidSdkManager::reloadPackages, m_sdkManager.get(), false));
|
QTimer::singleShot(0, std::bind(&AndroidSdkManager::reloadPackages, m_sdkManager.get(), false));
|
||||||
|
|
||||||
|
startUpdateAvd();
|
||||||
}
|
}
|
||||||
|
|
||||||
AndroidSettingsWidget::~AndroidSettingsWidget()
|
AndroidSettingsWidget::~AndroidSettingsWidget()
|
||||||
@@ -548,7 +552,6 @@ void AndroidSettingsWidget::updateUI()
|
|||||||
Utils::DetailsWidget::Expanded);
|
Utils::DetailsWidget::Expanded);
|
||||||
m_ui->androidDetailsWidget->setState(androidSetupOk ? Utils::DetailsWidget::Collapsed :
|
m_ui->androidDetailsWidget->setState(androidSetupOk ? Utils::DetailsWidget::Collapsed :
|
||||||
Utils::DetailsWidget::Expanded);
|
Utils::DetailsWidget::Expanded);
|
||||||
startUpdateAvd();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void AndroidSettingsWidget::manageAVD()
|
void AndroidSettingsWidget::manageAVD()
|
||||||
|
@@ -304,6 +304,13 @@
|
|||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
|
<item>
|
||||||
|
<widget class="QPushButton" name="AVDRefreshPushButton">
|
||||||
|
<property name="text">
|
||||||
|
<string>Refresh List</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
<item>
|
<item>
|
||||||
<spacer name="verticalSpacer">
|
<spacer name="verticalSpacer">
|
||||||
<property name="orientation">
|
<property name="orientation">
|
||||||
@@ -351,8 +358,6 @@
|
|||||||
<container>1</container>
|
<container>1</container>
|
||||||
</customwidget>
|
</customwidget>
|
||||||
</customwidgets>
|
</customwidgets>
|
||||||
<resources>
|
<resources/>
|
||||||
<include location="android.qrc"/>
|
|
||||||
</resources>
|
|
||||||
<connections/>
|
<connections/>
|
||||||
</ui>
|
</ui>
|
||||||
|
Reference in New Issue
Block a user