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

Android: Use Utils::InfoLabel in AndroidSdkManagerWidget

Browse Source 
Task-number: QTCREATORBUG-23346
Change-Id: I9d9054a81567ff64b631c7c4f0541c0daac7e6dd
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
This commit is contained in:
Alessandro Portale
2019-12-13 08:43:49 +01:00
parent 1e87114bad
commit f5b92c865b
2 changed files with 4 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/android/androidsdkmanagerwidget.cpp
View File

@@ -76,8 +76,7 @@ AndroidSdkManagerWidget::AndroidSdkManagerWidget(AndroidConfig &config,
m_ui->setupUi(this); m_ui->setupUi(this);
m_ui->sdkLicensebuttonBox->hide(); m_ui->sdkLicensebuttonBox->hide();
m_ui->sdkLicenseLabel->hide(); m_ui->sdkLicenseLabel->hide();
m_ui->warningLabel->setElideMode(Qt::ElideRight); m_ui->warningLabel->setType(Utils::InfoLabel::Warning);
m_ui->warningIconLabel->setPixmap(Utils::Icons::WARNING.pixmap());
m_ui->viewStack->setCurrentWidget(m_ui->packagesStack); m_ui->viewStack->setCurrentWidget(m_ui->packagesStack);
m_formatter = new Utils::OutputFormatter; m_formatter = new Utils::OutputFormatter;
@@ -161,7 +160,6 @@ void AndroidSdkManagerWidget::setSdkManagerControlsEnabled(bool enable)
{ {
m_ui->packagesTypeGroup->setEnabled(enable); m_ui->packagesTypeGroup->setEnabled(enable);
m_ui->expandCheck->setVisible(enable); m_ui->expandCheck->setVisible(enable);
m_ui->warningIconLabel->setVisible(!enable);
m_ui->warningLabel->setVisible(!enable); m_ui->warningLabel->setVisible(!enable);
m_ui->packagesView->setEnabled(enable); m_ui->packagesView->setEnabled(enable);
m_ui->updateInstalledButton->setEnabled(enable); m_ui->updateInstalledButton->setEnabled(enable);

13
src/plugins/android/androidsdkmanagerwidget.ui
View File

@@ -70,14 +70,7 @@
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QLabel" name="warningIconLabel"> <widget class="Utils::InfoLabel" name="warningLabel">
<property name="text">
<string/>
</property>
</widget>
</item>
<item>
<widget class="Utils::ElidingLabel" name="warningLabel">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred"> <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<horstretch>0</horstretch> <horstretch>0</horstretch>
@@ -294,9 +287,9 @@
</widget> </widget>
<customwidgets> <customwidgets>
<customwidget> <customwidget>
<class>Utils::ElidingLabel</class> <class>Utils::InfoLabel</class>
<extends>QLabel</extends> <extends>QLabel</extends>
<header>utils/elidinglabel.h</header> <header location="global">utils/infolabel.h</header>
</customwidget> </customwidget>
</customwidgets> </customwidgets>
<tabstops> <tabstops>