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