Commit ac00146a authored by Daniel Teske's avatar Daniel Teske Committed by hjk

Core::Constants: Rename close icon constants to reflect file name

Change-Id: Ic88d9a87a9eb08e597a0aa5652ac061b54d86d1e
Reviewed-by: default avatarhjk <hjk121@nokiamail.com>
parent 56d29d1d
......@@ -199,9 +199,9 @@ const char ICON_RESET[] = ":/core/images/reset.png";
const char ICON_RELOAD_GRAY[] = ":/core/images/reload_gray.png";
const char ICON_MAGNIFIER[] = ":/core/images/magnifier.png";
const char ICON_TOGGLE_SIDEBAR[] = ":/core/images/sidebaricon.png";
const char ICON_CLOSE_DOCUMENT[] = ":/core/images/button_close.png";
const char ICON_CLOSE[] = ":/core/images/closebutton.png";
const char ICON_CLOSE_DARK[] = ":/core/images/darkclosebutton.png";
const char ICON_BUTTON_CLOSE[] = ":/core/images/button_close.png";
const char ICON_CLOSE_BUTTON[] = ":/core/images/closebutton.png";
const char ICON_DARK_CLOSE_BUTTON[] = ":/core/images/darkclosebutton.png";
const char ICON_DARK_CLOSE[] = ":/core/images/darkclose.png";
const char ICON_SPLIT_HORIZONTAL[] = ":/core/images/splitbutton_horizontal.png";
const char ICON_SPLIT_VERTICAL[] = ":/core/images/splitbutton_vertical.png";
......
......@@ -68,7 +68,7 @@ void OpenEditorsDelegate::paint(QPainter *painter, const QStyleOptionViewItem &o
if (index.column() == 1 && option.state & QStyle::State_MouseOver) {
const QIcon icon(QLatin1String((option.state & QStyle::State_Selected) ?
Constants::ICON_CLOSE : Constants::ICON_CLOSE_DARK));
Constants::ICON_CLOSE_BUTTON : Constants::ICON_DARK_CLOSE_BUTTON));
QRect iconRect(option.rect.right() - option.rect.height(),
option.rect.top(),
......
......@@ -128,7 +128,7 @@ EditorToolBar::EditorToolBar(QWidget *parent) :
d->m_editorList->setContextMenuPolicy(Qt::CustomContextMenu);
d->m_closeEditorButton->setAutoRaise(true);
d->m_closeEditorButton->setIcon(QIcon(QLatin1String(Constants::ICON_CLOSE_DOCUMENT)));
d->m_closeEditorButton->setIcon(QIcon(QLatin1String(Constants::ICON_BUTTON_CLOSE)));
d->m_closeEditorButton->setEnabled(false);
d->m_closeEditorButton->setProperty("showborder", true);
......
......@@ -93,7 +93,7 @@ FindToolBar::FindToolBar(FindPlugin *plugin, CurrentDocumentFind *currentDocumen
connect(m_ui.findEdit, SIGNAL(editingFinished()), this, SLOT(invokeResetIncrementalSearch()));
m_ui.close->setIcon(QIcon(QLatin1String(Core::Constants::ICON_CLOSE_DOCUMENT)));
m_ui.close->setIcon(QIcon(QLatin1String(Core::Constants::ICON_BUTTON_CLOSE)));
connect(m_ui.close, SIGNAL(clicked()), this, SLOT(hideAndResetFocus()));
m_findCompleter->setModel(m_plugin->findCompletionModel());
......
......@@ -133,7 +133,7 @@ ManhattanStylePrivate::ManhattanStylePrivate() :
lineeditImage(Utils::StyleHelper::dpiSpecificImageFile(QStringLiteral(":/core/images/inputfield.png"))),
lineeditImage_disabled(Utils::StyleHelper::dpiSpecificImageFile(QStringLiteral(":/core/images/inputfield_disabled.png"))),
extButtonPixmap(QLatin1String(":/core/images/extension.png")),
closeButtonPixmap(QLatin1String(Core::Constants::ICON_CLOSE))
closeButtonPixmap(QLatin1String(Core::Constants::ICON_CLOSE_BUTTON))
{
}
......
......@@ -75,7 +75,7 @@ NavigationSubWidget::NavigationSubWidget(NavigationWidget *parentWidget, int pos
splitAction->setIcon(QIcon(QLatin1String(Constants::ICON_SPLIT_HORIZONTAL)));
splitAction->setToolTip(tr("Split"));
QToolButton *close = new QToolButton();
close->setIcon(QIcon(QLatin1String(Constants::ICON_CLOSE_DOCUMENT)));
close->setIcon(QIcon(QLatin1String(Constants::ICON_BUTTON_CLOSE)));
close->setToolTip(tr("Close"));
toolBarLayout->addWidget(splitAction);
......
......@@ -143,7 +143,7 @@ OutputPaneManager::OutputPaneManager(QWidget *parent) :
m_minMaxAction->setIcon(m_maximizeIcon);
m_minMaxAction->setText(tr("Maximize Output Pane"));
m_closeButton->setIcon(QIcon(QLatin1String(Constants::ICON_CLOSE_DOCUMENT)));
m_closeButton->setIcon(QIcon(QLatin1String(Constants::ICON_BUTTON_CLOSE)));
connect(m_closeButton, SIGNAL(clicked()), this, SLOT(slotHide()));
connect(ICore::instance(), SIGNAL(saveSettingsRequested()), this, SLOT(saveSettings()));
......
......@@ -81,7 +81,7 @@ SideBarWidget::SideBarWidget(SideBar *sideBar, const QString &id)
QAction *closeAction = new QAction(tr("Close"), m_toolbar);
closeAction->setToolTip(tr("Close"));
closeAction->setIcon(QIcon(QLatin1String(Constants::ICON_CLOSE_DOCUMENT)));
closeAction->setIcon(QIcon(QLatin1String(Constants::ICON_BUTTON_CLOSE)));
connect(closeAction, SIGNAL(triggered()), this, SIGNAL(closeMe()));
m_toolbar->addAction(closeAction);
......
......@@ -841,7 +841,7 @@ Utils::StyledBar *HelpPlugin::createWidgetToolBar()
SLOT(updateSideBarSource()));
m_closeButton = new QToolButton();
m_closeButton->setIcon(QIcon(QLatin1String(Core::Constants::ICON_CLOSE_DOCUMENT)));
m_closeButton->setIcon(QIcon(QLatin1String(Core::Constants::ICON_BUTTON_CLOSE)));
m_closeButton->setToolTip(tr("Close current page"));
connect(m_closeButton, SIGNAL(clicked()), &OpenPagesManager::instance(),
SLOT(closeCurrentPage()));
......
......@@ -152,7 +152,7 @@ HelpWidget::HelpWidget(const Core::Context &context, WidgetStyle style, QWidget
}
if (style == SideBarWidget) {
QAction *close = new QAction(QIcon(QLatin1String(Core::Constants::ICON_CLOSE_DOCUMENT)),
QAction *close = new QAction(QIcon(QLatin1String(Core::Constants::ICON_BUTTON_CLOSE)),
QString(), toolBar);
connect(close, SIGNAL(triggered()), this, SIGNAL(closeButtonClicked()));
layout->addWidget(toolButton(close));
......
......@@ -69,7 +69,7 @@ void OpenPagesDelegate::paint(QPainter *painter, const QStyleOptionViewItem &opt
if (index.column() == 1 && index.model()->rowCount() > 1
&& option.state & QStyle::State_MouseOver) {
const QIcon icon(QLatin1String((option.state & QStyle::State_Selected) ?
Core::Constants::ICON_CLOSE : Core::Constants::ICON_CLOSE_DARK));
Core::Constants::ICON_CLOSE_BUTTON : Core::Constants::ICON_DARK_CLOSE_BUTTON));
const QRect iconRect(option.rect.right() - option.rect.height(),
option.rect.top(), option.rect.height(), option.rect.height());
......
......@@ -34,6 +34,7 @@
#include "projectexplorerconstants.h"
#include <coreplugin/icore.h>
#include <coreplugin/coreconstants.h>
#include <extensionsystem/pluginmanager.h>
#include <utils/qtcassert.h>
#include <utils/detailswidget.h>
......@@ -102,7 +103,7 @@ ToolWidget::ToolWidget(QWidget *parent)
m_removeButton->setAutoRaise(true);
m_removeButton->setToolTip(BuildStepListWidget::tr("Remove Item"));
m_removeButton->setFixedSize(buttonSize);
m_removeButton->setIcon(QIcon(QLatin1String(":/core/images/darkclose.png")));
m_removeButton->setIcon(QIcon(QLatin1String(Core::Constants::ICON_DARK_CLOSE)));
hbox->addWidget(m_removeButton);
layout->addWidget(m_secondWidget);
......
......@@ -44,7 +44,7 @@ ImportLabel::ImportLabel(QWidget *parent) :
m_removeButton = new QPushButton(this);
m_removeButton->setIcon(QIcon(Core::Constants::ICON_CLOSE_DOCUMENT));
m_removeButton->setIcon(QIcon(Core::Constants::ICON_BUTTON_CLOSE));
m_removeButton->setFlat(true);
m_removeButton->setMaximumWidth(20);
m_removeButton->setMaximumHeight(20);
......@@ -78,7 +78,7 @@ void ImportLabel::setReadOnly(bool readOnly) const
if (readOnly)
m_removeButton->setIcon(QIcon());
else
m_removeButton->setIcon(QIcon(Core::Constants::ICON_CLOSE_DOCUMENT));
m_removeButton->setIcon(QIcon(Core::Constants::ICON_BUTTON_CLOSE));
}
void ImportLabel::emitRemoveImport()
......
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