Skip to content

Commit d6637c5

Browse files
nyalldawsonnyalldawson
committedMay 3, 2020
Request ui changes
·
ltr-3_40final-3_14_0
1 parent d0ca4f3 commit d6637c5

File tree

1 file changed

+68
-54
lines changed

1 file changed

+68
-54
lines changed
 

‎src/ui/qgstextformatwidgetbase.ui

Lines changed: 68 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
<rect>
77
<x>0</x>
88
<y>0</y>
9-
<width>612</width>
10-
<height>589</height>
9+
<width>521</width>
10+
<height>650</height>
1111
</rect>
1212
</property>
1313
<property name="windowTitle">
@@ -172,7 +172,7 @@
172172
<rect>
173173
<x>0</x>
174174
<y>0</y>
175-
<width>590</width>
175+
<width>499</width>
176176
<height>300</height>
177177
</rect>
178178
</property>
@@ -4000,8 +4000,8 @@ font-style: italic;</string>
40004000
<rect>
40014001
<x>0</x>
40024002
<y>0</y>
4003-
<width>833</width>
4004-
<height>368</height>
4003+
<width>159</width>
4004+
<height>211</height>
40054005
</rect>
40064006
</property>
40074007
<layout class="QGridLayout" name="gridLayout_46">
@@ -4150,8 +4150,8 @@ font-style: italic;</string>
41504150
<rect>
41514151
<x>0</x>
41524152
<y>0</y>
4153-
<width>562</width>
4154-
<height>1266</height>
4153+
<width>471</width>
4154+
<height>1297</height>
41554155
</rect>
41564156
</property>
41574157
<layout class="QVBoxLayout" name="verticalLayout_11">
@@ -4321,33 +4321,6 @@ font-style: italic;</string>
43214321
</widget>
43224322
<widget class="QWidget" name="pagePolygon">
43234323
<layout class="QGridLayout" name="gridLayout_18">
4324-
<item row="1" column="1">
4325-
<widget class="QRadioButton" name="radPolygonFree">
4326-
<property name="text">
4327-
<string>Free (angled)</string>
4328-
</property>
4329-
</widget>
4330-
</item>
4331-
<item row="0" column="2">
4332-
<widget class="QRadioButton" name="radPolygonOutside">
4333-
<property name="text">
4334-
<string>Outside polygons</string>
4335-
</property>
4336-
</widget>
4337-
</item>
4338-
<item row="2" column="1">
4339-
<widget class="QRadioButton" name="radPolygonPerimeterCurved">
4340-
<property name="sizePolicy">
4341-
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
4342-
<horstretch>0</horstretch>
4343-
<verstretch>0</verstretch>
4344-
</sizepolicy>
4345-
</property>
4346-
<property name="text">
4347-
<string>Using perimeter (curved)</string>
4348-
</property>
4349-
</widget>
4350-
</item>
43514324
<item row="0" column="0">
43524325
<widget class="QRadioButton" name="radOverCentroid">
43534326
<property name="sizePolicy">
@@ -4364,6 +4337,20 @@ font-style: italic;</string>
43644337
</property>
43654338
</widget>
43664339
</item>
4340+
<item row="0" column="1">
4341+
<widget class="QRadioButton" name="radPolygonHorizontal">
4342+
<property name="text">
4343+
<string>Horizontal</string>
4344+
</property>
4345+
</widget>
4346+
</item>
4347+
<item row="1" column="1">
4348+
<widget class="QRadioButton" name="radPolygonFree">
4349+
<property name="text">
4350+
<string>Free (angled)</string>
4351+
</property>
4352+
</widget>
4353+
</item>
43674354
<item row="1" column="0">
43684355
<widget class="QRadioButton" name="radAroundCentroid">
43694356
<property name="sizePolicy">
@@ -4390,13 +4377,6 @@ font-style: italic;</string>
43904377
</property>
43914378
</widget>
43924379
</item>
4393-
<item row="0" column="1">
4394-
<widget class="QRadioButton" name="radPolygonHorizontal">
4395-
<property name="text">
4396-
<string>Horizontal</string>
4397-
</property>
4398-
</widget>
4399-
</item>
44004380
<item row="1" column="3">
44014381
<spacer name="horizontalSpacer_26">
44024382
<property name="orientation">
@@ -4410,6 +4390,26 @@ font-style: italic;</string>
44104390
</property>
44114391
</spacer>
44124392
</item>
4393+
<item row="2" column="1">
4394+
<widget class="QRadioButton" name="radPolygonPerimeterCurved">
4395+
<property name="sizePolicy">
4396+
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
4397+
<horstretch>0</horstretch>
4398+
<verstretch>0</verstretch>
4399+
</sizepolicy>
4400+
</property>
4401+
<property name="text">
4402+
<string>Using perimeter (curved)</string>
4403+
</property>
4404+
</widget>
4405+
</item>
4406+
<item row="3" column="0">
4407+
<widget class="QRadioButton" name="radPolygonOutside">
4408+
<property name="text">
4409+
<string>Outside polygons</string>
4410+
</property>
4411+
</widget>
4412+
</item>
44134413
</layout>
44144414
</widget>
44154415
</widget>
@@ -4548,19 +4548,6 @@ font-style: italic;</string>
45484548
<number>0</number>
45494549
</property>
45504550
<item row="0" column="0">
4551-
<widget class="QLabel" name="label_14">
4552-
<property name="sizePolicy">
4553-
<sizepolicy hsizetype="Maximum" vsizetype="Preferred">
4554-
<horstretch>0</horstretch>
4555-
<verstretch>0</verstretch>
4556-
</sizepolicy>
4557-
</property>
4558-
<property name="text">
4559-
<string>Allowed positions</string>
4560-
</property>
4561-
</widget>
4562-
</item>
4563-
<item row="0" column="1">
45644551
<layout class="QHBoxLayout" name="horizontalLayout_11">
45654552
<item>
45664553
<widget class="QCheckBox" name="mCheckAllowLabelsOutsidePolygons">
@@ -7045,6 +7032,7 @@ font-style: italic;</string>
70457032
<tabstop>radPolygonFree</tabstop>
70467033
<tabstop>radPolygonPerimeter</tabstop>
70477034
<tabstop>radPolygonPerimeterCurved</tabstop>
7035+
<tabstop>radPolygonOutside</tabstop>
70487036
<tabstop>radPredefinedOrder</tabstop>
70497037
<tabstop>radAroundPoint</tabstop>
70507038
<tabstop>radOverPoint</tabstop>
@@ -7055,6 +7043,8 @@ font-style: italic;</string>
70557043
<tabstop>chkLineOn</tabstop>
70567044
<tabstop>chkLineBelow</tabstop>
70577045
<tabstop>chkLineOrientationDependent</tabstop>
7046+
<tabstop>mCheckAllowLabelsOutsidePolygons</tabstop>
7047+
<tabstop>mAllowOutsidePolygonsDDBtn</tabstop>
70587048
<tabstop>mLinePlacementFlagsDDBtn</tabstop>
70597049
<tabstop>mCentroidRadioVisible</tabstop>
70607050
<tabstop>mCentroidRadioWhole</tabstop>
@@ -7139,6 +7129,30 @@ font-style: italic;</string>
71397129
<tabstop>mFontLetterSpacingDDBtn</tabstop>
71407130
<tabstop>mCheckBoxSubstituteText</tabstop>
71417131
<tabstop>mFontWordSpacingDDBtn</tabstop>
7132+
<tabstop>mTextOrientationComboBox</tabstop>
7133+
<tabstop>mTextOrientationDDBtn</tabstop>
7134+
<tabstop>mKerningCheckBox</tabstop>
7135+
<tabstop>mBufferDrawDDBtn</tabstop>
7136+
<tabstop>mBufferDrawChkBx</tabstop>
7137+
<tabstop>scrollArea_71</tabstop>
7138+
<tabstop>mMaskJoinStyleComboBox</tabstop>
7139+
<tabstop>mMaskOpacityDDBtn</tabstop>
7140+
<tabstop>mMaskBufferUnitWidget</tabstop>
7141+
<tabstop>mMaskJoinStyleDDBtn</tabstop>
7142+
<tabstop>mMaskBufferUnitsDDBtn</tabstop>
7143+
<tabstop>mMaskBufferSizeSpinBox</tabstop>
7144+
<tabstop>mMaskBufferSizeDDBtn</tabstop>
7145+
<tabstop>mMaskOpacityWidget</tabstop>
7146+
<tabstop>scrollArea_6</tabstop>
7147+
<tabstop>mCalloutsDrawCheckBox</tabstop>
7148+
<tabstop>mCalloutDrawDDBtn</tabstop>
7149+
<tabstop>mCalloutStyleComboBox</tabstop>
7150+
<tabstop>mOverrunDistanceSpinBox</tabstop>
7151+
<tabstop>mOverrunDistanceDDBtn</tabstop>
7152+
<tabstop>mOverrunDistanceUnitWidget</tabstop>
7153+
<tabstop>mChkNoObstacle</tabstop>
7154+
<tabstop>mIsObstacleDDBtn</tabstop>
7155+
<tabstop>mObstacleSettingsButton</tabstop>
71427156
</tabstops>
71437157
<resources>
71447158
<include location="../../images/images.qrc"/>

0 commit comments

Comments
 (0)
Please sign in to comment.