Commit 63cbcbc7 authored by Alessandro Portale's avatar Alessandro Portale

Locator: Remove old "Locator" menu icon. Re-use the "search" icon.

This patch removes the locator.png icon and replaces it with a
menu-friendly variation of the zoom icon.

The current ZOOM icon becomes ZOOM_TOOLBAR.

Change-Id: I8817c5c420801351db659caa4c4190a9074be720
Reviewed-by: default avatarhjk <hjk@theqtcompany.com>
parent 33bd06cb
......@@ -135,6 +135,8 @@ const Icon INFO_TOOLBAR({
const Icon EXPAND({
{QLatin1String(":/find/images/expand.png"), Theme::IconsBaseColor}});
const Icon ZOOM({
{QLatin1String(":/core/images/zoom.png"), Theme::PanelTextColorMid}}, Icon::Tint);
const Icon ZOOM_TOOLBAR({
{QLatin1String(":/core/images/zoom.png"), Theme::IconsBaseColor}});
const Icon TOOLBAR_EXTENSION({
{QLatin1String(":/core/images/extension.png"), Theme::IconsBaseColor}});
......
......@@ -85,6 +85,7 @@ CORE_EXPORT extern const Utils::Icon INFO;
CORE_EXPORT extern const Utils::Icon INFO_TOOLBAR;
CORE_EXPORT extern const Utils::Icon EXPAND;
CORE_EXPORT extern const Utils::Icon ZOOM;
CORE_EXPORT extern const Utils::Icon ZOOM_TOOLBAR;
CORE_EXPORT extern const Utils::Icon TOOLBAR_EXTENSION;
CORE_EXPORT extern const Utils::Icon MODE_EDIT_CLASSIC;
......
......@@ -268,7 +268,6 @@ QtcPlugin {
"filesystemfilter.ui",
"ilocatorfilter.cpp",
"ilocatorfilter.h",
"locator.qrc",
"locatorconstants.h",
"locatorfiltersfilter.cpp",
"locatorfiltersfilter.h",
......@@ -285,8 +284,6 @@ QtcPlugin {
"locatorsettingspage.cpp",
"locatorsettingspage.h",
"locatorsettingspage.ui",
"images/locator.png",
"images/reload.png",
]
}
......
......@@ -36,9 +36,6 @@ FORMS += \
$$PWD/directoryfilter.ui \
$$PWD/locatorsettingspage.ui
RESOURCES += \
$$PWD/locator.qrc
equals(TEST, 1) {
HEADERS += $$PWD/locatorfiltertest.h
SOURCES += \
......
<RCC>
<qresource prefix="/locator">
<file>images/reload.png</file>
<file>images/locator.png</file>
</qresource>
</RCC>
......@@ -248,7 +248,7 @@ LocatorWidget::LocatorWidget(Locator *qop) :
layout->setMargin(0);
layout->addWidget(m_fileLineEdit);
setWindowIcon(QIcon(QLatin1String(":/locator/images/locator.png")));
setWindowIcon(Icons::ZOOM.icon());
const QPixmap pixmap = Icons::MAGNIFIER.pixmap();
m_fileLineEdit->setFiltering(true);
m_fileLineEdit->setButtonPixmap(Utils::FancyLineEdit::Left, pixmap);
......
......@@ -1689,7 +1689,7 @@ bool DebuggerPluginPrivate::initialize(const QStringList &arguments,
auto qmlZoomDummyAction = new QAction(tr("Zoom"), this);
qmlZoomDummyAction->setCheckable(true);
qmlZoomDummyAction->setIcon(Core::Icons::ZOOM.icon());
qmlZoomDummyAction->setIcon(Core::Icons::ZOOM_TOOLBAR.icon());
qmlZoomDummyAction->setEnabled(false);
cmd = ActionManager::registerAction(qmlZoomDummyAction, Constants::QML_ZOOMTOOL);
debugMenu->addAction(cmd);
......
......@@ -104,7 +104,7 @@ void ImageViewer::ctor()
Core::Icons::SAVEFILE.icon()));
d->ui_toolbar.toolButtonZoomIn->setIcon(Core::Icons::PLUS.icon());
d->ui_toolbar.toolButtonZoomOut->setIcon(Core::Icons::MINUS.icon());
d->ui_toolbar.toolButtonFitToScreen->setIcon(Core::Icons::ZOOM.icon());
d->ui_toolbar.toolButtonFitToScreen->setIcon(Core::Icons::ZOOM_TOOLBAR.icon());
// icons update - try to use system theme
updateButtonIconByTheme(d->ui_toolbar.toolButtonZoomIn, QLatin1String("zoom-in"));
updateButtonIconByTheme(d->ui_toolbar.toolButtonZoomOut, QLatin1String("zoom-out"));
......
......@@ -213,7 +213,7 @@ QmlProfilerTool::QmlProfilerTool(QObject *parent)
});
d->m_searchButton = new QToolButton;
d->m_searchButton->setIcon(Icons::ZOOM.icon());
d->m_searchButton->setIcon(Icons::ZOOM_TOOLBAR.icon());
d->m_searchButton->setToolTip(tr("Search timeline event notes."));
connect(d->m_searchButton, &QToolButton::clicked, this, &QmlProfilerTool::showTimeLineSearch);
......
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