Convert Transparency tab page to widget UI

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

cui/UIConfig_cui.mk

@@ -85,6 +85,7 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\
 	cui/uiconfig/ui/storedwebconnectiondialog \
 	cui/uiconfig/ui/textflowpage \
 	cui/uiconfig/ui/thesaurus \
+	cui/uiconfig/ui/transparencytabpage \
 	cui/uiconfig/ui/twolinespage \
 	cui/uiconfig/ui/zoomdialog \
 ))

cui/source/inc/cuitabarea.hxx

@@ -110,33 +110,29 @@ class SvxTransparenceTabPage : public SvxTabPage
     sal_uInt16          nDlgType;
 
     // main selection
-    FixedLine           aFlProp;
-    RadioButton         aRbtTransOff;
-    RadioButton         aRbtTransLinear;
-    RadioButton         aRbtTransGradient;
+    RadioButton*        m_pRbtTransOff;
+    RadioButton*        m_pRbtTransLinear;
+    RadioButton*        m_pRbtTransGradient;
 
     /// linear transparency
-    MetricField         aMtrTransparent;
+    MetricField*        m_pMtrTransparent;
 
     // gradient transparency
-    FixedText           aFtTrgrType;
-    ListBox             aLbTrgrGradientType;
-    FixedText           aFtTrgrCenterX;
-    MetricField         aMtrTrgrCenterX;
-    FixedText           aFtTrgrCenterY;
-    MetricField         aMtrTrgrCenterY;
-    FixedText           aFtTrgrAngle;
-    MetricField         aMtrTrgrAngle;
-    FixedText           aFtTrgrBorder;
-    MetricField         aMtrTrgrBorder;
-    FixedText           aFtTrgrStartValue;
-    MetricField         aMtrTrgrStartValue;
-    FixedText           aFtTrgrEndValue;
-    MetricField         aMtrTrgrEndValue;
+    VclGrid*            m_pGridGradient;
+    ListBox*            m_pLbTrgrGradientType;
+    FixedText*          m_pFtTrgrCenterX;
+    MetricField*        m_pMtrTrgrCenterX;
+    FixedText*          m_pFtTrgrCenterY;
+    MetricField*        m_pMtrTrgrCenterY;
+    FixedText*          m_pFtTrgrAngle;
+    MetricField*        m_pMtrTrgrAngle;
+    MetricField*        m_pMtrTrgrBorder;
+    MetricField*        m_pMtrTrgrStartValue;
+    MetricField*        m_pMtrTrgrEndValue;
 
     // preview
-    SvxXRectPreview     aCtlBitmapPreview;
-    SvxXRectPreview     aCtlXRectPreview;
+    SvxXRectPreview*    m_pCtlBitmapPreview;
+    SvxXRectPreview*    m_pCtlXRectPreview;
     sal_Bool                bBitmap;
 
     XOutdevItemPool*    pXPool;

cui/source/inc/helpid.hrc

@@ -245,7 +245,7 @@
 #define HID_VALUESET_NUM "CUI_HID_VALUESET_NUM"
 #define HID_MEASURE_CTL_PREVIEW "CUI_HID_MEASURE_CTL_PREVIEW"
 #define HID_SVXPAGE_SWPOSSIZE "CUI_HID_SVXPAGE_SWPOSSIZE"
-#define HID_AREA_TRANSPARENCE "CUI_HID_AREA_TRANSPARENCE"
+
 #define HID_AREA_AREA "CUI_HID_AREA_AREA"
 #define HID_AREA_SHADOW "CUI_HID_AREA_SHADOW"
 #define HID_AREA_BITMAP "CUI_HID_AREA_BITMAP"

cui/source/tabpages/tabarea.hrc

@@ -94,27 +94,6 @@
 #define FT_Y_SIZE 11
 #define FT_BITMAPS_HIDDEN 12
 
-#define RBT_TRANS_OFF 8
-#define RBT_TRANS_LINEAR 9
-#define RBT_TRANS_GRADIENT 10
-#define CTL_TRANS_PREVIEW   19
-
-#define FT_TRGR_TYPE 12
-#define LB_TRGR_GRADIENT_TYPES 3
-#define FT_TRGR_CENTER_X 13
-#define MTR_TRGR_CENTER_X 4
-#define FT_TRGR_CENTER_Y 14
-#define MTR_TRGR_CENTER_Y 5
-#define FT_TRGR_ANGLE 15
-#define MTR_TRGR_ANGLE 6
-#define FT_TRGR_BORDER 16
-#define MTR_TRGR_BORDER 7
-#define FT_TRGR_START_VALUE 17
-#define MTR_TRGR_START_VALUE 8
-#define FT_TRGR_END_VALUE 18
-#define MTR_TRGR_END_VALUE 9
-#define MTR_TRANSPARENT 10
-
 #define MTR_SHADOW_TRANSPARENT 11
 
 // Hatch-Background on Area-TabPage

