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

Centralize error/warning/info icons

Browse Source 
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: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
This commit is contained in:
Alessandro Portale
2014-06-13 11:19:54 +02:00
parent 232024253f
commit fe08cb8902
57 changed files with 86 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/plugins/android/androiddeployqtwidget.ui
+2 -2
View File
@@ -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
+2 -1
View File
@@ -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
+1 -1
View File
@@ -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
+2 -2
View File
@@ -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
+4 -4
View File
@@ -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
+2 -2
View File
@@ -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
+2 -2
View File
@@ -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
+3 -1
View File
@@ -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
+6
View File
@@ -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
+3
View File
@@ -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/coreplugin/images/error.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 262 B

src/plugins/coreplugin/images/error@2x.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 484 B

src/plugins/coreplugin/images/info.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 432 B

src/plugins/coreplugin/images/info@2x.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 937 B

src/plugins/coreplugin/images/warning.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 402 B

src/plugins/coreplugin/images/warning@2x.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 719 B

src/plugins/git/gitsubmitpanel.ui
+2 -2
View File
@@ -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
+3 -2
View File
@@ -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
+2 -1
View File
@@ -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>"));
src/plugins/projectexplorer/images/compile_error.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 658 B

src/plugins/projectexplorer/images/compile_warning.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 679 B

src/plugins/projectexplorer/kitmodel.cpp
+3 -3
View File
@@ -32,8 +32,8 @@
#include "kit.h"
#include "kitmanagerconfigwidget.h"
#include "kitmanager.h"
#include "projectexplorerconstants.h"
#include <coreplugin/coreconstants.h>
#include <utils/qtcassert.h>
#include <QApplication>
@@ -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();
src/plugins/projectexplorer/projectexplorer.qbs
-2
View File
@@ -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",
src/plugins/projectexplorer/projectexplorer.qrc
-2
View File
@@ -25,8 +25,6 @@
<file>images/leftselection.png</file>
<file>images/rightselection.png</file>
<file>images/midselection.png</file>
<file>images/compile_error.png</file>
<file>images/compile_warning.png</file>
<file>images/BuildSettings.png</file>
<file>images/CodeStyleSettings.png</file>
<file>images/RunSettings.png</file>
src/plugins/projectexplorer/projectexplorerconstants.h
-2
View File
@@ -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";
src/plugins/projectexplorer/task.cpp
+3 -3
View File
@@ -29,7 +29,7 @@
#include "task.h"
#include <projectexplorer/projectexplorerconstants.h>
#include <coreplugin/coreconstants.h>
#include <utils/qtcassert.h>
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;
}
src/plugins/projectexplorer/taskhub.cpp
+3 -3
View File
@@ -29,8 +29,8 @@
#include "taskhub.h"
#include <coreplugin/coreconstants.h>
#include <coreplugin/ioutputpane.h>
#include <projectexplorer/projectexplorerconstants.h>
#include <utils/qtcassert.h>
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>("ProjectExplorer::Task");
src/plugins/projectexplorer/taskwindow.cpp
+1 -1
View File
@@ -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;
src/plugins/qbsprojectmanager/qbsbuildstepconfigwidget.ui
+1 -1
View File
@@ -108,7 +108,7 @@
<string/>
</property>
<property name="pixmap">
<pixmap>:/projectexplorer/images/compile_warning.png</pixmap>
<pixmap>:/coreplugin/images/warning.png</pixmap>
</property>
</widget>
</item>
src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp
+1 -1
View File
@@ -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);
src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.cpp
+1 -1
View File
@@ -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);
src/plugins/qmakeprojectmanager/qmakeprojectconfigwidget.ui
+1 -1
View File
@@ -60,7 +60,7 @@
<item>
<widget class="QLabel" name="warningLabel">
<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/qmakeprojectmanager/qmakestep.ui
+1 -1
View File
@@ -126,7 +126,7 @@
<item>
<widget class="QLabel" name="qmlDebuggingWarningIcon">
<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/qmljstools/images/error.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.3 KiB

src/plugins/qmljstools/images/log.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.3 KiB

src/plugins/qmljstools/images/warning.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.4 KiB

