Skip to content
Permalink
Browse files

[layouts][needs-docs] Replace layout and report icons

The previous layout icon (a blank page) was too difficult to
distinguish from actions relating to pages themselves.

Also fix incorrect tooltips in report designer
  • Loading branch information
nyalldawson committed Feb 23, 2018
1 parent 64aa400 commit 08b75ec0f536fc9a6325e06557fbdc6f275e0296
@@ -641,6 +641,12 @@
<file>themes/default/mActionDuplicateFeatureDigitized.svg</file>
<file>themes/default/mActionDuplicateFeature.svg</file>
<file>themes/default/mActionExport.svg</file>
<file>themes/default/mActionLayoutManager.svg</file>
<file>themes/default/mActionNewLayout.svg</file>
<file>themes/default/mActionDuplicateLayout.svg</file>
<file>themes/default/mIconLayout.svg</file>
<file>themes/default/mActionNewReport.svg</file>
<file>themes/default/mIconReport.svg</file>
</qresource>
<qresource prefix="/images/tips">
<file alias="symbol_levels.png">qgis_tips/symbol_levels.png</file>
@@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" height="24" width="24"><path d="M.5 21.5h21V7.664l-5-5.164H.5z" fill="#ccc" fill-rule="evenodd" stroke="#727272" stroke-linejoin="round"/><path d="M3.5 18.5h20V5.392L18.738.5H3.5z" fill="#fff" fill-rule="evenodd" stroke="#727272" stroke-linejoin="round"/><path fill="#7399ec" fill-opacity=".44" d="M4.983 2h13v1h-13zM5 16h16v1H5z"/><path d="M23.483 5.5h-5v-5z" fill="#f0f0f0" fill-rule="evenodd" stroke="#727272" stroke-linejoin="round"/><g transform="translate(33)"><rect y="13" x="-20" width="11" rx="2.011" height="11" fill="#c4a000"/><path d="M-15 14v2.063a2.501 2.501 0 0 0-1.375.78l-1.781-1.03-.5.874 1.781 1.032A2.46 2.46 0 0 0-17 18.5c0 .275.043.534.125.781l-1.781 1.032.5.875 1.781-1.032c.353.4.833.67 1.375.782V23h1v-2.063a2.501 2.501 0 0 0 1.375-.78l1.781 1.03.5-.875-1.781-1.03A2.46 2.46 0 0 0-12 18.5a2.46 2.46 0 0 0-.125-.781l1.781-1.032-.5-.875-1.781 1.032c-.353-.4-.833-.67-1.375-.782V14zm.5 3.5a1 1 0 1 1 0 2 1 1 0 0 1 0-2z" fill="#fcffff"/><path d="M-19 19l9-.01v-2C-10 14-11 14-14.5 14s-4.5 0-4.5 3v2z" opacity=".3" fill="#fcffff" fill-rule="evenodd"/></g><path fill="#7399ec" fill-opacity=".44" d="M21.983 13V6h-1v7zM6 16V3H5v13z"/></svg>
@@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" height="24" width="24"><linearGradient id="c" gradientTransform="matrix(-.67482 .52737 .29432 .37836 77.718 981.122)" gradientUnits="userSpaceOnUse" x1="97.442" x2="90.221" y1="35.152" y2="35.079"><stop offset="0" stop-color="#f8e27e"/><stop offset="1" stop-color="#e3d189"/></linearGradient><linearGradient id="b" gradientTransform="matrix(-.34112 .2669 .34709 .44633 7.386 1027.643)" gradientUnits="userSpaceOnUse" x1="-6.308" x2="-9.775" y1="44.229" y2="44.14"><stop offset="0"/><stop offset="1" stop-opacity="0"/></linearGradient><linearGradient id="a" gradientTransform="matrix(-.10787 .87849 .87408 .10732 -1.812 758.658)" gradientUnits="userSpaceOnUse" x1="304.76" x2="335.3" y1="64.295" y2="81.926"><stop offset="0" stop-color="#d3d7cf"/><stop offset=".183" stop-color="#babdb6"/><stop offset=".319" stop-color="#fff"/><stop offset=".876" stop-color="#babdb6"/><stop offset="1" stop-color="#eeeeec"/></linearGradient><path d="M.5 19.5h21v-14l-5-5H.5z" fill="#fff" fill-rule="evenodd" stroke="#727272" stroke-linejoin="round"/><path d="M21.5 5.5h-5v-5z" fill="#f0f0f0" fill-rule="evenodd" stroke="#727272" stroke-linejoin="round"/><path fill="#7399ec" fill-opacity=".44" d="M2 2h14v1H2zM2 17h18v1H2z"/><path d="M21.5 5.5h-5v-5z" fill="#f0f0f0" fill-rule="evenodd" stroke="#727272" stroke-linejoin="round"/><path fill="#7399ec" fill-opacity=".44" d="M20 17V6h-1v11z"/><path d="M10.457 1032.309c-.055-.856.634-.25.876 0 1.025.743 2.03 1.516 3.067 2.24.725.256 1.422-.312 1.905-.792.691-.772 1.365-1.77 1.239-2.855-.1-.551-.678-.756-1.06-1.087-.949-.7-1.905-1.394-2.849-2.1.05-.536.921-.43 1.352-.453 1.8.032 3.761.62 4.848 2.148.894 1.243 1.096 2.91.645 4.36.249 1.355.75 2.683 1.605 3.775l-3.165 2.326c-.744-.97-1.666-1.813-2.743-2.398-1.597.233-3.23-.52-4.194-1.792-.762-.975-1.327-2.144-1.526-3.367z" fill="url(#a)" fill-rule="evenodd" stroke="#3b3b3b" stroke-width="1.027" stroke-linecap="round" stroke-linejoin="round" stroke-dashoffset=".361" transform="translate(-.924 -790.997) scale(.7743)"/><path d="M20.57 1038.954a.859.859 0 0 0-.161 1.204l5.276 7.727c.289.371 1.281.076 1.66-.22.377-.296.905-1.189.616-1.56l-6.182-7.015a.853.853 0 0 0-1.203-.136z" opacity=".231" fill="url(#b)" transform="translate(-.924 -790.997) scale(.7743)"/><path d="M7.42 8.354c.003.013.02.008.02 0l2.541 1.866c.343.251.795.156 1.187-.05.396-.206.798-.552 1.135-1.025.338-.474.536-.991.606-1.436.07-.444-.006-.878-.335-1.12L10.012 4.72c0-.01.004-.023.003-.022-.017.013.01.008.021 0 1.245-.133 2.626.185 3.485.816 1.176.865 1.597 2.42 1.159 3.854-.44 1.428-1.857 2.52-3.1 2.684-.803.1-1.63-.086-2.31-.586-.857-.63-1.585-1.874-1.85-3.119z" fill="#f0f3f2" fill-rule="evenodd"/><path d="M21.97 1036.91l9.581 11.101c.57.734-.032 2.138-1.341 3.16-1.308 1.023-2.814 1.267-3.385.534l-8.4-12.025 3.547-2.77zm6.345 11.821c-.65.509-.786 1.432-.461 1.849.324.417 1.282.485 1.933-.023.65-.509.754-1.407.43-1.824-.325-.417-1.251-.51-1.902 0z" fill="url(#c)" stroke="#3b3b3b" stroke-width=".867" stroke-linecap="round" stroke-linejoin="round" stroke-dashoffset=".7" transform="translate(-.924 -790.997) scale(.7743)"/><path transform="matrix(.63846 -.43808 .51263 .5803 -.924 -790.997)" d="M-679.108 874.67h3.571v.578h-3.57z" fill="#fff" fill-opacity=".578" stroke="#3b3b3b" stroke-width="1.289"/><path fill="#7399ec" fill-opacity=".44" d="M2 17V3h1v14z"/></svg>
@@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" height="24" width="24"><path d="M.5 19.5h21V5.664L16.5.5H.5z" fill="#fff" fill-rule="evenodd" stroke="#727272" stroke-linejoin="round"/><path fill="#7399ec" fill-opacity=".44" d="M3 2h13v1H3zM2.051 17.038h18.008v1H2.051z"/><path d="M21.5 5.5h-5v-5z" fill="#f0f0f0" fill-rule="evenodd" stroke="#727272" stroke-linejoin="round"/><g transform="translate(33)"><rect y="13" x="-20" width="11" rx="2.011" height="11" fill="#c4a000"/><path d="M-15 14v2.063a2.501 2.501 0 0 0-1.375.78l-1.781-1.03-.5.874 1.781 1.032A2.46 2.46 0 0 0-17 18.5c0 .275.043.534.125.781l-1.781 1.032.5.875 1.781-1.032c.353.4.833.67 1.375.782V23h1v-2.063a2.501 2.501 0 0 0 1.375-.78l1.781 1.03.5-.875-1.781-1.03A2.46 2.46 0 0 0-12 18.5a2.46 2.46 0 0 0-.125-.781l1.781-1.032-.5-.875-1.781 1.032c-.353-.4-.833-.67-1.375-.782V14zm.5 3.5a1 1 0 1 1 0 2 1 1 0 0 1 0-2z" fill="#fcffff"/><path d="M-19 19l9-.01v-2C-10 14-11 14-14.5 14s-4.5 0-4.5 3v2z" opacity=".3" fill="#fcffff" fill-rule="evenodd"/></g><path d="M2.498 2.496v18.99h4.016V7.547l4.96.036v-5.05l-4.96-.036z" fill="#ffe680" stroke="#d4aa00" stroke-linecap="square"/><path fill="#d4aa00" fill-opacity=".647" d="M3.027 2.56L7 6l-.85.766-3.972-3.44z"/><path fill="#b29000" d="M2 7h3v1H2zM2 9h3v1H2zM2 11h3v1H2zM2 13h3v1H2zM2 15h3v1H2z"/><path fill="#7399ec" fill-opacity=".44" d="M20 13V6h-1v7z"/><path fill="#b29000" d="M2.024 16.992h3v1h-3z"/></svg>
@@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" height="24" width="24"><path d="M2.5 21.5l17-.05V7.65L14.495 2.5 2.5 2.55z" fill="#fff" fill-rule="evenodd" stroke="#919191" stroke-width=".999" stroke-linejoin="round"/><path d="M4.5 19.5l17-.05V5.65L16.495.5 4.5.55z" fill="#fff" fill-rule="evenodd" stroke="#727272" stroke-width=".999" stroke-linejoin="round"/><path fill="#7399ec" fill-opacity=".44" d="M6 2h10v1H6zM5.966 17.038h14.093v1H5.966z"/><path d="M21.5 5.5h-5v-5z" fill="#f0f0f0" fill-rule="evenodd" stroke="#727272" stroke-linejoin="round"/><path fill="#7399ec" fill-opacity=".44" d="M20 17V6h-1v11zM7 17V3H6v14z"/><path fill="#999" d="M8 10h1v6H8z"/><path fill="#6d97c4" d="M10 15h2v-3h-2z"/><path fill="#de8787" d="M13 10h2v6h-2z"/><path fill="#d06935" d="M16 16h2v-5.007h-2z"/><path fill="#999" fill-opacity=".793" d="M8 5h7V4H8zM8 7h7V6H8zM8 9h10V8H8z"/><path fill="#999" fill-opacity=".979" d="M9 16h9v-1H9z"/><g transform="translate(33)"><rect y="13" x="-20" width="11" rx="2.011" height="11" fill="#c4a000"/><path d="M-15 14v2.063a2.501 2.501 0 0 0-1.375.78l-1.781-1.03-.5.874 1.781 1.032A2.46 2.46 0 0 0-17 18.5c0 .275.043.534.125.781l-1.781 1.032.5.875 1.781-1.032c.353.4.833.67 1.375.782V23h1v-2.063a2.501 2.501 0 0 0 1.375-.78l1.781 1.03.5-.875-1.781-1.03A2.46 2.46 0 0 0-12 18.5a2.46 2.46 0 0 0-.125-.781l1.781-1.032-.5-.875-1.781 1.032c-.353-.4-.833-.67-1.375-.782V14zm.5 3.5a1 1 0 1 1 0 2 1 1 0 0 1 0-2z" fill="#fcffff"/><path d="M-19 19l9-.01v-2C-10 14-11 14-14.5 14s-4.5 0-4.5 3v2z" opacity=".3" fill="#fcffff" fill-rule="evenodd"/></g></svg>
@@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" height="24" width="24"><path d="M1.5 20.5h21V6.664l-5-5.164h-16z" fill="#fff" fill-rule="evenodd" stroke="#727272" stroke-linejoin="round"/><path fill="#b3b3b3" fill-opacity=".44" d="M4 3h13v1H4z"/><path fill="#999" fill-opacity=".44" d="M3 18h18v1H3z"/><path d="M22.619 6.568h-5v-5z" fill="#f0f0f0" fill-rule="evenodd" stroke="#727272" stroke-linejoin="round"/><path d="M3.502 3.5v18.99h4.016V8.55l4.96.037v-5.05L7.519 3.5z" fill="#e6e6e6" stroke="#999" stroke-linecap="square"/><path fill="#999" fill-opacity=".647" d="M4.019 3.565l3.914 4.38-.837.977-3.914-4.381z"/><path fill="#999" d="M3.004 8.004h3v1h-3zM3.004 10.004h3v1h-3zM3.004 12.004h3v1h-3zM3.004 14.004h3v1h-3zM3.004 16.004h3v1h-3z"/><path fill="#b3b3b3" fill-opacity=".44" d="M21 18V7h-1v11z"/><path fill="#999" d="M3.028 17.996h3v1h-3z"/></svg>
@@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" height="24" width="24"><path d="M2.5 23.458l17-.05v-13.8l-5.005-5.15-11.995.05z" fill="#fff" fill-rule="evenodd" stroke="#919191" stroke-width=".999" stroke-linejoin="round"/><path d="M4.5 21.458l17-.05v-13.8l-5.005-5.15-11.995.05z" fill="#fff" fill-rule="evenodd" stroke="#727272" stroke-width=".999" stroke-linejoin="round"/><path fill="#999" fill-opacity=".439" d="M6 4h10v1H6zM5.966 19h14.093v1H5.966z"/><path d="M21.5 7.458h-5v-5z" fill="#f0f0f0" fill-rule="evenodd" stroke="#727272" stroke-linejoin="round"/><path fill="#999" fill-opacity=".439" d="M20 19V8h-1v11zM7 19V5H6v14z"/><path fill="#999" d="M8 11.958h1v6H8z"/><path fill="#4d4d4d" d="M10 16.958h2v-3h-2z"/><path fill="gray" d="M13 11.958h2v6h-2z"/><path fill="#4d4d4d" d="M16 17.958h2v-5.007h-2z"/><path fill="#999" fill-opacity=".793" d="M8 6.958h7v-1H8zM8 8.958h7v-1H8zM8 10.958h10v-1H8z"/><path fill="#999" fill-opacity=".979" d="M9 17.958h9v-1H9z"/></svg>
@@ -4102,16 +4102,28 @@ void QgsLayoutDesignerDialog::updateActionNames( QgsMasterLayoutInterface::Type
{
case QgsMasterLayoutInterface::PrintLayout:
mActionDuplicateLayout->setText( tr( "&Duplicate Layout…" ) );
mActionDuplicateLayout->setToolTip( tr( "Duplicate layout" ) );
mActionDuplicateLayout->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "mActionDuplicateLayout.svg" ) ) );
mActionRemoveLayout->setText( tr( "Delete Layout…" ) );
mActionRemoveLayout->setToolTip( tr( "Delete layout" ) );
mActionRenameLayout->setText( tr( "Rename Layout…" ) );
mActionRenameLayout->setToolTip( tr( "Rename layout" ) );
mActionNewLayout->setText( tr( "New Layout…" ) );
mActionNewLayout->setToolTip( tr( "New layout" ) );
mActionNewLayout->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "mActionNewLayout.svg" ) ) );
break;

