Skip to content

Commit c00fbde

Browse files
DelazJDelazJ
committedAug 5, 2017
[needs-docs] Move diagram z-index option to a renamed Rendering tab
Trying to standardize dialog with the Labels tab: * Rename the Appearance tab to Rendering * Move the Diagram z-index option from the placement tab to rendering; i believe it's more about visibility than x-y placement Also Improve diagram and label z-index tooltip
·
ltr-3_40final-3_0_0
1 parent 0d092f9 commit c00fbde

File tree

2 files changed

+71
-71
lines changed

2 files changed

+71
-71
lines changed
 

‎src/ui/qgsdiagrampropertiesbase.ui

Lines changed: 70 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@
185185
</item>
186186
<item>
187187
<property name="text">
188-
<string>Appearance</string>
188+
<string>Rendering</string>
189189
</property>
190190
<property name="toolTip">
191191
<string>Rendering</string>
@@ -267,7 +267,7 @@
267267
<item>
268268
<widget class="QStackedWidget" name="mDiagramStackedWidget">
269269
<property name="currentIndex">
270-
<number>1</number>
270+
<number>0</number>
271271
</property>
272272
<widget class="QWidget" name="mDiagramPage_Attributes">
273273
<layout class="QVBoxLayout" name="verticalLayout_9">
@@ -303,8 +303,8 @@
303303
<rect>
304304
<x>0</x>
305305
<y>0</y>
306-
<width>640</width>
307-
<height>428</height>
306+
<width>642</width>
307+
<height>421</height>
308308
</rect>
309309
</property>
310310
<layout class="QHBoxLayout" name="horizontalLayout_6">
@@ -522,7 +522,7 @@
522522
<string notr="true">text-decoration: underline;</string>
523523
</property>
524524
<property name="text">
525-
<string>Appearance</string>
525+
<string>Rendering</string>
526526
</property>
527527
</widget>
528528
</item>
@@ -539,8 +539,8 @@
539539
<rect>
540540
<x>0</x>
541541
<y>0</y>
542-
<width>640</width>
543-
<height>428</height>
542+
<width>626</width>
543+
<height>465</height>
544544
</rect>
545545
</property>
546546
<layout class="QVBoxLayout" name="verticalLayout" stretch="0,0,0,1">
@@ -859,17 +859,7 @@
859859
<property name="bottomMargin">
860860
<number>0</number>
861861
</property>
862-
<item row="0" column="0">
863-
<widget class="QCheckBox" name="mShowAllCheckBox">
864-
<property name="text">
865-
<string>Show all diagrams</string>
866-
</property>
867-
<property name="checked">
868-
<bool>true</bool>
869-
</property>
870-
</widget>
871-
</item>
872-
<item row="1" column="0">
862+
<item row="2" column="0">
873863
<widget class="QgsCollapsibleGroupBox" name="mScaleVisibilityGroupBox">
874864
<property name="title">
875865
<string>Scale dependent visibility</string>
@@ -890,6 +880,60 @@
890880
</layout>
891881
</widget>
892882
</item>
883+
<item row="1" column="0">
884+
<widget class="QCheckBox" name="mShowAllCheckBox">
885+
<property name="text">
886+
<string>Show all diagrams</string>
887+
</property>
888+
<property name="checked">
889+
<bool>true</bool>
890+
</property>
891+
</widget>
892+
</item>
893+
<item row="0" column="0">
894+
<layout class="QHBoxLayout" name="horizontalLayout_8">
895+
<item>
896+
<widget class="QLabel" name="label_16">
897+
<property name="text">
898+
<string>Diagram z-index</string>
899+
</property>
900+
</widget>
901+
</item>
902+
<item>
903+
<widget class="QgsDoubleSpinBox" name="mZIndexSpinBox">
904+
<property name="toolTip">
905+
<string>Controls how diagrams are drawn on top of each other. Diagrams with a higher z-index are drawn above diagrams and labels with a lower z-index.</string>
906+
</property>
907+
<property name="minimum">
908+
<double>-9999999.000000000000000</double>
909+
</property>
910+
<property name="maximum">
911+
<double>9999999.000000000000000</double>
912+
</property>
913+
</widget>
914+
</item>
915+
<item>
916+
<widget class="QgsPropertyOverrideButton" name="mZOrderDDBtn">
917+
<property name="text">
918+
<string>…</string>
919+
</property>
920+
</widget>
921+
</item>
922+
<item>
923+
<spacer name="horizontalSpacer_10">
924+
<property name="orientation">
925+
<enum>Qt::Horizontal</enum>
926+
</property>
927+
<property name="sizeHint" stdset="0">
928+
<size>
929+
<width>40</width>
930+
<height>20</height>
931+
</size>
932+
</property>
933+
</spacer>
934+
</item>
935+
</layout>
936+
</item>
893937
</layout>
894938
</widget>
895939
</item>
@@ -1095,8 +1139,8 @@
10951139
<rect>
10961140
<x>0</x>
10971141
<y>0</y>
1098-
<width>413</width>
1099-
<height>238</height>
1142+
<width>642</width>
1143+
<height>421</height>
11001144
</rect>
11011145
</property>
11021146
<layout class="QGridLayout" name="gridLayout_11">
@@ -1411,8 +1455,8 @@
14111455
<rect>
14121456
<x>0</x>
14131457
<y>0</y>
1414-
<width>213</width>
1415-
<height>220</height>
1458+
<width>642</width>
1459+
<height>421</height>
14161460
</rect>
14171461
</property>
14181462
<layout class="QGridLayout" name="gridLayout_12">
@@ -1573,50 +1617,6 @@
15731617
</item>
15741618
</layout>
15751619
</item>
1576-
<item row="6" column="0">
1577-
<layout class="QHBoxLayout" name="horizontalLayout_8">
1578-
<item>
1579-
<widget class="QLabel" name="label_16">
1580-
<property name="text">
1581-
<string>Diagram z-index</string>
1582-
</property>
1583-
</widget>
1584-
</item>
1585-
<item>
1586-
<widget class="QgsDoubleSpinBox" name="mZIndexSpinBox">
1587-
<property name="toolTip">
1588-
<string>Controls how labels are drawn on top of each other. Labels with a higher z-index are drawn above labels with a lower z-index.</string>
1589-
</property>
1590-
<property name="minimum">
1591-
<double>-9999999.000000000000000</double>
1592-
</property>
1593-
<property name="maximum">
1594-
<double>9999999.000000000000000</double>
1595-
</property>
1596-
</widget>
1597-
</item>
1598-
<item>
1599-
<widget class="QgsPropertyOverrideButton" name="mZOrderDDBtn">
1600-
<property name="text">
1601-
<string>…</string>
1602-
</property>
1603-
</widget>
1604-
</item>
1605-
<item>
1606-
<spacer name="horizontalSpacer_10">
1607-
<property name="orientation">
1608-
<enum>Qt::Horizontal</enum>
1609-
</property>
1610-
<property name="sizeHint" stdset="0">
1611-
<size>
1612-
<width>40</width>
1613-
<height>20</height>
1614-
</size>
1615-
</property>
1616-
</spacer>
1617-
</item>
1618-
</layout>
1619-
</item>
16201620
<item row="1" column="0" colspan="2">
16211621
<widget class="QFrame" name="mLinePlacementFrame">
16221622
<property name="frameShape">
@@ -1837,8 +1837,8 @@
18371837
<rect>
18381838
<x>0</x>
18391839
<y>0</y>
1840-
<width>98</width>
1841-
<height>137</height>
1840+
<width>642</width>
1841+
<height>421</height>
18421842
</rect>
18431843
</property>
18441844
<layout class="QVBoxLayout" name="verticalLayout_3">
@@ -2056,8 +2056,8 @@
20562056
<rect>
20572057
<x>0</x>
20582058
<y>0</y>
2059-
<width>246</width>
2060-
<height>72</height>
2059+
<width>642</width>
2060+
<height>421</height>
20612061
</rect>
20622062
</property>
20632063
<layout class="QVBoxLayout" name="verticalLayout_12">

‎src/ui/qgstextformatwidgetbase.ui

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5686,7 +5686,7 @@ font-style: italic;</string>
56865686
<item>
56875687
<widget class="QgsDoubleSpinBox" name="mZIndexSpinBox">
56885688
<property name="toolTip">
5689-
<string>Controls how labels are drawn on top of each other. Labels with a higher z-index are drawn above labels with a lower z-index.</string>
5689+
<string>Controls how labels are drawn on top of each other. Labels with a higher z-index are drawn above labels and diagrams with a lower z-index.</string>
56905690
</property>
56915691
<property name="minimum">
56925692
<double>-9999999.000000000000000</double>

0 commit comments

Comments
 (0)
Please sign in to comment.