diff --git a/src/plugins/android/androiddeployqtwidget.ui b/src/plugins/android/androiddeployqtwidget.ui index c7636369a25..fc744a6955a 100644 --- a/src/plugins/android/androiddeployqtwidget.ui +++ b/src/plugins/android/androiddeployqtwidget.ui @@ -69,7 +69,7 @@ - :/projectexplorer/images/compile_warning.png + :/core/images/warning.png @@ -220,7 +220,7 @@ - :/projectexplorer/images/compile_warning.png + :/core/images/warning.png Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop diff --git a/src/plugins/android/androidmanifesteditorwidget.cpp b/src/plugins/android/androidmanifesteditorwidget.cpp index 42a0bf89112..338954849aa 100644 --- a/src/plugins/android/androidmanifesteditorwidget.cpp +++ b/src/plugins/android/androidmanifesteditorwidget.cpp @@ -33,6 +33,7 @@ #include "androidmanifestdocument.h" #include "androidmanager.h" +#include #include #include #include @@ -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); diff --git a/src/plugins/android/androidpackagecreationwidget.ui b/src/plugins/android/androidpackagecreationwidget.ui index 13b96df7473..102e74cfb4d 100644 --- a/src/plugins/android/androidpackagecreationwidget.ui +++ b/src/plugins/android/androidpackagecreationwidget.ui @@ -232,7 +232,7 @@ - :/projectexplorer/images/compile_warning.png + :/core/images/warning.png diff --git a/src/plugins/android/androidpotentialkit.cpp b/src/plugins/android/androidpotentialkit.cpp index 5ef87071a24..247872b3e41 100644 --- a/src/plugins/android/androidpotentialkit.cpp +++ b/src/plugins/android/androidpotentialkit.cpp @@ -32,8 +32,8 @@ #include "androidconfigurations.h" #include +#include #include -#include #include #include #include @@ -92,7 +92,7 @@ AndroidPotentialKitWidget::AndroidPotentialKitWidget(QWidget *parent) : Utils::DetailsWidget(parent) { setSummaryText(QLatin1String("Android has not been configured. Create Android kits.")); - 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); diff --git a/src/plugins/android/androidsettingswidget.ui b/src/plugins/android/androidsettingswidget.ui index 6dd67b22314..5b40861e160 100644 --- a/src/plugins/android/androidsettingswidget.ui +++ b/src/plugins/android/androidsettingswidget.ui @@ -58,7 +58,7 @@ - :/projectexplorer/images/compile_warning.png + :/core/images/warning.png @@ -124,7 +124,7 @@ - :/projectexplorer/images/compile_warning.png + :/core/images/error.png @@ -193,7 +193,7 @@ - :/projectexplorer/images/compile_error.png + :/core/images/error.png @@ -245,7 +245,7 @@ - :/projectexplorer/images/compile_warning.png + :/core/images/warning.png diff --git a/src/plugins/android/avddialog.cpp b/src/plugins/android/avddialog.cpp index a72b943b6e9..8aa54debe36 100644 --- a/src/plugins/android/avddialog.cpp +++ b/src/plugins/android/avddialog.cpp @@ -29,7 +29,7 @@ #include "avddialog.h" #include "androidconfigurations.h" -#include +#include #include @@ -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(); diff --git a/src/plugins/android/createandroidmanifestwizard.cpp b/src/plugins/android/createandroidmanifestwizard.cpp index 5703975831b..fffe8e5e5b4 100644 --- a/src/plugins/android/createandroidmanifestwizard.cpp +++ b/src/plugins/android/createandroidmanifestwizard.cpp @@ -32,7 +32,6 @@ #include #include #include -#include #include #include #include @@ -40,6 +39,7 @@ #include #include #include +#include #include 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); diff --git a/src/plugins/baremetal/baremetalrunconfigurationwidget.cpp b/src/plugins/baremetal/baremetalrunconfigurationwidget.cpp index 1e244aeacf7..5f62a4a6736 100644 --- a/src/plugins/baremetal/baremetalrunconfigurationwidget.cpp +++ b/src/plugins/baremetal/baremetalrunconfigurationwidget.cpp @@ -29,6 +29,8 @@ #include "baremetalrunconfigurationwidget.h" #include "baremetalrunconfiguration.h" + +#include #include #include @@ -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); diff --git a/src/plugins/coreplugin/core.qrc b/src/plugins/coreplugin/core.qrc index ca54e34c30a..bb606f02a32 100644 --- a/src/plugins/coreplugin/core.qrc +++ b/src/plugins/coreplugin/core.qrc @@ -91,5 +91,11 @@ images/pause.png images/reload_gray.png images/reload_gray@2x.png + images/error.png + images/error@2x.png + images/warning.png + images/warning@2x.png + images/info.png + images/info@2x.png diff --git a/src/plugins/coreplugin/coreconstants.h b/src/plugins/coreplugin/coreconstants.h index 8066161e0ff..f517fb618d7 100644 --- a/src/plugins/coreplugin/coreconstants.h +++ b/src/plugins/coreplugin/coreconstants.h @@ -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"); diff --git a/src/plugins/coreplugin/images/error.png b/src/plugins/coreplugin/images/error.png new file mode 100644 index 00000000000..8f9f3bb1615 Binary files /dev/null and b/src/plugins/coreplugin/images/error.png differ diff --git a/src/plugins/coreplugin/images/error@2x.png b/src/plugins/coreplugin/images/error@2x.png new file mode 100644 index 00000000000..464072347b6 Binary files /dev/null and b/src/plugins/coreplugin/images/error@2x.png differ diff --git a/src/plugins/coreplugin/images/info.png b/src/plugins/coreplugin/images/info.png new file mode 100644 index 00000000000..4fcbe4068e5 Binary files /dev/null and b/src/plugins/coreplugin/images/info.png differ diff --git a/src/plugins/coreplugin/images/info@2x.png b/src/plugins/coreplugin/images/info@2x.png new file mode 100644 index 00000000000..816f4d75a6f Binary files /dev/null and b/src/plugins/coreplugin/images/info@2x.png differ diff --git a/src/plugins/coreplugin/images/warning.png b/src/plugins/coreplugin/images/warning.png new file mode 100644 index 00000000000..74e67dbae89 Binary files /dev/null and b/src/plugins/coreplugin/images/warning.png differ diff --git a/src/plugins/coreplugin/images/warning@2x.png b/src/plugins/coreplugin/images/warning@2x.png new file mode 100644 index 00000000000..b362e6c5554 Binary files /dev/null and b/src/plugins/coreplugin/images/warning@2x.png differ diff --git a/src/plugins/git/gitsubmitpanel.ui b/src/plugins/git/gitsubmitpanel.ui index 3d80ddacc40..7bc4bb6963c 100644 --- a/src/plugins/git/gitsubmitpanel.ui +++ b/src/plugins/git/gitsubmitpanel.ui @@ -89,7 +89,7 @@ - :/projectexplorer/images/compile_error.png + :/core/images/error.png @@ -138,7 +138,7 @@ - :/projectexplorer/images/compile_error.png + :/core/images/error.png diff --git a/src/plugins/projectexplorer/buildprogress.cpp b/src/plugins/projectexplorer/buildprogress.cpp index 65623f1f274..0300d1ffc86 100644 --- a/src/plugins/projectexplorer/buildprogress.cpp +++ b/src/plugins/projectexplorer/buildprogress.cpp @@ -30,6 +30,7 @@ #include "buildprogress.h" #include "projectexplorerconstants.h" +#include #include #include @@ -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(); diff --git a/src/plugins/projectexplorer/devicesupport/desktopdeviceconfigurationwidget.cpp b/src/plugins/projectexplorer/devicesupport/desktopdeviceconfigurationwidget.cpp index 475e4f152d4..d346ab2cbce 100644 --- a/src/plugins/projectexplorer/devicesupport/desktopdeviceconfigurationwidget.cpp +++ b/src/plugins/projectexplorer/devicesupport/desktopdeviceconfigurationwidget.cpp @@ -31,6 +31,7 @@ #include "ui_desktopdeviceconfigurationwidget.h" #include +#include #include #include @@ -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("") + tr("You will need at least one port for QML debugging.") + QLatin1String("")); diff --git a/src/plugins/projectexplorer/images/compile_error.png b/src/plugins/projectexplorer/images/compile_error.png deleted file mode 100644 index 71496e04378..00000000000 Binary files a/src/plugins/projectexplorer/images/compile_error.png and /dev/null differ diff --git a/src/plugins/projectexplorer/images/compile_warning.png b/src/plugins/projectexplorer/images/compile_warning.png deleted file mode 100644 index 645cc5fd58f..00000000000 Binary files a/src/plugins/projectexplorer/images/compile_warning.png and /dev/null differ diff --git a/src/plugins/projectexplorer/kitmodel.cpp b/src/plugins/projectexplorer/kitmodel.cpp index be87d31d3a5..e0920fb8ace 100644 --- a/src/plugins/projectexplorer/kitmodel.cpp +++ b/src/plugins/projectexplorer/kitmodel.cpp @@ -32,8 +32,8 @@ #include "kit.h" #include "kitmanagerconfigwidget.h" #include "kitmanager.h" -#include "projectexplorerconstants.h" +#include #include #include @@ -156,8 +156,8 @@ int KitModel::columnCount(const QModelIndex &parent) const QVariant KitModel::data(const QModelIndex &index, int role) const { - static QIcon warningIcon(QString::fromLatin1(ProjectExplorer::Constants::ICON_WARNING)); - static QIcon errorIcon(QString::fromLatin1(ProjectExplorer::Constants::ICON_ERROR)); + static QIcon warningIcon(QString::fromLatin1(Core::Constants::ICON_WARNING)); + static QIcon errorIcon(QString::fromLatin1(Core::Constants::ICON_ERROR)); if (!index.isValid() || index.column() != 0) return QVariant(); diff --git a/src/plugins/projectexplorer/projectexplorer.qbs b/src/plugins/projectexplorer/projectexplorer.qbs index bce65aadffd..2837bb3f586 100644 --- a/src/plugins/projectexplorer/projectexplorer.qbs +++ b/src/plugins/projectexplorer/projectexplorer.qbs @@ -227,8 +227,6 @@ QtcPlugin { "clean.png", "clean_small.png", "closetab.png", - "compile_error.png", - "compile_warning.png", "debugger_start.png", "debugger_start_small.png", "findallprojects.png", diff --git a/src/plugins/projectexplorer/projectexplorer.qrc b/src/plugins/projectexplorer/projectexplorer.qrc index bbf1b90b31c..faa38fd3abe 100644 --- a/src/plugins/projectexplorer/projectexplorer.qrc +++ b/src/plugins/projectexplorer/projectexplorer.qrc @@ -25,8 +25,6 @@ images/leftselection.png images/rightselection.png images/midselection.png - images/compile_error.png - images/compile_warning.png images/BuildSettings.png images/CodeStyleSettings.png images/RunSettings.png diff --git a/src/plugins/projectexplorer/projectexplorerconstants.h b/src/plugins/projectexplorer/projectexplorerconstants.h index 9f7c14d29ae..180e7a57417 100644 --- a/src/plugins/projectexplorer/projectexplorerconstants.h +++ b/src/plugins/projectexplorer/projectexplorerconstants.h @@ -162,8 +162,6 @@ const char ICON_DEBUG_SMALL[] = ":/projectexplorer/images/debugger_start_sma const char ICON_STOP[] = ":/projectexplorer/images/stop.png"; const char ICON_STOP_SMALL[] = ":/projectexplorer/images/stop_small.png"; const char ICON_WINDOW[] = ":/projectexplorer/images/window.png"; -const char ICON_WARNING[] = ":/projectexplorer/images/compile_warning.png"; -const char ICON_ERROR[] = ":/projectexplorer/images/compile_error.png"; // Mime types const char C_SOURCE_MIMETYPE[] = "text/x-csrc"; diff --git a/src/plugins/projectexplorer/task.cpp b/src/plugins/projectexplorer/task.cpp index f794969066f..ac7a8d48389 100644 --- a/src/plugins/projectexplorer/task.cpp +++ b/src/plugins/projectexplorer/task.cpp @@ -29,7 +29,7 @@ #include "task.h" -#include +#include #include namespace ProjectExplorer @@ -39,9 +39,9 @@ static QString taskTypeIcon(Task::TaskType t) { switch (t) { case Task::Warning: - return QLatin1String(ProjectExplorer::Constants::ICON_WARNING); + return QLatin1String(Core::Constants::ICON_WARNING); case Task::Error: - return QLatin1String(ProjectExplorer::Constants::ICON_ERROR); + return QLatin1String(Core::Constants::ICON_ERROR); case Task::Unknown: break; } diff --git a/src/plugins/projectexplorer/taskhub.cpp b/src/plugins/projectexplorer/taskhub.cpp index 3b671b3d46a..d02cce80dbf 100644 --- a/src/plugins/projectexplorer/taskhub.cpp +++ b/src/plugins/projectexplorer/taskhub.cpp @@ -29,8 +29,8 @@ #include "taskhub.h" +#include #include -#include #include using namespace ProjectExplorer; @@ -85,8 +85,8 @@ void TaskMark::clicked() } TaskHub::TaskHub() - : m_errorIcon(QLatin1String(ProjectExplorer::Constants::ICON_ERROR)), - m_warningIcon(QLatin1String(ProjectExplorer::Constants::ICON_WARNING)) + : m_errorIcon(QLatin1String(Core::Constants::ICON_ERROR)), + m_warningIcon(QLatin1String(Core::Constants::ICON_WARNING)) { m_instance = this; qRegisterMetaType("ProjectExplorer::Task"); diff --git a/src/plugins/projectexplorer/taskwindow.cpp b/src/plugins/projectexplorer/taskwindow.cpp index d5d18337903..0bc1c088bbe 100644 --- a/src/plugins/projectexplorer/taskwindow.cpp +++ b/src/plugins/projectexplorer/taskwindow.cpp @@ -262,7 +262,7 @@ TaskWindow::TaskWindow() : d(new TaskWindowPrivate) d->m_listview->setContextMenuPolicy(Qt::ActionsContextMenu); d->m_filterWarningsButton = createFilterButton( - QIcon(QLatin1String(Constants::ICON_WARNING)), + QIcon(QLatin1String(Core::Constants::ICON_WARNING)), tr("Show Warnings"), this, SLOT(setShowWarnings(bool))); d->m_categoriesButton = new QToolButton; diff --git a/src/plugins/qbsprojectmanager/qbsbuildstepconfigwidget.ui b/src/plugins/qbsprojectmanager/qbsbuildstepconfigwidget.ui index 3be95b229e5..c0d88a9a7ec 100644 --- a/src/plugins/qbsprojectmanager/qbsbuildstepconfigwidget.ui +++ b/src/plugins/qbsprojectmanager/qbsbuildstepconfigwidget.ui @@ -108,7 +108,7 @@ - :/projectexplorer/images/compile_warning.png + :/coreplugin/images/warning.png diff --git a/src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp b/src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp index 6fda531af9f..fb28e7a554e 100644 --- a/src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp +++ b/src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp @@ -340,7 +340,7 @@ QbsRunConfigurationWidget::QbsRunConfigurationWidget(QbsRunConfiguration *rc, QW QHBoxLayout *hl = new QHBoxLayout(); hl->addStretch(); m_disabledIcon = new QLabel(this); - m_disabledIcon->setPixmap(QPixmap(QLatin1String(Constants::ICON_WARNING))); + m_disabledIcon->setPixmap(QPixmap(QLatin1String(Core::Constants::ICON_WARNING))); hl->addWidget(m_disabledIcon); m_disabledReason = new QLabel(this); m_disabledReason->setVisible(false); diff --git a/src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.cpp b/src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.cpp index 4aa5bd2af86..188b9add4ee 100644 --- a/src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.cpp +++ b/src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.cpp @@ -190,7 +190,7 @@ DesktopQmakeRunConfigurationWidget::DesktopQmakeRunConfigurationWidget(DesktopQm QHBoxLayout *hl = new QHBoxLayout(); hl->addStretch(); m_disabledIcon = new QLabel(this); - m_disabledIcon->setPixmap(QPixmap(QLatin1String(ProjectExplorer::Constants::ICON_WARNING))); + m_disabledIcon->setPixmap(QPixmap(QLatin1String(Core::Constants::ICON_WARNING))); hl->addWidget(m_disabledIcon); m_disabledReason = new QLabel(this); m_disabledReason->setVisible(false); diff --git a/src/plugins/qmakeprojectmanager/qmakeprojectconfigwidget.ui b/src/plugins/qmakeprojectmanager/qmakeprojectconfigwidget.ui index c2383e587ba..33b53f89259 100644 --- a/src/plugins/qmakeprojectmanager/qmakeprojectconfigwidget.ui +++ b/src/plugins/qmakeprojectmanager/qmakeprojectconfigwidget.ui @@ -60,7 +60,7 @@ - :/projectexplorer/images/compile_warning.png + :/core/images/warning.png diff --git a/src/plugins/qmakeprojectmanager/qmakestep.ui b/src/plugins/qmakeprojectmanager/qmakestep.ui index 0b6315c8788..0aeed59dfb2 100644 --- a/src/plugins/qmakeprojectmanager/qmakestep.ui +++ b/src/plugins/qmakeprojectmanager/qmakestep.ui @@ -126,7 +126,7 @@ - :/projectexplorer/images/compile_warning.png + :/core/images/warning.png diff --git a/src/plugins/qmljstools/images/error.png b/src/plugins/qmljstools/images/error.png deleted file mode 100644 index 39768b9f39a..00000000000 Binary files a/src/plugins/qmljstools/images/error.png and /dev/null differ diff --git a/src/plugins/qmljstools/images/log.png b/src/plugins/qmljstools/images/log.png deleted file mode 100644 index e4766f228ba..00000000000 Binary files a/src/plugins/qmljstools/images/log.png and /dev/null differ diff --git a/src/plugins/qmljstools/images/warning.png b/src/plugins/qmljstools/images/warning.png deleted file mode 100644 index 3200efc4fd0..00000000000 Binary files a/src/plugins/qmljstools/images/warning.png and /dev/null differ diff --git a/src/plugins/qmljstools/qmlconsoleitemdelegate.cpp b/src/plugins/qmljstools/qmlconsoleitemdelegate.cpp index 095b3d0ae91..114692c1c56 100644 --- a/src/plugins/qmljstools/qmlconsoleitemdelegate.cpp +++ b/src/plugins/qmljstools/qmlconsoleitemdelegate.cpp @@ -30,6 +30,8 @@ #include "qmlconsoleitemdelegate.h" #include "qmlconsoleedit.h" +#include + #include #include #include @@ -68,9 +70,9 @@ namespace Internal { QmlConsoleItemDelegate::QmlConsoleItemDelegate(QObject *parent) : QStyledItemDelegate(parent), - m_logIcon(QLatin1String(":/qmljstools/images/log.png")), - m_warningIcon(QLatin1String(":/qmljstools/images/warning.png")), - m_errorIcon(QLatin1String(":/qmljstools/images/error.png")), + m_logIcon(QLatin1String(Core::Constants::ICON_INFO)), + m_warningIcon(QLatin1String(Core::Constants::ICON_WARNING)), + m_errorIcon(QLatin1String(Core::Constants::ICON_ERROR)), m_expandIcon(QLatin1String(":/qmljstools/images/expand.png")), m_collapseIcon(QLatin1String(":/qmljstools/images/collapse.png")), m_prompt(QLatin1String(":/qmljstools/images/prompt.png")), diff --git a/src/plugins/qmljstools/qmlconsolepane.cpp b/src/plugins/qmljstools/qmlconsolepane.cpp index 6f5c0f26d2f..9c01ebc3457 100644 --- a/src/plugins/qmljstools/qmlconsolepane.cpp +++ b/src/plugins/qmljstools/qmlconsolepane.cpp @@ -32,6 +32,7 @@ #include "qmlconsoleproxymodel.h" #include "qmlconsoleitemdelegate.h" +#include #include #include #include @@ -108,7 +109,7 @@ QmlConsolePane::QmlConsolePane(QObject *parent) m_showDebugButtonAction->setSettingsKey(QLatin1String(CONSOLE), QLatin1String(SHOW_LOG)); m_showDebugButtonAction->setToolTip(tr("Show debug, log, and info messages.")); m_showDebugButtonAction->setCheckable(true); - m_showDebugButtonAction->setIcon(QIcon(QLatin1String(":/qmljstools/images/log.png"))); + m_showDebugButtonAction->setIcon(QIcon(QLatin1String(Core::Constants::ICON_INFO))); connect(m_showDebugButtonAction, SIGNAL(toggled(bool)), m_proxyModel, SLOT(setShowLogs(bool))); m_showDebugButton->setDefaultAction(m_showDebugButtonAction); @@ -120,7 +121,7 @@ QmlConsolePane::QmlConsolePane(QObject *parent) m_showWarningButtonAction->setSettingsKey(QLatin1String(CONSOLE), QLatin1String(SHOW_WARNING)); m_showWarningButtonAction->setToolTip(tr("Show debug, log, and info messages.")); m_showWarningButtonAction->setCheckable(true); - m_showWarningButtonAction->setIcon(QIcon(QLatin1String(":/qmljstools/images/warning.png"))); + m_showWarningButtonAction->setIcon(QIcon(QLatin1String(Core::Constants::ICON_WARNING))); connect(m_showWarningButtonAction, SIGNAL(toggled(bool)), m_proxyModel, SLOT(setShowWarnings(bool))); m_showWarningButton->setDefaultAction(m_showWarningButtonAction); @@ -133,7 +134,7 @@ QmlConsolePane::QmlConsolePane(QObject *parent) m_showErrorButtonAction->setSettingsKey(QLatin1String(CONSOLE), QLatin1String(SHOW_ERROR)); m_showErrorButtonAction->setToolTip(tr("Show debug, log, and info messages.")); m_showErrorButtonAction->setCheckable(true); - m_showErrorButtonAction->setIcon(QIcon(QLatin1String(":/qmljstools/images/error.png"))); + m_showErrorButtonAction->setIcon(QIcon(QLatin1String(Core::Constants::ICON_ERROR))); connect(m_showErrorButtonAction, SIGNAL(toggled(bool)), m_proxyModel, SLOT(setShowErrors(bool))); m_showErrorButton->setDefaultAction(m_showErrorButtonAction); diff --git a/src/plugins/qmljstools/qmljstools.qrc b/src/plugins/qmljstools/qmljstools.qrc index 124a396169b..45c345ece6f 100644 --- a/src/plugins/qmljstools/qmljstools.qrc +++ b/src/plugins/qmljstools/qmljstools.qrc @@ -3,10 +3,7 @@ images/category_qml.png images/prompt.png images/collapse.png - images/warning.png - images/log.png images/expand.png - images/error.png QmlJSTools.mimetypes.xml diff --git a/src/plugins/qnx/bardescriptoreditorentrypointwidget.ui b/src/plugins/qnx/bardescriptoreditorentrypointwidget.ui index 5811dd917b2..f83b6bc72be 100644 --- a/src/plugins/qnx/bardescriptoreditorentrypointwidget.ui +++ b/src/plugins/qnx/bardescriptoreditorentrypointwidget.ui @@ -94,7 +94,7 @@ - :/projectexplorer/images/compile_warning.png + :/core/images/warning.png @@ -184,7 +184,7 @@ - :/projectexplorer/images/compile_warning.png + :/core/images/warning.png diff --git a/src/plugins/qnx/blackberrycreatepackagestepconfigwidget.ui b/src/plugins/qnx/blackberrycreatepackagestepconfigwidget.ui index a277b2e856d..41ebb3f1ef6 100644 --- a/src/plugins/qnx/blackberrycreatepackagestepconfigwidget.ui +++ b/src/plugins/qnx/blackberrycreatepackagestepconfigwidget.ui @@ -188,7 +188,7 @@ - :/projectexplorer/images/compile_warning.png + :/core/images/warning.png diff --git a/src/plugins/qnx/blackberryndksettingswidget.cpp b/src/plugins/qnx/blackberryndksettingswidget.cpp index 2a516963c3f..ce5551469c7 100644 --- a/src/plugins/qnx/blackberryndksettingswidget.cpp +++ b/src/plugins/qnx/blackberryndksettingswidget.cpp @@ -40,8 +40,8 @@ #include +#include #include -#include #include #include @@ -52,7 +52,7 @@ namespace Qnx { namespace Internal { -static QIcon invalidConfigIcon(QString::fromLatin1(ProjectExplorer::Constants::ICON_ERROR)); +static QIcon invalidConfigIcon(QString::fromLatin1(Core::Constants::ICON_ERROR)); BlackBerryNDKSettingsWidget::BlackBerryNDKSettingsWidget(QWidget *parent) : QWidget(parent), diff --git a/src/plugins/qnx/blackberrypotentialkit.cpp b/src/plugins/qnx/blackberrypotentialkit.cpp index a3db5586015..dc1a91e6479 100644 --- a/src/plugins/qnx/blackberrypotentialkit.cpp +++ b/src/plugins/qnx/blackberrypotentialkit.cpp @@ -34,8 +34,8 @@ #include "blackberryapilevelconfiguration.h" #include "qnxconstants.h" +#include #include -#include #include #include @@ -87,7 +87,7 @@ BlackBerryPotentialKitWidget::BlackBerryPotentialKitWidget(QWidget *parent) : Utils::DetailsWidget(parent) { setSummaryText(tr("BlackBerry has not been configured. Create BlackBerry kits.")); - setIcon(QIcon(QLatin1String(ProjectExplorer::Constants::ICON_WARNING))); + setIcon(QIcon(QLatin1String(Core::Constants::ICON_WARNING))); QWidget *mainWidget = new QWidget(this); setWidget(mainWidget); diff --git a/src/plugins/qnx/blackberrysetupwidget.cpp b/src/plugins/qnx/blackberrysetupwidget.cpp index 911715510cf..17284c9618e 100644 --- a/src/plugins/qnx/blackberrysetupwidget.cpp +++ b/src/plugins/qnx/blackberrysetupwidget.cpp @@ -38,6 +38,7 @@ #include "blackberrycertificate.h" #include "qnxconstants.h" +#include #include #include @@ -94,13 +95,13 @@ void SetupItem::set(Status status, const QString &message, const QString &fixTex icon = Qnx::Constants::QNX_OK_ICON; break; case Info: - icon = Qnx::Constants::QNX_INFO_ICON; + icon = Core::Constants::ICON_INFO; break; case Warning: - icon = Qnx::Constants::QNX_WARNING_ICON; + icon = Core::Constants::ICON_WARNING; break; case Error: - icon = Qnx::Constants::QNX_ERROR_ICON; + icon = Core::Constants::ICON_ERROR; break; } m_icon->setPixmap(QPixmap(QLatin1String(icon))); diff --git a/src/plugins/qnx/images/error.png b/src/plugins/qnx/images/error.png deleted file mode 100644 index 0d49c16f431..00000000000 Binary files a/src/plugins/qnx/images/error.png and /dev/null differ diff --git a/src/plugins/qnx/images/info.png b/src/plugins/qnx/images/info.png deleted file mode 100644 index 8d81e904ac3..00000000000 Binary files a/src/plugins/qnx/images/info.png and /dev/null differ diff --git a/src/plugins/qnx/images/warning.png b/src/plugins/qnx/images/warning.png deleted file mode 100644 index 934e4af507c..00000000000 Binary files a/src/plugins/qnx/images/warning.png and /dev/null differ diff --git a/src/plugins/qnx/qnx.qrc b/src/plugins/qnx/qnx.qrc index 0d50275c904..16047a41259 100644 --- a/src/plugins/qnx/qnx.qrc +++ b/src/plugins/qnx/qnx.qrc @@ -3,9 +3,6 @@ images/target-small.png images/target.png images/ok.png - images/info.png - images/warning.png - images/error.png images/qnx-target.png diff --git a/src/plugins/qnx/qnxconstants.h b/src/plugins/qnx/qnxconstants.h index eafc8b7842a..768b6d069c6 100644 --- a/src/plugins/qnx/qnxconstants.h +++ b/src/plugins/qnx/qnxconstants.h @@ -126,9 +126,6 @@ const char QNX_DEBUGGING_GROUP[] = "Debugger.Group.Qnx"; const char QNX_BLACKBERRY_DEFAULT_DEPLOY_QT_BASEPATH[] = "/accounts/devuser/"; const char QNX_OK_ICON[] = ":/qnx/images/ok.png"; -const char QNX_INFO_ICON[] = ":/qnx/images/info.png"; -const char QNX_WARNING_ICON[] = ":/qnx/images/warning.png"; -const char QNX_ERROR_ICON[] = ":/qnx/images/error.png"; const char QNX_BLACKBERRY_SETUP_URL[] = "http://qt-project.org/wiki/Qt-Creator-with-BlackBerry-10"; const char QNX_LEGACY_KEYS_URL[] = "https://developer.blackberry.com/native/documentation/core" diff --git a/src/plugins/qtsupport/qtoptionspage.cpp b/src/plugins/qtsupport/qtoptionspage.cpp index 7397f56f877..171ac83ab7c 100644 --- a/src/plugins/qtsupport/qtoptionspage.cpp +++ b/src/plugins/qtsupport/qtoptionspage.cpp @@ -39,6 +39,7 @@ #include "qmldumptool.h" #include +#include #include #include #include @@ -107,8 +108,8 @@ QtOptionsPageWidget::QtOptionsPageWidget(QWidget *parent) , m_versionUi(new Internal::Ui::QtVersionInfo()) , m_debuggingHelperUi(new Internal::Ui::DebuggingHelper()) , m_infoBrowser(new QTextBrowser) - , m_invalidVersionIcon(QLatin1String(ProjectExplorer::Constants::ICON_ERROR)) - , m_warningVersionIcon(QLatin1String(ProjectExplorer::Constants::ICON_WARNING)) + , m_invalidVersionIcon(QLatin1String(Core::Constants::ICON_ERROR)) + , m_warningVersionIcon(QLatin1String(Core::Constants::ICON_WARNING)) , m_configurationWidget(0) , m_autoItem(0) , m_manualItem(0) diff --git a/src/plugins/remotelinux/genericlinuxdeviceconfigurationwidget.cpp b/src/plugins/remotelinux/genericlinuxdeviceconfigurationwidget.cpp index dd4f8c41e81..e97a4d3a785 100644 --- a/src/plugins/remotelinux/genericlinuxdeviceconfigurationwidget.cpp +++ b/src/plugins/remotelinux/genericlinuxdeviceconfigurationwidget.cpp @@ -30,7 +30,7 @@ #include "genericlinuxdeviceconfigurationwidget.h" #include "ui_genericlinuxdeviceconfigurationwidget.h" -#include +#include #include #include #include @@ -180,7 +180,7 @@ void GenericLinuxDeviceConfigurationWidget::initGui() m_ui->machineTypeValueLabel->setText(tr("Physical Device")); else m_ui->machineTypeValueLabel->setText(tr("Emulator")); - m_ui->portsWarningLabel->setPixmap(QPixmap(QLatin1String(ProjectExplorer::Constants::ICON_ERROR))); + m_ui->portsWarningLabel->setPixmap(QPixmap(QLatin1String(Core::Constants::ICON_ERROR))); m_ui->portsWarningLabel->setToolTip(QLatin1String("") + tr("You will need at least one port.") + QLatin1String("")); m_ui->keyFileLineEdit->setExpectedKind(PathChooser::File); diff --git a/src/plugins/remotelinux/remotelinuxrunconfigurationwidget.cpp b/src/plugins/remotelinux/remotelinuxrunconfigurationwidget.cpp index 17b8f95703f..9ffc257b7a4 100644 --- a/src/plugins/remotelinux/remotelinuxrunconfigurationwidget.cpp +++ b/src/plugins/remotelinux/remotelinuxrunconfigurationwidget.cpp @@ -30,6 +30,7 @@ #include "remotelinuxrunconfiguration.h" +#include #include #include @@ -105,7 +106,7 @@ void RemoteLinuxRunConfigurationWidget::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); diff --git a/src/plugins/todo/constants.h b/src/plugins/todo/constants.h index fbbe260f94e..c3c488f0e8b 100644 --- a/src/plugins/todo/constants.h +++ b/src/plugins/todo/constants.h @@ -43,12 +43,6 @@ const char COLOR_FIXME_BG[] = "#ffcccc"; const char COLOR_BUG_BG[] = "#ffcccc"; const char COLOR_NOTE_BG[] = "#e0ebff"; -// Todo item icons - -// http://en.wikipedia.org/wiki/File:Information_icon_with_gradient_background.svg, -// public domain, tuned a bit -const char ICON_INFO[] = ":/todoplugin/images/info.png"; - // Dummy, needs to be changed const char ICON_TODO[] = ":/todoplugin/images/todo.png"; diff --git a/src/plugins/todo/images/info.png b/src/plugins/todo/images/info.png deleted file mode 100755 index 5c800c3ce61..00000000000 Binary files a/src/plugins/todo/images/info.png and /dev/null differ diff --git a/src/plugins/todo/keyworddialog.cpp b/src/plugins/todo/keyworddialog.cpp index f738f7bb47e..03b3332a387 100644 --- a/src/plugins/todo/keyworddialog.cpp +++ b/src/plugins/todo/keyworddialog.cpp @@ -34,7 +34,7 @@ #include "constants.h" #include "lineparser.h" -#include +#include #include @@ -87,19 +87,19 @@ void KeywordDialog::setupListWidget(const QString &selectedIcon) { ui->listWidget->setViewMode(QListWidget::IconMode); ui->listWidget->setDragEnabled(false); - const QString infoIconName = QLatin1String(Constants::ICON_INFO); + const QString infoIconName = QLatin1String(Core::Constants::ICON_INFO); QListWidgetItem *item = new QListWidgetItem(QIcon(infoIconName), QLatin1String("information")); item->setData(Qt::UserRole, infoIconName); ui->listWidget->addItem(item); - const QString warningIconName = QLatin1String(ProjectExplorer::Constants::ICON_WARNING); + const QString warningIconName = QLatin1String(Core::Constants::ICON_WARNING); item = new QListWidgetItem(QIcon(warningIconName), QLatin1String("warning")); item->setData(Qt::UserRole, warningIconName); ui->listWidget->addItem(item); - const QString errorIconName = QLatin1String(ProjectExplorer::Constants::ICON_ERROR); + const QString errorIconName = QLatin1String(Core::Constants::ICON_ERROR); item = new QListWidgetItem(QIcon(errorIconName), QLatin1String("error")); item->setData(Qt::UserRole, errorIconName); diff --git a/src/plugins/todo/settings.cpp b/src/plugins/todo/settings.cpp index e3a2b1ca5ef..16e855ee79b 100644 --- a/src/plugins/todo/settings.cpp +++ b/src/plugins/todo/settings.cpp @@ -31,7 +31,7 @@ #include "settings.h" #include "constants.h" -#include +#include #include @@ -100,27 +100,27 @@ void Settings::setDefault() Keyword keyword; keyword.name = QLatin1String("TODO"); - keyword.iconResource = QLatin1String(ProjectExplorer::Constants::ICON_WARNING); + keyword.iconResource = QLatin1String(Core::Constants::ICON_WARNING); keyword.color = QColor(QLatin1String(Constants::COLOR_TODO_BG)); keywords.append(keyword); keyword.name = QLatin1String("NOTE"); - keyword.iconResource = QLatin1String(Constants::ICON_INFO); + keyword.iconResource = QLatin1String(Core::Constants::ICON_INFO); keyword.color = QColor(QLatin1String(Constants::COLOR_NOTE_BG)); keywords.append(keyword); keyword.name = QLatin1String("FIXME"); - keyword.iconResource = QLatin1String(ProjectExplorer::Constants::ICON_ERROR); + keyword.iconResource = QLatin1String(Core::Constants::ICON_ERROR); keyword.color = QColor(QLatin1String(Constants::COLOR_FIXME_BG)); keywords.append(keyword); keyword.name = QLatin1String("BUG"); - keyword.iconResource = QLatin1String(ProjectExplorer::Constants::ICON_ERROR); + keyword.iconResource = QLatin1String(Core::Constants::ICON_ERROR); keyword.color = QColor(QLatin1String(Constants::COLOR_BUG_BG)); keywords.append(keyword); keyword.name = QLatin1String("WARNING"); - keyword.iconResource = QLatin1String(ProjectExplorer::Constants::ICON_WARNING); + keyword.iconResource = QLatin1String(Core::Constants::ICON_WARNING); keyword.color = QColor(QLatin1String(Constants::COLOR_WARNING_BG)); keywords.append(keyword); } diff --git a/src/plugins/todo/todoplugin.qrc b/src/plugins/todo/todoplugin.qrc index a7d1a2c239f..ac97a969436 100644 --- a/src/plugins/todo/todoplugin.qrc +++ b/src/plugins/todo/todoplugin.qrc @@ -1,6 +1,5 @@ images/todo.png - images/info.png