Convert line style tab page to widget UI

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

cui/UIConfig_cui.mk

@@ -42,6 +42,7 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\
 	cui/uiconfig/ui/insertrowcolumn \
 	cui/uiconfig/ui/linetabpage \
 	cui/uiconfig/ui/lineendstabpage \
+	cui/uiconfig/ui/linestyletabpage \
 	cui/uiconfig/ui/macroselectordialog \
 	cui/uiconfig/ui/messbox \
 	cui/uiconfig/ui/namedialog \

cui/source/inc/cuitabline.hxx

@@ -239,27 +239,21 @@ class SvxLineDefTabPage : public SfxTabPage
     using TabPage::ActivatePage;
     using TabPage::DeactivatePage;
 private:
-    FixedLine           aFlDefinition;
-    FixedText           aFTLinestyle;
-    LineLB              aLbLineStyles;
-    FixedText           aFtType;
-    ListBox             aLbType1;
-    ListBox             aLbType2;
-    FixedText           aFtNumber;
-    NumericField        aNumFldNumber1;
-    NumericField        aNumFldNumber2;
-    FixedText           aFtLength;
-    MetricField         aMtrLength1;
-    MetricField         aMtrLength2;
-    FixedText           aFtDistance;
-    MetricField         aMtrDistance;
-    CheckBox            aCbxSynchronize;
-    PushButton          aBtnAdd;
-    PushButton          aBtnModify;
-    PushButton          aBtnDelete;
-    ImageButton         aBtnLoad;
-    ImageButton         aBtnSave;
-    SvxXLinePreview     aCtlPreview;
+    LineLB*              m_pLbLineStyles;
+    ListBox*             m_pLbType1;
+    ListBox*             m_pLbType2;
+    NumericField*        m_pNumFldNumber1;
+    NumericField*        m_pNumFldNumber2;
+    MetricField*         m_pMtrLength1;
+    MetricField*         m_pMtrLength2;
+    MetricField*         m_pMtrDistance;
+    CheckBox*            m_pCbxSynchronize;
+    PushButton*          m_pBtnAdd;
+    PushButton*          m_pBtnModify;
+    PushButton*          m_pBtnDelete;
+    PushButton*          m_pBtnLoad;
+    PushButton*          m_pBtnSave;
+    SvxXLinePreview*     m_pCtlPreview;
 
     const SfxItemSet&   rOutAttrs;
     XDash               aDash;

cui/source/inc/helpid.hrc

@@ -243,8 +243,6 @@
 
 #define HID_TPSHADOW_CTRL "CUI_HID_TPSHADOW_CTRL"
 
-
-#define HID_LINE_DEF "CUI_HID_LINE_DEF"
 #define HID_SPELLDLG_SETWORD "CUI_HID_SPELLDLG_SETWORD"
 #define HID_PAGE_TEXTATTR "CUI_HID_PAGE_TEXTATTR"
 #define HID_TEXTATTR_CTL_POSITION "CUI_HID_TEXTATTR_CTL_POSITION"

cui/source/tabpages/tabline.hrc

@@ -25,28 +25,5 @@
 #define STR_START_LENGTH    40
 #define STR_END_LENGTH      41
 
-#define CBX_SYNCHRONIZE 1
-#define CTL_POSITION 2
-#define FT_POSITION 9
-#define CTL_PREVIEW 1
-#define FL_DEFINITION 1
-#define FT_NUMBER 3
-#define FT_DISTANCE 2
-#define FT_LENGTH 4
-#define LB_TYPE_1 3
-#define FT_TYPE 1
-#define LB_TYPE_2 1
-#define NUM_FLD_1 1
-#define NUM_FLD_2 2
-#define MTR_FLD_DISTANCE 1
-#define MTR_FLD_LENGTH_1 3
-#define MTR_FLD_LENGTH_2 4
-#define FT_LINESTYLE 10
-#define LB_LINESTYLES 2
-#define BTN_ADD 1
-#define BTN_MODIFY 2
-#define BTN_DELETE 3
-#define BTN_LOAD   5
-#define BTN_SAVE   6
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

cui/source/tabpages/tabline.src

@@ -26,280 +26,6 @@
 
 #define MASKCOLOR   MaskColor = Color{ Red = 0xFFFF ; Green = 0x0000 ; Blue = 0xFFFF ; };
 
