diff --git a/src/ui/qgsvectorlayerpropertiesbase.ui b/src/ui/qgsvectorlayerpropertiesbase.ui
index 81cbe7597b17..e499c84a96b3 100644
--- a/src/ui/qgsvectorlayerpropertiesbase.ui
+++ b/src/ui/qgsvectorlayerpropertiesbase.ui
@@ -21,6 +21,48 @@
true
+ -
+
+
-
+
+
+ Restore Default Style
+
+
+
+ -
+
+
+ Save As Default
+
+
+
+ -
+
+
+ Load Style ...
+
+
+
+ -
+
+
+ Save Style ...
+
+
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+ QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::Help|QDialogButtonBox::Ok
+
+
+
-
@@ -129,10 +171,8 @@
QFrame::Sunken
- 0
+ -1
-
-
-
@@ -330,8 +370,8 @@
0
0
- 446
- 481
+ 755
+ 519
@@ -560,52 +600,77 @@
-
-
-
- Title
-
-
-
- -
-
-
- -
-
-
- Abstract
-
-
-
- -
-
-
-
- 0
- 50
-
-
-
-
- 0
- 50
-
-
-
-
- 16777215
- 80
-
+
+
+ QFrame::NoFrame
-
-
- -
-
-
- 2
+
+ QFrame::Plain
-
+
true
+
+
+
+ 0
+ 0
+ 733
+ 497
+
+
+
+
-
+
+
+ Title
+
+
+
+ -
+
+
+ -
+
+
+ Abstract
+
+
+
+ -
+
+
+
+ 0
+ 50
+
+
+
+
+ 0
+ 50
+
+
+
+
+ 16777215
+ 80
+
+
+
+
+ -
+
+
+ 2
+
+
+ true
+
+
+
+
+
@@ -646,61 +711,86 @@
Joins
- -
-
-
-
-
-
-
- :/images/themes/default/symbologyAdd.png:/images/themes/default/symbologyAdd.png
-
-
-
- -
-
-
-
-
-
-
- :/images/themes/default/symbologyRemove.png:/images/themes/default/symbologyRemove.png
-
-
-
- -
-
-
- Qt::Horizontal
+
-
+
+
+ QFrame::NoFrame
-
-
- 354
- 23
-
+
+ QFrame::Plain
-
-
- -
-
-
- 3
+
+ true
-
-
- Join layer
-
-
-
-
- Join field
-
-
-
-
- Target field
+
+
+
+ 0
+ 0
+ 733
+ 497
+
-
+
+
-
+
+
+
+
+
+
+ :/images/themes/default/symbologyAdd.png:/images/themes/default/symbologyAdd.png
+
+
+
+ -
+
+
+
+
+
+
+ :/images/themes/default/symbologyRemove.png:/images/themes/default/symbologyRemove.png
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 354
+ 23
+
+
+
+
+ -
+
+
+ 3
+
+
+
+ Join layer
+
+
+
+
+ Join field
+
+
+
+
+ Target field
+
+
+
+
+
+
@@ -715,540 +805,523 @@
-
-
-
- Display diagrams
-
-
-
- -
-
-
- 6
+
+
+ QFrame::NoFrame
-
- 0
+
+ QFrame::Plain
-
-
-
-
- Diagram type
-
-
-
- -
-
-
-
-
- -
-
-
-
-
-
- Priority:
-
-
-
- -
-
-
- Low
-
-
-
- -
-
-
- 10
-
-
- Qt::Horizontal
-
-
- false
-
-
- false
-
-
- QSlider::TicksBelow
-
-
- 1
-
-
-
- -
-
-
- High
-
-
-
-
-
- -
-
-
- Appearance
+
+ true
-
-
-
-
-
-
-
-
- Pen color
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
-
- 25
- 0
-
-
-
-
-
-
-
-
-
- -
-
-
-
-
-
- Pen width
-
-
-
- -
-
-
- 5
-
-
- 99999.990000000005239
-
-
-
-
-
- -
-
-
-
-
-
- Scale dependent visibility
-
-
-
- -
-
-
- Minimum
-
-
-
- -
-
-
- -
-
-
- Maximum
-
-
-
- -
-
-
-
-
- -
-
-
-
-
-
-
-
-
- Background color
-
-
+
+
+
+ 0
+ 0
+ 713
+ 637
+
+
+
+
-
+
+
+ Display diagrams
+
+
+
+ -
+
+
+ 6
+
+
+ 0
+
+
-
+
+
+ Diagram type
+
+
+
+ -
+
+
+
+
+ -
+
+
-
+
+
+ Priority:
+
+
+
+ -
+
+
+ Low
+
+
+
+ -
+
+
+ 10
+
+
+ Qt::Horizontal
+
+
+ false
+
+
+ false
+
+
+ QSlider::TicksBelow
+
+
+ 1
+
+
+
+ -
+
+
+ High
+
+
+
+
+
+ -
+
+
+ Appearance
+
+
+
-
+
+
-
+
+
+ Pen color
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 25
+ 0
+
+
+
+
+
+
+
+
- -
-
-
-
- 0
- 0
-
-
-
-
- 25
- 0
-
-
-
-
-
-
+
-
+
+
-
+
+
+ Pen width
+
+
+
+ -
+
+
+ 5
+
+
+ 99999.990000000005239
+
+
+
+
-
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
- Font...
-
-
-
-
-
-
- -
-
-
- Size
-
-
-
-
-
-
- Fixed size
-
-
-
- -
-
-
- 9999999.990000000223517
-
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- 335
- 20
-
-
-
-
- -
-
-
- Scale linearly between 0 and the following attribute value / diagram size:
-
-
- true
-
-
-
- -
-
-
-
-
-
- Attribute
-
-
-
- -
-
-
- -
-
-
- Find maximum value
-
-
-
- -
-
-
- -
-
-
- Size
-
-
-
- -
-
-
- 10000000
-
-
-
-
-
- -
-
-
-
-
-
- Size units
-
-
-
- -
-
-
-
-
-
-
-
- -
-
-
- Position
-
-
-
-
-
-
-
-
-
- Placement
-
-
-
- -
-
-
-
-
- -
-
-
-
-
-
- Line Options
-
-
-
- -
-
-
-
-
- -
-
-
-
-
-
- Distance
-
-
-
- -
-
-
-
-
- -
-
-
- Data defined position
-
-
-
- -
-
-
-
-
-
-
- 0
- 0
-
-
+
-
+
+
-
+
+
+ Scale dependent visibility
+
+
+
+ -
+
+
+ Minimum
+
+
+
+ -
+
+
+ -
+
+
+ Maximum
+
+
+
+ -
+
+
+
+
+ -
+
+
-
+
+
-
+
+
+ Background color
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 25
+ 0
+
+
+
+
+
+
+
+
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ Font...
+
+
+
+
+
+
+ -
+
+
+ Size
+
+
+
-
+
+
+ Fixed size
+
+
+
+ -
+
+
+ 9999999.990000000223517
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 335
+ 20
+
+
+
+
+ -
+
+
+ Scale linearly between 0 and the following attribute value / diagram size:
+
+
+ true
+
+
+
+ -
+
+
-
+
+
+ Attribute
+
+
+
+ -
+
+
+ -
+
+
+ Find maximum value
+
+
+
+ -
+
+
+ -
+
+
+ Size
+
+
+
+ -
+
+
+ 10000000
+
+
+
+
+
+ -
+
+
-
+
+
+ Size units
+
+
+
+ -
+
+
+
+
+
+
+
+ -
+
+
+ Position
+
+
+
-
+
+
-
+
+
+ Placement
+
+
+
+ -
+
+
+
+
+ -
+
+
-
+
+
+ Line Options
+
+
+
+ -
+
+
+
+
+ -
+
+
-
+
+
+ Distance
+
+
+
+ -
+
+
+
+
+ -
+
+
+ Data defined position
+
+
+
+ -
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+ x
+
+
+
+ -
+
+
+
+
+ -
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+ y
+
+
+
+ -
+
+
+
+
+
+
+
+ -
+
+
+ Attributes
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 241
+ 23
+
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+
+
+
+ :/images/themes/default/symbologyRemove.png:/images/themes/default/symbologyRemove.png
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+
+
+
+ :/images/themes/default/symbologyAdd.png:/images/themes/default/symbologyAdd.png
+
+
+
+ -
+
+
+ 2
+
+
- x
-
-
-
- -
-
-
-
-
- -
-
-
-
-
-
-
- 0
- 0
-
+ Attribute
+
+
- y
+ Color
-
-
- -
-
-
-
-
-
-
-
- -
-
-
- Attributes
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- 241
- 23
-
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
-
-
-
-
- :/images/themes/default/symbologyRemove.png:/images/themes/default/symbologyRemove.png
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
-
-
-
-
- :/images/themes/default/symbologyAdd.png:/images/themes/default/symbologyAdd.png
-
-
-
- -
-
-
- 2
-
-
-
- Attribute
-
-
-
-
- Color
-
-
+
+
+
+
+
- -
-
-
-
-
-
- Restore Default Style
-
-
-
- -
-
-
- Save As Default
-
-
-
- -
-
-
- Load Style ...
-
-
-
- -
-
-
- Save Style ...
-
-
-
-
-
- -
-
-
- Qt::Horizontal
-
-
- QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::Help|QDialogButtonBox::Ok
-
-
-