Skip to content

Commit

Permalink
Move the "Discourage diagrams from covering features" setting
Browse files Browse the repository at this point in the history 
from Rendering tab to Placement tab.
Makes it inline with labels dialog, and next to the related priority rank setting
  • Loading branch information
@DelazJ @nyalldawson
DelazJ authored and nyalldawson committed Jul 15, 2020
1 parent 4009fa8 commit 50178cc
Showing 1 changed file with 46 additions and 32 deletions.
78 changes: 46 additions & 32 deletions src/ui/qgsdiagrampropertiesbase.ui
View file
Expand Up @@ -968,37 +968,6 @@
</item>
</layout>
</item>
<item row="4" column="0" colspan="3">
<layout class="QHBoxLayout" name="horizontalLayout_12">
<item>
<widget class="QLabel" name="label_8">
<property name="text">
<string>Discourage diagrams and labels from covering features</string>
</property>
</widget>
</item>
<item>
<widget class="QgsPropertyOverrideButton" name="mIsObstacleDDBtn">
<property name="text">
<string>…</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer">
<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="3" column="0" colspan="3">
<widget class="QgsCollapsibleGroupBox" name="mScaleVisibilityGroupBox">
<property name="title">
Expand Down Expand Up @@ -1619,6 +1588,51 @@
</layout>
</widget>
</item>
<item row="8" column="0">
<widget class="QgsCollapsibleGroupBox" name="mObstaclesGrpBox">
<property name="title">
<string>Obstacles</string>
</property>
<property name="syncGroup" stdset="0">
<string notr="true">labelplacementgroup</string>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_12">
<property name="leftMargin">
<number>8</number>
</property>
<property name="rightMargin">
<number>8</number>
</property>
<item>
<widget class="QLabel" name="label_8">
<property name="text">
<string>Discourage diagrams and labels from covering features</string>
</property>
</widget>
</item>
<item>
<widget class="QgsPropertyOverrideButton" name="mIsObstacleDDBtn">
<property name="text">
<string>…</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer">
<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>
</widget>
</item>
<item row="2" column="0">
<widget class="QFrame" name="mPlacementFrame">
<property name="frameShape">
Expand Down Expand Up @@ -2312,7 +2326,6 @@
<tabstop>mScaleVisibilityGroupBox</tabstop>
<tabstop>mShowDiagramDDBtn</tabstop>
<tabstop>mAlwaysShowDDBtn</tabstop>
<tabstop>mIsObstacleDDBtn</tabstop>
<tabstop>scrollArea_5</tabstop>
<tabstop>mDiagramUnitComboBox</tabstop>
<tabstop>mFixedSizeRadio</tabstop>
Expand Down Expand Up @@ -2343,6 +2356,7 @@
<tabstop>mCoordYDDBtn</tabstop>
<tabstop>mPrioritySlider</tabstop>
<tabstop>mPriorityDDBtn</tabstop>
<tabstop>mIsObstacleDDBtn</tabstop>
<tabstop>scrollArea_7</tabstop>
<tabstop>mOrientationUpButton</tabstop>
<tabstop>mOrientationDownButton</tabstop>
Expand Down

0 comments on commit 50178cc

Please sign in to comment.