sidebar: AreaPropertyPanel conversion to .ui

Change-Id: I1c291b3806a483a7ce50c64d0fbf2f28204c132e

6 files changed, 341 insertions, 231 deletions

diff --git a/svx/UIConfig_svx.mk b/svx/UIConfig_svx.mk
index f1fa287a000a..74bff0969682 100644
--- a/svx/UIConfig_svx.mk
+++ b/svx/UIConfig_svx.mk
@@ -22,6 +22,7 @@ $(eval $(call gb_UIConfig_add_uifiles,svx,\
 	svx/uiconfig/ui/redlinecontrol \
 	svx/uiconfig/ui/redlinefilterpage \
 	svx/uiconfig/ui/redlineviewpage \
+	svx/uiconfig/ui/sidebararea \
 	svx/uiconfig/ui/sidebarline \
 	svx/uiconfig/ui/sidebarparagraph \
 	svx/uiconfig/ui/sidebartextpanel \
diff --git a/svx/source/sidebar/area/AreaPropertyPanel.cxx b/svx/source/sidebar/area/AreaPropertyPanel.cxx
index 4046d422df3f..40330ae46275 100644
--- a/svx/source/sidebar/area/AreaPropertyPanel.cxx
+++ b/svx/source/sidebar/area/AreaPropertyPanel.cxx
@@ -45,10 +45,10 @@ using namespace css;
 using namespace cssu;
 using ::sfx2::sidebar::Theme;
 
-#define A2S(pString) (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(pString)))
-
-
+const char UNO_SIDEBARCOLOR[]    = ".uno:sidebarcolor";
+const char UNO_SIDEBARGRADIENT[] = ".uno:sidebargradient";
 
+#define A2S(pString) (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(pString)))
 
 namespace svx { namespace sidebar {
 
@@ -64,7 +64,7 @@ AreaPropertyPanel::AreaPropertyPanel(
     Window* pParent,
     const cssu::Reference<css::frame::XFrame>& rxFrame,
     SfxBindings* pBindings)
-    : Control(pParent, SVX_RES(RID_SIDEBAR_AREA_PANEL)),
+    : PanelLayout(pParent, "AreaPropertyPanel", "svx/ui/sidebararea.ui", rxFrame),
       meLastXFS(-1),
       maLastColor(Color(COL_DEFAULT_SHAPE_FILLING)),
       mnLastPosGradient(0),
@@ -77,17 +77,8 @@ AreaPropertyPanel::AreaPropertyPanel(
       maGradientElliptical(),
       maGradientSquare(),
       maGradientRect(),
-      mpColorTextFT(new FixedText(this, SVX_RES(FT_COLOR_LIST))),
       mpLbFillType(new SvxFillTypeBox(this)),
       mpLbFillAttr(new SvxFillAttrBox(this)),
-      mpToolBoxColorBackground(sfx2::sidebar::ControlFactory::CreateToolBoxBackground(this)),
-      mpToolBoxColor(sfx2::sidebar::ControlFactory::CreateToolBox(mpToolBoxColorBackground.get(), SVX_RES(TB_COLOR))),
-      mpTrspTextFT(new FixedText(this, SVX_RES(FL_TRSP_TEXT))),
-      mpLBTransType(new ListBox(this, SVX_RES(LB_TRGR_TYPES))),
-      mpMTRTransparent(new MetricField(this, SVX_RES(MTR_TRANSPARENT))),
-      mpBTNGradientBackground(sfx2::sidebar::ControlFactory::CreateToolBoxBackground(this)),
-      mpBTNGradient(sfx2::sidebar::ControlFactory::CreateToolBox(mpBTNGradientBackground.get(), SVX_RES(BTN_GRADIENT))),
-      mpColorUpdater(new ::svx::ToolboxButtonColorUpdater(SID_ATTR_FILL_COLOR, TBI_COLOR, mpToolBoxColor.get())),
       mpStyleItem(),
       mpColorItem(),
       mpFillGradientItem(),
@@ -121,28 +112,29 @@ AreaPropertyPanel::AreaPropertyPanel(
       mpBindings(pBindings),
       mbColorAvail(true)
 {
+    get(mpColorTextFT,    "filllabel");
+    get(mpTrspTextFT,     "transparencylabel");
+    get(mpToolBoxColor,   "selectcolor");
+    get(mpLBTransType,    "transtype");
+    get(mpMTRTransparent, "settransparency");   // GtkSpinButton
+    get(mpBTNGradient,    "selectgradient");    // GtkToolbar
+
+    const sal_uInt16 nIdColor = mpToolBoxColor->GetItemId(UNO_SIDEBARCOLOR);
+    mpColorUpdater.reset(new ::svx::ToolboxButtonColorUpdater(SID_ATTR_FILL_COLOR, nIdColor, mpToolBoxColor)),
+
     Initialize();
-    FreeResource();
 }
 
 
 
 AreaPropertyPanel::~AreaPropertyPanel()
 {
-    // Destroy the toolboxes, then their background windows.
-    mpToolBoxColor.reset();
-    mpBTNGradient.reset();
-    mpToolBoxColorBackground.reset();
-    mpBTNGradientBackground.reset();
 }
 
 
 
 void AreaPropertyPanel::Initialize()
 {
-    mpColorTextFT->SetBackground(Wallpaper());
-    mpTrspTextFT->SetBackground(Wallpaper());
-
     maGradientLinear.SetXOffset(DEFAULT_CENTERX);
     maGradientLinear.SetYOffset(DEFAULT_CENTERY);
     maGradientLinear.SetAngle(DEFAULT_ANGLE);
@@ -198,21 +190,16 @@ void AreaPropertyPanel::Initialize()
 
     //add  for new color picker
     mpLbFillAttr->Hide();
-    mpToolBoxColor->SetItemImage(TBI_COLOR, maImgColor);
-    Size aTbxSize( mpToolBoxColor->CalcWindowSizePixel() );
-    mpToolBoxColor->SetOutputSizePixel( aTbxSize );
-    mpToolBoxColor->SetItemBits( TBI_COLOR, mpToolBoxColor->GetItemBits( TBI_COLOR ) | TIB_DROPDOWNONLY );
-    mpToolBoxColor->SetBackground(Wallpaper());
-    mpToolBoxColor->SetPaintTransparent(true);
-    mpToolBoxColor->SetQuickHelpText(TBI_COLOR, String(SVX_RES(STR_HELP_COLOR)));    //wj acc
-    //mpToolBoxColor->SetItemText(TBI_COLOR, msHelpFillAttr);
+    const sal_uInt16 nIdColor = mpToolBoxColor->GetItemId(UNO_SIDEBARCOLOR);
+    mpToolBoxColor->SetItemImage(nIdColor, maImgColor);
+    mpToolBoxColor->SetItemBits( nIdColor, mpToolBoxColor->GetItemBits( nIdColor ) | TIB_DROPDOWNONLY );
+    mpToolBoxColor->SetItemText(nIdColor, msHelpFillAttr);
 
     long aHeightLBStyle = mpLbFillType->GetSizePixel().getHeight();
     long aLBPosY = mpLbFillType->GetPosPixel().getY();
     long aHeightTBAttr = mpToolBoxColor->GetSizePixel().getHeight();
     Point aPointTBAttr = mpToolBoxColor->GetPosPixel();
     aPointTBAttr.setY( aLBPosY + aHeightLBStyle / 2 - aHeightTBAttr / 2);
-    mpToolBoxColor->SetPosPixel(aPointTBAttr);
 
     aLink = LINK(this, AreaPropertyPanel, ToolBoxColorDropHdl);
     mpToolBoxColor->SetDropdownClickHdl ( aLink );
@@ -226,14 +213,12 @@ void AreaPropertyPanel::Initialize()
     mpMTRTransparent->SetModifyHdl(LINK(this, AreaPropertyPanel, ModifyTransparentHdl_Impl));
     mpMTRTransparent->SetAccessibleName(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Transparency")));    //wj acc
 
-    mpBTNGradient->SetItemBits( TBI_BTX_GRADIENT, mpBTNGradient->GetItemBits( TBI_BTX_GRADIENT ) | TIB_DROPDOWNONLY );
+    const sal_uInt16 nIdGradient = mpBTNGradient->GetItemId(UNO_SIDEBARGRADIENT);
+    mpBTNGradient->SetItemBits( nIdGradient, mpBTNGradient->GetItemBits( nIdGradient ) | TIB_DROPDOWNONLY );
     aLink = LINK( this, AreaPropertyPanel, ClickTrGrHdl_Impl );
     mpBTNGradient->SetDropdownClickHdl( aLink );
     mpBTNGradient->SetSelectHdl( aLink );
-    aTbxSize = mpBTNGradient->CalcWindowSizePixel();
-    mpBTNGradient->SetOutputSizePixel( aTbxSize );
-    mpBTNGradient->SetItemImage(TBI_BTX_GRADIENT,maImgLinear);
-    mpBTNGradient->SetQuickHelpText(TBI_BTX_GRADIENT, String(SVX_RES(STR_HELP_GRADIENT)));    //wj acc
+    mpBTNGradient->SetItemImage(nIdGradient,maImgLinear);
     mpBTNGradient->Hide();
 
     long aHeightLBTrans = mpLBTransType->GetSizePixel().getHeight();
@@ -247,15 +232,12 @@ void AreaPropertyPanel::Initialize()
     aPointMetric.setY(aPosY+aHeightLBTrans/2-aHeightMetric/2);
     aPointTB.setY(aPosY+aHeightLBTrans/2-aHeightTool/2);
     aPointTB.setX(aPointTB.getX()+3);
-    mpMTRTransparent->SetPosPixel(aPointMetric);
-    mpBTNGradient->SetPosPixel(aPointTB);
-
-    mpLbFillType->SetAccessibleRelationLabeledBy(mpColorTextFT.get());
+    mpLbFillType->SetAccessibleRelationLabeledBy(mpColorTextFT);
     mpLbFillAttr->SetAccessibleRelationLabeledBy(mpLbFillAttr.get());
-    mpToolBoxColor->SetAccessibleRelationLabeledBy(mpToolBoxColor.get());
-    mpLBTransType->SetAccessibleRelationLabeledBy(mpTrspTextFT.get());
-    mpMTRTransparent->SetAccessibleRelationLabeledBy(mpMTRTransparent.get());
-    mpBTNGradient->SetAccessibleRelationLabeledBy(mpBTNGradient.get());
+    mpToolBoxColor->SetAccessibleRelationLabeledBy(mpToolBoxColor);
+    mpLBTransType->SetAccessibleRelationLabeledBy(mpTrspTextFT);
+    mpMTRTransparent->SetAccessibleRelationLabeledBy(mpMTRTransparent);
+    mpBTNGradient->SetAccessibleRelationLabeledBy(mpBTNGradient);
 
     SetupIcons();
 }
@@ -564,9 +546,9 @@ IMPL_LINK( AreaPropertyPanel, SelectFillAttrHdl, ListBox*, pToolBox )
 
 IMPL_LINK(AreaPropertyPanel, ToolBoxColorDropHdl, ToolBox*, pToolBox)
 {
-    const sal_uInt16 nId = pToolBox->GetCurItemId();
+    const OUString aCommand(pToolBox->GetItemCommand(pToolBox->GetCurItemId()));
 
-    if(TBI_COLOR == nId)
+    if(UNO_SIDEBARCOLOR == aCommand)
     {
         maColorPopup.Show(*pToolBox);
 
@@ -750,8 +732,9 @@ void AreaPropertyPanel::ImpUpdateTransparencies()
                     }
                 }
 
+                const sal_uInt16 nIdGradient = mpBTNGradient->GetItemId(UNO_SIDEBARGRADIENT);
                 mpLBTransType->SelectEntryPos(nEntryPos);
-                mpBTNGradient->SetItemImage(TBI_BTX_GRADIENT, *pImage);
+                mpBTNGradient->SetItemImage(nIdGradient, *pImage);
                 bZeroValue = false;
             }
             else
@@ -1269,7 +1252,7 @@ IMPL_LINK( AreaPropertyPanel, ImplPopupModeEndHdl, FloatingWindow*, EMPTYARG )
 IMPL_LINK( AreaPropertyPanel, ClickTrGrHdl_Impl, ToolBox*, pToolBox )
 {
     maTrGrPopup.Rearrange(mpFloatTransparenceItem.get());
-    OSL_ASSERT(pToolBox->GetCurItemId() == TBI_BTX_GRADIENT);
+    OSL_ASSERT( pToolBox->GetItemCommand(pToolBox->GetCurItemId()) == UNO_SIDEBARGRADIENT);
     maTrGrPopup.Show(*pToolBox);
 
     return (0L);
@@ -1303,25 +1286,26 @@ IMPL_LINK(AreaPropertyPanel, ChangeTrgrTypeHdl_Impl, void *, EMPTYARG)
     {
         mpBTNGradient->Show();
 
+        const sal_uInt16 nIdGradient = mpBTNGradient->GetItemId(UNO_SIDEBARGRADIENT);
         switch (nSelectType)
         {
             case 2:
-                mpBTNGradient->SetItemImage(TBI_BTX_GRADIENT, maImgLinear);
+                mpBTNGradient->SetItemImage(nIdGradient, maImgLinear);
                 break;
             case 3:
-                mpBTNGradient->SetItemImage(TBI_BTX_GRADIENT, maImgAxial);
+                mpBTNGradient->SetItemImage(nIdGradient, maImgAxial);
                 break;
             case 4:
-                mpBTNGradient->SetItemImage(TBI_BTX_GRADIENT, maImgRadial);
+                mpBTNGradient->SetItemImage(nIdGradient, maImgRadial);
                 break;
             case 5:
-                mpBTNGradient->SetItemImage(TBI_BTX_GRADIENT, maImgElli );
+                mpBTNGradient->SetItemImage(nIdGradient, maImgElli );
                 break;
             case 6:
-                mpBTNGradient->SetItemImage(TBI_BTX_GRADIENT, maImgQuad );
+                mpBTNGradient->SetItemImage(nIdGradient, maImgQuad );
                 break;
             case 7:
-                mpBTNGradient->SetItemImage(TBI_BTX_GRADIENT, maImgSquare);
+                mpBTNGradient->SetItemImage(nIdGradient, maImgSquare);
                 break;
         }
 
diff --git a/svx/source/sidebar/area/AreaPropertyPanel.hrc b/svx/source/sidebar/area/AreaPropertyPanel.hrc
index a11a54faaf94..5c9def0a2787 100644
--- a/svx/source/sidebar/area/AreaPropertyPanel.hrc
+++ b/svx/source/sidebar/area/AreaPropertyPanel.hrc
@@ -16,17 +16,12 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 //  RID_SIDEBAR_AREA_PANEL--------------------------------------------------------------
-#define FT_COLOR_LIST                        1
-#define TB_COLOR            2
-#define TBI_COLOR           3
-#define IMG_COLOR           5
 
-#define VS_COLOR            1
+#include "svx/dialogs.hrc"
 
 #define TBI_LEFT                            1
 #define TBI_RIGHT                           1
 #define TBI_BTX_GRADIENT                    51
-#define FL_TRSP_TEXT                         4
 
 #define LB_TRGR_TYPES   6
 #define MTR_TRANSPARENT 7
@@ -50,18 +45,23 @@
 #define BTN_LEFT_SECOND         22
 #define BTN_RIGHT_FIRST         23
 
-#define IMG_AXIAL              24
-#define IMG_ELLI               25
-#define IMG_QUAD               26
-#define IMG_RADIAL              27
-#define IMG_SQUARE              28
-#define IMG_LINEAR              29
-#define IMG_ROT_LEFT            30
-#define IMG_ROT_RIGHT           31
-#define STR_HELP_TYPE           32
-#define STR_HELP_ATTR           33
+// global definitions
+#define IMG_AXIAL       (RID_SVX_SIDEBAR_BEGIN +  30)
+#define IMG_ELLI        (RID_SVX_SIDEBAR_BEGIN +  31)
+#define IMG_QUAD        (RID_SVX_SIDEBAR_BEGIN +  32)
+#define IMG_RADIAL      (RID_SVX_SIDEBAR_BEGIN +  33)
+#define IMG_SQUARE      (RID_SVX_SIDEBAR_BEGIN +  34)
+#define IMG_LINEAR      (RID_SVX_SIDEBAR_BEGIN +  35)
+#define IMG_COLOR       (RID_SVX_SIDEBAR_BEGIN +  36)
+
+#define IMG_ROT_LEFT    (RID_SVX_SIDEBAR_BEGIN +  37)
+#define IMG_ROT_RIGHT   (RID_SVX_SIDEBAR_BEGIN +  38)
+
+#define STR_HELP_TYPE   (RID_SVX_SIDEBAR_BEGIN +  39)
+#define STR_HELP_ATTR   (RID_SVX_SIDEBAR_BEGIN +  40)
+#define VS_COLOR        (RID_SVX_SIDEBAR_BEGIN +  41)
+
 #define STR_HELP_COLOR          41
-#define STR_HELP_GRADIENT       42
 
 #define FIXED_TEXT_HEIGHT   9
 #define FIXED_TEXT_WIDTH   40
diff --git a/svx/source/sidebar/area/AreaPropertyPanel.hxx b/svx/source/sidebar/area/AreaPropertyPanel.hxx
index caf005a8fd27..d0df11a500f7 100644
--- a/svx/source/sidebar/area/AreaPropertyPanel.hxx
+++ b/svx/source/sidebar/area/AreaPropertyPanel.hxx
@@ -31,6 +31,7 @@
 #include <svx/xflhtit.hxx>
 #include <svx/xbtmpit.hxx>
 #include <svx/drawitem.hxx>
+#include <svx/sidebar/PanelLayout.hxx>
 #include <vcl/lstbox.hxx>
 #include <vcl/field.hxx>
 #include <vcl/fixed.hxx>
@@ -50,7 +51,7 @@ class PopupContainer;
 class AreaTransparencyGradientControl;
 
 class AreaPropertyPanel
-:   public Control,
+:   public PanelLayout,
     public ::sfx2::sidebar::ControllerItem::ItemUpdateReceiverInterface
 {
 public:
@@ -98,16 +99,14 @@ private:
     XGradient                                           maGradientRect;
 
     //ui controls
-    ::boost::scoped_ptr< FixedText >                    mpColorTextFT;
-    ::boost::scoped_ptr< SvxFillTypeBox >               mpLbFillType;
-    ::boost::scoped_ptr< SvxFillAttrBox >               mpLbFillAttr;
-    ::boost::scoped_ptr< Window >                       mpToolBoxColorBackground;
-    ::boost::scoped_ptr< ToolBox >                      mpToolBoxColor; // for new color picker
-    ::boost::scoped_ptr< FixedText >                    mpTrspTextFT;
-    ::boost::scoped_ptr< ListBox >                      mpLBTransType;
-    ::boost::scoped_ptr< MetricField >                  mpMTRTransparent;
-    ::boost::scoped_ptr< Window >                       mpBTNGradientBackground;
-    ::boost::scoped_ptr< ToolBox >                      mpBTNGradient;
+    FixedText*                              mpColorTextFT;
+    ::boost::scoped_ptr< SvxFillTypeBox >   mpLbFillType;
+    ::boost::scoped_ptr< SvxFillAttrBox >   mpLbFillAttr;
+    ToolBox*                                mpToolBoxColor; // for new color picker
+    FixedText*                              mpTrspTextFT;
+    ListBox*                                mpLBTransType;
+    MetricField*                            mpMTRTransparent;
+    ToolBox*                                mpBTNGradient;
 
     ::boost::scoped_ptr< ::svx::ToolboxButtonColorUpdater > mpColorUpdater;
 
diff --git a/svx/source/sidebar/area/AreaPropertyPanel.src b/svx/source/sidebar/area/AreaPropertyPanel.src
index 849c14139657..353e1250d11b 100644
--- a/svx/source/sidebar/area/AreaPropertyPanel.src
+++ b/svx/source/sidebar/area/AreaPropertyPanel.src
@@ -23,6 +23,43 @@
 #define TOOLBOX_WIDTH       50
 #define TOOLBOX_HEIGHT      17
 
+Image IMG_AXIAL
+{
+    ImageBitmap = Bitmap{File = "symphony/axial.png";};
+};
+Image IMG_ELLI
+{
+    ImageBitmap = Bitmap{File = "symphony/ellipsoid.png";};
+};
+Image IMG_QUAD
+{
+    ImageBitmap = Bitmap{File = "symphony/Quadratic.png";};
+};
+Image IMG_RADIAL
+{
+    ImageBitmap = Bitmap{File = "symphony/radial.png";};
+};
+Image IMG_SQUARE
+{
+    ImageBitmap = Bitmap{File = "symphony/Square.png";};
+};
+Image IMG_LINEAR
+{
+    ImageBitmap = Bitmap{File = "symphony/linear.png";};
+};
+Image IMG_COLOR
+{
+    ImageBitmap = Bitmap{File = "symphony/fill_color.png";};
+};
+Image IMG_ROT_LEFT
+{
+    ImageBitmap = Bitmap{File = "symphony/rotate_left.png";};
+};
+Image IMG_ROT_RIGHT
+{
+    ImageBitmap = Bitmap{File = "symphony/rotate_right.png";};
+};
+
 Control RID_SIDEBAR_AREA_PANEL
 {
     OutputSize = TRUE;
@@ -31,147 +68,6 @@ Control RID_SIDEBAR_AREA_PANEL
     Size = MAP_APPFONT( PROPERTYPAGE_WIDTH, SECTIONPAGE_MARGIN_VERTICAL_TOP + SECTIONPAGE_MARGIN_VERTICAL_BOT + 2*( FIXED_TEXT_HEIGHT + TEXT_CONTROL_SPACING_VERTICAL + CBOX_HEIGHT) + CONTROL_SPACING_VERTICAL );
     HelpID = HID_PROPERTYPANEL_AREA_SECTION ;
     Text [ en-US ] = "Area";
-
-    FixedText FT_COLOR_LIST
-    {
-        Pos     = MAP_APPFONT ( SECTIONPAGE_MARGIN_HORIZONTAL , SECTIONPAGE_MARGIN_VERTICAL_TOP  ) ;
-        Size    = MAP_APPFONT ( FIXED_TEXT_WIDTH + 50, FIXED_TEXT_HEIGHT ) ;
-        Text [ en-US ] = "~Fill:";
-    };
-    FixedText FL_TRSP_TEXT
-    {
-        Pos     = MAP_APPFONT ( SECTIONPAGE_MARGIN_HORIZONTAL , SECTIONPAGE_MARGIN_VERTICAL_TOP + FIXED_TEXT_HEIGHT + TEXT_CONTROL_SPACING_VERTICAL + CBOX_HEIGHT + CONTROL_SPACING_VERTICAL ) ;
-        Size    = MAP_APPFONT ( FIXED_TEXT_WIDTH + 50, FIXED_TEXT_HEIGHT ) ;
-        Text [ en-US ] = "~Transparency:";
-    };
-    ToolBox TB_COLOR
-    {
-        HelpID = HID_PPROPERTYPANEL_AREA_TBX_COLOR;
-        SVLook = TRUE ;
-        Pos = MAP_APPFONT ( SECTIONPAGE_MARGIN_HORIZONTAL + MBOX_WIDTH + CONTROL_SPACING_HORIZONTAL, SECTIONPAGE_MARGIN_VERTICAL_TOP + FIXED_TEXT_HEIGHT + 1) ;
-        Size = MAP_APPFONT (TOOLBOX_WIDTH ,TOOLBOX_HEIGHT ) ;
-        TabStop = TRUE ;
-        Text = "Color";
-        ItemList =
-        {
-            ToolBoxItem
-            {
-                Identifier = TBI_COLOR ;
-                HelpID = HID_PPROPERTYPANEL_AREA_TBI_COLOR;
-                DropDown = TRUE ;
-                Text = "Color" ;
-            };
-        };
-    };
-    String STR_HELP_COLOR
-    {
-        Text [ en-US ] = "Select the color to apply." ;
-    };
-    String STR_HELP_TYPE
-    {
-        Text [en-US] = "Select the fill type to apply.";
-    };
-    String STR_HELP_ATTR
-    {
-        Text [en-US] = "Select the effect to apply.";
-    };
-    Image IMG_AXIAL
-    {
-        ImageBitmap = Bitmap{File = "symphony/axial.png";};
-    };
-    Image IMG_ELLI
-    {
-        ImageBitmap = Bitmap{File = "symphony/ellipsoid.png";};
-    };
-    Image IMG_QUAD
-    {
-        ImageBitmap = Bitmap{File = "symphony/Quadratic.png";};
-    };
-    Image IMG_RADIAL
-    {
-        ImageBitmap = Bitmap{File = "symphony/radial.png";};
-    };
-    Image IMG_SQUARE
-    {
-        ImageBitmap = Bitmap{File = "symphony/Square.png";};
-    };
-    Image IMG_LINEAR
-    {
-        ImageBitmap = Bitmap{File = "symphony/linear.png";};
-    };
-    Image IMG_COLOR
-    {
-        ImageBitmap = Bitmap{File = "symphony/fill_color.png";};
-    };
-
-    //=====================================================================================================================================
-    ListBox LB_TRGR_TYPES
-    {
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( SECTIONPAGE_MARGIN_HORIZONTAL , SECTIONPAGE_MARGIN_VERTICAL_TOP + 2*(FIXED_TEXT_HEIGHT + TEXT_CONTROL_SPACING_VERTICAL) + CBOX_HEIGHT + CONTROL_SPACING_VERTICAL ) ;
-        Size = MAP_APPFONT ( MBOX_WIDTH , LISTBOX_HEIGHT ) ;
-        QuickHelpText [ en-US ] = "Select the type of transparency to apply." ;
-        TabStop = TRUE ;
-        DropDown = TRUE ;
-        HelpID = HID_PPROPERTYPANEL_AREA_LB_TRGR_TYPES ;
-        StringList [ en-US ] =
-        {
-            < "None" ; Default ; > ;
-            < "Solid" ; Default ; > ;
-            < "Linear" ; Default ; > ;
-            < "Axial" ; Default ; > ;
-            < "Radial" ; Default ; > ;
-            < "Ellipsoid" ; Default ; > ;
-            < "Quadratic" ; Default ; > ;
-            < "Square" ; Default ; > ;
-        };
-    };
-
-    MetricField MTR_TRANSPARENT
-    {
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( SECTIONPAGE_MARGIN_HORIZONTAL + MBOX_WIDTH + CONTROL_SPACING_HORIZONTAL , SECTIONPAGE_MARGIN_VERTICAL_TOP + 2*(FIXED_TEXT_HEIGHT + TEXT_CONTROL_SPACING_VERTICAL) + CBOX_HEIGHT + CONTROL_SPACING_VERTICAL ) ;
-        Size = MAP_APPFONT ( MBOX_WIDTH + 1 ,MBOX_HEIGHT ) ;
-        HelpID = HID_PPROPERTYPANEL_AREA_MTR_TRANSPARENT ;
-        QuickHelpText [ en-US ] = "Specify 0% for fully opaque through 100% for fully transparent." ;
-        TabStop = TRUE ;
-        Repeat = TRUE ;
-        Spin = TRUE ;
-        Maximum = 100 ;
-        StrictFormat = TRUE ;
-        Unit = FUNIT_CUSTOM ;
-        CustomUnitText = "%" ;
-        Last = 100 ;
-        SpinSize = 5 ;
-    };
-
-    ToolBox BTN_GRADIENT
-    {
-        Pos = MAP_APPFONT ( SECTIONPAGE_MARGIN_HORIZONTAL + MBOX_WIDTH + CONTROL_SPACING_HORIZONTAL , SECTIONPAGE_MARGIN_VERTICAL_TOP + 2*(FIXED_TEXT_HEIGHT + TEXT_CONTROL_SPACING_VERTICAL) + CBOX_HEIGHT + CONTROL_SPACING_VERTICAL ) ;
-        HelpID = HID_PPROPERTYPANEL_AREA_TBX_GRADIENT ;
-        SVLook = TRUE ;
-        Border = FALSE ;
-        TabStop = TRUE ;
-        Text = "Gradient";
-        ItemList =
-        {
-            ToolBoxItem
-            {
-                Identifier = TBI_BTX_GRADIENT ;
-                HelpID = HID_PPROPERTYPANEL_AREA_TBI_GRADIENT ;
-                ItemBitmap = Bitmap
-                {
-                    File = "symphony/linear.png" ;
-                };
-                DropDown = TRUE;
-                Text = "Gradient" ;
-            };
-        };
-    };
-    String STR_HELP_GRADIENT
-    {
-        Text [ en-US ] = "Specify the variation of gradient transparency." ;
-    };
 };
 
 Control RID_POPUPPANEL_AREAPAGE_TRGR
@@ -359,14 +255,6 @@ Control RID_POPUPPANEL_AREAPAGE_TRGR
     {
         Text [ en-US ] = "Rotate clockwise by 45 degrees." ;
     };
-    Image IMG_ROT_LEFT
-    {
-        ImageBitmap = Bitmap{File = "symphony/rotate_left.png";};
-    };
-    Image IMG_ROT_RIGHT
-    {
-        ImageBitmap = Bitmap{File = "symphony/rotate_right.png";};
-    };
 };
 Control RID_POPUPPANEL_AERAPAGE_COLOR
 {
diff --git a/svx/uiconfig/ui/sidebararea.ui b/svx/uiconfig/ui/sidebararea.ui
new file mode 100644
index 000000000000..fe5c29bfb2b0
--- /dev/null
+++ b/svx/uiconfig/ui/sidebararea.ui
@@ -0,0 +1,238 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <!-- interface-requires gtk+ 3.0 -->
+  <!-- interface-requires LibreOffice 1.0 -->
+  <object class="GtkGrid" id="AreaPropertyPanel">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="row_homogeneous">True</property>
+    <property name="column_homogeneous">True</property>
+    <child>
+      <object class="GtkBox" id="box1">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="border_width">6</property>
+        <property name="orientation">vertical</property>
+        <property name="spacing">12</property>
+        <child>
+          <object class="GtkBox" id="box2">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="orientation">vertical</property>
+            <child>
+              <object class="GtkBox" id="box3">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="orientation">vertical</property>
+                <child>
+                  <object class="GtkLabel" id="filllabel">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="tooltip_text" translatable="yes">Fill:</property>
+                    <property name="xalign">0</property>
+                    <property name="label" translatable="yes">_Fill:</property>
+                    <property name="use_underline">True</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkBox" id="box5">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="margin_bottom">4</property>
+                    <child>
+                      <object class="GtkComboBoxText" id="fillstyle">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="tooltip_text" translatable="yes">Select the fill type to apply.</property>
+                        <property name="entry_text_column">0</property>
+                        <property name="id_column">1</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkToolbar" id="selectcolor">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <child>
+                          <object class="GtkMenuToolButton" id="color">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="tooltip_text" translatable="yes">Select the color to apply.</property>
+                            <property name="halign">end</property>
+                            <property name="action_name">.uno:sidebarcolor</property>
+                            <property name="use_underline">True</property>
+                          </object>
+                          <packing>
+                            <property name="expand">True</property>
+                            <property name="homogeneous">True</property>
+                          </packing>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="expand">True</property>
+                        <property name="fill">True</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkBox" id="box4">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="orientation">vertical</property>
+                <child>
+                  <object class="GtkLabel" id="transparencylabel">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="tooltip_text" translatable="yes">Transparency</property>
+                    <property name="xalign">0</property>
+                    <property name="label" translatable="yes">_Transparency:</property>
+                    <property name="use_underline">True</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkBox" id="box6">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <child>
+                      <object class="GtkComboBoxText" id="transtype">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="tooltip_markup" translatable="yes">Select the type of transparence to apply.</property>
+                        <property name="tooltip_text" translatable="yes">Select the type of transparence to apply.</property>
+                        <property name="entry_text_column">0</property>
+                        <property name="id_column">1</property>
+                        <items>
+                          <item translatable="yes">None</item>
+                          <item translatable="yes">Solid</item>
+                          <item translatable="yes">Linear</item>
+                          <item translatable="yes">Axial</item>
+                          <item translatable="yes">Radial</item>
+                          <item translatable="yes">Ellipsoid</item>
+                          <item translatable="yes">Quadratic</item>
+                          <item translatable="yes">Square</item>
+                        </items>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkBox" id="box7">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <child>
+                          <object class="GtkSpinButton" id="settransparency:0%">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="tooltip_markup" translatable="yes">Specify 0% for fully opaque through 100% for fully transparent.</property>
+                            <property name="tooltip_text" translatable="yes">Specify 0% for fully opaque through 100% for fully transparent.</property>
+                            <property name="halign">end</property>
+                            <property name="max_length">100</property>
+                            <property name="invisible_char">•</property>
+                            <property name="secondary_icon_activatable">False</property>
+                            <property name="climb_rate">5</property>
+                            <property name="numeric">True</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkToolbar" id="selectgradient">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="halign">end</property>
+                            <property name="margin_left">13</property>
+                            <child>
+                              <object class="GtkMenuToolButton" id="gradient">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="has_tooltip">True</property>
+                                <property name="tooltip_markup" translatable="yes">Specify the variation of gradient transparency.</property>
+                                <property name="tooltip_text" translatable="yes">Specify the variation of gradient transparency.</property>
+                                <property name="margin_left">23</property>
+                                <property name="action_name">.uno:sidebargradient</property>
+                                <property name="use_underline">True</property>
+                              </object>
+                              <packing>
+                                <property name="expand">True</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">2</property>
+                          </packing>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+      </object>
+      <packing>
+        <property name="left_attach">0</property>
+        <property name="top_attach">0</property>
+        <property name="width">1</property>
+        <property name="height">1</property>
+      </packing>
+    </child>
+  </object>
+</interface>