Convert shadow tab page to widget UI

Change-Id: I8828100136f73e4f80cb11c2b5003fa7de6b575f
Reviewed-on: https://gerrit.libreoffice.org/5116Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

cui/UIConfig_cui.mk

@@ -81,6 +81,7 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\
 	cui/uiconfig/ui/scriptorganizer \
 	cui/uiconfig/ui/securityoptionsdialog \
 	cui/uiconfig/ui/select_persona_dialog \
+	cui/uiconfig/ui/shadowtabpage \
 	cui/uiconfig/ui/specialcharacters \
 	cui/uiconfig/ui/spellingdialog \
 	cui/uiconfig/ui/splitcellsdialog \

cui/source/inc/cuitabarea.hxx

@@ -303,17 +303,13 @@ class SvxShadowTabPage : public SvxTabPage
     using TabPage::DeactivatePage;
 
 private:
-    FixedLine           aFlProp;
-    TriStateBox         aTsbShowShadow;
-    FixedText           aFtPosition;
-    SvxRectCtl          aCtlPosition;
-    FixedText           aFtDistance;
-    MetricField         aMtrDistance;
-    FixedText           aFtShadowColor;
-    ColorLB             aLbShadowColor;
-    FixedText           aFtTransparent;
-    MetricField         aMtrTransparent;
-    SvxXShadowPreview   aCtlXRectPreview;
+    TriStateBox*        m_pTsbShowShadow;
+    VclGrid*            m_pGridShadow;
+    SvxRectCtl*         m_pCtlPosition;
+    MetricField*        m_pMtrDistance;
+    ColorLB*            m_pLbShadowColor;
+    MetricField*        m_pMtrTransparent;
+    SvxXShadowPreview*  m_pCtlXRectPreview;
 
     const SfxItemSet&   rOutAttrs;
     RECT_POINT          eRP;

cui/source/inc/helpid.hrc

@@ -246,7 +246,6 @@
 #define HID_MEASURE_CTL_PREVIEW "CUI_HID_MEASURE_CTL_PREVIEW"
 #define HID_SVXPAGE_SWPOSSIZE "CUI_HID_SVXPAGE_SWPOSSIZE"
 
-#define HID_AREA_SHADOW "CUI_HID_AREA_SHADOW"
 #define HID_AREA_BITMAP "CUI_HID_AREA_BITMAP"
 #define HID_TPSHADOW_CTRL "CUI_HID_TPSHADOW_CTRL"
 #define HID_LINE_ENDDEF "CUI_HID_LINE_ENDDEF"

cui/source/tabpages/tabarea.hrc

@@ -22,11 +22,8 @@
 #define BTN_EMBED 7
 #define CTL_PREVIEW 1
 #define CTL_POSITION 2
-#define CTL_COLOR_PREVIEW 5
 #define CTL_BITMAP_PREVIEW 6
-#define MTR_FLD_DISTANCE 1
 #define TSB_INVISIBLE 1
-#define TSB_SHOW_SHADOW 2
 
 #define LB_COLOR 1
 #define LB_GRADIENT 2
@@ -41,16 +38,12 @@
 #define BTN_DELETE 4
 #define FT_COLOR 1
 #define FT_BACKGROUND_COLOR 2
-#define FT_POSITION 2
-#define FT_DISTANCE 1
 #define MTR_FLD_ANGLE 3
 #define CTL_ANGLE 2
 #define NUM_FLD_STEPCOUNT 1
 #define FT_PIXEL_EDIT 4
 #define CTL_PIXEL 2
 #define FT_TYPE 7
-#define FT_SHADOW_COLOR 10
-#define LB_SHADOW_COLOR 10
 #define FL_PROP 2
 #define FL_SIZE 3
 
@@ -71,9 +64,6 @@
 #define MTR_FLD_4 4
 #define FT_TABLE_NAME 7
 
-#define FT_TRANSPARENT 9
 #define FT_BITMAPS_HIDDEN 12
 
-#define MTR_SHADOW_TRANSPARENT 11
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

cui/source/tabpages/tabarea.src

@@ -28,112 +28,6 @@
 #define TRANS_GRAD_OFFSET_X             6
 #define TRANS_GRAD_OFFSET_Y             64
 
