diff --git a/src/ui/qgsdiagrampropertiesbase.ui b/src/ui/qgsdiagrampropertiesbase.ui index 0a042f33b7a..4d046fdd21c 100755 --- a/src/ui/qgsdiagrampropertiesbase.ui +++ b/src/ui/qgsdiagrampropertiesbase.ui @@ -185,7 +185,7 @@ - Appearance + Rendering Rendering @@ -267,7 +267,7 @@ - 1 + 0 @@ -303,8 +303,8 @@ 0 0 - 640 - 428 + 642 + 421 @@ -499,7 +499,7 @@ - + 6 @@ -522,7 +522,7 @@ text-decoration: underline; - Appearance + Rendering @@ -538,9 +538,9 @@ 0 - 0 - 640 - 428 + -73 + 626 + 494 @@ -557,319 +557,290 @@ 0 - - - - - Format - - - - - - - QFrame::NoFrame - - - QFrame::Raised - - - - 20 + + + Format + + + labelrenderinggroup + + + + + + QFrame::NoFrame - - 0 + + QFrame::Raised - - 0 - - - 0 - - - - - - 130 - 0 - - + + + 20 + + + 0 + + + 0 + + + 0 + + + + + + 130 + 0 + + + + Opacity + + + + + + + Qt::StrongFocus + + + + + + + Line width + + + + + + + Start angle + + + + + + + … + + + + + + + + 0 + 0 + + + + + 120 + 0 + + + + + 16777215 + 16777215 + + + + + + + + + + + + 0 + 0 + + + + 5 + + + 99999.990000000005239 + + + 0.200000000000000 + + + + + + + 0.010000000000000 + + + 5.000000000000000 + + + + + + + + 0 + 0 + + + + + 0 + 0 + + + + + 16777215 + 16777215 + + + + + + + + + + + Line color + + + + + + + … + + + + + + + … + + + + + + + + 0 + 0 + + + + Font + + + + + + + Background color + + + + + + + Bar width + + + + + + + … + + + + + + + + 0 + 0 + + + + + + + + + 0 + 0 + + + + Qt::StrongFocus + + + + + + + + + + + + + Visibility + + + labelrenderinggroup + + + + 8 + + + 8 + + + + + - Opacity + … - - - - Bar width - - - - - - - 0.010000000000000 - - - 5.000000000000000 - - - - - - - Line width - - - - - - - Background color - - - - - - - Line color - - - - - - - Start angle - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - 120 - 0 - - - - - 120 - 16777215 - - - - - - - - - - - … - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - - - 120 - 0 - - - - - 120 - 16777215 - - - - - - - - - - - … - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - - 5 - - - 99999.990000000005239 - - - 0.200000000000000 - - - - - - - Qt::StrongFocus - - - - - - - … - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - - - - - … - - - - - - - - - Qt::StrongFocus - - - - - + + 0 0 - - Font + + 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. + + + -9999999.000000000000000 + + + 9999999.000000000000000 - - - - - - - - - 0 - - - - - Visibility - - - - - - - QFrame::NoFrame - - - QFrame::Raised - - - - 20 - - - 0 - - - 0 - - - 0 - - + - Show all diagrams - - - true + Diagram z-index - + Scale dependent visibility @@ -890,150 +861,132 @@ - - - - - - - - - QFrame::NoFrame - - - QFrame::Raised - - - - 0 - - - 0 - - - 0 - - - 0 - - - 6 - - - - - true - - - - 0 - 0 - - - - Show diagram - - - - - - - … - - - - - - - Qt::Vertical - - - - - - - - 0 - 0 - - - - Always show - - - - - - - … - - - - - - - Qt::Horizontal - - - QSizePolicy::Fixed - - - - 6 - 20 - - - - - - - - Data defined - - - - - - - Qt::Horizontal - - - - 195 - 20 - - - - - - - - + + - Discourage labels from covering features + Show all diagrams + + + true - - + + + + + + + + + Data-Defined + + + labelrenderinggroup + + + + 8 + + + 8 + + + + + … - - + + + + + 0 + 0 + + + + Always show + + + + + Qt::Horizontal - 40 + 195 20 + + + + Qt::Vertical + + + + + + + + + Discourage diagrams and labels from covering features + + + + + + + … + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + … + + + + + + + true + + + + 0 + 0 + + + + Show diagram + + + @@ -1095,8 +1048,8 @@ 0 0 - 413 - 238 + 642 + 421 @@ -1131,6 +1084,12 @@ false + + + 0 + 0 + + 5 @@ -1141,12 +1100,6 @@ - - - 0 - 0 - - Qt::StrongFocus @@ -1215,36 +1168,6 @@ - - - - Maximum value - - - - - - - Attribute - - - - - - - - 0 - 0 - - - - - 16777215 - 16777215 - - - - @@ -1255,30 +1178,6 @@ - - - - - - 6 - - - -99999999.000000000000000 - - - 99999999.000000000000000 - - - - - - - Find - - - - - @@ -1316,6 +1215,12 @@ + + + 0 + 0 + + 6 @@ -1327,22 +1232,59 @@ - - - - Qt::Horizontal - - - - 40 - 20 - - - - + + + + Find + + + + + + + + 0 + 0 + + + + + 16777215 + 16777215 + + + + + + + + Attribute + + + + + + + Maximum value + + + + + + + 6 + + + -99999999.000000000000000 + + + 99999999.000000000000000 + + + @@ -1355,19 +1297,6 @@ - - - - Qt::Horizontal - - - - 40 - 20 - - - - @@ -1411,8 +1340,8 @@ 0 0 - 213 - 220 + 642 + 421 @@ -1428,7 +1357,7 @@ 0 - + Qt::Vertical @@ -1459,18 +1388,15 @@ 0 - - - - Qt::Horizontal + + + + + 0 + 0 + - - - 40 - 20 - - - + @@ -1486,137 +1412,26 @@ - - + + + + … + + - - - - - - - - - … - - - - + + + + + 0 + 0 + + + - - - - - - Priority - - - - - - - Low - - - - - - - 10 - - - Qt::Horizontal - - - false - - - false - - - QSlider::TicksBelow - - - 1 - - - - - - - High - - - - - - - … - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - - Diagram z-index - - - - - - - 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. - - - -9999999.000000000000000 - - - 9999999.000000000000000 - - - - - - - … - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - @@ -1794,6 +1609,67 @@ + + + + Priority + + + labelplacementgroup + + + + 8 + + + 8 + + + + + Low + + + + + + + 10 + + + Qt::Horizontal + + + false + + + false + + + QSlider::TicksBelow + + + 1 + + + + + + + High + + + + + + + … + + + + + + @@ -1837,8 +1713,8 @@ 0 0 - 98 - 137 + 642 + 421 @@ -2056,8 +1932,8 @@ 0 0 - 246 - 72 + 642 + 421 @@ -2202,12 +2078,22 @@ mOpacityWidget mBarWidthSpinBox mBackgroundColorButton + mBackgroundColorDDBtn mDiagramPenColorButton + mLineColorDDBtn mPenWidthSpinBox + mDiagramLineUnitComboBox + mLineWidthDDBtn mAngleOffsetComboBox + mStartAngleDDBtn mDiagramFontButton + mZIndexSpinBox + mZOrderDDBtn mShowAllCheckBox mScaleVisibilityGroupBox + mShowDiagramDDBtn + mAlwaysShowDDBtn + mIsObstacleDDBtn scrollArea_5 mDiagramUnitComboBox mFixedSizeRadio @@ -2222,12 +2108,15 @@ scrollArea_6 mPlacementComboBox mDiagramDistanceSpinBox + mDistanceDDBtn chkLineAbove chkLineOn chkLineBelow chkLineOrientationDependent + mCoordXDDBtn + mCoordYDDBtn mPrioritySlider - mZIndexSpinBox + mPriorityDDBtn scrollArea_7 mOrientationUpButton mOrientationDownButton @@ -2235,19 +2124,7 @@ mOrientationLeftButton scrollArea_2 mCheckBoxAttributeLegend - mBackgroundColorDDBtn - mLineColorDDBtn - mDiagramLineUnitComboBox - mLineWidthDDBtn - mStartAngleDDBtn - mShowDiagramDDBtn - mAlwaysShowDDBtn - mIsObstacleDDBtn - mDistanceDDBtn - mPriorityDDBtn - mZOrderDDBtn - mCoordXDDBtn - mCoordYDDBtn + mButtonSizeLegendSettings diff --git a/src/ui/qgstextformatwidgetbase.ui b/src/ui/qgstextformatwidgetbase.ui index ed4b8092c62..c8b6eec5bd2 100755 --- a/src/ui/qgstextformatwidgetbase.ui +++ b/src/ui/qgstextformatwidgetbase.ui @@ -5686,7 +5686,7 @@ font-style: italic; - 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. + 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. -9999999.000000000000000