Skip to content
Permalink
Browse files
Reorganize balloon callout dialog
- Group properties of the same type (rendering vs relation with feature)
- Fix indentation, blend mode DD button misalignment
- Fix tab order
- Some Qt Designer fixups
  • Loading branch information
DelazJ authored and nyalldawson committed Jul 22, 2021
1 parent 751ca17 commit 9af76046be368973bde8759fcd898d37ffbf4290
Showing with 38 additions and 33 deletions.
  1. +38 −33 src/ui/callouts/widget_ballooncallout.ui
@@ -27,38 +27,38 @@
<number>0</number>
</property>
<item>
<layout class="QGridLayout" name="gridLayout_45" columnstretch="0,0,0,0,0">
<layout class="QGridLayout" name="gridLayout_45" columnstretch="0,0,0,0">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<item row="5" column="3">
<widget class="QgsPropertyOverrideButton" name="mCalloutBlendModeDDBtn">
<item row="6" column="3">
<widget class="QgsPropertyOverrideButton" name="mCalloutBlendModeDDBtn">
<property name="text">
<string>…</string>
<string>…</string>
</property>
</widget>
</widget>
</item>
<item row="5" column="1" colspan="2">
<widget class="QgsBlendModeComboBox" name="mCalloutBlendComboBox"/>
<item row="6" column="1" colspan="2">
<widget class="QgsBlendModeComboBox" name="mCalloutBlendComboBox" native="true"/>
</item>
<item row="5" column="0">
<item row="6" column="0">
<widget class="QLabel" name="mCalloutBlendModeLbl">
<property name="text">
<string>Blend mode</string>
<string>Blend mode</string>
</property>
</widget>
</widget>
</item>
<item row="4" column="0">
<item row="2" column="0">
<widget class="QLabel" name="mWedgeWidthLbl">
<property name="text">
<string>Wedge width</string>
</property>
</widget>
</item>
<item row="0" column="1" colspan="3">
<item row="0" column="1" colspan="2">
<widget class="QgsSymbolButton" name="mCalloutFillStyleButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
@@ -71,7 +71,7 @@
</property>
</widget>
</item>
<item row="4" column="2" colspan="2">
<item row="2" column="2">
<widget class="QgsUnitSelectionWidget" name="mWedgeWidthUnitWidget" native="true">
<property name="minimumSize">
<size>
@@ -91,14 +91,14 @@
</property>
</widget>
</item>
<item row="1" column="0">
<item row="4" column="0">
<widget class="QLabel" name="mOffsetFromAnchorLbl">
<property name="text">
<string>Offset from feature</string>
</property>
</widget>
</item>
<item row="1" column="1">
<item row="4" column="1">
<widget class="QgsDoubleSpinBox" name="mOffsetFromAnchorSpin">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
@@ -123,14 +123,14 @@
</property>
</widget>
</item>
<item row="1" column="4">
<item row="4" column="3">
<widget class="QgsPropertyOverrideButton" name="mOffsetFromAnchorDDBtn">
<property name="text">
<string>…</string>
</property>
</widget>
</item>
<item row="1" column="2" colspan="2">
<item row="4" column="2">
<widget class="QgsUnitSelectionWidget" name="mOffsetFromAnchorUnitWidget" native="true">
<property name="minimumSize">
<size>
@@ -143,24 +143,24 @@
</property>
</widget>
</item>
<item row="2" column="1" colspan="3">
<item row="5" column="1" colspan="2">
<widget class="QComboBox" name="mAnchorPointComboBox"/>
</item>
<item row="2" column="4">
<item row="5" column="3">
<widget class="QgsPropertyOverrideButton" name="mAnchorPointDDBtn">
<property name="text">
<string>…</string>
</property>
</widget>
</item>
<item row="2" column="0">
<item row="5" column="0">
<widget class="QLabel" name="mAnchorPointLbl">
<property name="text">
<string>Anchor point</string>
</property>
</widget>
</item>
<item row="4" column="1">
<item row="2" column="1">
<widget class="QgsDoubleSpinBox" name="mWedgeWidthSpin">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
@@ -185,21 +185,21 @@
</property>
</widget>
</item>
<item row="4" column="4">
<item row="2" column="3">
<widget class="QgsPropertyOverrideButton" name="mWedgeWidthDDBtn">
<property name="text">
<string>…</string>
</property>
</widget>
</item>
<item row="3" column="0">
<item row="1" column="0">
<widget class="QLabel" name="mCornerRadiusLbl">
<property name="text">
<string>Corner radius</string>
</property>
</widget>
</item>
<item row="3" column="1">
<item row="1" column="1">
<widget class="QgsDoubleSpinBox" name="mCornerRadiusSpin">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
@@ -224,7 +224,7 @@
</property>
</widget>
</item>
<item row="3" column="2" colspan="2">
<item row="1" column="2">
<widget class="QgsUnitSelectionWidget" name="mCornerRadiusUnitWidget" native="true">
<property name="minimumSize">
<size>
@@ -237,7 +237,7 @@
</property>
</widget>
</item>
<item row="3" column="4">
<item row="1" column="3">
<widget class="QgsPropertyOverrideButton" name="mCornerRadiusDDBtn">
<property name="text">
<string>…</string>
@@ -592,16 +592,14 @@
<header>qgsunitselectionwidget.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>QgsBlendModeComboBox</class>
<extends>QWidget</extends>
<header>qgsblendmodecombobox.h</header>
</customwidget>
</customwidgets>
<tabstops>
<tabstop>mCalloutFillStyleButton</tabstop>
<tabstop>mOffsetFromAnchorSpin</tabstop>
<tabstop>mOffsetFromAnchorUnitWidget</tabstop>
<tabstop>mOffsetFromAnchorDDBtn</tabstop>
<tabstop>mAnchorPointComboBox</tabstop>
<tabstop>mAnchorPointDDBtn</tabstop>
<tabstop>mCalloutBlendComboBox</tabstop>
<tabstop>mCalloutBlendModeDDBtn</tabstop>
<tabstop>mCornerRadiusSpin</tabstop>
<tabstop>mCornerRadiusUnitWidget</tabstop>
<tabstop>mCornerRadiusDDBtn</tabstop>
@@ -614,6 +612,13 @@
<tabstop>mSpinBottomMargin</tabstop>
<tabstop>mMarginUnitWidget</tabstop>
<tabstop>mMarginsDDBtn</tabstop>
<tabstop>mOffsetFromAnchorSpin</tabstop>
<tabstop>mOffsetFromAnchorUnitWidget</tabstop>
<tabstop>mOffsetFromAnchorDDBtn</tabstop>
<tabstop>mAnchorPointComboBox</tabstop>
<tabstop>mAnchorPointDDBtn</tabstop>
<tabstop>mCalloutBlendComboBox</tabstop>
<tabstop>mCalloutBlendModeDDBtn</tabstop>
<tabstop>mDestXDDBtn</tabstop>
<tabstop>mDestYDDBtn</tabstop>
</tabstops>

0 comments on commit 9af7604

Please sign in to comment.