diff --git a/src/plugins/android/createandroidmanifestwizard.cpp b/src/plugins/android/createandroidmanifestwizard.cpp index bac135d7d2e..31d65855556 100644 --- a/src/plugins/android/createandroidmanifestwizard.cpp +++ b/src/plugins/android/createandroidmanifestwizard.cpp @@ -38,7 +38,7 @@ #include -#include +#include #include #include @@ -123,22 +123,13 @@ ChooseDirectoryPage::ChooseDirectoryPage(CreateAndroidManifestWizard *wizard) m_androidPackageSourceDir->setExpectedKind(PathChooser::Directory); m_layout->addRow(tr("Android package source directory:"), m_androidPackageSourceDir); - m_sourceDirectoryWarning = new QLabel(this); + m_sourceDirectoryWarning = + new Utils::InfoLabel(tr("The Android package source directory cannot be the same as " + "the project directory."), Utils::InfoLabel::Error, this); m_sourceDirectoryWarning->setVisible(false); - m_sourceDirectoryWarning->setText(tr("The Android package source directory cannot be the same as the project directory.")); + m_sourceDirectoryWarning->setElideMode(Qt::ElideNone); m_sourceDirectoryWarning->setWordWrap(true); - m_warningIcon = new QLabel(this); - m_warningIcon->setVisible(false); - m_warningIcon->setPixmap(Utils::Icons::CRITICAL.pixmap()); - m_warningIcon->setWordWrap(true); - m_warningIcon->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); - - auto hbox = new QHBoxLayout; - hbox->addWidget(m_warningIcon); - hbox->addWidget(m_sourceDirectoryWarning); - hbox->setAlignment(m_warningIcon, Qt::AlignTop); - - m_layout->addRow(hbox); + m_layout->addRow(m_sourceDirectoryWarning); connect(m_androidPackageSourceDir, &PathChooser::pathChanged, m_wizard, &CreateAndroidManifestWizard::setDirectory); @@ -163,7 +154,6 @@ void ChooseDirectoryPage::checkPackageSourceDir() bool isComplete = QFileInfo(projectDir) != QFileInfo(newDir); m_sourceDirectoryWarning->setVisible(!isComplete); - m_warningIcon->setVisible(!isComplete); if (isComplete != m_complete) { m_complete = isComplete; diff --git a/src/plugins/android/createandroidmanifestwizard.h b/src/plugins/android/createandroidmanifestwizard.h index 4695f9a4d52..3a5080f67ec 100644 --- a/src/plugins/android/createandroidmanifestwizard.h +++ b/src/plugins/android/createandroidmanifestwizard.h @@ -37,6 +37,10 @@ class QLabel; class QFormLayout; QT_END_NAMESPACE +namespace Utils { +class InfoLabel; +} + namespace ProjectExplorer { class Target; } namespace Android { @@ -78,8 +82,7 @@ private: private: CreateAndroidManifestWizard *m_wizard; Utils::PathChooser *m_androidPackageSourceDir; - QLabel *m_sourceDirectoryWarning; - QLabel *m_warningIcon; + Utils::InfoLabel *m_sourceDirectoryWarning; QLabel *m_label; QFormLayout *m_layout; bool m_complete;