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

Android: disable controls when sdkmanager is running a task

Browse Source 
Change-Id: Ib8220fa3510a186d69e17ae46a23c5b40f1de76b
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Assam Boudjelthia
2020-06-30 12:06:46 +03:00
parent 560f5bfdc7
commit 67634d0d46
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/plugins/android/androidsettingswidget.cpp
View File

@@ -350,13 +350,18 @@ AndroidSettingsWidget::AndroidSettingsWidget()
sdkMangerLayout->setContentsMargins(0, 0, 0, 0); sdkMangerLayout->setContentsMargins(0, 0, 0, 0);
sdkMangerLayout->addWidget(m_sdkManagerWidget); sdkMangerLayout->addWidget(m_sdkManagerWidget);
connect(m_sdkManagerWidget, &AndroidSdkManagerWidget::updatingSdk, [this] { connect(m_sdkManagerWidget, &AndroidSdkManagerWidget::updatingSdk, [this] {
m_ui.SDKLocationPathChooser->setEnabled(false); // Disable the top level UI to keep the user from unintentionally interrupting operations
// Disable the tab bar to restrict the user moving away from sdk manager tab untill m_ui.javaSettingsGroupBox->setEnabled(false);
// operations finish. m_ui.androidSettingsGroupBox->setEnabled(false);
m_ui.androidOpenSSLSettingsGroupBox->setEnabled(false);
m_ui.CreateKitCheckBox->setEnabled(false);
m_ui.managerTabWidget->tabBar()->setEnabled(false); m_ui.managerTabWidget->tabBar()->setEnabled(false);
}); });
connect(m_sdkManagerWidget, &AndroidSdkManagerWidget::updatingSdkFinished, [this] { connect(m_sdkManagerWidget, &AndroidSdkManagerWidget::updatingSdkFinished, [this] {
m_ui.SDKLocationPathChooser->setEnabled(true); m_ui.javaSettingsGroupBox->setEnabled(true);
m_ui.androidSettingsGroupBox->setEnabled(true);
m_ui.androidOpenSSLSettingsGroupBox->setEnabled(true);
m_ui.CreateKitCheckBox->setEnabled(true);
m_ui.managerTabWidget->tabBar()->setEnabled(true); m_ui.managerTabWidget->tabBar()->setEnabled(true);
}); });
connect(m_sdkManagerWidget, &AndroidSdkManagerWidget::licenseWorkflowStarted, [this] { connect(m_sdkManagerWidget, &AndroidSdkManagerWidget::licenseWorkflowStarted, [this] {

6
src/plugins/android/androidsettingswidget.ui
View File

@@ -66,7 +66,7 @@
<number>0</number> <number>0</number>
</property> </property>
<item> <item>
<widget class="QGroupBox" name="javaSettingsGroup"> <widget class="QGroupBox" name="javaSettingsGroupBox">
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>0</width> <width>0</width>
@@ -124,7 +124,7 @@
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QGroupBox" name="groupBox"> <widget class="QGroupBox" name="androidSettingsGroupBox">
<property name="title"> <property name="title">
<string>Android Settings</string> <string>Android Settings</string>
</property> </property>
@@ -263,7 +263,7 @@
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QGroupBox" name="groupBox_2"> <widget class="QGroupBox" name="androidOpenSSLSettingsGroupBox">
<property name="title"> <property name="title">
<string>Android OpenSSL settings (Optional)</string> <string>Android OpenSSL settings (Optional)</string>
</property> </property>