Skip to content
Permalink
Browse files

Place labels next to their corresponding options in North Arrow decor…

…ation

The "placement" and "Margin from edge" labels are currently inverted
Also fix tabstops
  • Loading branch information
DelazJ authored and nyalldawson committed Jun 19, 2018
1 parent db55088 commit 9b220664b0918d003044eba7181dfc459a7d6f7d
Showing with 16 additions and 21 deletions.
  1. +16 −21 src/ui/qgsdecorationnortharrowdialog.ui
@@ -6,16 +6,17 @@
<rect>
<x>0</x>
<y>0</y>
<width>560</width>
<height>234</height>
<width>578</width>
<height>259</height>
</rect>
</property>
<property name="windowTitle">
<string>North Arrow Decoration</string>
</property>
<property name="windowIcon">
<iconset>
<normaloff>.</normaloff>.</iconset>
<normaloff/>
</iconset>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
@@ -74,16 +75,7 @@
</item>
<item row="2" column="2" colspan="3">
<layout class="QHBoxLayout" name="horizontalLayout_26">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<property name="margin">
<number>0</number>
</property>
<item>
@@ -237,7 +229,7 @@
</layout>
</item>
<item row="3" column="1">
<widget class="QLabel" name="textLabel6">
<widget class="QLabel" name="angleLabel">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Minimum">
<horstretch>0</horstretch>
@@ -258,8 +250,8 @@
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="QLabel" name="textLabel8">
<item row="5" column="1">
<widget class="QLabel" name="placementLabel">
<property name="text">
<string>Placement</string>
</property>
@@ -268,7 +260,7 @@
</property>
</widget>
</item>
<item row="5" column="1">
<item row="4" column="1">
<widget class="QLabel" name="lblMargin">
<property name="minimumSize">
<size>
@@ -429,16 +421,19 @@
</customwidgets>
<tabstops>
<tabstop>grpEnable</tabstop>
<tabstop>pbnChangeColor</tabstop>
<tabstop>pbnChangeOutlineColor</tabstop>
<tabstop>spinSize</tabstop>
<tabstop>mSvgPathLineEdit</tabstop>
<tabstop>mSvgSelectorBtn</tabstop>
<tabstop>pbnChangeColor</tabstop>
<tabstop>sliderRotation</tabstop>
<tabstop>spinAngle</tabstop>
<tabstop>cboPlacement</tabstop>
<tabstop>spinVertical</tabstop>
<tabstop>cboxAutomatic</tabstop>
<tabstop>spinHorizontal</tabstop>
<tabstop>spinVertical</tabstop>
<tabstop>wgtUnitSelection</tabstop>
<tabstop>cboxAutomatic</tabstop>
<tabstop>cboPlacement</tabstop>
<tabstop>buttonBox</tabstop>
</tabstops>
<resources/>
<connections/>

0 comments on commit 9b22066

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