sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-17 00:04:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4803 from DelazJ/polygon_symbol

Browse Source 
Reorganize Polygon symbol dialogs
This commit is contained in:
Matthias Kuhn 2017-07-08 10:22:28 +02:00 committed by GitHub
commit 8f8cb67370
3 changed files with 515 additions and 514 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

377
src/ui/symbollayer/widget_rasterfill.ui
View File

@ -14,166 +14,35 @@
<string>Form</string> <string>Form</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout_2"> <layout class="QGridLayout" name="gridLayout_2">
<item row="4" column="0">
<widget class="QLabel" name="label_3">
<property name="text">
<string>Coord mode</string>
</property>
<property name="buddy">
<cstring>cboCoordinateMode</cstring>
</property>
</widget>
</item>
<item row="2" column="2">
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="QgsDoubleSpinBox" name="mWidthSpinBox">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>1</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="specialValueText">
<string>Original</string>
</property>
<property name="decimals">
<number>6</number>
</property>
<property name="maximum">
<double>99999999.000000000000000</double>
</property>
<property name="singleStep">
<double>0.200000000000000</double>
</property>
</widget>
</item>
<item>
<widget class="QgsUnitSelectionWidget" name="mWidthUnitWidget" native="true">
<property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
<property name="focusPolicy">
<enum>Qt::StrongFocus</enum>
</property>
</widget>
</item>
</layout>
</item>
<item row="1" column="3">
<widget class="QgsPropertyOverrideButton" name="mFilenameDDBtn">
<property name="text">
<string>…</string>
</property>
</widget>
</item>
<item row="3" column="2">
<widget class="QgsDoubleSpinBox" name="mRotationSpinBox">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="wrapping">
<bool>true</bool>
</property>
<property name="suffix">
<string> °</string>
</property>
<property name="minimum">
<double>-360.000000000000000</double>
</property>
<property name="maximum">
<double>360.000000000000000</double>
</property>
<property name="singleStep">
<double>0.500000000000000</double>
</property>
</widget>
</item>
<item row="5" column="3"> <item row="5" column="3">
<widget class="QgsPropertyOverrideButton" name="mOpacityDDBtn"> <widget class="QgsPropertyOverrideButton" name="mRotationDDBtn">
<property name="text"> <property name="text">
<string>…</string> <string>…</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="0"> <item row="1" column="0" colspan="3">
<widget class="QLabel" name="mRotationLabel"> <layout class="QHBoxLayout" name="horizontalLayout">
<property name="text">
<string>Rotation</string>
</property>
<property name="buddy">
<cstring>mRotationSpinBox</cstring>
</property>
</widget>
</item>
<item row="0" column="0" colspan="4">
<layout class="QHBoxLayout" name="horizontalLayout_4">
<property name="topMargin">
<number>0</number>
</property>
<item> <item>
<widget class="QLabel" name="mLabelImagePreview"> <widget class="QLineEdit" name="mImageLineEdit"/>
<property name="sizePolicy"> </item>
<sizepolicy hsizetype="Fixed" vsizetype="Fixed"> <item>
<horstretch>0</horstretch> <widget class="QToolButton" name="mBrowseToolButton">
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>150</width>
<height>150</height>
</size>
</property>
<property name="frameShape">
<enum>QFrame::Panel</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Sunken</enum>
</property>
<property name="lineWidth">
<number>1</number>
</property>
<property name="midLineWidth">
<number>0</number>
</property>
<property name="text"> <property name="text">
<string/> <string>…</string>
</property> </property>
</widget> </widget>
</item> </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> </layout>
</item> </item>
<item row="6" column="0"> <item row="2" column="3">
<widget class="QLabel" name="label_7"> <widget class="QgsPropertyOverrideButton" name="mWidthDDBtn">
<property name="text"> <property name="text">
<string>Offset</string> <string>…</string>
</property>
<property name="buddy">
<cstring>mSpinOffsetX</cstring>
</property> </property>
</widget> </widget>
</item> </item>
<item row="6" column="2"> <item row="8" column="2">
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout">
<item row="0" column="0"> <item row="0" column="0">
<widget class="QLabel" name="label_2"> <widget class="QLabel" name="label_2">
@ -248,6 +117,19 @@
</item> </item>
</layout> </layout>
</item> </item>
<item row="9" 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>
<item row="2" column="0"> <item row="2" column="0">
<widget class="QLabel" name="mTextureWidthLabel"> <widget class="QLabel" name="mTextureWidthLabel">
<property name="text"> <property name="text">
@ -258,28 +140,17 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="5" column="0"> <item row="3" column="0">
<widget class="QLabel" name="label"> <widget class="QLabel" name="label_3">
<property name="text"> <property name="text">
<string>Opacity</string> <string>Coord mode</string>
</property>
<property name="buddy">
<cstring>cboCoordinateMode</cstring>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="0" colspan="3"> <item row="3" column="2">
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QLineEdit" name="mImageLineEdit"/>
</item>
<item>
<widget class="QToolButton" name="mBrowseToolButton">
<property name="text">
<string>…</string>
</property>
</widget>
</item>
</layout>
</item>
<item row="4" column="2">
<widget class="QComboBox" name="cboCoordinateMode"> <widget class="QComboBox" name="cboCoordinateMode">
<item> <item>
<property name="text"> <property name="text">
@ -293,40 +164,169 @@
</item> </item>
</widget> </widget>
</item> </item>
<item row="2" column="3"> <item row="0" column="0" colspan="4">
<widget class="QgsPropertyOverrideButton" name="mWidthDDBtn"> <layout class="QHBoxLayout" name="horizontalLayout_4">
<property name="text"> <property name="topMargin">
<string>…</string> <number>0</number>
</property> </property>
</widget> <item>
</item> <widget class="QLabel" name="mLabelImagePreview">
<item row="3" column="3"> <property name="sizePolicy">
<widget class="QgsPropertyOverrideButton" name="mRotationDDBtn"> <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<property name="text"> <horstretch>0</horstretch>
<string>…</string> <verstretch>0</verstretch>
</property> </sizepolicy>
</widget> </property>
</item> <property name="minimumSize">
<item row="7" column="0"> <size>
<spacer name="verticalSpacer"> <width>150</width>
<property name="orientation"> <height>150</height>
<enum>Qt::Vertical</enum> </size>
</property> </property>
<property name="sizeHint" stdset="0"> <property name="frameShape">
<size> <enum>QFrame::Panel</enum>
<width>20</width> </property>
<height>40</height> <property name="frameShadow">
</size> <enum>QFrame::Sunken</enum>
</property> </property>
</spacer> <property name="lineWidth">
<number>1</number>
</property>
<property name="midLineWidth">
<number>0</number>
</property>
<property name="text">
<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>
<item row="5" column="2"> <item row="5" column="2">
<widget class="QgsDoubleSpinBox" name="mRotationSpinBox">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="wrapping">
<bool>true</bool>
</property>
<property name="suffix">
<string> °</string>
</property>
<property name="minimum">
<double>-360.000000000000000</double>
</property>
<property name="maximum">
<double>360.000000000000000</double>
</property>
<property name="singleStep">
<double>0.500000000000000</double>
</property>
</widget>
</item>
<item row="8" column="0">
<widget class="QLabel" name="label_7">
<property name="text">
<string>Offset</string>
</property>
<property name="buddy">
<cstring>mSpinOffsetX</cstring>
</property>
</widget>
</item>
<item row="2" column="2">
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="QgsDoubleSpinBox" name="mWidthSpinBox">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>1</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="specialValueText">
<string>Original</string>
</property>
<property name="decimals">
<number>6</number>
</property>
<property name="maximum">
<double>99999999.000000000000000</double>
</property>
<property name="singleStep">
<double>0.200000000000000</double>
</property>
</widget>
</item>
<item>
<widget class="QgsUnitSelectionWidget" name="mWidthUnitWidget" native="true">
<property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
<property name="focusPolicy">
<enum>Qt::StrongFocus</enum>
</property>
</widget>
</item>
</layout>
</item>
<item row="5" 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="1" column="3">
<widget class="QgsPropertyOverrideButton" name="mFilenameDDBtn">
<property name="text">
<string>…</string>
</property>
</widget>
</item>
<item row="4" column="0">
<widget class="QLabel" name="label">
<property name="text">
<string>Opacity</string>
</property>
</widget>
</item>
<item row="4" column="2">
<widget class="QgsOpacityWidget" name="mOpacityWidget" native="true"> <widget class="QgsOpacityWidget" name="mOpacityWidget" native="true">
<property name="focusPolicy"> <property name="focusPolicy">
<enum>Qt::StrongFocus</enum> <enum>Qt::StrongFocus</enum>
</property> </property>
</widget> </widget>
</item> </item>
<item row="4" column="3">
<widget class="QgsPropertyOverrideButton" name="mOpacityDDBtn">
<property name="text">
<string>…</string>
</property>
</widget>
</item>
</layout> </layout>
</widget> </widget>
<customwidgets> <customwidgets>
@ -360,10 +360,11 @@
<tabstop>mWidthSpinBox</tabstop> <tabstop>mWidthSpinBox</tabstop>
<tabstop>mWidthUnitWidget</tabstop> <tabstop>mWidthUnitWidget</tabstop>
<tabstop>mWidthDDBtn</tabstop> <tabstop>mWidthDDBtn</tabstop>
<tabstop>cboCoordinateMode</tabstop>
<tabstop>mOpacityWidget</tabstop>
<tabstop>mOpacityDDBtn</tabstop>
<tabstop>mRotationSpinBox</tabstop> <tabstop>mRotationSpinBox</tabstop>
<tabstop>mRotationDDBtn</tabstop> <tabstop>mRotationDDBtn</tabstop>
<tabstop>cboCoordinateMode</tabstop>
<tabstop>mOpacityDDBtn</tabstop>
<tabstop>mSpinOffsetX</tabstop> <tabstop>mSpinOffsetX</tabstop>
<tabstop>mSpinOffsetY</tabstop> <tabstop>mSpinOffsetY</tabstop>
<tabstop>mOffsetUnitWidget</tabstop> <tabstop>mOffsetUnitWidget</tabstop>

