From 9bc60e0b9dc9864145015f5cbfa3e323ed0d409d Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Mon, 11 Apr 2016 09:48:46 +0200 Subject: [PATCH] Bounding Rect Icon: Move from qmldesigner to core ..and re-use it in the imageviewer plugin Change-Id: I230bdf6917203c9f4e5ed08a0fdd13dfca8b9749 Reviewed-by: Alessandro Portale --- src/plugins/coreplugin/core.qrc | 2 ++ src/plugins/coreplugin/coreicons.cpp | 2 ++ src/plugins/coreplugin/coreicons.h | 1 + .../images}/boundingrect.png | Bin .../images}/boundingrect@2x.png | Bin src/plugins/imageviewer/images/outline.png | Bin 593 -> 0 bytes src/plugins/imageviewer/imageviewer.cpp | 1 + src/plugins/imageviewer/imageviewer.qrc | 1 - src/plugins/imageviewer/imageviewertoolbar.ui | 4 ---- .../components/formeditor/formeditor.qrc | 2 -- .../components/formeditor/formeditorwidget.cpp | 3 ++- src/plugins/qmldesigner/qmldesignericons.h | 2 -- src/tools/icons/qtcreatoricons.svg | 2 +- 13 files changed, 9 insertions(+), 11 deletions(-) rename src/plugins/{qmldesigner/components/formeditor => coreplugin/images}/boundingrect.png (100%) rename src/plugins/{qmldesigner/components/formeditor => coreplugin/images}/boundingrect@2x.png (100%) delete mode 100644 src/plugins/imageviewer/images/outline.png diff --git a/src/plugins/coreplugin/core.qrc b/src/plugins/coreplugin/core.qrc index a6a223c0238..a4fa04d2c0f 100644 --- a/src/plugins/coreplugin/core.qrc +++ b/src/plugins/coreplugin/core.qrc @@ -109,5 +109,7 @@ images/run_small@2x.png images/stop_small.png images/stop_small@2x.png + images/boundingrect.png + images/boundingrect@2x.png diff --git a/src/plugins/coreplugin/coreicons.cpp b/src/plugins/coreplugin/coreicons.cpp index 9fa70f9ac33..1980a7779aa 100644 --- a/src/plugins/coreplugin/coreicons.cpp +++ b/src/plugins/coreplugin/coreicons.cpp @@ -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")); diff --git a/src/plugins/coreplugin/coreicons.h b/src/plugins/coreplugin/coreicons.h index 1a9a57ed1a4..4b6e24f8a4d 100644 --- a/src/plugins/coreplugin/coreicons.h +++ b/src/plugins/coreplugin/coreicons.h @@ -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; diff --git a/src/plugins/qmldesigner/components/formeditor/boundingrect.png b/src/plugins/coreplugin/images/boundingrect.png similarity index 100% rename from src/plugins/qmldesigner/components/formeditor/boundingrect.png rename to src/plugins/coreplugin/images/boundingrect.png diff --git a/src/plugins/qmldesigner/components/formeditor/boundingrect@2x.png b/src/plugins/coreplugin/images/boundingrect@2x.png similarity index 100% rename from src/plugins/qmldesigner/components/formeditor/boundingrect@2x.png rename to src/plugins/coreplugin/images/boundingrect@2x.png diff --git a/src/plugins/imageviewer/images/outline.png b/src/plugins/imageviewer/images/outline.png deleted file mode 100644 index aaa9464535529bb3cef7e3eede71e3e76fd4dea5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 593 zcmeAS@N?(olHy`uVBq!ia0y~yV2}V|4mJh`h6m-gKNuJoBuiW)N`mv#O3D+9QW+dm z@{>{(JaZG%Q-e|yQz{EjrrIztFn;!QaSW-rwPo7btV0eWt@%D?cO%NV#9}mlNi+p$ z=w9>P{ee*=X4i}09VHK$OVsnC7S3MR)N0q-p`oPYA^z{bY5Ip#Dr#FZXEiRKeCEg8 z>h~(fY~Oy{{#?oM^UjnjmqnNE&&%(rJ9%NQ;#KA1>=$hjtx(RBIqnb24r7 z6dyHBfe+KJIjWO}P?2#;RtHQ=k+OWZ3QtwTf`+w{HpAc5tV_@HS zF^vyb~PJ;@Nj@WJEI8~ucL z)@cndJ}&zw`X-}6jH`9U?YDB?PsMm#l>{dTe@(p~RG{mt0-fAtTs1O}fui_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()); diff --git a/src/plugins/imageviewer/imageviewer.qrc b/src/plugins/imageviewer/imageviewer.qrc index 9adc10e090c..60678a9cede 100644 --- a/src/plugins/imageviewer/imageviewer.qrc +++ b/src/plugins/imageviewer/imageviewer.qrc @@ -1,6 +1,5 @@ - images/outline.png images/originalsize.png images/background.png ImageViewer.mimetypes.xml diff --git a/src/plugins/imageviewer/imageviewertoolbar.ui b/src/plugins/imageviewer/imageviewertoolbar.ui index 0c86a3e5852..4dec6dc66ec 100644 --- a/src/plugins/imageviewer/imageviewertoolbar.ui +++ b/src/plugins/imageviewer/imageviewertoolbar.ui @@ -46,10 +46,6 @@ Show Outline - - - :/imageviewer/images/outline.png:/imageviewer/images/outline.png - true diff --git a/src/plugins/qmldesigner/components/formeditor/formeditor.qrc b/src/plugins/qmldesigner/components/formeditor/formeditor.qrc index 4b949ad92cc..6f986b3a1ed 100644 --- a/src/plugins/qmldesigner/components/formeditor/formeditor.qrc +++ b/src/plugins/qmldesigner/components/formeditor/formeditor.qrc @@ -6,8 +6,6 @@ no_snapping@2x.png snapping_and_anchoring.png snapping_and_anchoring@2x.png - boundingrect.png - boundingrect@2x.png reset.png diff --git a/src/plugins/qmldesigner/components/formeditor/formeditorwidget.cpp b/src/plugins/qmldesigner/components/formeditor/formeditorwidget.cpp index 8ca2afd8500..936c299b842 100644 --- a/src/plugins/qmldesigner/components/formeditor/formeditorwidget.cpp +++ b/src/plugins/qmldesigner/components/formeditor/formeditorwidget.cpp @@ -40,6 +40,7 @@ #include #include +#include #include 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()); diff --git a/src/plugins/qmldesigner/qmldesignericons.h b/src/plugins/qmldesigner/qmldesignericons.h index 3fb9732c687..c85c2a76926 100644 --- a/src/plugins/qmldesigner/qmldesignericons.h +++ b/src/plugins/qmldesigner/qmldesignericons.h @@ -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({ diff --git a/src/tools/icons/qtcreatoricons.svg b/src/tools/icons/qtcreatoricons.svg index e2d680e5c68..1435147586e 100644 --- a/src/tools/icons/qtcreatoricons.svg +++ b/src/tools/icons/qtcreatoricons.svg @@ -2596,7 +2596,7 @@ + id="src/plugins/coreplugin/images/boundingrect">