-// ------------------------------------------------------
-TabPage RID_SVXPAGE_SHADOW
-{
-    HelpID = HID_AREA_SHADOW ;
-    Hide = TRUE ;
-    Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
-    Text [ en-US ] = "Shadow" ;
-    FixedLine FL_PROP
-    {
-        Pos = MAP_APPFONT ( 6 , 3  ) ;
-        Size = MAP_APPFONT ( 248, 8 ) ;
-        Text [ en-US ] = "Properties";
-    };
-    TriStateBox TSB_SHOW_SHADOW
-    {
-        HelpID = "cui:TriStateBox:RID_SVXPAGE_SHADOW:TSB_SHOW_SHADOW";
-        Pos = MAP_APPFONT ( 12 , 14  ) ;
-        Size = MAP_APPFONT ( 110 , 10 ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "~Use shadow";
-    };
-    FixedText FT_POSITION
-    {
-        Pos = MAP_APPFONT ( 12 , 33  ) ;
-        Size = MAP_APPFONT ( 50 , 10 ) ;
-        Text [ en-US ] = "~Position";
-    };
-    Control CTL_POSITION
-    {
-        HelpId = HID_TPSHADOW_CTRL ;
-        Pos = MAP_APPFONT ( 65 , 31  ) ;
-        Size = MAP_APPFONT ( 57 , 29 ) ;
-        Border = TRUE ;
-        TabStop = TRUE ;
-    };
-    FixedText FT_DISTANCE
-    {
-        Pos = MAP_APPFONT ( 12 , 69  ) ;
-        Size = MAP_APPFONT ( 50 , 8 ) ;
-        Text [ en-US ] = "~Distance";
-    };
-    MetricField MTR_FLD_DISTANCE
-    {
-        HelpID = "cui:MetricField:RID_SVXPAGE_SHADOW:MTR_FLD_DISTANCE";
-        Pos = MAP_APPFONT ( 65 , 67  ) ;
-        Size = MAP_APPFONT ( 47 , 12 ) ;
-        Border = TRUE ;
-        TabStop = TRUE ;
-        Repeat = TRUE ;
-        Spin = TRUE ;
-        Maximum = 99999 ;
-        Minimum = 0 ; // #i33700#
-        StrictFormat = TRUE ;
-        DecimalDigits = 2 ;
-        Unit = FUNIT_MM ;
-        Last = 99999 ;
-        /*SpinSize = 100 ; */
-        SpinSize = 1 ;
-    };
-    ListBox LB_SHADOW_COLOR
-    {
-        HelpID = "cui:ListBox:RID_SVXPAGE_SHADOW:LB_SHADOW_COLOR";
-        Pos = MAP_APPFONT ( 65 , 86  ) ;
-        Size = MAP_APPFONT ( 57 , 100 ) ;
-        DropDown = TRUE ;
-        DDExtraWidth = TRUE ;
-        Border = TRUE ;
-        TabStop = TRUE ;
-    };
-    FixedText FT_SHADOW_COLOR
-    {
-        Pos = MAP_APPFONT ( 12 , 88  ) ;
-        Size = MAP_APPFONT ( 50 , 8 ) ;
-        Text [ en-US ] = "~Color" ;
-    };
-    FixedText FT_TRANSPARENT
-    {
-        Pos = MAP_APPFONT ( 12 , 107  ) ;
-        Size = MAP_APPFONT ( 50 , 8 ) ;
-        Text [ en-US ] = "~Transparency";
-    };
-    MetricField MTR_SHADOW_TRANSPARENT
-    {
-        HelpID = "cui:MetricField:RID_SVXPAGE_SHADOW:MTR_SHADOW_TRANSPARENT";
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 65 , 105  ) ;
-        Size = MAP_APPFONT ( 47 , 12 ) ;
-        TabStop = TRUE ;
-        Repeat = TRUE ;
-        Spin = TRUE ;
-        Maximum = 100 ;
-        StrictFormat = TRUE ;
-        Unit = FUNIT_CUSTOM ;
-        CustomUnitText = "%" ;
-        Last = 100 ;
-        SpinSize = 5 ;
-    };
-    Control CTL_COLOR_PREVIEW
-    {
-        Border = TRUE;
-        Pos = MAP_APPFONT ( 138 , 14  ) ;
-        Size = MAP_APPFONT ( 110 , 42 ) ;
-        TabStop = FALSE ;
-    };
-};
-
 // ------------------------------------------------------
 TabPage RID_SVXPAGE_BITMAP
 {

extras/source/glade/libreoffice-catalog.xml.in

@@ -218,6 +218,9 @@
     <glade-widget-class title="Rectangle Preview" name="svxlo-SvxXRectPreview"
                         generic-name="Rectangle Preview Window" parent="GtkDrawingArea"
                         icon-name="widget-gtk-drawingarea"/>
+    <glade-widget-class title="Shadow Preview" name="svxlo-SvxXShadowPreview"
+                        generic-name="Shadow Preview Window" parent="GtkDrawingArea"
+                            icon-name="widget-gtk-drawingarea"/>
     <glade-widget-class title="Frame Selector" name="svxlo-SvxFrameSelector"
                         generic-name="Frame Border Preview Window" parent="GtkDrawingArea"
                         icon-name="widget-gtk-drawingarea"/>

include/svx/dlgctrl.hxx

@@ -428,11 +428,14 @@ public:
 class SVX_DLLPUBLIC SvxXShadowPreview : public SvxPreviewBase
 {
 private:
-    SdrObject*                                      mpRectangleObject;
-    SdrObject*                                      mpRectangleShadow;
+    Point maShadowOffset;
+
+    SdrObject* mpRectangleObject;
+    SdrObject* mpRectangleShadow;
 
 public:
-    SvxXShadowPreview( Window* pParent, const ResId& rResId );
+    SvxXShadowPreview(Window *pParent);
+
     virtual ~SvxXShadowPreview();
 
     void SetRectangleAttributes(const SfxItemSet& rItemSet);

svx/source/dialog/dlgctrl.cxx

@@ -1949,10 +1949,10 @@ void SvxXRectPreview::Paint( const Rectangle& )
     LocalPostPaint();
 }
 
-SvxXShadowPreview::SvxXShadowPreview( Window* pParent, const ResId& rResId )
-:   SvxPreviewBase( pParent, rResId ),
-    mpRectangleObject(0),
-    mpRectangleShadow(0)
+SvxXShadowPreview::SvxXShadowPreview( Window* pParent )
+    : SvxPreviewBase(pParent)
+    , mpRectangleObject(0)
+    , mpRectangleShadow(0)
 {
     InitSettings(true, true);
 
@@ -1972,6 +1972,11 @@ SvxXShadowPreview::SvxXShadowPreview( Window* pParent, const ResId& rResId )
     mpRectangleShadow->SetModel(&getModel());
 }
 
+extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxXShadowPreview (Window *pParent, VclBuilder::stringmap &)
+{
+    return new SvxXShadowPreview(pParent);
+}
+
 SvxXShadowPreview::~SvxXShadowPreview()
 {
     SdrObject::Free(mpRectangleObject);
@@ -1992,15 +1997,23 @@ void SvxXShadowPreview::SetShadowAttributes(const SfxItemSet& rItemSet)
 
 void SvxXShadowPreview::SetShadowPosition(const Point& rPos)
 {
-    Rectangle aObjectPosition(mpRectangleObject->GetSnapRect());
-    aObjectPosition.Move(rPos.X(), rPos.Y());
-    mpRectangleShadow->SetSnapRect(aObjectPosition);
+    maShadowOffset = rPos;
 }
 
 void SvxXShadowPreview::Paint( const Rectangle& )
 {
     LocalPrePaint();
 
+    // prepare size
+    Size aSize = GetOutputSize();
+    aSize.Width() = aSize.Width() / 3;
+    aSize.Height() = aSize.Height() / 3;
+
+    Rectangle aObjectRect(Point(aSize.Width(), aSize.Height()), aSize);
+    mpRectangleObject->SetSnapRect(aObjectRect);
+    aObjectRect.Move(maShadowOffset.X(), maShadowOffset.Y());
+    mpRectangleShadow->SetSnapRect(aObjectRect);
+
     sdr::contact::SdrObjectVector aObjectVector;
 
     aObjectVector.push_back(mpRectangleShadow);