forked from qt-creator/qt-creator
Utils: move pan icon from scxml to utils
It will also be used in Qt Quick Designer Change-Id: Id4e16f417c5faf8baf9437c0d4845397f3ddb4fc Reviewed-by: Marco Benelli <marco.benelli@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
This commit is contained in:
|
Before Width: | Height: | Size: 199 B After Width: | Height: | Size: 199 B |
|
Before Width: | Height: | Size: 240 B After Width: | Height: | Size: 240 B |
@@ -170,5 +170,7 @@
|
|||||||
<file>images/namespace@2x.png</file>
|
<file>images/namespace@2x.png</file>
|
||||||
<file>images/filledcircle.png</file>
|
<file>images/filledcircle.png</file>
|
||||||
<file>images/filledcircle@2x.png</file>
|
<file>images/filledcircle@2x.png</file>
|
||||||
|
<file>images/pan.png</file>
|
||||||
|
<file>images/pan@2x.png</file>
|
||||||
</qresource>
|
</qresource>
|
||||||
</RCC>
|
</RCC>
|
||||||
|
|||||||
@@ -208,6 +208,8 @@ const Icon COLLAPSE({
|
|||||||
{QLatin1String(":/utils/images/collapse.png"), Theme::PanelTextColorMid}}, Icon::Tint);
|
{QLatin1String(":/utils/images/collapse.png"), Theme::PanelTextColorMid}}, Icon::Tint);
|
||||||
const Icon COLLAPSE_TOOLBAR({
|
const Icon COLLAPSE_TOOLBAR({
|
||||||
{QLatin1String(":/utils/images/collapse.png"), Theme::IconsBaseColor}});
|
{QLatin1String(":/utils/images/collapse.png"), Theme::IconsBaseColor}});
|
||||||
|
const Icon PAN_TOOLBAR({
|
||||||
|
{QLatin1String(":/utils/images/pan.png"), Theme::IconsBaseColor}});
|
||||||
const Icon EMPTY14(":/utils/images/empty14.png");
|
const Icon EMPTY14(":/utils/images/empty14.png");
|
||||||
const Icon OVERLAY_ADD({
|
const Icon OVERLAY_ADD({
|
||||||
{":/utils/images/iconoverlay_add_background.png", Theme::BackgroundColorNormal},
|
{":/utils/images/iconoverlay_add_background.png", Theme::BackgroundColorNormal},
|
||||||
|
|||||||
@@ -121,6 +121,7 @@ QTCREATOR_UTILS_EXPORT extern const Icon EXPAND;
|
|||||||
QTCREATOR_UTILS_EXPORT extern const Icon EXPAND_TOOLBAR;
|
QTCREATOR_UTILS_EXPORT extern const Icon EXPAND_TOOLBAR;
|
||||||
QTCREATOR_UTILS_EXPORT extern const Icon COLLAPSE;
|
QTCREATOR_UTILS_EXPORT extern const Icon COLLAPSE;
|
||||||
QTCREATOR_UTILS_EXPORT extern const Icon COLLAPSE_TOOLBAR;
|
QTCREATOR_UTILS_EXPORT extern const Icon COLLAPSE_TOOLBAR;
|
||||||
|
QTCREATOR_UTILS_EXPORT extern const Icon PAN_TOOLBAR;
|
||||||
QTCREATOR_UTILS_EXPORT extern const Icon EMPTY14;
|
QTCREATOR_UTILS_EXPORT extern const Icon EMPTY14;
|
||||||
QTCREATOR_UTILS_EXPORT extern const Icon OVERLAY_ADD;
|
QTCREATOR_UTILS_EXPORT extern const Icon OVERLAY_ADD;
|
||||||
QTCREATOR_UTILS_EXPORT extern const Icon OVERLAY_WARNING;
|
QTCREATOR_UTILS_EXPORT extern const Icon OVERLAY_WARNING;
|
||||||
|
|||||||
@@ -24,8 +24,6 @@
|
|||||||
<file>images/history.png</file>
|
<file>images/history.png</file>
|
||||||
<file>images/icon-export-canvas.png</file>
|
<file>images/icon-export-canvas.png</file>
|
||||||
<file>images/icon-export-canvas@2x.png</file>
|
<file>images/icon-export-canvas@2x.png</file>
|
||||||
<file>images/icon-pan.png</file>
|
|
||||||
<file>images/icon-pan@2x.png</file>
|
|
||||||
<file>images/initial.png</file>
|
<file>images/initial.png</file>
|
||||||
<file>images/more_colors.png</file>
|
<file>images/more_colors.png</file>
|
||||||
<file>images/navigator.png</file>
|
<file>images/navigator.png</file>
|
||||||
|
|||||||
@@ -45,7 +45,7 @@ ActionHandler::ActionHandler(QObject *parent)
|
|||||||
{ Utils::Icons::ZOOMIN_TOOLBAR, tr("Zoom In"), tr("Zoom In (Ctrl + + / Ctrl + Wheel)"), "Ctrl++", false },
|
{ Utils::Icons::ZOOMIN_TOOLBAR, tr("Zoom In"), tr("Zoom In (Ctrl + + / Ctrl + Wheel)"), "Ctrl++", false },
|
||||||
{ Utils::Icons::ZOOMOUT_TOOLBAR, tr("Zoom Out"), tr("Zoom Out (Ctrl + - / Ctrl + Wheel)"), "Ctrl+-", false },
|
{ Utils::Icons::ZOOMOUT_TOOLBAR, tr("Zoom Out"), tr("Zoom Out (Ctrl + - / Ctrl + Wheel)"), "Ctrl+-", false },
|
||||||
{ Utils::Icons::FITTOVIEW_TOOLBAR, tr("Fit to View"), tr("Fit to View (F11)"), "F11", false },
|
{ Utils::Icons::FITTOVIEW_TOOLBAR, tr("Fit to View"), tr("Fit to View (F11)"), "F11", false },
|
||||||
{ Utils::Icon({{":/scxmleditor/images/icon-pan.png", Utils::Theme::IconsBaseColor}}), tr("Panning"), tr("Panning (Shift)"), "Shift", true },
|
{ Utils::Icons::PAN_TOOLBAR, tr("Panning"), tr("Panning (Shift)"), "Shift", true },
|
||||||
|
|
||||||
{ Utils::Icons::ZOOM_TOOLBAR, tr("Magnifier"), tr("Magnifier Tool (Alt)"), "Alt", true },
|
{ Utils::Icons::ZOOM_TOOLBAR, tr("Magnifier"), tr("Magnifier Tool (Alt)"), "Alt", true },
|
||||||
{ Utils::Icon(":/scxmleditor/images/navigator.png"), tr("Navigator"), tr("Navigator (Ctrl+E)"), "Ctrl+E", true },
|
{ Utils::Icon(":/scxmleditor/images/navigator.png"), tr("Navigator"), tr("Navigator (Ctrl+E)"), "Ctrl+E", true },
|
||||||
|
|||||||
@@ -4034,7 +4034,7 @@
|
|||||||
<g
|
<g
|
||||||
transform="translate(336,0)"
|
transform="translate(336,0)"
|
||||||
style="display:inline"
|
style="display:inline"
|
||||||
id="src/plugins/scxmleditor/common/images/icon-pan">
|
id="src/libs/utils/images/pan">
|
||||||
<rect
|
<rect
|
||||||
style="fill:#ffffff;fill-opacity:1"
|
style="fill:#ffffff;fill-opacity:1"
|
||||||
x="1228"
|
x="1228"
|
||||||
|
|||||||
|
Before Width: | Height: | Size: 249 KiB After Width: | Height: | Size: 249 KiB |
Reference in New Issue
Block a user