Skip to content

GitLab

Commit fe08cb89 authored by Alessandro Portale's avatar Alessandro Portale
Browse files

Centralize error/warning/info icons 



There are multiple copies of these pngs in different plugins.
Let's have one version in core, also as @2x variant.

Change-Id: Iedff1a6190a72c1947dd202ae1ee46f59f9fb13c
Reviewed-by: default avatarKai Koehne <kai.koehne@digia.com>
Reviewed-by: default avatarAlessandro Portale <alessandro.portale@digia.com>
parent 23202425
Hide whitespace changes
Inline Side-by-side
src/plugins/android/androiddeployqtwidget.ui
View file @ fe08cb89
......@@ -69,7 +69,7 @@
<string/>
</property>
<property name="pixmap">
<pixmap resource="../projectexplorer/projectexplorer.qrc">:/projectexplorer/images/compile_warning.png</pixmap>
<pixmap resource="../coreplugin/core.qrc">:/core/images/warning.png</pixmap>
</property>
</widget>
</item>
......@@ -220,7 +220,7 @@
<string/>
</property>
<property name="pixmap">
<pixmap resource="../projectexplorer/projectexplorer.qrc">:/projectexplorer/images/compile_warning.png</pixmap>
<pixmap resource="../coreplugin/core.qrc">:/core/images/warning.png</pixmap>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
......
src/plugins/android/androidmanifesteditorwidget.cpp
View file @ fe08cb89
......@@ -33,6 +33,7 @@
#include "androidmanifestdocument.h"
#include "androidmanager.h"
#include <coreplugin/coreconstants.h>
#include <coreplugin/icore.h>
#include <coreplugin/infobar.h>
#include <coreplugin/editormanager/ieditor.h>
......@@ -165,7 +166,7 @@ void AndroidManifestEditorWidget::initializePage()
m_packageNameWarning->setVisible(false);
m_packageNameWarningIcon = new QLabel;
m_packageNameWarningIcon->setPixmap(QPixmap(QLatin1String(ProjectExplorer::Constants::ICON_WARNING)));
m_packageNameWarningIcon->setPixmap(QPixmap(QLatin1String(Core::Constants::ICON_WARNING)));
m_packageNameWarningIcon->setVisible(false);
m_packageNameWarningIcon->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
......
src/plugins/android/androidpackagecreationwidget.ui
View file @ fe08cb89
......@@ -232,7 +232,7 @@
<string/>
</property>
<property name="pixmap">
<pixmap resource="../projectexplorer/projectexplorer.qrc">:/projectexplorer/images/compile_warning.png</pixmap>
<pixmap resource="../coreplugin/core.qrc">:/core/images/warning.png</pixmap>
</property>
</widget>
</item>
......
src/plugins/android/androidpotentialkit.cpp
View file @ fe08cb89
......@@ -32,8 +32,8 @@
#include "androidconfigurations.h"
#include <utils/detailswidget.h>
#include <coreplugin/coreconstants.h>
#include <coreplugin/icore.h>
#include <projectexplorer/projectexplorerconstants.h>
#include <projectexplorer/kitmanager.h>
#include <projectexplorer/kit.h>
#include <projectexplorer/kitinformation.h>
......@@ -92,7 +92,7 @@ AndroidPotentialKitWidget::AndroidPotentialKitWidget(QWidget *parent)
: Utils::DetailsWidget(parent)
{
setSummaryText(QLatin1String("<b>Android has not been configured. Create Android kits.</b>"));
setIcon(QIcon(QLatin1String(ProjectExplorer::Constants::ICON_WARNING)));
setIcon(QIcon(QLatin1String(Core::Constants::ICON_WARNING)));
//detailsWidget->setState(Utils::DetailsWidget::NoSummary);
QWidget *mainWidget = new QWidget(this);
setWidget(mainWidget);
......
src/plugins/android/androidsettingswidget.ui
View file @ fe08cb89
......@@ -58,7 +58,7 @@
<string/>
</property>
<property name="pixmap">
<pixmap>:/projectexplorer/images/compile_warning.png</pixmap>
<pixmap>:/core/images/warning.png</pixmap>
</property>
</widget>
</item>
......@@ -124,7 +124,7 @@
<string/>
</property>
<property name="pixmap">
<pixmap resource="../projectexplorer/projectexplorer.qrc">:/projectexplorer/images/compile_warning.png</pixmap>
<pixmap resource="../coreplugin/core.qrc">:/core/images/error.png</pixmap>
</property>
</widget>
</item>
......@@ -193,7 +193,7 @@
<string/>
</property>
<property name="pixmap">
<pixmap resource="../projectexplorer/projectexplorer.qrc">:/projectexplorer/images/compile_error.png</pixmap>
<pixmap resource="../coreplugin/core.qrc">:/core/images/error.png</pixmap>
</property>
</widget>
</item>
......@@ -245,7 +245,7 @@
<string/>
</property>
<property name="pixmap">
<pixmap resource="../projectexplorer/projectexplorer.qrc">:/projectexplorer/images/compile_warning.png</pixmap>
<pixmap resource="../coreplugin/core.qrc">:/core/images/warning.png</pixmap>
</property>
</widget>
</item>
......
src/plugins/android/avddialog.cpp
View file @ fe08cb89
......@@ -29,7 +29,7 @@
#include "avddialog.h"
#include "androidconfigurations.h"
#include <projectexplorer/projectexplorerconstants.h>
#include <coreplugin/coreconstants.h>
#include <QMessageBox>
......@@ -53,7 +53,7 @@ AvdDialog::AvdDialog(int minApiLevel, const QString &targetArch, const AndroidCo
QRegExp rx(QLatin1String("\\S+"));
QRegExpValidator v(rx, 0);
m_avdDialog.nameLineEdit->setValidator(&v);
m_avdDialog.warningIcon->setPixmap(QPixmap(QLatin1String(ProjectExplorer::Constants::ICON_WARNING)));
m_avdDialog.warningIcon->setPixmap(QPixmap(QLatin1String(Core::Constants::ICON_WARNING)));
updateApiLevelComboBox();
......
src/plugins/android/createandroidmanifestwizard.cpp
View file @ fe08cb89
......@@ -32,7 +32,6 @@
#include <projectexplorer/target.h>
#include <qmakeprojectmanager/qmakeproject.h>
#include <qmakeprojectmanager/qmakenodes.h>
#include <projectexplorer/projectexplorerconstants.h>
#include <proparser/prowriter.h>
#include <QComboBox>
#include <QFormLayout>
......@@ -40,6 +39,7 @@
#include <QMessageBox>
#include <QVBoxLayout>
#include <qtsupport/qtkitinformation.h>
#include <coreplugin/coreconstants.h>
#include <coreplugin/editormanager/editormanager.h>
using namespace Android;
......@@ -111,7 +111,7 @@ ChooseDirectoryPage::ChooseDirectoryPage(CreateAndroidManifestWizard *wizard)
m_sourceDirectoryWarning->setWordWrap(true);
m_warningIcon = new QLabel(this);
m_warningIcon->setVisible(false);
m_warningIcon->setPixmap(QPixmap(QLatin1String(ProjectExplorer::Constants::ICON_ERROR)));
m_warningIcon->setPixmap(QPixmap(QLatin1String(Core::Constants::ICON_ERROR)));
m_warningIcon->setWordWrap(true);
m_warningIcon->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
......
src/plugins/baremetal/baremetalrunconfigurationwidget.cpp
View file @ fe08cb89
......@@ -29,6 +29,8 @@
#include "baremetalrunconfigurationwidget.h"
#include "baremetalrunconfiguration.h"
#include <coreplugin/coreconstants.h>
#include <utils/detailswidget.h>
#include <QLineEdit>
......@@ -86,7 +88,7 @@ void BareMetalRunConfigurationWidget::addDisabledLabel(QVBoxLayout *topLayout)
{
QHBoxLayout * const hl = new QHBoxLayout;
hl->addStretch();
d->disabledIcon.setPixmap(QPixmap(QLatin1String(ProjectExplorer::Constants::ICON_WARNING)));
d->disabledIcon.setPixmap(QPixmap(QLatin1String(Core::Constants::ICON_WARNING)));
hl->addWidget(&d->disabledIcon);
d->disabledReason.setVisible(false);
hl->addWidget(&d->disabledReason);
......
src/plugins/coreplugin/core.qrc
View file @ fe08cb89
......@@ -91,5 +91,11 @@
<file>images/pause.png</file>
<file>images/reload_gray.png</file>
<file>images/reload_gray@2x.png</file>
<file>images/error.png</file>
<file>images/error@2x.png</file>
<file>images/warning.png</file>
<file>images/warning@2x.png</file>
<file>images/info.png</file>
<file>images/info@2x.png</file>
</qresource>
</RCC>
src/plugins/coreplugin/coreconstants.h
View file @ fe08cb89
......@@ -213,6 +213,9 @@ const char ICON_PAUSE[] = ":/core/images/pause.png";
const char ICON_QTLOGO_32[] = ":/core/images/logo/32/QtProject-qtcreator.png";
const char ICON_QTLOGO_64[] = ":/core/images/logo/64/QtProject-qtcreator.png";
const char ICON_QTLOGO_128[] = ":/core/images/logo/128/QtProject-qtcreator.png";
const char ICON_WARNING[] = ":/core/images/warning.png";
const char ICON_ERROR[] = ":/core/images/error.png";
const char ICON_INFO[] = ":/core/images/info.png";
const char WIZARD_CATEGORY_QT[] = "R.Qt";
const char WIZARD_TR_CATEGORY_QT[] = QT_TRANSLATE_NOOP("Core", "Qt");
......
src/plugins/git/gitsubmitpanel.ui
View file @ fe08cb89
......@@ -89,7 +89,7 @@
<string/>
</property>
<property name="pixmap">
<pixmap resource="../projectexplorer/projectexplorer.qrc">:/projectexplorer/images/compile_error.png</pixmap>
<pixmap resource="../coreplugin/core.qrc">:/core/images/error.png</pixmap>
</property>
</widget>
</item>
......@@ -138,7 +138,7 @@
<string/>
</property>
<property name="pixmap">
<pixmap resource="../projectexplorer/projectexplorer.qrc">:/projectexplorer/images/compile_error.png</pixmap>
<pixmap resource="../coreplugin/core.qrc">:/core/images/error.png</pixmap>
</property>
</widget>
</item>
......
src/plugins/projectexplorer/buildprogress.cpp
View file @ fe08cb89
......@@ -30,6 +30,7 @@
#include "buildprogress.h"
#include "projectexplorerconstants.h"
#include <coreplugin/coreconstants.h>
#include <utils/stylehelper.h>
#include <QVBoxLayout>
......@@ -85,8 +86,8 @@ BuildProgress::BuildProgress(TaskWindow *taskWindow, Qt::Orientation orientation
m_errorIcon->setAlignment(Qt::AlignRight);
m_warningIcon->setAlignment(Qt::AlignRight);
m_errorIcon->setPixmap(QPixmap(QLatin1String(ProjectExplorer::Constants::ICON_ERROR)));
m_warningIcon->setPixmap(QPixmap(QLatin1String(ProjectExplorer::Constants::ICON_WARNING)));
m_errorIcon->setPixmap(QPixmap(QLatin1String(Core::Constants::ICON_ERROR)));
m_warningIcon->setPixmap(QPixmap(QLatin1String(Core::Constants::ICON_WARNING)));
m_contentWidget->hide();
......
src/plugins/projectexplorer/devicesupport/desktopdeviceconfigurationwidget.cpp
View file @ fe08cb89
......@@ -31,6 +31,7 @@
#include "ui_desktopdeviceconfigurationwidget.h"
#include <projectexplorer/projectexplorerconstants.h>
#include <coreplugin/coreconstants.h>
#include <utils/portlist.h>
#include <utils/qtcassert.h>
......@@ -73,7 +74,7 @@ void DesktopDeviceConfigurationWidget::initGui()
m_ui->freePortsLineEdit->setPlaceholderText(
QString::fromLatin1("eg: %1-%2").arg(DESKTOP_PORT_START).arg(DESKTOP_PORT_END));
m_ui->portsWarningLabel->setPixmap(
QPixmap(QLatin1String(ProjectExplorer::Constants::ICON_WARNING)));
QPixmap(QLatin1String(Core::Constants::ICON_WARNING)));
m_ui->portsWarningLabel->setToolTip(QLatin1String("<font color=\"red\">")
+ tr("You will need at least one port for QML debugging.")
+ QLatin1String("</font>"));
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment