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

Ios: Use Utils::InfoLabel in IosBuildConfiguration

Browse Source 
Task-number: QTCREATORBUG-23346
Change-Id: Ia5a0a1ca1df3c33c256b2021b31faf7989720086
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Alessandro Portale
2019-12-14 21:18:13 +01:00
parent 00fb2421e7
commit 445a09b17c
1 changed files with 7 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/plugins/ios/iosbuildconfiguration.cpp
View File

@@ -37,7 +37,7 @@
#include <utils/algorithm.h> #include <utils/algorithm.h>
#include <utils/detailswidget.h> #include <utils/detailswidget.h>
#include <utils/utilsicons.h> #include <utils/infolabel.h>
#include <QCheckBox> #include <QCheckBox>
#include <QComboBox> #include <QComboBox>
@@ -91,10 +91,8 @@ private:
QComboBox *m_signEntityCombo; QComboBox *m_signEntityCombo;
QCheckBox *m_autoSignCheckbox; QCheckBox *m_autoSignCheckbox;
QLabel *m_signEntityLabel; QLabel *m_signEntityLabel;
QLabel *m_infoIconLabel; Utils::InfoLabel *m_infoLabel;
QLabel *m_infoLabel; Utils::InfoLabel *m_warningLabel;
QLabel *m_warningIconLabel;
QLabel *m_warningLabel;
}; };
IosBuildSettingsWidget::IosBuildSettingsWidget(IosBuildConfiguration *bc) IosBuildSettingsWidget::IosBuildSettingsWidget(IosBuildConfiguration *bc)
@@ -132,36 +130,16 @@ IosBuildSettingsWidget::IosBuildSettingsWidget(IosBuildConfiguration *bc)
m_signEntityLabel = new QLabel(container); m_signEntityLabel = new QLabel(container);
m_infoIconLabel = new QLabel(container); m_infoLabel = new Utils::InfoLabel({}, Utils::InfoLabel::Information, container);
QSizePolicy sizePolicy3(QSizePolicy::Maximum, QSizePolicy::Preferred);
sizePolicy3.setHorizontalStretch(0);
sizePolicy3.setVerticalStretch(0);
m_infoIconLabel->setSizePolicy(sizePolicy3);
m_infoLabel = new QLabel(container); m_warningLabel = new Utils::InfoLabel({}, Utils::InfoLabel::Warning, container);
QSizePolicy sizePolicy4(QSizePolicy::Preferred, QSizePolicy::Preferred);
sizePolicy4.setHorizontalStretch(0);
sizePolicy4.setVerticalStretch(0);
m_infoLabel->setSizePolicy(sizePolicy4);
m_infoLabel->setWordWrap(false);
m_warningIconLabel = new QLabel(container);
m_warningIconLabel->setSizePolicy(sizePolicy3);
m_warningLabel = new QLabel(container);
m_warningLabel->setSizePolicy(sizePolicy4);
m_warningLabel->setWordWrap(true);
m_signEntityLabel->setText(IosBuildConfiguration::tr("Development team:")); m_signEntityLabel->setText(IosBuildConfiguration::tr("Development team:"));
connect(m_qmakeDefaults, &QPushButton::clicked, this, &IosBuildSettingsWidget::onReset); connect(m_qmakeDefaults, &QPushButton::clicked, this, &IosBuildSettingsWidget::onReset);
m_infoIconLabel->hide();
m_infoIconLabel->setPixmap(Utils::Icons::INFO.pixmap());
m_infoLabel->hide(); m_infoLabel->hide();
m_warningIconLabel->hide();
m_warningIconLabel->setPixmap(Utils::Icons::WARNING.pixmap());
m_warningLabel->hide(); m_warningLabel->hide();
detailsWidget->setState(Utils::DetailsWidget::NoSummary); detailsWidget->setState(Utils::DetailsWidget::NoSummary);
@@ -192,18 +170,10 @@ IosBuildSettingsWidget::IosBuildSettingsWidget(IosBuildConfiguration *bc)
gridLayout->addWidget(m_autoSignCheckbox, 0, 2, 1, 1); gridLayout->addWidget(m_autoSignCheckbox, 0, 2, 1, 1);
gridLayout->addWidget(m_qmakeDefaults, 1, 1, 1, 1); gridLayout->addWidget(m_qmakeDefaults, 1, 1, 1, 1);
auto horizontalLayout = new QHBoxLayout();
horizontalLayout->addWidget(m_infoIconLabel);
horizontalLayout->addWidget(m_infoLabel);
auto horizontalLayout_2 = new QHBoxLayout();
horizontalLayout_2->addWidget(m_warningIconLabel);
horizontalLayout_2->addWidget(m_warningLabel);
auto verticalLayout = new QVBoxLayout(container); auto verticalLayout = new QVBoxLayout(container);
verticalLayout->addLayout(gridLayout); verticalLayout->addLayout(gridLayout);
verticalLayout->addLayout(horizontalLayout); verticalLayout->addWidget(m_infoLabel);
verticalLayout->addLayout(horizontalLayout_2); verticalLayout->addWidget(m_warningLabel);
} }
void IosBuildSettingsWidget::setDefaultSigningIdentfier(const QString &identifier) const void IosBuildSettingsWidget::setDefaultSigningIdentfier(const QString &identifier) const
@@ -366,7 +336,6 @@ void IosBuildSettingsWidget::updateInfoText()
} }
} }
m_infoIconLabel->setVisible(!infoMessage.isEmpty());
m_infoLabel->setVisible(!infoMessage.isEmpty()); m_infoLabel->setVisible(!infoMessage.isEmpty());
m_infoLabel->setText(infoMessage); m_infoLabel->setText(infoMessage);
} }
@@ -400,7 +369,6 @@ void IosBuildSettingsWidget::updateWarningText()
} }
m_warningLabel->setVisible(!warningText.isEmpty()); m_warningLabel->setVisible(!warningText.isEmpty());
m_warningIconLabel->setVisible(!warningText.isEmpty());
m_warningLabel->setText(warningText); m_warningLabel->setText(warningText);
} }