Skip to content

Commit

Permalink
Fix some alignment and tab issues with symbol dialogs (refs #11060)
Browse files Browse the repository at this point in the history
  • Loading branch information
@nyalldawson
nyalldawson committed Aug 25, 2014
1 parent 3d7d240 commit 31c055d
Show file tree
Hide file tree
Showing 11 changed files with 396 additions and 179 deletions.
1 change: 1 addition & 0 deletions src/gui/symbology-ng/qgssymbollayerv2widget.cpp 100644 → 100755
View file
Expand Up @@ -1310,6 +1310,7 @@ void QgsShapeburstFillSymbolLayerV2Widget::on_mRadioUseWholeShape_toggled( bool
if ( mLayer )
{
mLayer->setUseWholeShape( value );
mDistanceUnitWidget->setEnabled( !value );
emit changed();
}
}
Expand Down
50 changes: 48 additions & 2 deletions src/ui/symbollayer/widget_ellipse.ui 100644 → 100755
View file
Expand Up @@ -41,13 +41,19 @@
<property name="text">
<string>Symbol height</string>
</property>
<property name="buddy">
<cstring>mHeightSpinBox</cstring>
</property>
</widget>
</item>
<item row="4" column="0">
<widget class="QLabel" name="mRotationLabel">
<property name="text">
<string>Rotation</string>
</property>
<property name="buddy">
<cstring>mRotationSpinBox</cstring>
</property>
</widget>
</item>
<item row="0" column="1">
Expand All @@ -63,6 +69,9 @@
<property name="text">
<string>Fill</string>
</property>
<property name="buddy">
<cstring>btnChangeColorFill</cstring>
</property>
</widget>
</item>
<item>
Expand Down Expand Up @@ -95,6 +104,9 @@
<property name="text">
<string>Border</string>
</property>
<property name="buddy">
<cstring>btnChangeColorBorder</cstring>
</property>
</widget>
</item>
<item>
Expand Down Expand Up @@ -188,6 +200,9 @@
<property name="text">
<string>Symbol width</string>
</property>
<property name="buddy">
<cstring>mWidthSpinBox</cstring>
</property>
</widget>
</item>
<item row="7" column="1">
Expand Down Expand Up @@ -237,10 +252,13 @@
<property name="text">
<string>Outline style</string>
</property>
<property name="buddy">
<cstring>mOutlineStyleComboBox</cstring>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QgsPenStyleComboBox" name="mOutlineStyleComboBox" native="true"/>
<widget class="QgsPenStyleComboBox" name="mOutlineStyleComboBox"/>
</item>
<item row="3" column="1">
<layout class="QHBoxLayout" name="horizontalLayout_2">
Expand Down Expand Up @@ -273,20 +291,29 @@
<property name="text">
<string>Outline width</string>
</property>
<property name="buddy">
<cstring>mOutlineWidthSpinBox</cstring>
</property>
</widget>
</item>
<item row="7" column="0">
<widget class="QLabel" name="mAnchorPointLabel">
<property name="text">
<string>Anchor point</string>
</property>
<property name="buddy">
<cstring>mHorizontalAnchorComboBox</cstring>
</property>
</widget>
</item>
<item row="6" column="0">
<widget class="QLabel" name="label_5">
<property name="text">
<string>Offset X,Y</string>
</property>
<property name="buddy">
<cstring>spinOffsetX</cstring>
</property>
</widget>
</item>
<item row="6" column="1">
Expand Down Expand Up @@ -411,10 +438,29 @@
</customwidget>
<customwidget>
<class>QgsPenStyleComboBox</class>
<extends>QWidget</extends>
<extends>QComboBox</extends>
<header>qgspenstylecombobox.h</header>
</customwidget>
</customwidgets>
<tabstops>
<tabstop>btnChangeColorFill</tabstop>
<tabstop>btnChangeColorBorder</tabstop>
<tabstop>mWidthSpinBox</tabstop>
<tabstop>mSymbolWidthUnitWidget</tabstop>
<tabstop>mOutlineStyleComboBox</tabstop>
<tabstop>mOutlineWidthSpinBox</tabstop>
<tabstop>mOutlineWidthUnitWidget</tabstop>
<tabstop>mRotationSpinBox</tabstop>
<tabstop>mHeightSpinBox</tabstop>
<tabstop>mSymbolHeightUnitWidget</tabstop>
<tabstop>spinOffsetX</tabstop>
<tabstop>spinOffsetY</tabstop>
<tabstop>mOffsetUnitWidget</tabstop>
<tabstop>mHorizontalAnchorComboBox</tabstop>
<tabstop>mVerticalAnchorComboBox</tabstop>
<tabstop>mDataDefinedPropertiesButton</tabstop>
<tabstop>mShapeListWidget</tabstop>
</tabstops>
<resources/>
<connections/>
</ui>
70 changes: 43 additions & 27 deletions src/ui/symbollayer/widget_gradientfill.ui 100644 → 100755
View file
Expand Up @@ -13,19 +13,22 @@
<property name="windowTitle">
<string>Form</string>
</property>
<layout class="QFormLayout" name="formLayout">
<property name="fieldGrowthPolicy">
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
<layout class="QGridLayout" name="gridLayout">
<property name="leftMargin">
<number>1</number>
</property>
<property name="labelAlignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
<property name="topMargin">
<number>1</number>
</property>
<property name="horizontalSpacing">
<number>28</number>
<property name="rightMargin">
<number>1</number>
</property>
<property name="margin">
<property name="bottomMargin">
<number>1</number>
</property>
<property name="horizontalSpacing">
<number>28</number>
</property>
<item row="0" column="0">
<widget class="QRadioButton" name="radioTwoColor">
<property name="text">
Expand Down Expand Up @@ -257,14 +260,14 @@
</item>
</layout>
</item>
<item row="7" column="0">
<item row="6" column="0">
<widget class="QLabel" name="label_8">
<property name="text">
<string>Reference Point 2</string>
</property>
</widget>
</item>
<item row="7" column="1">
<item row="6" column="1">
<layout class="QHBoxLayout" name="horizontalLayout_7">
<property name="spacing">
<number>12</number>
Expand Down Expand Up @@ -331,14 +334,14 @@
</item>
</layout>
</item>
<item row="9" column="0">
<item row="7" column="0">
<widget class="QLabel" name="label_11">
<property name="text">
<string>Angle</string>
</property>
</widget>
</item>
<item row="9" column="1">
<item row="7" column="1">
<widget class="QDoubleSpinBox" name="mSpinAngle">
<property name="suffix">
<string> °</string>
Expand All @@ -351,20 +354,14 @@
</property>
</widget>
</item>
<item row="12" column="0" colspan="2">
<widget class="QPushButton" name="mDataDefinedPropertiesButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<item row="8" column="0">
<widget class="QLabel" name="label_6">
<property name="text">
<string>Data defined properties...</string>
<string>Offset X,Y</string>
</property>
</widget>
</item>
<item row="10" column="1">
<item row="8" column="1">
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QDoubleSpinBox" name="spinOffsetX">
Expand Down Expand Up @@ -411,17 +408,36 @@
</widget>
</item>
<item>
<widget class="QgsUnitSelectionWidget" name="mOffsetUnitWidget" native="true"/>
<widget class="QgsUnitSelectionWidget" name="mOffsetUnitWidget"/>
</item>
</layout>
</item>
<item row="10" column="0">
<widget class="QLabel" name="label_6">
<item row="9" column="0" colspan="2">
<widget class="QPushButton" name="mDataDefinedPropertiesButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Offset X,Y</string>
<string>Data defined properties...</string>
</property>
</widget>
</item>
<item row="10" column="0">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
<customwidgets>
Expand All @@ -432,7 +448,7 @@
</customwidget>
<customwidget>
<class>QgsUnitSelectionWidget</class>
<extends>QWidget</extends>
<extends>QComboBox</extends>
<header>qgsunitselectionwidget.h</header>
<container>1</container>
</customwidget>
Expand Down
55 changes: 38 additions & 17 deletions src/ui/symbollayer/widget_markerline.ui 100644 → 100755
View file
Expand Up @@ -155,23 +155,6 @@
</property>
</widget>
</item>
<item row="5" column="0" colspan="2">
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="QPushButton" name="mDataDefinedPropertiesButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Data defined properties</string>
</property>
</widget>
</item>
</layout>
</item>
<item row="3" column="1">
<layout class="QHBoxLayout" name="horizontalLayout_3">
<item>
Expand Down Expand Up @@ -201,6 +184,32 @@
</item>
</layout>
</item>
<item row="4" column="0" colspan="2">
<widget class="QPushButton" name="mDataDefinedPropertiesButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Data defined properties</string>
</property>
</widget>
</item>
<item row="5" column="0">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
<customwidgets>
Expand All @@ -212,7 +221,19 @@
</customwidget>
</customwidgets>
<tabstops>
<tabstop>radInterval</tabstop>
<tabstop>spinInterval</tabstop>
<tabstop>mIntervalUnitWidget</tabstop>
<tabstop>radVertex</tabstop>
<tabstop>radVertexLast</tabstop>
<tabstop>radVertexFirst</tabstop>
<tabstop>radCentralPoint</tabstop>
<tabstop>mSpinOffsetAlongLine</tabstop>
<tabstop>mOffsetAlongLineUnitWidget</tabstop>
<tabstop>chkRotateMarker</tabstop>
<tabstop>spinOffset</tabstop>
<tabstop>mOffsetUnitWidget</tabstop>
<tabstop>mDataDefinedPropertiesButton</tabstop>
</tabstops>
<resources/>
<connections/>
Expand Down

0 comments on commit 31c055d

Please sign in to comment.