case QgsMasterLayoutInterface::Report:
mActionDuplicateLayout->setText( tr( "&Duplicate Report…" ) );
mActionDuplicateLayout->setToolTip( tr( "Duplicate report" ) );
mActionDuplicateLayout->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "mActionDuplicateLayout.svg" ) ) );
mActionRemoveLayout->setText( tr( "Delete Report…" ) );
mActionRemoveLayout->setToolTip( tr( "Delete report" ) );
mActionRenameLayout->setText( tr( "Rename Report…" ) );
mActionRenameLayout->setToolTip( tr( "Rename report" ) );
mActionNewLayout->setText( tr( "New Report…" ) );
mActionNewLayout->setToolTip( tr( "New report" ) );
mActionNewLayout->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "mActionNewReport.svg" ) ) );
break;
}
}
@@ -50,7 +50,7 @@ QgsProject *QgsPrintLayout::layoutProject() const

QIcon QgsPrintLayout::icon() const
{
return QgsApplication::getThemeIcon( QStringLiteral( "mActionNewComposer.svg" ) );
return QgsApplication::getThemeIcon( QStringLiteral( "mIconLayout.svg" ) );
}

QgsLayoutAtlas *QgsPrintLayout::atlas()
@@ -26,7 +26,7 @@ QgsReport::QgsReport( QgsProject *project )

