Skip to content

Commit

Permalink
Place labels next to their corresponding options in North Arrow decor…
Browse files Browse the repository at this point in the history 
…ation

The "placement" and "Margin from edge" labels are currently inverted
Also fix tabstops
  • Loading branch information
@DelazJ @nyalldawson
DelazJ authored and nyalldawson committed Jun 19, 2018
1 parent db55088 commit 9b22066
Showing 1 changed file with 16 additions and 21 deletions.
37 changes: 16 additions & 21 deletions src/ui/qgsdecorationnortharrowdialog.ui
View file
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand Down Expand Up @@ -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/>
Expand Down

0 comments on commit 9b22066

Please sign in to comment.