338
src/ui/symbollayer/widget_simplefill.ui
View File

@ -14,31 +14,92 @@
<string>Form</string> <string>Form</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout_2"> <layout class="QGridLayout" name="gridLayout_2">
<item row="5" column="3"> <item row="1" column="0">
<widget class="QgsPenJoinStyleComboBox" name="cboJoinStyle"/> <widget class="QLabel" name="label_2">
</item>
<item row="4" column="0">
<widget class="QLabel" name="label_4">
<property name="text"> <property name="text">
<string>Stroke style</string> <string>Fill style</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set> <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
</property> </property>
</widget> </widget>
</item> </item>
<item row="6" column="0"> <item row="0" column="3">
<widget class="QLabel" name="label_5"> <widget class="QgsColorButton" name="btnChangeColor">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>120</width>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>16777215</height>
</size>
</property>
<property name="text"> <property name="text">
<string>Stroke width</string> <string/>
</property>
</widget>
</item>
<item row="2" column="3">
<widget class="QgsColorButton" name="btnChangeStrokeColor">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>120</width>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>16777215</height>
</size>
</property>
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="7" column="0">
<widget class="QLabel" name="label_6">
<property name="text">
<string>Offset</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set> <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="0"> <item row="4" column="5">
<widget class="QLabel" name="label_7"> <widget class="QgsPropertyOverrideButton" name="mStrokeStyleDDBtn">
<property name="text">
<string>…</string>
</property>
</widget>
</item>
<item row="5" column="5">
<widget class="QgsPropertyOverrideButton" name="mJoinStyleDDBtn">
<property name="text">
<string>…</string>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="label_3">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Preferred"> <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
<horstretch>0</horstretch> <horstretch>0</horstretch>
@ -46,37 +107,13 @@
</sizepolicy> </sizepolicy>
</property> </property>
<property name="text"> <property name="text">
<string>Fill</string> <string>Stroke color</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set> <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="4">
<widget class="QgsPropertyOverrideButton" name="mFillStyleDDBtn">
<property name="text">
<string>…</string>
</property>
</widget>
</item>
<item row="0" column="4">
<widget class="QgsPropertyOverrideButton" name="mFillColorDDBtn">
<property name="text">
<string>…</string>
</property>
</widget>
</item>
<item row="6" column="4">
<widget class="QgsPropertyOverrideButton" name="mStrokeWidthDDBtn">
<property name="text">
<string>…</string>
</property>
</widget>
</item>
<item row="4" column="3">
<widget class="QgsPenStyleComboBox" name="cboStrokeStyle"/>
</item>
<item row="7" column="3"> <item row="7" column="3">
<layout class="QGridLayout" name="gridLayout" rowstretch="0,0" rowminimumheight="0,0"> <layout class="QGridLayout" name="gridLayout" rowstretch="0,0" rowminimumheight="0,0">
<property name="leftMargin"> <property name="leftMargin">
@ -158,17 +195,96 @@
</item> </item>
</layout> </layout>
</item> </item>
<item row="7" column="0"> <item row="2" column="5">
<widget class="QLabel" name="label_6"> <widget class="QgsPropertyOverrideButton" name="mStrokeColorDDBtn">
<property name="text"> <property name="text">
<string>Offset</string> <string>…</string>
</property>
</widget>
</item>
<item row="8" column="3">
<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>
<item row="5" column="0">
<widget class="QLabel" name="label_8">
<property name="text">
<string>Join style</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set> <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
</property> </property>
</widget> </widget>
</item> </item>
<item row="6" column="3"> <item row="5" column="3">
<widget class="QgsPenJoinStyleComboBox" name="cboJoinStyle"/>
</item>
<item row="4" column="0">
<widget class="QLabel" name="label_4">
<property name="text">
<string>Stroke style</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="0" column="5">
<widget class="QgsPropertyOverrideButton" name="mFillColorDDBtn">
<property name="text">
<string>…</string>
</property>
</widget>
</item>
<item row="4" column="3">
<widget class="QgsPenStyleComboBox" name="cboStrokeStyle"/>
</item>
<item row="0" column="0">
<widget class="QLabel" name="label_7">
<property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Fill color</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="1" column="3">
<widget class="QgsBrushStyleComboBox" name="cboFillStyle"/>
</item>
<item row="1" column="5">
<widget class="QgsPropertyOverrideButton" name="mFillStyleDDBtn">
<property name="text">
<string>…</string>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="label_5">
<property name="text">
<string>Stroke width</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="3" column="3">
<layout class="QHBoxLayout" name="horizontalLayout_3"> <layout class="QHBoxLayout" name="horizontalLayout_3">
<item> <item>
<widget class="QgsDoubleSpinBox" name="spinStrokeWidth"> <widget class="QgsDoubleSpinBox" name="spinStrokeWidth">
@ -210,138 +326,16 @@
</item> </item>
</layout> </layout>
</item> </item>
<item row="2" column="3"> <item row="3" column="5">
<widget class="QgsColorButton" name="btnChangeStrokeColor"> <widget class="QgsPropertyOverrideButton" name="mStrokeWidthDDBtn">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>120</width>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>16777215</height>
</size>
</property>
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="5" column="0">
<widget class="QLabel" name="label_8">
<property name="text">
<string>Join style</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="2" column="4">
<widget class="QgsPropertyOverrideButton" name="mStrokeColorDDBtn">
<property name="text"> <property name="text">
<string>…</string> <string>…</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="5" column="4">
<widget class="QgsPropertyOverrideButton" name="mJoinStyleDDBtn">
<property name="text">
<string>…</string>
</property>
</widget>
</item>
<item row="0" column="3">
<widget class="QgsColorButton" name="btnChangeColor">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>120</width>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>16777215</height>
</size>
</property>
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="label_2">
<property name="text">
<string>Fill style</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="4" column="4">
<widget class="QgsPropertyOverrideButton" name="mStrokeStyleDDBtn">
<property name="text">
<string>…</string>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="label_3">
<property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Stroke</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="3" column="3">
<widget class="QgsBrushStyleComboBox" name="cboFillStyle"/>
</item>
<item row="8" column="3">
<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> </layout>
</widget> </widget>
<customwidgets> <customwidgets>
<customwidget>
<class>QgsColorButton</class>
<extends>QToolButton</extends>
<header>qgscolorbutton.h</header>
<container>1</container>
</customwidget>
<customwidget> <customwidget>
<class>QgsPropertyOverrideButton</class> <class>QgsPropertyOverrideButton</class>
<extends>QToolButton</extends> <extends>QToolButton</extends>
@ -358,6 +352,12 @@
<header>qgsunitselectionwidget.h</header> <header>qgsunitselectionwidget.h</header>
<container>1</container> <container>1</container>
</customwidget> </customwidget>
<customwidget>
<class>QgsColorButton</class>
<extends>QToolButton</extends>
<header>qgscolorbutton.h</header>
<container>1</container>
</customwidget>
<customwidget> <customwidget>
<class>QgsPenJoinStyleComboBox</class> <class>QgsPenJoinStyleComboBox</class>
<extends>QComboBox</extends> <extends>QComboBox</extends>
@ -377,17 +377,17 @@
<tabstops> <tabstops>
<tabstop>btnChangeColor</tabstop> <tabstop>btnChangeColor</tabstop>
<tabstop>mFillColorDDBtn</tabstop> <tabstop>mFillColorDDBtn</tabstop>
<tabstop>btnChangeStrokeColor</tabstop>
<tabstop>mStrokeColorDDBtn</tabstop>
<tabstop>cboFillStyle</tabstop> <tabstop>cboFillStyle</tabstop>
<tabstop>mFillStyleDDBtn</tabstop> <tabstop>mFillStyleDDBtn</tabstop>
<tabstop>btnChangeStrokeColor</tabstop>
<tabstop>mStrokeColorDDBtn</tabstop>
<tabstop>spinStrokeWidth</tabstop>
<tabstop>mStrokeWidthUnitWidget</tabstop>
<tabstop>mStrokeWidthDDBtn</tabstop>
<tabstop>cboStrokeStyle</tabstop> <tabstop>cboStrokeStyle</tabstop>
<tabstop>mStrokeStyleDDBtn</tabstop> <tabstop>mStrokeStyleDDBtn</tabstop>
<tabstop>cboJoinStyle</tabstop> <tabstop>cboJoinStyle</tabstop>
<tabstop>mJoinStyleDDBtn</tabstop> <tabstop>mJoinStyleDDBtn</tabstop>
<tabstop>spinStrokeWidth</tabstop>
<tabstop>mStrokeWidthUnitWidget</tabstop>
<tabstop>mStrokeWidthDDBtn</tabstop>
<tabstop>spinOffsetX</tabstop> <tabstop>spinOffsetX</tabstop>
<tabstop>spinOffsetY</tabstop> <tabstop>spinOffsetY</tabstop>
<tabstop>mOffsetUnitWidget</tabstop> <tabstop>mOffsetUnitWidget</tabstop>