QIcon QgsReport::icon() const
{
return QgsApplication::getThemeIcon( QStringLiteral( "processingResult.svg" ) );
return QgsApplication::getThemeIcon( QStringLiteral( "mIconReport.svg" ) );
}

QgsReport *QgsReport::clone() const
@@ -25,7 +25,7 @@ QgsReportSectionLayout::QgsReportSectionLayout( QgsAbstractReportSection *parent

QIcon QgsReportSectionLayout::icon() const
{
return QgsApplication::getThemeIcon( QStringLiteral( "/mActionNewComposer.svg" ) );
return QgsApplication::getThemeIcon( QStringLiteral( "/mIconLayout.svg" ) );
}

QgsReportSectionLayout *QgsReportSectionLayout::clone() const
@@ -1193,7 +1193,7 @@
<action name="mActionDuplicateLayout">
<property name="icon">
<iconset resource="../../../images/images.qrc">
<normaloff>:/images/themes/default/mActionDuplicateComposer.svg</normaloff>:/images/themes/default/mActionDuplicateComposer.svg</iconset>
<normaloff>:/images/themes/default/mActionDuplicateLayout.svg</normaloff>:/images/themes/default/mActionDuplicateLayout.svg</iconset>
</property>
<property name="text">
<string>&amp;Duplicate Layout…</string>
@@ -1220,7 +1220,7 @@
<action name="mActionNewLayout">
<property name="icon">
<iconset resource="../../../images/images.qrc">
<normaloff>:/images/themes/default/mActionNewComposer.svg</normaloff>:/images/themes/default/mActionNewComposer.svg</iconset>
<normaloff>:/images/themes/default/mActionNewLayout.svg</normaloff>:/images/themes/default/mActionNewLayout.svg</iconset>
</property>
<property name="text">
<string>&amp;New Layout…</string>
@@ -1235,7 +1235,7 @@
<action name="mActionLayoutManager">
<property name="icon">
<iconset resource="../../../images/images.qrc">
<normaloff>:/images/themes/default/mActionComposerManager.svg</normaloff>:/images/themes/default/mActionComposerManager.svg</iconset>
<normaloff>:/images/themes/default/mActionLayoutManager.svg</normaloff>:/images/themes/default/mActionLayoutManager.svg</iconset>
</property>
<property name="text">
<string>Layout &amp;Manager...</string>
@@ -1549,6 +1549,8 @@
<include location="../../../images/images.qrc"/>
<include location="../../../images/images.qrc"/>
<include location="../../../images/images.qrc"/>
<include location="../../../images/images.qrc"/>
<include location="../../../images/images.qrc"/>
</resources>
<connections/>
</ui>
@@ -19,6 +19,10 @@
<property name="windowTitle">
<string>Layout Manager</string>
</property>
<property name="windowIcon">
<iconset resource="../../../images/images.qrc">
<normaloff>:/images/themes/default/mActionLayoutManager.svg</normaloff>:/images/themes/default/mActionLayoutManager.svg</iconset>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QListView" name="mLayoutListView">
@@ -165,7 +169,37 @@
<tabstop>mTemplatesUserDirBtn</tabstop>
<tabstop>mTemplatesDefaultDirBtn</tabstop>
</tabstops>
<resources/>
<resources>
<include location="../../../images/images.qrc"/>
<include location="../../../images/images.qrc"/>
<include location="../../../images/images.qrc"/>
<include location="../../../images/images.qrc"/>
<include location="../../../images/images.qrc"/>
<include location="../../../images/images.qrc"/>
<include location="../../../images/images.qrc"/>
<include location="../../../images/images.qrc"/>
<include location="../../../images/images.qrc"/>
<include location="../../../images/images.qrc"/>
<include location="../../../images/images.qrc"/>
<include location="../../../images/images.qrc"/>
<include location="../../../images/images.qrc"/>
<include location="../../../images/images.qrc"/>
<include location="../../../images/images.qrc"/>
<include location="../../../images/images.qrc"/>
<include location="../../../images/images.qrc"/>
<include location="../../../images/images.qrc"/>
<include location="../../../images/images.qrc"/>
<include location="../../../images/images.qrc"/>
<include location="../../../images/images.qrc"/>
<include location="../../../images/images.qrc"/>
<include location="../../../images/images.qrc"/>
<include location="../../../images/images.qrc"/>
<include location="../../../images/images.qrc"/>
<include location="../../../images/images.qrc"/>
<include location="../../../images/images.qrc"/>
<include location="../../../images/images.qrc"/>
<include location="../../../images/images.qrc"/>
</resources>
<connections>
<connection>
<sender>mButtonBox</sender>
@@ -6,7 +6,7 @@
<rect>
<x>0</x>
<y>0</y>
<width>1018</width>
<width>1030</width>
<height>506</height>
</rect>
</property>
@@ -16,8 +16,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>1018</width>
<height>18</height>
<width>1030</width>
<height>25</height>
</rect>
</property>
<property name="toolTip">
@@ -2923,7 +2923,7 @@ Acts on currently active editable layer</string>
<action name="mActionShowLayoutManager">
<property name="icon">
<iconset resource="../../images/images.qrc">
<normaloff>:/images/themes/default/mActionComposerManager.svg</normaloff>:/images/themes/default/mActionComposerManager.svg</iconset>
<normaloff>:/images/themes/default/mActionLayoutManager.svg</normaloff>:/images/themes/default/mActionLayoutManager.svg</iconset>
</property>
<property name="text">
<string>Layout Manager…</string>
@@ -2935,7 +2935,7 @@ Acts on currently active editable layer</string>
<action name="mActionNewPrintLayout">
<property name="icon">
<iconset resource="../../images/images.qrc">
<normaloff>:/images/themes/default/mActionNewComposer.svg</normaloff>:/images/themes/default/mActionNewComposer.svg</iconset>
<normaloff>:/images/themes/default/mActionNewLayout.svg</normaloff>:/images/themes/default/mActionNewLayout.svg</iconset>
</property>
<property name="text">
<string>New &amp;Print Layout</string>
@@ -2950,7 +2950,7 @@ Acts on currently active editable layer</string>
<action name="mActionNewReport">
<property name="icon">
<iconset resource="../../images/images.qrc">
<normaloff>:/images/themes/default/mActionNewComposer.svg</normaloff>:/images/themes/default/mActionNewComposer.svg</iconset>
<normaloff>:/images/themes/default/mActionNewReport.svg</normaloff>:/images/themes/default/mActionNewReport.svg</iconset>
</property>
<property name="text">
<string>New &amp;Report</string>
@@ -2989,6 +2989,7 @@ Acts on currently active editable layer</string>
<include location="../../images/images.qrc"/>
<include location="../../images/images.qrc"/>
<include location="../../images/images.qrc"/>
<include location="../../images/images.qrc"/>
</resources>
<connections/>
</ui>

0 comments on commit 08b75ec

Please sign in to comment.
You can’t perform that action at this time.