Skip to content

Commit

Permalink
Merge pull request #2990 from DelazJ/style
Browse files Browse the repository at this point in the history 
Symbol selector dialog: use same terms in the gui
  • Loading branch information
@m-kuhn
m-kuhn committed Apr 18, 2016
2 parents a44d0c1 + 81b6493 commit 7cb77d8
Show file tree
Hide file tree
Showing 6 changed files with 28 additions and 46 deletions.
17 changes: 4 additions & 13 deletions src/ui/symbollayer/widget_gradientfill.ui
View file
Expand Up @@ -14,21 +14,12 @@
<string>Form</string>
</property>
<layout class="QGridLayout" name="gridLayout">
<property name="leftMargin">
<number>1</number>
</property>
<property name="topMargin">
<number>1</number>
</property>
<property name="rightMargin">
<number>1</number>
</property>
<property name="bottomMargin">
<number>1</number>
</property>
<property name="horizontalSpacing">
<number>28</number>
</property>
<property name="margin">
<number>1</number>
</property>
<item row="4" column="1">
<layout class="QHBoxLayout" name="horizontalLayout_5">
<item>
Expand Down Expand Up @@ -533,7 +524,7 @@
<item row="7" column="0">
<widget class="QLabel" name="label_11">
<property name="text">
<string>Angle</string>
<string>Rotation</string>
</property>
</widget>
</item>
Expand Down
25 changes: 8 additions & 17 deletions src/ui/symbollayer/widget_linepatternfill.ui
View file
Expand Up @@ -23,22 +23,13 @@
<property name="horizontalSpacing">
<number>28</number>
</property>
<property name="leftMargin">
<number>1</number>
</property>
<property name="topMargin">
<number>1</number>
</property>
<property name="rightMargin">
<number>1</number>
</property>
<property name="bottomMargin">
<property name="margin">
<number>1</number>
</property>
<item row="1" column="0">
<widget class="QLabel" name="mAngleLabel">
<widget class="QLabel" name="mRotationLabel">
<property name="text">
<string>Angle</string>
<string>Rotation</string>
</property>
</widget>
</item>
Expand Down Expand Up @@ -161,11 +152,6 @@
</layout>
</widget>
<customwidgets>
<customwidget>
<class>QgsDataDefinedButton</class>
<extends>QToolButton</extends>
<header>qgsdatadefinedbutton.h</header>
</customwidget>
<customwidget>
<class>QgsDoubleSpinBox</class>
<extends>QDoubleSpinBox</extends>
Expand All @@ -177,6 +163,11 @@
<header>qgsunitselectionwidget.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>QgsDataDefinedButton</class>
<extends>QToolButton</extends>
<header>qgsdatadefinedbutton.h</header>
</customwidget>
</customwidgets>
<resources/>
<connections/>
Expand Down
6 changes: 3 additions & 3 deletions src/ui/symbollayer/widget_simplefill.ui
View file
Expand Up @@ -31,7 +31,7 @@
<item row="7" column="0">
<widget class="QLabel" name="label_5">
<property name="text">
<string>Border width</string>
<string>Outline width</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
Expand Down Expand Up @@ -117,7 +117,7 @@
</sizepolicy>
</property>
<property name="text">
<string>Border</string>
<string>Outline</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
Expand Down Expand Up @@ -330,7 +330,7 @@
<item row="4" column="0">
<widget class="QLabel" name="label_4">
<property name="text">
<string>Border style</string>
<string>Outline style</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
Expand Down
2 changes: 1 addition & 1 deletion src/ui/symbollayer/widget_simplemarker.ui
View file
Expand Up @@ -308,7 +308,7 @@
<item row="8" column="0">
<widget class="QLabel" name="label_4">
<property name="text">
<string>Angle</string>
<string>Rotation</string>
</property>
</widget>
</item>
Expand Down
12 changes: 6 additions & 6 deletions src/ui/symbollayer/widget_svgfill.ui
View file
Expand Up @@ -143,7 +143,7 @@
<item row="3" column="0">
<widget class="QLabel" name="mBorderWidthLabel">
<property name="text">
<string>Border width</string>
<string>Outline width</string>
</property>
</widget>
</item>
Expand Down Expand Up @@ -335,11 +335,6 @@
<header>qgscolorbuttonv2.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>QgsDataDefinedButton</class>
<extends>QToolButton</extends>
<header>qgsdatadefinedbutton.h</header>
</customwidget>
<customwidget>
<class>QgsDoubleSpinBox</class>
<extends>QDoubleSpinBox</extends>
Expand All @@ -351,6 +346,11 @@
<header>qgsunitselectionwidget.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>QgsDataDefinedButton</class>
<extends>QToolButton</extends>
<header>qgsdatadefinedbutton.h</header>
</customwidget>
</customwidgets>
<tabstops>
<tabstop>mTextureWidthSpinBox</tabstop>
Expand Down
12 changes: 6 additions & 6 deletions src/ui/symbollayer/widget_svgmarker.ui
View file
Expand Up @@ -398,7 +398,7 @@
<item row="1" column="0">
<widget class="QLabel" name="label_3">
<property name="text">
<string>Angle</string>
<string>Rotation</string>
</property>
</widget>
</item>
Expand Down Expand Up @@ -504,11 +504,6 @@
<header>qgscolorbuttonv2.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>QgsDataDefinedButton</class>
<extends>QToolButton</extends>
<header>qgsdatadefinedbutton.h</header>
</customwidget>
<customwidget>
<class>QgsDoubleSpinBox</class>
<extends>QDoubleSpinBox</extends>
Expand All @@ -520,6 +515,11 @@
<header>qgsunitselectionwidget.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>QgsDataDefinedButton</class>
<extends>QToolButton</extends>
<header>qgsdatadefinedbutton.h</header>
</customwidget>
</customwidgets>
<tabstops>
<tabstop>spinSize</tabstop>
Expand Down

0 comments on commit 7cb77d8

Please sign in to comment.