diff --git a/src/frontends/qt4/ui/BoxUi.ui b/src/frontends/qt4/ui/BoxUi.ui
index bd530c23e3..22ae57d4c9 100644
--- a/src/frontends/qt4/ui/BoxUi.ui
+++ b/src/frontends/qt4/ui/BoxUi.ui
@@ -39,79 +39,10 @@
- -
-
-
-
-
-
- &Width:
-
-
- false
-
-
- false
-
-
-
- -
-
-
- Width value
-
-
-
- -
-
-
- -
-
-
-
-
-
- &Height:
-
-
- false
-
-
- false
-
-
-
- -
-
-
- false
-
-
- Height value
-
-
-
- -
-
-
- false
-
-
-
- -
-
-
- Check this if the box should break across pages
-
-
- Allow &page breaks
-
-
-
-
- Inner box -- needed for fixed width & line breaks
+ Inner box type
-
@@ -130,6 +61,75 @@
+ -
+
+
+ Check this if the box should break across pages
+
+
+ Allow &page breaks
+
+
+
+ -
+
+
+ false
+
+
+
+ -
+
+
+ false
+
+
+ Height value
+
+
+
+ -
+
+
+
+
+
+ &Height:
+
+
+ false
+
+
+ false
+
+
+
+ -
+
+
+ -
+
+
+ Width value
+
+
+
+ -
+
+
+
+
+
+ &Width:
+
+
+ false
+
+
+ false
+
+
+
@@ -142,35 +142,14 @@
true
- -
-
-
- true
-
-
-
- 0
- 0
-
-
+
-
+
Horizontal alignment of the content inside the box
-
-
-
- Left
-
-
- -
-
- Center
-
-
- -
-
- Right
-
-
+
+ Horizontal
+
-
@@ -183,39 +162,27 @@
- -
-
-
- Horizontal alignment of the content inside the box
-
+
-
+
- Horizontal
+ Co&ntent:
+
+
+ ialignCO
- -
-
-
- true
-
+
-
+
Vertical alignment of the box (with regard to baseline)
-
-
-
- Top
-
-
- -
-
- Middle
-
-
- -
-
- Bottom
-
-
+
+ &Box:
+
+
+ valignCO
+
-
@@ -254,27 +221,60 @@
- -
-
-
- Co&ntent:
+
-
+
+
+ true
-
- ialignCO
-
-
-
- -
-
Vertical alignment of the box (with regard to baseline)
-
- &Box:
+
-
+
+ Top
+
+
+ -
+
+ Middle
+
+
+ -
+
+ Bottom
+
+
+
+
+ -
+
+
+ true
-
- valignCO
+
+
+ 0
+ 0
+
+
+ Horizontal alignment of the content inside the box
+
+
-
+
+ Left
+
+
+ -
+
+ Center
+
+
+ -
+
+ Right
+
+
@@ -289,6 +289,20 @@
true
+ -
+
+
+ Line thickness:
+
+
+
+ -
+
+
+ Decoration box types
+
+
+
-
@@ -302,27 +316,20 @@
- -
-
-
- Supported box types
-
-
-
- -
-
-
- Line thickness:
-
-
-
-
false
- Width value
+ Thickness value
+
+
+
+ -
+
+
+ Shadow size:
@@ -346,7 +353,7 @@
false
- Width value
+ Separation value
@@ -357,10 +364,10 @@
- -
-
-
- Shadow size:
+
-
+
+
+ false
@@ -370,14 +377,7 @@
false
- Width value
-
-
-
- -
-
-
- false
+ Size value
@@ -394,12 +394,24 @@
- typeCO
innerBoxCO
+ widthCB
+ widthED
+ widthUnitsLC
heightCB
+ heightED
+ heightUnitsLC
+ pagebreakCB
ialignCO
halignCO
valignCO
+ typeCO
+ thicknessED
+ thicknessUnitsLC
+ separationED
+ separationUnitsLC
+ shadowsizeED
+ shadowsizeUnitsLC
qt_i18n.h
diff --git a/src/insets/InsetBox.cpp b/src/insets/InsetBox.cpp
index 011df87327..0156603f76 100644
--- a/src/insets/InsetBox.cpp
+++ b/src/insets/InsetBox.cpp
@@ -274,11 +274,11 @@ void InsetBox::latex(otexstream & os, OutputParams const & runparams) const
string width_string = params_.width.asLatexString();
string thickness_string = params_.thickness.asLatexString();
- string defaultThick = "0.4pt";
+ const string defaultThick = "0.4pt";
string separation_string = params_.separation.asLatexString();
- string defaultSep = "3pt";
+ const string defaultSep = "3pt";
string shadowsize_string = params_.shadowsize.asLatexString();
- string defaultShadow = "4pt";
+ const string defaultShadow = "4pt";
bool stdwidth = false;
// in general the overall width of some decorated boxes is wider thean the inner box
// we could therefore calculate the real width for all sizes so that if the user wants