Skip to content
Permalink
Browse files
Reorganize linear callouts dialog
- Group callout properties of the same type (rendering vs relation with feature)
- Fix tab order
  • Loading branch information
DelazJ authored and nyalldawson committed Jul 22, 2021
1 parent d652046 commit 751ca17db2a64c92e7248da021a9e0c265e3f88e
Showing with 38 additions and 38 deletions.
  1. +19 −19 src/ui/callouts/widget_curvedlinecallout.ui
  2. +19 −19 src/ui/callouts/widget_simplelinecallout.ui
@@ -34,7 +34,7 @@
<property name="topMargin">
<number>0</number>
</property>
<item row="7" column="3">
<item row="8" column="3">
<widget class="QgsPropertyOverrideButton" name="mAnchorPointDDBtn">
<property name="text">
<string>…</string>
@@ -48,21 +48,21 @@
</property>
</widget>
</item>
<item row="4" column="0">
<item row="7" column="0">
<widget class="QLabel" name="mOffsetFromAnchorLbl">
<property name="text">
<string>Offset from feature</string>
</property>
</widget>
</item>
<item row="4" column="3">
<item row="7" column="3">
<widget class="QgsPropertyOverrideButton" name="mOffsetFromAnchorDDBtn">
<property name="text">
<string>…</string>
</property>
</widget>
</item>
<item row="4" column="2">
<item row="7" column="2">
<widget class="QgsUnitSelectionWidget" name="mOffsetFromAnchorUnitWidget" native="true">
<property name="minimumSize">
<size>
@@ -92,14 +92,14 @@
</property>
</widget>
</item>
<item row="8" column="0">
<item row="5" column="0">
<widget class="QLabel" name="mAnchorPointLbl_2">
<property name="text">
<string>Label anchor point</string>
</property>
</widget>
</item>
<item row="5" column="1">
<item row="4" column="1">
<widget class="QgsDoubleSpinBox" name="mOffsetFromLabelSpin">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
@@ -145,14 +145,14 @@
</property>
</widget>
</item>
<item row="5" column="0">
<item row="4" column="0">
<widget class="QLabel" name="mOffsetFromLabelLbl">
<property name="text">
<string>Offset from label area</string>
</property>
</widget>
</item>
<item row="5" column="3">
<item row="4" column="3">
<widget class="QgsPropertyOverrideButton" name="mOffsetFromLabelDDBtn">
<property name="text">
<string>…</string>
@@ -229,7 +229,7 @@
</property>
</widget>
</item>
<item row="4" column="1">
<item row="7" column="1">
<widget class="QgsDoubleSpinBox" name="mOffsetFromAnchorSpin">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
@@ -254,20 +254,20 @@
</property>
</widget>
</item>
<item row="7" column="1" colspan="2">
<item row="8" column="1" colspan="2">
<widget class="QComboBox" name="mAnchorPointComboBox"/>
</item>
<item row="8" column="3">
<item row="5" column="3">
<widget class="QgsPropertyOverrideButton" name="mLabelAnchorPointDDBtn">
<property name="text">
<string>…</string>
</property>
</widget>
</item>
<item row="8" column="1" colspan="2">
<item row="5" column="1" colspan="2">
<widget class="QComboBox" name="mLabelAnchorPointComboBox"/>
</item>
<item row="5" column="2">
<item row="4" column="2">
<widget class="QgsUnitSelectionWidget" name="mOffsetFromLabelUnitWidget" native="true">
<property name="minimumSize">
<size>
@@ -305,7 +305,7 @@
</property>
</widget>
</item>
<item row="7" column="0">
<item row="8" column="0">
<widget class="QLabel" name="mAnchorPointLbl">
<property name="text">
<string>Anchor point</string>
@@ -559,18 +559,18 @@
<tabstop>mMinCalloutLengthSpin</tabstop>
<tabstop>mMinCalloutWidthUnitWidget</tabstop>
<tabstop>mMinCalloutLengthDDBtn</tabstop>
<tabstop>mOffsetFromAnchorSpin</tabstop>
<tabstop>mOffsetFromAnchorUnitWidget</tabstop>
<tabstop>mOffsetFromAnchorDDBtn</tabstop>
<tabstop>mOffsetFromLabelSpin</tabstop>
<tabstop>mOffsetFromLabelUnitWidget</tabstop>
<tabstop>mOffsetFromLabelDDBtn</tabstop>
<tabstop>mLabelAnchorPointComboBox</tabstop>
<tabstop>mLabelAnchorPointDDBtn</tabstop>
<tabstop>mDrawToAllPartsCheck</tabstop>
<tabstop>mDrawToAllPartsDDBtn</tabstop>
<tabstop>mOffsetFromAnchorSpin</tabstop>
<tabstop>mOffsetFromAnchorUnitWidget</tabstop>
<tabstop>mOffsetFromAnchorDDBtn</tabstop>
<tabstop>mAnchorPointComboBox</tabstop>
<tabstop>mAnchorPointDDBtn</tabstop>
<tabstop>mLabelAnchorPointComboBox</tabstop>
<tabstop>mLabelAnchorPointDDBtn</tabstop>
<tabstop>mCalloutBlendComboBox</tabstop>
<tabstop>mCalloutBlendModeDDBtn</tabstop>
<tabstop>mOriginXDDBtn</tabstop>
@@ -48,7 +48,7 @@
</property>
</widget>
</item>
<item row="3" column="1">
<item row="2" column="1">
<widget class="QgsDoubleSpinBox" name="mOffsetFromLabelSpin">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
@@ -73,7 +73,7 @@
</property>
</widget>
</item>
<item row="2" column="0">
<item row="5" column="0">
<widget class="QLabel" name="mOffsetFromAnchorLbl">
<property name="text">
<string>Offset from feature</string>
@@ -93,14 +93,14 @@
</property>
</widget>
</item>
<item row="2" column="3">
<item row="5" column="3">
<widget class="QgsPropertyOverrideButton" name="mOffsetFromAnchorDDBtn">
<property name="text">
<string>…</string>
</property>
</widget>
</item>
<item row="2" column="2">
<item row="5" column="2">
<widget class="QgsUnitSelectionWidget" name="mOffsetFromAnchorUnitWidget" native="true">
<property name="minimumSize">
<size>
@@ -113,7 +113,7 @@
</property>
</widget>
</item>
<item row="3" column="3">
<item row="2" column="3">
<widget class="QgsPropertyOverrideButton" name="mOffsetFromLabelDDBtn">
<property name="text">
<string>…</string>
@@ -140,24 +140,24 @@
</property>
</widget>
</item>
<item row="6" column="1" colspan="2">
<item row="3" column="1" colspan="2">
<widget class="QComboBox" name="mLabelAnchorPointComboBox"/>
</item>
<item row="5" column="3">
<item row="6" column="3">
<widget class="QgsPropertyOverrideButton" name="mAnchorPointDDBtn">
<property name="text">
<string>…</string>
</property>
</widget>
</item>
<item row="3" column="0">
<item row="2" column="0">
<widget class="QLabel" name="mOffsetFromLabelLbl">
<property name="text">
<string>Offset from label area</string>
</property>
</widget>
</item>
<item row="2" column="1">
<item row="5" column="1">
<widget class="QgsDoubleSpinBox" name="mOffsetFromAnchorSpin">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
@@ -199,14 +199,14 @@
</property>
</widget>
</item>
<item row="6" column="0">
<item row="3" column="0">
<widget class="QLabel" name="mAnchorPointLbl_2">
<property name="text">
<string>Label anchor point</string>
</property>
</widget>
</item>
<item row="3" column="2">
<item row="2" column="2">
<widget class="QgsUnitSelectionWidget" name="mOffsetFromLabelUnitWidget" native="true">
<property name="minimumSize">
<size>
@@ -251,7 +251,7 @@
</property>
</widget>
</item>
<item row="5" column="1" colspan="2">
<item row="6" column="1" colspan="2">
<widget class="QComboBox" name="mAnchorPointComboBox"/>
</item>
<item row="1" column="0">
@@ -261,14 +261,14 @@
</property>
</widget>
</item>
<item row="6" column="3">
<item row="3" column="3">
<widget class="QgsPropertyOverrideButton" name="mLabelAnchorPointDDBtn">
<property name="text">
<string>…</string>
</property>
</widget>
</item>
<item row="5" column="0">
<item row="6" column="0">
<widget class="QLabel" name="mAnchorPointLbl">
<property name="text">
<string>Anchor point</string>
@@ -492,18 +492,18 @@
<tabstop>mMinCalloutLengthSpin</tabstop>
<tabstop>mMinCalloutWidthUnitWidget</tabstop>
<tabstop>mMinCalloutLengthDDBtn</tabstop>
<tabstop>mOffsetFromAnchorSpin</tabstop>
<tabstop>mOffsetFromAnchorUnitWidget</tabstop>
<tabstop>mOffsetFromAnchorDDBtn</tabstop>
<tabstop>mOffsetFromLabelSpin</tabstop>
<tabstop>mOffsetFromLabelUnitWidget</tabstop>
<tabstop>mOffsetFromLabelDDBtn</tabstop>
<tabstop>mLabelAnchorPointComboBox</tabstop>
<tabstop>mLabelAnchorPointDDBtn</tabstop>
<tabstop>mDrawToAllPartsCheck</tabstop>
<tabstop>mDrawToAllPartsDDBtn</tabstop>
<tabstop>mOffsetFromAnchorSpin</tabstop>
<tabstop>mOffsetFromAnchorUnitWidget</tabstop>
<tabstop>mOffsetFromAnchorDDBtn</tabstop>
<tabstop>mAnchorPointComboBox</tabstop>
<tabstop>mAnchorPointDDBtn</tabstop>
<tabstop>mLabelAnchorPointComboBox</tabstop>
<tabstop>mLabelAnchorPointDDBtn</tabstop>
<tabstop>mCalloutBlendComboBox</tabstop>
<tabstop>mCalloutBlendModeDDBtn</tabstop>
<tabstop>mOriginXDDBtn</tabstop>

0 comments on commit 751ca17

Please sign in to comment.