cui/source/tabpages/tabarea.src

@@ -28,224 +28,6 @@
 #define TRANS_GRAD_OFFSET_X             6
 #define TRANS_GRAD_OFFSET_Y             64
 
-TabPage RID_SVXPAGE_TRANSPARENCE
-{
-    HelpID = HID_AREA_TRANSPARENCE;
-    Hide = TRUE;
-    Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT );
-    FixedLine FL_PROP
-    {
-        Pos = MAP_APPFONT ( 6 , 3  ) ;
-        Size = MAP_APPFONT ( 248, 8 ) ;
-        Text [ en-US ] = "Transparency mode";
-    };
-    RadioButton RBT_TRANS_OFF
-    {
-        HelpID = "cui:RadioButton:RID_SVXPAGE_TRANSPARENCE:RBT_TRANS_OFF";
-        Pos = MAP_APPFONT ( 12 , 14  ) ;
-        Size = MAP_APPFONT ( 110 , 10 ) ;
-        Text [ en-US ] = "~No transparency";
-    };
-    RadioButton RBT_TRANS_LINEAR
-    {
-        HelpID = "cui:RadioButton:RID_SVXPAGE_TRANSPARENCE:RBT_TRANS_LINEAR";
-        Pos = MAP_APPFONT ( 12 , 28  ) ;
-        Size = MAP_APPFONT ( 60 , 10 ) ;
-        Text [ en-US ] = "~Transparency";
-    };
-    MetricField MTR_TRANSPARENT
-    {
-        HelpID = "cui:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRANSPARENT";
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 72 , 26 ) ;
-        Size = MAP_APPFONT ( 40 , 12 ) ;
-        TabStop = TRUE ;
-        Repeat = TRUE ;
-        Spin = TRUE ;
-        Maximum = 100 ;
-        StrictFormat = TRUE ;
-        Unit = FUNIT_CUSTOM ;
-        CustomUnitText = "%" ;
-        Last = 100 ;
-        SpinSize = 5 ;
-    };
-    RadioButton RBT_TRANS_GRADIENT
-    {
-        HelpID = "cui:RadioButton:RID_SVXPAGE_TRANSPARENCE:RBT_TRANS_GRADIENT";
-        Pos = MAP_APPFONT ( 12 , 42 ) ;
-        Size = MAP_APPFONT ( 110 , 10 ) ;
-        Text [ en-US ] = "Gradient";
-    };
-    FixedText FT_TRGR_TYPE
-    {
-        Pos = MAP_APPFONT ( 21 , 56 ) ;
-        Size = MAP_APPFONT ( 41 , 8 ) ;
-        Text [ en-US ] = "Ty~pe";
-    };
-    ListBox LB_TRGR_GRADIENT_TYPES
-    {
-        HelpID = "cui:ListBox:RID_SVXPAGE_TRANSPARENCE:LB_TRGR_GRADIENT_TYPES";
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 72 , 54  ) ;
-        Size = MAP_APPFONT ( 53 , 63 ) ;
-        TabStop = TRUE ;
-        DropDown = TRUE ;
-        StringList [ en-US ] =
-        {
-            < "Linear" ; Default ; > ;
-            < "Axial" ; Default ; > ;
-            < "Radial" ; Default ; > ;
-            < "Ellipsoid" ; Default ; > ;
-            < "Quadratic" ; Default ; > ;
-            < "Square" ; Default ; > ;
-        };
-    };
-    FixedText FT_TRGR_CENTER_X
-    {
-        Pos = MAP_APPFONT ( 21 , 72 ) ;
-        Size = MAP_APPFONT ( 41 , 8 ) ;
-        Text [ en-US ] = "Center ~X";
-    };
-    MetricField MTR_TRGR_CENTER_X
-    {
-        HelpID = "cui:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_CENTER_X";
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 72 , 70 ) ;
-        Size = MAP_APPFONT ( 40 , 12 ) ;
-        TabStop = TRUE ;
-        Repeat = TRUE ;
-        Spin = TRUE ;
-        Maximum = 100 ;
-        StrictFormat = TRUE ;
-        Unit = FUNIT_CUSTOM ;
-        CustomUnitText = "%" ;
-        Last = 100 ;
-        SpinSize = 5 ;
-    };
-    FixedText FT_TRGR_CENTER_Y
-    {
-        Pos = MAP_APPFONT ( 21 , 88 ) ;
-        Size = MAP_APPFONT ( 41 , 8 ) ;
-        Text [ en-US ] = "Center ~Y";
-    };
-    MetricField MTR_TRGR_CENTER_Y
-    {
-        HelpID = "cui:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_CENTER_Y";
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 72 , 86 ) ;
-        Size = MAP_APPFONT ( 40 , 12 ) ;
-        TabStop = TRUE ;
-        Repeat = TRUE ;
-        Spin = TRUE ;
-        Maximum = 100 ;
-        StrictFormat = TRUE ;
-        Unit = FUNIT_CUSTOM ;
-        CustomUnitText = "%" ;
-        Last = 100 ;
-        SpinSize = 5 ;
-    };
-    FixedText FT_TRGR_ANGLE
-    {
-        Pos = MAP_APPFONT ( 21 , 104 ) ;
-        Size = MAP_APPFONT ( 41 , 8 ) ;
-        Text [ en-US ] = "~Angle";
-    };
-    MetricField MTR_TRGR_ANGLE
-    {
-        HelpID = "cui:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_ANGLE";
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 72 , 102 ) ;
-        Size = MAP_APPFONT ( 40 , 12 ) ;
-        TabStop = TRUE ;
-        Repeat = TRUE ;
-        Spin = TRUE ;
-        Maximum = 359 ;
-        Unit = FUNIT_CUSTOM ;
-        Last = 359 ;
-        SpinSize = 15 ;
-        CustomUnitText [ en-US ] = " degrees";
-    };
-    FixedText FT_TRGR_BORDER
-    {
-        Pos = MAP_APPFONT ( 15 + TRANS_GRAD_OFFSET_X, 56 + TRANS_GRAD_OFFSET_Y) ;
-        Size = MAP_APPFONT ( 41, 8 ) ;
-        Text [ en-US ] = "~Border";
-    };
-    MetricField MTR_TRGR_BORDER
-    {
-        HelpID = "cui:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_BORDER";
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 66 + TRANS_GRAD_OFFSET_X, 54 + TRANS_GRAD_OFFSET_Y) ;
-        Size = MAP_APPFONT ( 40 , 12 ) ;
-        TabStop = TRUE ;
-        Repeat = TRUE ;
-        Spin = TRUE ;
-        Maximum = 100 ;
-        StrictFormat = TRUE ;
-        Unit = FUNIT_CUSTOM ;
-        CustomUnitText = "%" ;
-        Last = 100 ;
-        SpinSize = 5 ;
-    };
-    FixedText FT_TRGR_START_VALUE
-    {
-        Pos = MAP_APPFONT ( 21 , 136 ) ;
-        Size = MAP_APPFONT ( 41 , 8 ) ;
-        Text [ en-US ] = "~Start value";
-    };
-    MetricField MTR_TRGR_START_VALUE
-    {
-        HelpID = "cui:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_START_VALUE";
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 72 , 134 ) ;
-        Size = MAP_APPFONT ( 40 , 12 ) ;
-        TabStop = TRUE ;
-        Repeat = TRUE ;
-        Spin = TRUE ;
-        Maximum = 100 ;
-        StrictFormat = TRUE ;
-        Unit = FUNIT_CUSTOM ;
-        CustomUnitText = "%" ;
-        Last = 100 ;
-        SpinSize = 5 ;
-    };
-    FixedText FT_TRGR_END_VALUE
-    {
-        Pos = MAP_APPFONT ( 21 , 152 ) ;
-        Size = MAP_APPFONT ( 41 , 8 ) ;
-        Text [ en-US ] = "~End value";
-    };
-    MetricField MTR_TRGR_END_VALUE
-    {
-        HelpID = "cui:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_END_VALUE";
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 72 , 150 ) ;
-        Size = MAP_APPFONT ( 40 , 12 ) ;
-        TabStop = TRUE ;
-        Repeat = TRUE ;
-        Spin = TRUE ;
-        Maximum = 100 ;
-        StrictFormat = TRUE ;
-        Unit = FUNIT_CUSTOM ;
-        CustomUnitText = "%" ;
-        Last = 100 ;
-        SpinSize = 5 ;
-    };
-    Control CTL_BITMAP_PREVIEW
-    {
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 138 , 14  ) ;
-        Size = MAP_APPFONT ( 110 , 42 ) ;
-    };
-    Control CTL_TRANS_PREVIEW
-    {
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 138 , 14  ) ;
-        Size = MAP_APPFONT ( 110 , 42 ) ;
-    };
-    Text [ en-US ] = "Transparency";
-};
-
 // ------------------------------------------------------
 TabPage RID_SVXPAGE_AREA
 {