Skip to content

Commit 68ee969

Browse files
committedFeb 26, 2018
fix bad merge
1 parent a6eb520 commit 68ee969

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed
 

‎src/ui/qgisapp.ui

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -643,12 +643,12 @@
643643
<addaction name="mActionNewSpatiaLiteLayer"/>
644644
<addaction name="mActionNewMemoryLayer"/>
645645
</widget>
646-
<widget class="QToolBar" name="mRegularShapeDigitizeToolBar">
646+
<widget class="QToolBar" name="mShapeDigitizeToolBar">
647647
<property name="windowTitle">
648-
<string>Regular Shape Digitizing Toolbar</string>
648+
<string>Shape Digitizing Toolbar</string>
649649
</property>
650650
<property name="toolTip">
651-
<string>Regular Shape Digitizing Toolbar</string>
651+
<string>Shape Digitizing Toolbar</string>
652652
</property>
653653
<attribute name="toolBarArea">
654654
<enum>TopToolBarArea</enum>
@@ -741,7 +741,7 @@
741741
<action name="mActionExit">
742742
<property name="icon">
743743
<iconset resource="../../images/images.qrc">
744-
<normaloff>:/images/themes/default/mActionFileExit.png</normaloff>:/images/themes/default/mActionFileExit.png</iconset>
744+
<normaloff>:/images/themes/default/mActionFileExit.svg</normaloff>:/images/themes/default/mActionFileExit.svg</iconset>
745745
</property>
746746
<property name="text">
747747
<string>Exit QGIS</string>
@@ -997,7 +997,7 @@
997997
</property>
998998
<property name="icon">
999999
<iconset resource="../../images/images.qrc">
1000-
<normaloff>:/images/themes/default/mActionMoveVertex.png</normaloff>:/images/themes/default/mActionMoveVertex.png</iconset>
1000+
<normaloff>:/images/themes/default/mActionMoveVertex.svg</normaloff>:/images/themes/default/mActionMoveVertex.svg</iconset>
10011001
</property>
10021002
<property name="text">
10031003
<string>Offset Point Symbol</string>
@@ -1649,7 +1649,7 @@
16491649
<action name="mActionProjectProperties">
16501650
<property name="icon">
16511651
<iconset resource="../../images/images.qrc">
1652-
<normaloff>:/images/themes/default/mActionProjectProperties.png</normaloff>:/images/themes/default/mActionProjectProperties.png</iconset>
1652+
<normaloff>:/images/themes/default/mActionProjectProperties.svg</normaloff>:/images/themes/default/mActionProjectProperties.svg</iconset>
16531653
</property>
16541654
<property name="text">
16551655
<string>&amp;Project Properties...</string>
@@ -1904,7 +1904,7 @@ Ctrl (Cmd) increments by 15 deg.</string>
19041904
<action name="mActionDecorationNorthArrow">
19051905
<property name="icon">
19061906
<iconset resource="../../images/images.qrc">
1907-
<normaloff>:/images/themes/default/north_arrow.png</normaloff>:/images/themes/default/north_arrow.png</iconset>
1907+
<normaloff>:/images/themes/default/north_arrow.svg</normaloff>:/images/themes/default/north_arrow.svg</iconset>
19081908
</property>
19091909
<property name="text">
19101910
<string>&amp;North Arrow…</string>

0 commit comments

Comments
 (0)
Please sign in to comment.