Commit 27383f07 authored by Alessandro Portale's avatar Alessandro Portale

Moving desktopdevicesmall.png from projectexplorer to core

It is also needed by imageviewer

Change-Id: Idd489ebc71768e293790e4b8f8ae9f5ede38e80d
Reviewed-by: default avatarAlessandro Portale <alessandro.portale@theqtcompany.com>
parent 10374825
......@@ -115,5 +115,7 @@
<file>images/eye_closed@2x.png</file>
<file>images/eye_open.png</file>
<file>images/eye_open@2x.png</file>
<file>images/desktopdevicesmall.png</file>
<file>images/desktopdevicesmall@2x.png</file>
</qresource>
</RCC>
......@@ -102,6 +102,9 @@ void ImageViewer::ctor()
d->ui_toolbar.setupUi(d->toolbar);
d->ui_toolbar.toolButtonExportImage->setIcon(QIcon::fromTheme(QLatin1String("document-save"),
Core::Icons::SAVEFILE.icon()));
const Utils::Icon backgroundIcon({
{QLatin1String(":/core/images/desktopdevicesmall.png"), Utils::Theme::IconsBaseColor}});
d->ui_toolbar.toolButtonBackground->setIcon(backgroundIcon.icon());
d->ui_toolbar.toolButtonOutline->setIcon(Core::Icons::BOUNDING_RECT.icon());
d->ui_toolbar.toolButtonZoomIn->setIcon(Core::Icons::PLUS.icon());
d->ui_toolbar.toolButtonZoomOut->setIcon(Core::Icons::MINUS.icon());
......
<RCC>
<qresource prefix="/imageviewer">
<file>images/background.png</file>
<file>ImageViewer.mimetypes.xml</file>
</qresource>
</RCC>
......@@ -29,10 +29,6 @@
<property name="toolTipBase">
<string>Show Background</string>
</property>
<property name="icon">
<iconset resource="imageviewer.qrc">
<normaloff>:/imageviewer/images/background.png</normaloff>:/imageviewer/images/background.png</iconset>
</property>
<property name="checkable">
<bool>true</bool>
</property>
......
......@@ -69,7 +69,5 @@
<file>images/targetchangebutton2@2x.png</file>
<file>images/desktopdevice.png</file>
<file>images/desktopdevice@2x.png</file>
<file>images/desktopdevicesmall.png</file>
<file>images/desktopdevicesmall@2x.png</file>
</qresource>
</RCC>
......@@ -70,7 +70,7 @@ const Utils::Icon BUILDSTEP_REMOVE({
const Utils::Icon DESKTOP_DEVICE({
{QLatin1String(":/projectexplorer/images/desktopdevice.png"), Utils::Theme::IconsBaseColor}});
const Utils::Icon DESKTOP_DEVICE_SMALL({
{QLatin1String(":/projectexplorer/images/desktopdevicesmall.png"), Utils::Theme::PanelTextColorDark}}, Utils::Icon::Tint);
{QLatin1String(":/core/images/desktopdevicesmall.png"), Utils::Theme::PanelTextColorDark}}, Utils::Icon::Tint);
const Utils::Icon MODE_PROJECT_CLASSIC(
QLatin1String(":/projectexplorer/images/mode_project.png"));
......
......@@ -5025,7 +5025,7 @@
x="0"
y="0"
xlink:href="#src/plugins/projectexplorer/images/desktopdevice"
id="src/plugins/projectexplorer/images/desktopdevicesmall"
id="src/plugins/coreplugin/images/desktopdevicesmall"
transform="matrix(0.5,0,0,0.5,285,189.5)"
width="100%"
height="100%" />
......
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