314
src/ui/symbollayer/widget_svgfill.ui
View File

@ -6,7 +6,7 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>319</width> <width>328</width>
<height>497</height> <height>497</height>
</rect> </rect>
</property> </property>
@ -14,71 +14,7 @@
<string>Form</string> <string>Form</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout">
<item row="1" column="2"> <item row="10" column="0" colspan="3">
<widget class="QgsDoubleSpinBox" name="mRotationSpinBox">
<property name="wrapping">
<bool>true</bool>
</property>
<property name="suffix">
<string> °</string>
</property>
<property name="minimum">
<double>-360.000000000000000</double>
</property>
<property name="maximum">
<double>360.000000000000000</double>
</property>
<property name="singleStep">
<double>0.500000000000000</double>
</property>
</widget>
</item>
<item row="5" column="0">
<widget class="QLabel" name="mStrokeColorLabel">
<property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Stroke</string>
</property>
</widget>
</item>
<item row="5" column="2">
<widget class="QgsColorButton" name="mChangeStrokeColorButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>120</width>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>16777215</height>
</size>
</property>
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="6" column="0">
<widget class="QLabel" name="mStrokeWidthLabel">
<property name="text">
<string>Stroke width</string>
</property>
</widget>
</item>
<item row="8" column="0" colspan="3">
<layout class="QHBoxLayout" name="horizontalLayout"> <layout class="QHBoxLayout" name="horizontalLayout">
<item> <item>
<widget class="QLineEdit" name="mSVGLineEdit"/> <widget class="QLineEdit" name="mSVGLineEdit"/>
@ -92,6 +28,19 @@
</item> </item>
</layout> </layout>
</item> </item>
<item row="5" column="0">
<widget class="QLabel" name="mStrokeColorLabel">
<property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Stroke color</string>
</property>
</widget>
</item>
<item row="6" column="2"> <item row="6" column="2">
<layout class="QHBoxLayout" name="horizontalLayout_4"> <layout class="QHBoxLayout" name="horizontalLayout_4">
<item> <item>
@ -128,6 +77,13 @@
</item> </item>
</layout> </layout>
</item> </item>
<item row="6" column="0">
<widget class="QLabel" name="mStrokeWidthLabel">
<property name="text">
<string>Stroke width</string>
</property>
</widget>
</item>
<item row="3" column="2"> <item row="3" column="2">
<widget class="QgsColorButton" name="mChangeColorButton"> <widget class="QgsColorButton" name="mChangeColorButton">
<property name="sizePolicy"> <property name="sizePolicy">
@ -153,87 +109,6 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="0">
<widget class="QLabel" name="mRotationLabel">
<property name="text">
<string>Rotation</string>
</property>
</widget>
</item>
<item row="0" column="2">
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="QgsDoubleSpinBox" name="mTextureWidthSpinBox">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>1</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="decimals">
<number>6</number>
</property>
<property name="maximum">
<double>999999999.999999046325684</double>
</property>
<property name="singleStep">
<double>0.200000000000000</double>
</property>
<property name="showClearButton" stdset="0">
<bool>false</bool>
</property>
</widget>
</item>
<item>
<widget class="QgsUnitSelectionWidget" name="mTextureWidthUnitWidget" native="true">
<property name="focusPolicy">
<enum>Qt::StrongFocus</enum>
</property>
</widget>
</item>
</layout>
</item>
<item row="3" column="0">
<widget class="QLabel" name="label">
<property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Fill</string>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="mTextureWidthLabel">
<property name="text">
<string>Texture width</string>
</property>
</widget>
</item>
<item row="0" column="3">
<widget class="QgsPropertyOverrideButton" name="mTextureWidthDDBtn">
<property name="text">
<string>…</string>
</property>
</widget>
</item>
<item row="1" column="3">
<widget class="QgsPropertyOverrideButton" name="mRotationDDBtn">
<property name="text">
<string>…</string>
</property>
</widget>
</item>
<item row="3" column="3">
<widget class="QgsPropertyOverrideButton" name="mFilColorDDBtn">
<property name="text">
<string>…</string>
</property>
</widget>
</item>
<item row="5" column="3"> <item row="5" column="3">
<widget class="QgsPropertyOverrideButton" name="mStrokeColorDDBtn"> <widget class="QgsPropertyOverrideButton" name="mStrokeColorDDBtn">
<property name="text"> <property name="text">
@ -248,7 +123,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="7" column="0" colspan="4"> <item row="9" column="0" colspan="4">
<layout class="QGridLayout" name="gridLayout_2"> <layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="0"> <item row="0" column="0">
<widget class="QLabel" name="mSymbolGroupLabel"> <widget class="QLabel" name="mSymbolGroupLabel">
@ -319,22 +194,141 @@
</item> </item>
</layout> </layout>
</item> </item>
<item row="8" column="3"> <item row="10" column="3">
<widget class="QgsPropertyOverrideButton" name="mSVGDDBtn"> <widget class="QgsPropertyOverrideButton" name="mSVGDDBtn">
<property name="text"> <property name="text">
<string>…</string> <string>…</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="3">
<widget class="QgsPropertyOverrideButton" name="mFilColorDDBtn">
<property name="text">
<string>…</string>
</property>
</widget>
</item>
<item row="5" column="2">
<widget class="QgsColorButton" name="mChangeStrokeColorButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>120</width>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>16777215</height>
</size>
</property>
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="label">
<property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Fill color</string>
</property>
</widget>
</item>
<item row="8" column="0">
<widget class="QLabel" name="mRotationLabel">
<property name="text">
<string>Rotation</string>
</property>
</widget>
</item>
<item row="8" column="2">
<widget class="QgsDoubleSpinBox" name="mRotationSpinBox">
<property name="wrapping">
<bool>true</bool>
</property>
<property name="suffix">
<string> °</string>
</property>
<property name="minimum">
<double>-360.000000000000000</double>
</property>
<property name="maximum">
<double>360.000000000000000</double>
</property>
<property name="singleStep">
<double>0.500000000000000</double>
</property>
</widget>
</item>
<item row="8" column="3">
<widget class="QgsPropertyOverrideButton" name="mRotationDDBtn">
<property name="text">
<string>…</string>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="mTextureWidthLabel">
<property name="text">
<string>Texture width</string>
</property>
</widget>
</item>
<item row="0" column="2">
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="QgsDoubleSpinBox" name="mTextureWidthSpinBox">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>1</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="decimals">
<number>6</number>
</property>
<property name="maximum">
<double>999999999.999999046325684</double>
</property>
<property name="singleStep">
<double>0.200000000000000</double>
</property>
<property name="showClearButton" stdset="0">
<bool>false</bool>
</property>
</widget>
</item>
<item>
<widget class="QgsUnitSelectionWidget" name="mTextureWidthUnitWidget" native="true">
<property name="focusPolicy">
<enum>Qt::StrongFocus</enum>
</property>
</widget>
</item>
</layout>
</item>
<item row="0" column="3">
<widget class="QgsPropertyOverrideButton" name="mTextureWidthDDBtn">
<property name="text">
<string>…</string>
</property>
</widget>
</item>
</layout> </layout>
</widget> </widget>
<customwidgets> <customwidgets>
<customwidget>
<class>QgsColorButton</class>
<extends>QToolButton</extends>
<header>qgscolorbutton.h</header>
<container>1</container>
</customwidget>
<customwidget> <customwidget>
<class>QgsPropertyOverrideButton</class> <class>QgsPropertyOverrideButton</class>
<extends>QToolButton</extends> <extends>QToolButton</extends>
@ -351,13 +345,17 @@
<header>qgsunitselectionwidget.h</header> <header>qgsunitselectionwidget.h</header>
<container>1</container> <container>1</container>
</customwidget> </customwidget>
<customwidget>
<class>QgsColorButton</class>
<extends>QToolButton</extends>
<header>qgscolorbutton.h</header>
<container>1</container>
</customwidget>
</customwidgets> </customwidgets>
<tabstops> <tabstops>
<tabstop>mTextureWidthSpinBox</tabstop> <tabstop>mTextureWidthSpinBox</tabstop>
<tabstop>mTextureWidthUnitWidget</tabstop> <tabstop>mTextureWidthUnitWidget</tabstop>
<tabstop>mTextureWidthDDBtn</tabstop> <tabstop>mTextureWidthDDBtn</tabstop>
<tabstop>mRotationSpinBox</tabstop>
<tabstop>mRotationDDBtn</tabstop>
<tabstop>mChangeColorButton</tabstop> <tabstop>mChangeColorButton</tabstop>
<tabstop>mFilColorDDBtn</tabstop> <tabstop>mFilColorDDBtn</tabstop>
<tabstop>mChangeStrokeColorButton</tabstop> <tabstop>mChangeStrokeColorButton</tabstop>
@ -365,6 +363,8 @@
<tabstop>mStrokeWidthSpinBox</tabstop> <tabstop>mStrokeWidthSpinBox</tabstop>
<tabstop>mSvgStrokeWidthUnitWidget</tabstop> <tabstop>mSvgStrokeWidthUnitWidget</tabstop>
<tabstop>mStrokeWidthDDBtn</tabstop> <tabstop>mStrokeWidthDDBtn</tabstop>
<tabstop>mRotationSpinBox</tabstop>
<tabstop>mRotationDDBtn</tabstop>
<tabstop>mSvgTreeView</tabstop> <tabstop>mSvgTreeView</tabstop>
<tabstop>mSvgListView</tabstop> <tabstop>mSvgListView</tabstop>
<tabstop>mSVGLineEdit</tabstop> <tabstop>mSVGLineEdit</tabstop>