131 changes: 97 additions & 34 deletions src/ui/symbollayer/widget_ellipse.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,52 +34,49 @@
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QgsColorButtonV2" name="btnChangeColorBorder">
<item row="1" column="1">
<widget class="QgsColorButtonV2" name="btnChangeColorFill">
<property name="text">
<string>Change</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_2">
<property name="text">
<string>Fill color</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QgsColorButtonV2" name="btnChangeColorFill">
<item row="0" column="1">
<widget class="QgsColorButtonV2" name="btnChangeColorBorder">
<property name="text">
<string>Change</string>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="mSymbolWidthLabel">
<item row="3" column="0">
<widget class="QLabel" name="mSymbolWidthUnitLabel">
<property name="text">
<string>Symbol width</string>
<string>Symbol width unit</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QDoubleSpinBox" name="mWidthSpinBox">
<property name="decimals">
<number>6</number>
</property>
<property name="maximum">
<double>999999999.000000000000000</double>
</property>
<item row="5" column="1">
<widget class="QComboBox" name="mOutlineWidthUnitComboBox">
<item>
<property name="text">
<string>Millimeter</string>
</property>
</item>
<item>
<property name="text">
<string>Map unit</string>
</property>
</item>
</widget>
</item>
<item row="3" column="0">
<item row="4" column="0">
<widget class="QLabel" name="mOutlineWidthLabel">
<property name="text">
<string>Outline width</string>
</property>
</widget>
</item>
<item row="3" column="1">
<item row="4" column="1">
<widget class="QDoubleSpinBox" name="mOutlineWidthSpinBox">
<property name="decimals">
<number>6</number>
Expand All @@ -89,14 +86,31 @@
</property>
</widget>
</item>
<item row="5" column="0">
<widget class="QLabel" name="mSymbolHeightLabel">
<item row="6" column="1">
<widget class="QDoubleSpinBox" name="mRotationSpinBox"/>
</item>
<item row="6" column="0">
<widget class="QLabel" name="mRotationLabel">
<property name="text">
<string>Symbol height</string>
<string>Rotation</string>
</property>
</widget>
</item>
<item row="5" column="1">
<item row="3" column="1">
<widget class="QComboBox" name="mSymbolWidthUnitComboBox">
<item>
<property name="text">
<string>Millimeter</string>
</property>
</item>
<item>
<property name="text">
<string>Map unit</string>
</property>
</item>
</widget>
</item>
<item row="7" column="1">
<widget class="QDoubleSpinBox" name="mHeightSpinBox">
<property name="decimals">
<number>6</number>
Expand All @@ -106,7 +120,14 @@
</property>
</widget>
</item>
<item row="6" column="0" colspan="2">
<item row="5" column="0">
<widget class="QLabel" name="mOutlineWidthUnitLabel">
<property name="text">
<string>Outline width unit</string>
</property>
</widget>
</item>
<item row="9" column="0" colspan="2">
<widget class="QListWidget" name="mShapeListWidget">
<property name="dragDropMode">
<enum>QAbstractItemView::NoDragDrop</enum>
Expand Down Expand Up @@ -146,13 +167,55 @@
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="QDoubleSpinBox" name="mRotationSpinBox"/>
<item row="1" column="0">
<widget class="QLabel" name="label_2">
<property name="text">
<string>Fill color</string>
</property>
</widget>
</item>
<item row="4" column="0">
<widget class="QLabel" name="mRotationLabel">
<item row="2" column="0">
<widget class="QLabel" name="mSymbolWidthLabel">
<property name="text">
<string>Rotation</string>
<string>Symbol width</string>
</property>
</widget>
</item>
<item row="7" column="0">
<widget class="QLabel" name="mSymbolHeightLabel">
<property name="text">
<string>Symbol height</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QDoubleSpinBox" name="mWidthSpinBox">
<property name="decimals">
<number>6</number>
</property>
<property name="maximum">
<double>999999999.000000000000000</double>
</property>
</widget>
</item>
<item row="8" column="1">
<widget class="QComboBox" name="mSymbolHeightUnitComboBox">
<item>
<property name="text">
<string>Millimeter</string>
</property>
</item>
<item>
<property name="text">
<string>Map unit</string>
</property>
</item>
</widget>
</item>
<item row="8" column="0">
<widget class="QLabel" name="mSymbolHeightUnitLabel">
<property name="text">
<string>Symbol height unit</string>
</property>
</widget>
</item>
Expand Down
109 changes: 77 additions & 32 deletions src/ui/symbollayer/widget_fontmarker.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,50 +22,64 @@
<property name="sizeConstraint">
<enum>QLayout::SetDefaultConstraint</enum>
</property>
<property name="horizontalSpacing">
<number>6</number>
</property>
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="horizontalSpacing">
<number>6</number>
</property>
<item row="2" column="0">
<widget class="QLabel" name="label_2">
<item row="5" column="0">
<widget class="QLabel" name="label_5">
<property name="text">
<string>Size</string>
<string>Offset X,Y</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QgsColorButtonV2" name="btnColor">
<item row="4" column="0">
<widget class="QLabel" name="label_4">
<property name="text">
<string>Change</string>
<string>Rotation</string>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="label">
<item row="3" column="0">
<widget class="QLabel" name="mSizeUnitLabel">
<property name="text">
<string>Font family</string>
<string>Size unit</string>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QDoubleSpinBox" name="spinAngle">
<property name="suffix">
<string>°</string>
</property>
<widget class="QComboBox" name="mSizeUnitComboBox">
<item>
<property name="text">
<string>Millimeter</string>
</property>
</item>
<item>
<property name="text">
<string>Map unit</string>
</property>
</item>
</widget>
</item>
<item row="2" column="1">
<widget class="QDoubleSpinBox" name="spinSize">
<property name="decimals">
<number>1</number>
<number>5</number>
</property>
<property name="maximum">
<double>360.000000000000000</double>
<double>99999999.000000000000000</double>
</property>
<property name="value">
<double>12.000000000000000</double>
</property>
</widget>
</item>
<item row="4" column="1">
<item row="5" column="1">
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QDoubleSpinBox" name="spinOffsetX">
Expand Down Expand Up @@ -95,10 +109,10 @@
</item>
</layout>
</item>
<item row="4" column="0">
<widget class="QLabel" name="label_5">
<item row="2" column="0">
<widget class="QLabel" name="label_2">
<property name="text">
<string>Offset X,Y</string>
<string>Size</string>
</property>
</widget>
</item>
Expand All @@ -109,26 +123,57 @@
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QDoubleSpinBox" name="spinSize">
<property name="decimals">
<number>5</number>
</property>
<property name="value">
<double>12.000000000000000</double>
<item row="0" column="0">
<widget class="QLabel" name="label">
<property name="text">
<string>Font family</string>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="label_4">
<item row="1" column="1">
<widget class="QgsColorButtonV2" name="btnColor">
<property name="text">
<string>Rotation</string>
<string>Change</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QFontComboBox" name="cboFont"/>
</item>
<item row="4" column="1">
<widget class="QDoubleSpinBox" name="spinAngle">
<property name="suffix">
<string>°</string>
</property>
<property name="decimals">
<number>1</number>
</property>
<property name="maximum">
<double>360.000000000000000</double>
</property>
</widget>
</item>
<item row="6" column="1">
<widget class="QComboBox" name="mOffsetUnitComboBox">
<item>
<property name="text">
<string>Millimeter</string>
</property>
</item>
<item>
<property name="text">
<string>Map unit</string>
</property>
</item>
</widget>
</item>
<item row="6" column="0">
<widget class="QLabel" name="mOffsetUnitLabel">
<property name="text">
<string>Offset unit</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
Expand Down