Commit 9bc60e0b authored by Alessandro Portale's avatar Alessandro Portale

Bounding Rect Icon: Move from qmldesigner to core

..and re-use it in the imageviewer plugin

Change-Id: I230bdf6917203c9f4e5ed08a0fdd13dfca8b9749
Reviewed-by: default avatarAlessandro Portale <alessandro.portale@theqtcompany.com>
parent d13d1795
......@@ -109,5 +109,7 @@
<file>images/run_small@2x.png</file>
<file>images/stop_small.png</file>
<file>images/stop_small@2x.png</file>
<file>images/boundingrect.png</file>
<file>images/boundingrect@2x.png</file>
</qresource>
</RCC>
......@@ -146,6 +146,8 @@ const Utils::Icon STOP_SMALL({
{QLatin1String(":/core/images/stop_small.png"), Utils::Theme::IconsStopColor}});
const Utils::Icon INTERRUPT_SMALL({
{QLatin1String(":/core/images/interrupt_small.png"), Utils::Theme::IconsInterruptColor}});
const Icon BOUNDING_RECT({
{QLatin1String(":/core/images/boundingrect.png"), Theme::IconsBaseColor}});
const Icon MODE_EDIT_CLASSIC(
QLatin1String(":/fancyactionbar/images/mode_Edit.png"));
......
......@@ -90,6 +90,7 @@ CORE_EXPORT extern const Utils::Icon TOOLBAR_EXTENSION;
CORE_EXPORT extern const Utils::Icon RUN_SMALL;
CORE_EXPORT extern const Utils::Icon STOP_SMALL;
CORE_EXPORT extern const Utils::Icon INTERRUPT_SMALL;
CORE_EXPORT extern const Utils::Icon BOUNDING_RECT;
CORE_EXPORT extern const Utils::Icon MODE_EDIT_CLASSIC;
CORE_EXPORT extern const Utils::Icon MODE_EDIT_FLAT;
......
......@@ -102,6 +102,7 @@ void ImageViewer::ctor()
d->ui_toolbar.setupUi(d->toolbar);
d->ui_toolbar.toolButtonExportImage->setIcon(QIcon::fromTheme(QLatin1String("document-save"),
Core::Icons::SAVEFILE.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());
d->ui_toolbar.toolButtonFitToScreen->setIcon(Core::Icons::ZOOM_TOOLBAR.icon());
......
<RCC>
<qresource prefix="/imageviewer">
<file>images/outline.png</file>
<file>images/originalsize.png</file>
<file>images/background.png</file>
<file>ImageViewer.mimetypes.xml</file>
......
......@@ -46,10 +46,6 @@
<property name="toolTipBase">
<string>Show Outline</string>
</property>
<property name="icon">
<iconset resource="imageviewer.qrc">
<normaloff>:/imageviewer/images/outline.png</normaloff>:/imageviewer/images/outline.png</iconset>
</property>
<property name="checkable">
<bool>true</bool>
</property>
......
......@@ -6,8 +6,6 @@
<file>no_snapping@2x.png</file>
<file>snapping_and_anchoring.png</file>
<file>snapping_and_anchoring@2x.png</file>
<file>boundingrect.png</file>
<file>boundingrect@2x.png</file>
</qresource>
<qresource prefix="/icon">
<file>reset.png</file>
......
......@@ -40,6 +40,7 @@
#include <lineeditaction.h>
#include <backgroundaction.h>
#include <coreplugin/coreicons.h>
#include <utils/fileutils.h>
namespace QmlDesigner {
......@@ -97,7 +98,7 @@ FormEditorWidget::FormEditorWidget(FormEditorView *view)
m_showBoundingRectAction->setShortcutContext(Qt::WidgetWithChildrenShortcut);
m_showBoundingRectAction->setCheckable(true);
m_showBoundingRectAction->setChecked(true);
m_showBoundingRectAction->setIcon(Icons::BOUNDING_RECT.icon());
m_showBoundingRectAction->setIcon(Core::Icons::BOUNDING_RECT.icon());
addAction(m_showBoundingRectAction.data());
upperActions.append(m_showBoundingRectAction.data());
......
......@@ -47,8 +47,6 @@ const Utils::Icon EXPORT_CHECKED({
{QLatin1String(":/navigator/icon/export_checked.png"), Utils::Theme::IconsBaseColor}});
const Utils::Icon EXPORT_UNCHECKED({
{QLatin1String(":/navigator/icon/export_unchecked.png"), Utils::Theme::IconsBaseColor}});
const Utils::Icon BOUNDING_RECT({
{QLatin1String(":/icon/layout/boundingrect.png"), Utils::Theme::IconsBaseColor}});
const Utils::Icon SNAPPING({
{QLatin1String(":/icon/layout/snapping.png"), Utils::Theme::IconsBaseColor}});
const Utils::Icon NO_SNAPPING({
......
......@@ -2596,7 +2596,7 @@
<g
transform="translate(608,268)"
style="display:inline"
id="src/plugins/qmldesigner/components/formeditor/boundingrect">
id="src/plugins/coreplugin/images/boundingrect">
<rect
id="rect6754-2"
height="16"
......
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