Skip to content

Commit

Permalink
[needs-docs] Move diagram z-index option to a renamed Rendering tab
Browse files Browse the repository at this point in the history 
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
  • Loading branch information
@DelazJ
DelazJ committed Aug 5, 2017
1 parent 0d092f9 commit c00fbde
Show file tree
Hide file tree
Showing 2 changed files with 71 additions and 71 deletions.
140 changes: 70 additions & 70 deletions src/ui/qgsdiagrampropertiesbase.ui
View file
Expand Up @@ -185,7 +185,7 @@
</item>
<item>
<property name="text">
<string>Appearance</string>
<string>Rendering</string>
</property>
<property name="toolTip">
<string>Rendering</string>
Expand Down Expand Up @@ -267,7 +267,7 @@
<item>
<widget class="QStackedWidget" name="mDiagramStackedWidget">
<property name="currentIndex">
<number>1</number>
<number>0</number>
</property>
<widget class="QWidget" name="mDiagramPage_Attributes">
<layout class="QVBoxLayout" name="verticalLayout_9">
Expand Down Expand Up @@ -303,8 +303,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>640</width>
<height>428</height>
<width>642</width>
<height>421</height>
</rect>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_6">
Expand Down Expand Up @@ -522,7 +522,7 @@
<string notr="true">text-decoration: underline;</string>
</property>
<property name="text">
<string>Appearance</string>
<string>Rendering</string>
</property>
</widget>
</item>
Expand All @@ -539,8 +539,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>640</width>
<height>428</height>
<width>626</width>
<height>465</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout" stretch="0,0,0,1">
Expand Down Expand Up @@ -859,17 +859,7 @@
<property name="bottomMargin">
<number>0</number>
</property>
<item row="0" column="0">
<widget class="QCheckBox" name="mShowAllCheckBox">
<property name="text">
<string>Show all diagrams</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<item row="1" column="0">
<item row="2" column="0">
<widget class="QgsCollapsibleGroupBox" name="mScaleVisibilityGroupBox">
<property name="title">
<string>Scale dependent visibility</string>
Expand All @@ -890,6 +880,60 @@
</layout>
</widget>
</item>
<item row="1" column="0">
<widget class="QCheckBox" name="mShowAllCheckBox">
<property name="text">
<string>Show all diagrams</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<item row="0" column="0">
<layout class="QHBoxLayout" name="horizontalLayout_8">
<item>
<widget class="QLabel" name="label_16">
<property name="text">
<string>Diagram z-index</string>
</property>
</widget>
</item>
<item>
<widget class="QgsDoubleSpinBox" name="mZIndexSpinBox">
<property name="toolTip">
<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>
</property>
<property name="minimum">
<double>-9999999.000000000000000</double>
</property>
<property name="maximum">
<double>9999999.000000000000000</double>
</property>
</widget>
</item>
<item>
<widget class="QgsPropertyOverrideButton" name="mZOrderDDBtn">
<property name="text">
<string>…</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_10">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
</layout>
</widget>
</item>
Expand Down Expand Up @@ -1095,8 +1139,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>413</width>
<height>238</height>
<width>642</width>
<height>421</height>
</rect>
</property>
<layout class="QGridLayout" name="gridLayout_11">
Expand Down Expand Up @@ -1411,8 +1455,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>213</width>
<height>220</height>
<width>642</width>
<height>421</height>
</rect>
</property>
<layout class="QGridLayout" name="gridLayout_12">
Expand Down Expand Up @@ -1573,50 +1617,6 @@
</item>
</layout>
</item>
<item row="6" column="0">
<layout class="QHBoxLayout" name="horizontalLayout_8">
<item>
<widget class="QLabel" name="label_16">
<property name="text">
<string>Diagram z-index</string>
</property>
</widget>
</item>
<item>
<widget class="QgsDoubleSpinBox" name="mZIndexSpinBox">
<property name="toolTip">
<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>
</property>
<property name="minimum">
<double>-9999999.000000000000000</double>
</property>
<property name="maximum">
<double>9999999.000000000000000</double>
</property>
</widget>
</item>
<item>
<widget class="QgsPropertyOverrideButton" name="mZOrderDDBtn">
<property name="text">
<string>…</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_10">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item row="1" column="0" colspan="2">
<widget class="QFrame" name="mLinePlacementFrame">
<property name="frameShape">
Expand Down Expand Up @@ -1837,8 +1837,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>98</width>
<height>137</height>
<width>642</width>
<height>421</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_3">
Expand Down Expand Up @@ -2056,8 +2056,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>246</width>
<height>72</height>
<width>642</width>
<height>421</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_12">
Expand Down
2 changes: 1 addition & 1 deletion src/ui/qgstextformatwidgetbase.ui
View file
Expand Up @@ -5686,7 +5686,7 @@ font-style: italic;</string>
<item>
<widget class="QgsDoubleSpinBox" name="mZIndexSpinBox">
<property name="toolTip">
<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>
<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>
</property>
<property name="minimum">
<double>-9999999.000000000000000</double>
Expand Down

0 comments on commit c00fbde

Please sign in to comment.