-// Defining LineStyles --------------------
-
-TabPage RID_SVXPAGE_LINE_DEF
-{
-    Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
-    HelpId = HID_LINE_DEF ;
-    Hide = TRUE ;
-    Text [ en-US ] = "Define line styles" ;
-
-    FixedLine FL_DEFINITION
-    {
-        Pos = MAP_APPFONT ( 6 , 3  ) ;
-        Size = MAP_APPFONT ( 248 , 8 ) ;
-        Text [ en-US ] = "Properties" ;
-    };
-    FixedText FT_TYPE
-    {
-        Pos = MAP_APPFONT ( 12 , 34  ) ;
-        Size = MAP_APPFONT ( 52 , 8 ) ;
-        Text [ en-US ] = "~Type" ;
-    };
-    ListBox LB_TYPE_1
-    {
-        HelpID = "cui:ListBox:RID_SVXPAGE_LINE_DEF:LB_TYPE_1";
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 66 , 32  ) ;
-        Size = MAP_APPFONT ( 43 , 49 ) ;
-        TabStop = TRUE ;
-        DropDown = TRUE ;
-        StringList [ en-US ] =
-        {
-            < "Dot" ; Default ; > ;
-            < "Dash" ; Default ; > ;
-        };
-    };
-    ListBox LB_TYPE_2
-    {
-        HelpID = "cui:ListBox:RID_SVXPAGE_LINE_DEF:LB_TYPE_2";
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 113 , 32  ) ;
-        Size = MAP_APPFONT ( 43 , 49 ) ;
-        TabStop = TRUE ;
-        DropDown = TRUE ;
-        StringList [ en-US ] =
-        {
-            < "Dot" ; Default ; > ;
-            < "Dash" ; Default ; > ;
-        };
-    };
-    FixedText FT_NUMBER
-    {
-        Pos = MAP_APPFONT ( 12 , 50  ) ;
-        Size = MAP_APPFONT ( 52 , 8 ) ;
-        Text [ en-US ] = "~Number" ;
-    };
-    NumericField NUM_FLD_1
-    {
-        HelpID = "cui:NumericField:RID_SVXPAGE_LINE_DEF:NUM_FLD_1";
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 66 , 48  ) ;
-        Size = MAP_APPFONT ( 43 , 12 ) ;
-        TabStop = TRUE ;
-        Right = TRUE ;
-        Repeat = TRUE ;
-        Spin = TRUE ;
-        Maximum = 99 ;
-        StrictFormat = TRUE ;
-        Last = 99 ;
-        SpinSize = 1 ;
-    };
-    NumericField NUM_FLD_2
-    {
-        HelpID = "cui:NumericField:RID_SVXPAGE_LINE_DEF:NUM_FLD_2";
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 113 , 48  ) ;
-        Size = MAP_APPFONT ( 43 , 12 ) ;
-        TabStop = TRUE ;
-        Right = TRUE ;
-        Repeat = TRUE ;
-        Spin = TRUE ;
-        Maximum = 99 ;
-        StrictFormat = TRUE ;
-        Last = 99 ;
-        SpinSize = 1 ;
-    };
-    FixedText FT_LENGTH
-    {
-        Pos = MAP_APPFONT ( 12 , 66  ) ;
-        Size = MAP_APPFONT ( 52 , 8 ) ;
-        Text [ en-US ] = "~Length" ;
-    };
-    MetricField MTR_FLD_LENGTH_1
-    {
-        HelpID = "cui:MetricField:RID_SVXPAGE_LINE_DEF:MTR_FLD_LENGTH_1";
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 66 , 64  ) ;
-        Size = MAP_APPFONT ( 43 , 12 ) ;
-        TabStop = TRUE ;
-        Right = TRUE ;
-        Repeat = TRUE ;
-        Spin = TRUE ;
-        Minimum = 1 ;
-        First = 1 ;
-        Maximum = 5000 ;
-        Last = 5000 ;
-        StrictFormat = TRUE ;
-        DecimalDigits = 2 ;
-        Value = 1 ;
-        Unit = FUNIT_MM ;
-        CustomUnitText = "%" ;
-        SpinSize = 10 ;
-    };
-    MetricField MTR_FLD_LENGTH_2
-    {
-        HelpID = "cui:MetricField:RID_SVXPAGE_LINE_DEF:MTR_FLD_LENGTH_2";
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 113 , 64  ) ;
-        Size = MAP_APPFONT ( 43 , 12 ) ;
-        TabStop = TRUE ;
-        Right = TRUE ;
-        Repeat = TRUE ;
-        Spin = TRUE ;
-        Minimum = 1 ;
-        First = 1 ;
-        Maximum = 5000 ;
-        Last = 5000 ;
-        StrictFormat = TRUE ;
-        DecimalDigits = 2 ;
-        Value = 1 ;
-        Unit = FUNIT_MM ;
-        CustomUnitText = "%" ;
-        SpinSize = 10 ;
-    };
-    FixedText FT_DISTANCE
-    {
-        Pos = MAP_APPFONT ( 12 , 81  ) ;
-        Size = MAP_APPFONT ( 52 , 8 ) ;
-        Text [ en-US ] = "~Spacing" ;
-    };
-    MetricField MTR_FLD_DISTANCE
-    {
-        HelpID = "cui:MetricField:RID_SVXPAGE_LINE_DEF:MTR_FLD_DISTANCE";
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 66 , 79  ) ;
-        Size = MAP_APPFONT ( 43 , 12 ) ;
-        TabStop = TRUE ;
-        Right = TRUE ;
-        Repeat = TRUE ;
-        Spin = TRUE ;
-        Maximum = 5000 ;
-        StrictFormat = TRUE ;
-        DecimalDigits = 2 ;
-        Value = 1 ;
-        Unit = FUNIT_MM ;
-        CustomUnitText = "%" ;
-        Last = 5000 ;
-        SpinSize = 10 ;
-    };
-    CheckBox CBX_SYNCHRONIZE
-    {
-        HelpID = "cui:CheckBox:RID_SVXPAGE_LINE_DEF:CBX_SYNCHRONIZE";
-        Pos = MAP_APPFONT ( 12 , 95  ) ;
-        Size = MAP_APPFONT ( 174 , 10 ) ;
-        Text [ en-US ] = "~Fit to line width" ;
-        TabStop = TRUE ;
-    };
-
-    // ----------------------------------------
-
-    FixedText FT_LINESTYLE
-    {
-        Pos = MAP_APPFONT ( 12 , 16  ) ;
-        Size = MAP_APPFONT ( 52 , 8 ) ;
-        Text [ en-US ] = "Line style" ;
-    };
-    ListBox LB_LINESTYLES
-    {
-        HelpID = "cui:ListBox:RID_SVXPAGE_LINE_DEF:LB_LINESTYLES";
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 66 , 14  ) ;
-        Size = MAP_APPFONT ( 120 , 80 ) ;
-        TabStop = TRUE ;
-        DropDown = TRUE ;
-        DDExtraWidth = TRUE ;
-    };
-    PushButton BTN_ADD
-    {
-        HelpID = "cui:PushButton:RID_SVXPAGE_LINE_DEF:BTN_ADD";
-        Pos = MAP_APPFONT ( 198 , 14  ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        Text [ en-US ] = "~Add..." ;
-        TabStop = TRUE ;
-    };
-    PushButton BTN_MODIFY
-    {
-        HelpID = "cui:PushButton:RID_SVXPAGE_LINE_DEF:BTN_MODIFY";
-        Pos = MAP_APPFONT ( 198 , 34  ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        Text [ en-US ] = "~Modify..." ;
-        TabStop = TRUE ;
-    };
-    PushButton BTN_DELETE
-    {
-        HelpID = "cui:PushButton:RID_SVXPAGE_LINE_DEF:BTN_DELETE";
-        Pos = MAP_APPFONT ( 198 , 54  ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        Text [ en-US ] = "~Delete..." ;
-        TabStop = TRUE ;
-    };
-    ImageButton BTN_LOAD
-    {
-        HelpID = "cui:ImageButton:RID_SVXPAGE_LINE_DEF:BTN_LOAD";
-        Pos = MAP_APPFONT ( 198 , 74  ) ;
-        Size = MAP_APPFONT ( 16 , 16 ) ;
-        TabStop = TRUE ;
-        QuickHelpText [ en-US ] = "Load Line Styles" ;
-        ButtonImage = Image
-        {
-            ImageBitmap = Bitmap
-            {
-                File = "sc05501.bmp" ;
-            };
-            MASKCOLOR
-        };
-    };
-    ImageButton BTN_SAVE
-    {
-        HelpID = "cui:ImageButton:RID_SVXPAGE_LINE_DEF:BTN_SAVE";
-        Pos = MAP_APPFONT ( 198 , 96  ) ;
-        Size = MAP_APPFONT ( 16 , 16 ) ;
-        TabStop = TRUE ;
-        QuickHelpText [ en-US ] = "Save Line Styles" ;
-        ButtonImage = Image
-        {
-            ImageBitmap = Bitmap
-            {
-                File = "sc05502.bmp" ;
-            };
-            MASKCOLOR
-        };
-    };
-    Control CTL_PREVIEW
-    {
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 6 , 135  ) ;
-        Size = MAP_APPFONT ( 248 , 40 ) ;
-    };
-
-    String STR_START_TYPE
-    {
-        Text [ en-US ] = "Start type" ;
-    };
-    String STR_END_TYPE
-    {
-        Text [ en-US ] = "End type" ;
-     };
-    String STR_START_NUM
-    {
-        Text [ en-US ] = "Start number" ;
-    };
-    String STR_END_NUM
-    {
-        Text [ en-US ] = "End number" ;
-    };
-    String STR_START_LENGTH
-    {
-        Text [ en-US ] = "Start length" ;
-    };
-    String STR_END_LENGTH
-    {
-        Text [ en-US ] = "End length" ;
-    };
-};
-
  // RID_SVXDLG_LINE ----------------------------------------------------------
 TabDialog RID_SVXDLG_LINE
 {