Commit cb08a44e authored by Alessandro Portale's avatar Alessandro Portale

Unify "Reset" icons

Change-Id: Ice6029b01f202ab6ed6ffc2fbc54a103c43c9d5d
Reviewed-by: default avatarTim Jenssen <tim.jenssen@theqtcompany.com>
parent 4d5a8368
......@@ -118,5 +118,6 @@
<file>images/eye_open@2x.png</file>
<file>images/desktopdevicesmall.png</file>
<file>images/desktopdevicesmall@2x.png</file>
<file>images/reset@2x.png</file>
</qresource>
</RCC>
......@@ -50,8 +50,10 @@ const Icon CUT(
QLatin1String(":/core/images/editcut.png"));
const Icon DIR(
QLatin1String(":/core/images/dir.png"));
const Icon RESET(
QLatin1String(":/core/images/reset.png"));
const Icon RESET({
{QLatin1String(":/core/images/reset.png"), Theme::PanelTextColorMid}}, Icon::Tint);
const Icon RESET_TOOLBAR({
{QLatin1String(":/core/images/reset.png"), Theme::IconsBaseColor}});
const Icon DARK_CLOSE(
QLatin1String(":/core/images/darkclose.png"));
const Icon LOCKED_TOOLBAR({
......
......@@ -43,6 +43,7 @@ CORE_EXPORT extern const Utils::Icon PASTE;
CORE_EXPORT extern const Utils::Icon CUT;
CORE_EXPORT extern const Utils::Icon DIR;
CORE_EXPORT extern const Utils::Icon RESET;
CORE_EXPORT extern const Utils::Icon RESET_TOOLBAR;
CORE_EXPORT extern const Utils::Icon DARK_CLOSE;
CORE_EXPORT extern const Utils::Icon LOCKED_TOOLBAR;
CORE_EXPORT extern const Utils::Icon LOCKED;
......
src/plugins/coreplugin/images/reset.png

682 Bytes | W: | H:

src/plugins/coreplugin/images/reset.png

159 Bytes | W: | H:

src/plugins/coreplugin/images/reset.png
src/plugins/coreplugin/images/reset.png
src/plugins/coreplugin/images/reset.png
src/plugins/coreplugin/images/reset.png
  • 2-up
  • Swipe
  • Onion skin
......@@ -7,8 +7,4 @@
<file>snapping_and_anchoring.png</file>
<file>snapping_and_anchoring@2x.png</file>
</qresource>
<qresource prefix="/icon">
<file>reset.png</file>
<file>reset@2x.png</file>
</qresource>
</RCC>
......@@ -137,7 +137,7 @@ FormEditorWidget::FormEditorWidget(FormEditorView *view)
m_resetAction = new QAction(tr("Reset view (R)."), this);
m_resetAction->setShortcut(Qt::Key_R);
m_resetAction->setShortcutContext(Qt::WidgetWithChildrenShortcut);
m_resetAction->setIcon(Icons::RESET.icon());
m_resetAction->setIcon(Core::Icons::RESET_TOOLBAR.icon());
connect(m_resetAction.data(), SIGNAL(triggered(bool)), this, SLOT(resetNodeInstanceView()));
addAction(m_resetAction.data());
upperActions.append(m_resetAction.data());
......
......@@ -48,8 +48,6 @@ const Utils::Icon NO_SNAPPING({
{QLatin1String(":/icon/layout/no_snapping.png"), Utils::Theme::IconsBaseColor}});
const Utils::Icon NO_SNAPPING_AND_ANCHORING({
{QLatin1String(":/icon/layout/snapping_and_anchoring.png"), Utils::Theme::IconsBaseColor}});
const Utils::Icon RESET({
{QLatin1String(":/icon/reset.png"), Utils::Theme::IconsBaseColor}});
} // Icons
} // QmlDesigner
......@@ -2661,9 +2661,9 @@
inkscape:connector-curvature="0" />
</g>
<g
transform="translate(574,268)"
transform="matrix(0,-1,1,0,524,834)"
style="display:inline"
id="src/plugins/qmldesigner/components/formeditor/reset">
id="src/plugins/coreplugin/images/reset">
<rect
id="rect6700-2"
height="16"
......@@ -2673,14 +2673,19 @@
style="fill:#ffffff;fill-opacity:1" />
<g
id="g6694-7"
style="fill:#000000;fill-opacity:1">
<polygon
style="fill:#000000;fill-opacity:1"
transform="matrix(-1,0,0,1,516,0)">
<path
style="fill:#000000;fill-opacity:1"
inkscape:transform-center-x="-0.76923474"
inkscape:transform-center-y="-0.13577024"
d="m 257.5,303 -4.5,0 3.61478,4.53847 z"
id="polygon6696-3"
points="258,307 261,304.5 258,302 "
style="fill:#000000;fill-opacity:1" />
inkscape:connector-curvature="0"
sodipodi:nodetypes="cccc" />
<path
id="path6698-5"
d="m 258,313 c -2.206,0 -4,-1.795 -4,-4 0,-2.205 1.794,-4 4,-4 l 0,-1 c -2.762,0 -5,2.238 -5,5 0,2.762 2.238,5 5,5 2.762,0 5,-2.238 5,-5 l -1,0 c 0,2.205 -1.794,4 -4,4 z"
d="m 260.82843,310.82843 c -1.55988,1.55987 -4.09769,1.55917 -5.65686,0 -1.55917,-1.55917 -1.55987,-4.09698 0,-5.65686 l -0.7071,-0.7071 c -1.95303,1.95303 -1.95303,5.11803 0,7.07106 1.95303,1.95303 5.11803,1.95303 7.07106,0 1.95303,-1.95303 1.95303,-5.11803 0,-7.07106 l -0.7071,0.7071 c 1.55917,1.55917 1.55987,4.09698 0,5.65686 z"
inkscape:connector-curvature="0"
style="fill:#000000;fill-opacity:1" />
</g>
......
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