Skip to content

Commit

Permalink
[styledock] more widget changes
Browse files Browse the repository at this point in the history
  • Loading branch information
@NathanW2
NathanW2 committed May 17, 2016
1 parent e92dc26 commit 0ff10ae
Show file tree
Hide file tree
Showing 16 changed files with 1,622 additions and 1,684 deletions.
233 changes: 116 additions & 117 deletions src/ui/symbollayer/qgsarrowsymbollayerwidgetbase.ui
View file
Expand Up @@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>899</width>
<height>471</height>
<width>306</width>
<height>267</height>
</rect>
</property>
<property name="windowTitle">
Expand All @@ -17,23 +17,41 @@
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Symbols clip the geometry to the current canvas extent by default. This could result in undesired renderings for this kind of symbol layer. Make sure to check the corresponding &amp;quot;Clip features to canvas extent&amp;quot; advanced option of the symbol.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="10" column="0">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
<item row="2" column="0">
<widget class="QLabel" name="label">
<property name="text">
<string>Arrow width at start</string>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</widget>
</item>
<item row="2" column="2">
<widget class="QgsDataDefinedButton" name="mArrowStartWidthDDBtn">
<property name="text">
<string>...</string>
</property>
</spacer>
</widget>
</item>
<item row="7" column="1" colspan="2">
<layout class="QHBoxLayout" name="horizontalLayout_7">
<item row="1" column="0">
<widget class="QLabel" name="label_8">
<property name="text">
<string>Arrow width</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="4" column="2">
<widget class="QgsDataDefinedButton" name="mOffsetDDBtn">
<property name="text">
<string>...</string>
</property>
</widget>
</item>
<item row="1" column="1">
<layout class="QHBoxLayout" name="horizontalLayout_6">
<item>
<widget class="QgsDoubleSpinBox" name="mHeadSizeSpin">
<widget class="QgsDoubleSpinBox" name="mArrowWidthSpin">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>1</horstretch>
Expand All @@ -55,18 +73,42 @@
</widget>
</item>
<item>
<widget class="QgsDataDefinedButton" name="mHeadSizeDDBtn">
<property name="text">
<string>...</string>
</property>
</widget>
</item>
<item>
<widget class="QgsUnitSelectionWidget" name="mHeadSizeUnitWidget" native="true"/>
<widget class="QgsUnitSelectionWidget" name="mArrowWidthUnitWidget" native="true"/>
</item>
</layout>
</item>
<item row="9" column="1" colspan="2">
<item row="3" column="2">
<widget class="QgsDataDefinedButton" name="mHeadSizeDDBtn">
<property name="text">
<string>...</string>
</property>
</widget>
</item>
<item row="4" column="0">
<widget class="QLabel" name="label_6">
<property name="text">
<string>Offset</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="label_10">
<property name="text">
<string>Head type</string>
</property>
</widget>
</item>
<item row="0" column="2">
<widget class="QgsDataDefinedButton" name="mHeadTypeDDBtn">
<property name="text">
<string>...</string>
</property>
</widget>
</item>
<item row="5" column="1">
<widget class="QCheckBox" name="mCurvedArrowChck">
<property name="text">
<string>Curved arrows</string>
Expand All @@ -79,7 +121,17 @@
</property>
</widget>
</item>
<item row="8" column="1" colspan="2">
<item row="3" column="0">
<widget class="QLabel" name="label_9">
<property name="text">
<string>Head size</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="4" column="1">
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QgsDoubleSpinBox" name="mOffsetSpin">
Expand All @@ -103,13 +155,6 @@
</property>
</widget>
</item>
<item>
<widget class="QgsDataDefinedButton" name="mOffsetDDBtn">
<property name="text">
<string/>
</property>
</widget>
</item>
<item>
<widget class="QgsUnitSelectionWidget" name="mOffsetUnitWidget" native="true">
<property name="focusPolicy">
Expand All @@ -119,17 +164,20 @@
</item>
</layout>
</item>
<item row="7" column="0">
<widget class="QLabel" name="label_9">
<property name="text">
<string>Head size</string>
<item row="6" column="0">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</widget>
</spacer>
</item>
<item row="5" column="1" colspan="2">
<item row="2" column="1">
<layout class="QHBoxLayout" name="horizontalLayout_9">
<item>
<widget class="QgsDoubleSpinBox" name="mArrowStartWidthSpin">
Expand All @@ -153,86 +201,22 @@
</property>
</widget>
</item>
<item>
<widget class="QgsDataDefinedButton" name="mArrowStartWidthDDBtn">
<property name="text">
<string>...</string>
</property>
</widget>
</item>
<item>
<widget class="QgsUnitSelectionWidget" name="mArrowStartWidthUnitWidget" native="true"/>
</item>
</layout>
</item>
<item row="0" column="1" colspan="2">
<layout class="QHBoxLayout" name="horizontalLayout_8">
<item>
<widget class="QComboBox" name="mHeadTypeCombo">
<item>
<property name="text">
<string>Single</string>
</property>
</item>
<item>
<property name="text">
<string>Single, reversed</string>
</property>
</item>
<item>
<property name="text">
<string>Double</string>
</property>
</item>
</widget>
</item>
<item>
<widget class="QgsDataDefinedButton" name="mHeadTypeDDBtn">
<property name="text">
<string>...</string>
</property>
</widget>
</item>
</layout>
</item>
<item row="8" column="0">
<widget class="QLabel" name="label_6">
<item row="1" column="2">
<widget class="QgsDataDefinedButton" name="mArrowWidthDDBtn">
<property name="text">
<string>Offset</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
<string>...</string>
</property>
</widget>
</item>
<item row="5" column="0">
<widget class="QLabel" name="label">
<property name="text">
<string>Arrow width at start</string>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="label_10">
<property name="text">
<string>Head type</string>
</property>
</widget>
</item>
<item row="4" column="0">
<widget class="QLabel" name="label_8">
<property name="text">
<string>Arrow width</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="4" column="1" colspan="2">
<layout class="QHBoxLayout" name="horizontalLayout_6">
<item row="3" column="1">
<layout class="QHBoxLayout" name="horizontalLayout_7">
<item>
<widget class="QgsDoubleSpinBox" name="mArrowWidthSpin">
<widget class="QgsDoubleSpinBox" name="mHeadSizeSpin">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>1</horstretch>
Expand All @@ -254,14 +238,30 @@
</widget>
</item>
<item>
<widget class="QgsDataDefinedButton" name="mArrowWidthDDBtn">
<property name="text">
<string>...</string>
</property>
</widget>
<widget class="QgsUnitSelectionWidget" name="mHeadSizeUnitWidget" native="true"/>
</item>
</layout>
</item>
<item row="0" column="1">
<layout class="QHBoxLayout" name="horizontalLayout_8">
<item>
<widget class="QgsUnitSelectionWidget" name="mArrowWidthUnitWidget" native="true"/>
<widget class="QComboBox" name="mHeadTypeCombo">
<item>
<property name="text">
<string>Single</string>
</property>
</item>
<item>
<property name="text">
<string>Single, reversed</string>
</property>
</item>
<item>
<property name="text">
<string>Double</string>
</property>
</item>
</widget>
</item>
</layout>
</item>
Expand All @@ -286,7 +286,6 @@
</customwidget>
</customwidgets>
<tabstops>
<tabstop>mArrowWidthDDBtn</tabstop>
<tabstop>mOffsetSpin</tabstop>
<tabstop>mOffsetUnitWidget</tabstop>
</tabstops>
Expand Down
4 changes: 2 additions & 2 deletions src/ui/symbollayer/widget_ellipse.ui
View file
Expand Up @@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>386</width>
<height>660</height>
<width>305</width>
<height>680</height>
</rect>
</property>
<property name="windowTitle">
Expand Down
2 changes: 1 addition & 1 deletion src/ui/symbollayer/widget_filledmarker.ui
View file
Expand Up @@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>275</width>
<height>532</height>
<height>312</height>
</rect>
</property>
<property name="windowTitle">
Expand Down

0 comments on commit 0ff10ae

Please sign in to comment.