Skip to content
Permalink
Browse files

fix bad merge

  • Loading branch information
3nids committed Feb 26, 2018
1 parent a6eb520 commit 68ee969b30f839c41065a8585cc0057cbcac9d0c
Showing with 7 additions and 7 deletions.
  1. +7 −7 src/ui/qgisapp.ui
@@ -643,12 +643,12 @@
<addaction name="mActionNewSpatiaLiteLayer"/>
<addaction name="mActionNewMemoryLayer"/>
</widget>
<widget class="QToolBar" name="mRegularShapeDigitizeToolBar">
<widget class="QToolBar" name="mShapeDigitizeToolBar">
<property name="windowTitle">
<string>Regular Shape Digitizing Toolbar</string>
<string>Shape Digitizing Toolbar</string>
</property>
<property name="toolTip">
<string>Regular Shape Digitizing Toolbar</string>
<string>Shape Digitizing Toolbar</string>
</property>
<attribute name="toolBarArea">
<enum>TopToolBarArea</enum>
@@ -741,7 +741,7 @@
<action name="mActionExit">
<property name="icon">
<iconset resource="../../images/images.qrc">
<normaloff>:/images/themes/default/mActionFileExit.png</normaloff>:/images/themes/default/mActionFileExit.png</iconset>
<normaloff>:/images/themes/default/mActionFileExit.svg</normaloff>:/images/themes/default/mActionFileExit.svg</iconset>
</property>
<property name="text">
<string>Exit QGIS</string>
@@ -997,7 +997,7 @@
</property>
<property name="icon">
<iconset resource="../../images/images.qrc">
<normaloff>:/images/themes/default/mActionMoveVertex.png</normaloff>:/images/themes/default/mActionMoveVertex.png</iconset>
<normaloff>:/images/themes/default/mActionMoveVertex.svg</normaloff>:/images/themes/default/mActionMoveVertex.svg</iconset>
</property>
<property name="text">
<string>Offset Point Symbol</string>
@@ -1649,7 +1649,7 @@
<action name="mActionProjectProperties">
<property name="icon">
<iconset resource="../../images/images.qrc">
<normaloff>:/images/themes/default/mActionProjectProperties.png</normaloff>:/images/themes/default/mActionProjectProperties.png</iconset>
<normaloff>:/images/themes/default/mActionProjectProperties.svg</normaloff>:/images/themes/default/mActionProjectProperties.svg</iconset>
</property>
<property name="text">
<string>&amp;Project Properties...</string>
@@ -1904,7 +1904,7 @@ Ctrl (Cmd) increments by 15 deg.</string>
<action name="mActionDecorationNorthArrow">
<property name="icon">
<iconset resource="../../images/images.qrc">
<normaloff>:/images/themes/default/north_arrow.png</normaloff>:/images/themes/default/north_arrow.png</iconset>
<normaloff>:/images/themes/default/north_arrow.svg</normaloff>:/images/themes/default/north_arrow.svg</iconset>
</property>
<property name="text">
<string>&amp;North Arrow…</string>

0 comments on commit 68ee969

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