|
6 | 6 | <rect>
|
7 | 7 | <x>0</x>
|
8 | 8 | <y>0</y>
|
9 |
| - <width>326</width> |
| 9 | + <width>174</width> |
10 | 10 | <height>424</height>
|
11 | 11 | </rect>
|
12 | 12 | </property>
|
|
35 | 35 | <item>
|
36 | 36 | <widget class="QgsCollapsibleGroupBoxBasic" name="qgsCollapsibleGroupBoxBasic">
|
37 | 37 | <property name="title">
|
38 |
| - <string>Label Settings</string> |
| 38 | + <string>Placement</string> |
39 | 39 | </property>
|
40 | 40 | <layout class="QGridLayout" name="gridLayout_6" columnstretch="0,0,0,0">
|
41 |
| - <item row="3" column="0" colspan="2"> |
| 41 | + <item row="1" column="0" colspan="4"> |
42 | 42 | <widget class="QLabel" name="label_10">
|
43 | 43 | <property name="text">
|
44 |
| - <string>of map edges</string> |
| 44 | + <string>Map labels will be placed at least this far away from the edges of the map item.</string> |
| 45 | + </property> |
| 46 | + <property name="scaledContents"> |
| 47 | + <bool>false</bool> |
45 | 48 | </property>
|
46 | 49 | <property name="wordWrap">
|
47 | 50 | <bool>true</bool>
|
48 | 51 | </property>
|
49 | 52 | </widget>
|
50 | 53 | </item>
|
| 54 | + <item row="2" column="2"> |
| 55 | + <widget class="QgsLayoutUnitsComboBox" name="mLabelBoundaryUnitsCombo"/> |
| 56 | + </item> |
51 | 57 | <item row="2" column="0" colspan="2">
|
52 | 58 | <widget class="QgsDoubleSpinBox" name="mLabelBoundarySpinBox">
|
53 | 59 | <property name="prefix">
|
|
67 | 73 | </property>
|
68 | 74 | </widget>
|
69 | 75 | </item>
|
70 |
| - <item row="1" column="0" colspan="2"> |
| 76 | + <item row="0" column="0" colspan="4"> |
71 | 77 | <widget class="QLabel" name="label_8">
|
72 | 78 | <property name="text">
|
73 |
| - <string>Avoid placing labels within</string> |
| 79 | + <string><b>Margin from map edges</b></string> |
74 | 80 | </property>
|
75 | 81 | <property name="wordWrap">
|
76 | 82 | <bool>true</bool>
|
77 | 83 | </property>
|
78 | 84 | </widget>
|
79 | 85 | </item>
|
80 |
| - <item row="2" column="2"> |
81 |
| - <widget class="QgsLayoutUnitsComboBox" name="mLabelBoundaryUnitsCombo"/> |
82 |
| - </item> |
83 | 86 | <item row="2" column="3">
|
84 | 87 | <widget class="QgsPropertyOverrideButton" name="mLabelMarginDDBtn">
|
85 | 88 | <property name="text">
|
|
107 | 110 | </widget>
|
108 | 111 | <layoutdefault spacing="6" margin="11"/>
|
109 | 112 | <customwidgets>
|
110 |
| - <customwidget> |
111 |
| - <class>QgsCollapsibleGroupBoxBasic</class> |
112 |
| - <extends>QGroupBox</extends> |
113 |
| - <header>qgscollapsiblegroupbox.h</header> |
114 |
| - <container>1</container> |
115 |
| - </customwidget> |
116 | 113 | <customwidget>
|
117 | 114 | <class>QgsDoubleSpinBox</class>
|
118 | 115 | <extends>QDoubleSpinBox</extends>
|
|
123 | 120 | <extends>QToolButton</extends>
|
124 | 121 | <header>qgspropertyoverridebutton.h</header>
|
125 | 122 | </customwidget>
|
| 123 | + <customwidget> |
| 124 | + <class>QgsCollapsibleGroupBoxBasic</class> |
| 125 | + <extends>QGroupBox</extends> |
| 126 | + <header location="global">qgscollapsiblegroupbox.h</header> |
| 127 | + <container>1</container> |
| 128 | + </customwidget> |
126 | 129 | <customwidget>
|
127 | 130 | <class>QgsLayoutUnitsComboBox</class>
|
128 | 131 | <extends>QComboBox</extends>
|
|
0 commit comments