src/plugins/qmljstools/qmlconsoleitemdelegate.cpp
+5 -3
View File
@@ -30,6 +30,8 @@
#include "qmlconsoleitemdelegate.h"
#include "qmlconsoleedit.h"
#include <coreplugin/coreconstants.h>
#include <QPainter>
#include <QTreeView>
#include <QScrollBar>
@@ -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")),
src/plugins/qmljstools/qmlconsolepane.cpp
+4 -3
View File
@@ -32,6 +32,7 @@
#include "qmlconsoleproxymodel.h"
#include "qmlconsoleitemdelegate.h"
#include <coreplugin/coreconstants.h>
#include <coreplugin/icore.h>
#include <coreplugin/findplaceholder.h>
#include <utils/savedaction.h>
@@ -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);
src/plugins/qmljstools/qmljstools.qrc
-3
View File
@@ -3,10 +3,7 @@
<file>images/category_qml.png</file>
<file>images/prompt.png</file>
<file>images/collapse.png</file>
<file>images/warning.png</file>
<file>images/log.png</file>
<file>images/expand.png</file>
<file>images/error.png</file>
<file>QmlJSTools.mimetypes.xml</file>
</qresource>
</RCC>
src/plugins/qnx/bardescriptoreditorentrypointwidget.ui
+2 -2
View File
@@ -94,7 +94,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>
@@ -184,7 +184,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/qnx/blackberrycreatepackagestepconfigwidget.ui
+1 -1
View File
@@ -188,7 +188,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/qnx/blackberryndksettingswidget.cpp
+2 -2
View File
@@ -40,8 +40,8 @@
#include <utils/pathchooser.h>
#include <coreplugin/coreconstants.h>
#include <coreplugin/icore.h>
#include <projectexplorer/projectexplorerconstants.h>
#include <QMessageBox>
#include <QFileDialog>
@@ -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),
src/plugins/qnx/blackberrypotentialkit.cpp
+2 -2
View File
@@ -34,8 +34,8 @@
#include "blackberryapilevelconfiguration.h"
#include "qnxconstants.h"
#include <coreplugin/coreconstants.h>
#include <coreplugin/icore.h>
#include <projectexplorer/projectexplorerconstants.h>
#include <QGridLayout>
#include <QLabel>
@@ -87,7 +87,7 @@ BlackBerryPotentialKitWidget::BlackBerryPotentialKitWidget(QWidget *parent)
: Utils::DetailsWidget(parent)
{
setSummaryText(tr("<b>BlackBerry has not been configured. Create BlackBerry kits.</b>"));
setIcon(QIcon(QLatin1String(ProjectExplorer::Constants::ICON_WARNING)));
setIcon(QIcon(QLatin1String(Core::Constants::ICON_WARNING)));
QWidget *mainWidget = new QWidget(this);
setWidget(mainWidget);
src/plugins/qnx/blackberrysetupwidget.cpp
+4 -3
View File
@@ -38,6 +38,7 @@
#include "blackberrycertificate.h"
#include "qnxconstants.h"
#include <coreplugin/coreconstants.h>
#include <projectexplorer/devicesupport/devicemanager.h>
#include <QFileInfo>
@@ -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)));
src/plugins/qnx/images/error.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 627 B

src/plugins/qnx/images/info.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 630 B

src/plugins/qnx/images/warning.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 743 B

src/plugins/qnx/qnx.qrc
-3
View File
@@ -3,9 +3,6 @@
<file>images/target-small.png</file>
<file>images/target.png</file>
<file>images/ok.png</file>
<file>images/info.png</file>
<file>images/warning.png</file>
<file>images/error.png</file>
<file>images/qnx-target.png</file>
</qresource>
<qresource prefix="/"/>
src/plugins/qnx/qnxconstants.h
-3
View File
@@ -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"
src/plugins/qtsupport/qtoptionspage.cpp
+3 -2
View File
@@ -39,6 +39,7 @@
#include "qmldumptool.h"
#include <coreplugin/progressmanager/progressmanager.h>
#include <coreplugin/coreconstants.h>
#include <projectexplorer/toolchainmanager.h>
#include <projectexplorer/projectexplorerconstants.h>
#include <utils/hostosinfo.h>
@@ -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)
src/plugins/remotelinux/genericlinuxdeviceconfigurationwidget.cpp
+2 -2
View File
@@ -30,7 +30,7 @@
#include "genericlinuxdeviceconfigurationwidget.h"
#include "ui_genericlinuxdeviceconfigurationwidget.h"
#include <projectexplorer/projectexplorerconstants.h>
#include <coreplugin/coreconstants.h>
#include <utils/portlist.h>
#include <utils/fancylineedit.h>
#include <ssh/sshconnection.h>
@@ -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("<font color=\"red\">")
+ tr("You will need at least one port.") + QLatin1String("</font>"));
m_ui->keyFileLineEdit->setExpectedKind(PathChooser::File);
src/plugins/remotelinux/remotelinuxrunconfigurationwidget.cpp
+2 -1
View File
@@ -30,6 +30,7 @@
#include "remotelinuxrunconfiguration.h"
#include <coreplugin/coreconstants.h>
#include <utils/detailswidget.h>
#include <QCoreApplication>
@@ -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);
src/plugins/todo/constants.h
-6
View File
@@ -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";
src/plugins/todo/images/info.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 854 B

src/plugins/todo/keyworddialog.cpp
+4 -4
View File
@@ -34,7 +34,7 @@
#include "constants.h"
#include "lineparser.h"
#include <projectexplorer/projectexplorerconstants.h>
#include <coreplugin/coreconstants.h>
#include <QColorDialog>
@@ -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);
src/plugins/todo/settings.cpp
+6 -6
View File
@@ -31,7 +31,7 @@
#include "settings.h"
#include "constants.h"
#include <projectexplorer/projectexplorerconstants.h>
#include <coreplugin/coreconstants.h>
#include <QSettings>
@@ -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);
}
src/plugins/todo/todoplugin.qrc
-1
View File
@@ -1,6 +1,5 @@
<RCC>
<qresource prefix="/todoplugin">
<file>images/todo.png</file>
<file>images/info.png</file>
</qresource>
</RCC>