Convert Calc sheet page style to Widget UI

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

sc/UI_scalc.mk

@@ -16,6 +16,7 @@ $(eval $(call gb_UI_add_uifiles,modules/scalc,\
 	sc/uiconfig/scalc/ui/insertname \
 	sc/uiconfig/scalc/ui/insertsheet \
 	sc/uiconfig/scalc/ui/printeroptions \
+	sc/uiconfig/scalc/ui/sheetprintpage \
 	sc/uiconfig/scalc/ui/sortcriteriapage \
 	sc/uiconfig/scalc/ui/sortkey \
 	sc/uiconfig/scalc/ui/sortoptionspage \

sc/inc/sc.hrc

@@ -975,7 +975,7 @@
 #define RID_SCDLG_PIVOTSUBT     (SC_DIALOGS_START + 38)
 #define RID_SCDLG_NEWSCENARIO   (SC_DIALOGS_START + 39)
 #define RID_SCDLG_INSERT_TABLE  (SC_DIALOGS_START + 42)
-#define RID_SCPAGE_TABLE        (SC_DIALOGS_START + 43)
+
 #define RID_SCPAGE_AREAS        (SC_DIALOGS_START + 44)
 #define RID_SCDLG_STYLES_PAR    (SC_DIALOGS_START + 46)
 #define RID_SCDLG_STYLES_PAGE   (SC_DIALOGS_START + 48)

sc/source/ui/inc/tptable.hxx

@@ -63,36 +63,29 @@ private:
     void            ShowImage();
 
 private:
-    FixedLine       aFlPageDir;
-    RadioButton     aBtnTopDown;
-    RadioButton     aBtnLeftRight;
-    FixedImage      aBmpPageDir;
-    Image           aImgLeftRight;
-    Image           aImgTopDown;
-    CheckBox        aBtnPageNo;
-    NumericField    aEdPageNo;
+    RadioButton*     m_pBtnTopDown;
+    RadioButton*     m_pBtnLeftRight;
+    FixedImage*      m_pBmpPageDir;
+    CheckBox*        m_pBtnPageNo;
+    NumericField*    m_pEdPageNo;
 
-    FixedLine       aFlPrint;
-    CheckBox        aBtnHeaders;
-    CheckBox        aBtnGrid;
-    CheckBox        aBtnNotes;
-    CheckBox        aBtnObjects;
-    CheckBox        aBtnCharts;
-    CheckBox        aBtnDrawings;
-    CheckBox        aBtnFormulas;
-    CheckBox        aBtnNullVals;
+    CheckBox*        m_pBtnHeaders;
+    CheckBox*        m_pBtnGrid;
+    CheckBox*        m_pBtnNotes;
+    CheckBox*        m_pBtnObjects;
+    CheckBox*        m_pBtnCharts;
+    CheckBox*        m_pBtnDrawings;
+    CheckBox*        m_pBtnFormulas;
+    CheckBox*        m_pBtnNullVals;
 
-    FixedLine           aFlScale;
-    FixedText           aFtScaleMode;
-    ListBox             aLbScaleMode;
-    FixedText           aFtScaleAll;
-    MetricField         aEdScaleAll;
-    FixedText           aFtScalePageWidth;
-    EmptyNumericField   aEdScalePageWidth;
-    FixedText           aFtScalePageHeight;
-    EmptyNumericField   aEdScalePageHeight;
-    FixedText           aFtScalePageNum;
-    NumericField        aEdScalePageNum;
+    ListBox*             m_pLbScaleMode;
+    VclHBox*             m_pBxScaleAll;
+    MetricField*         m_pEdScaleAll;
+    VclGrid*             m_pGrHeightWidth;
+    NumericField*        m_pEdScalePageWidth;
+    NumericField*        m_pEdScalePageHeight;
+    VclHBox*             m_pBxScalePageNum;
+    NumericField*        m_pEdScalePageNum;
 
 private:
     //------------------------------------

sc/source/ui/pagedlg/pagedlg.hrc

@@ -29,42 +29,8 @@
 //================================================
 // TabPage: Tabelle
 
-#define BTN_GRID            10
-#define BTN_HEADER          11
-#define BTN_NOTES           12
-#define BTN_CHARTS          13
-#define BTN_OBJECTS         14
-#define BTN_DRAWINGS        15
-#define BTN_FORMULAS        16
-#define BTN_NULLVALS        17
-#define FL_PRINT            19
-
-#define BTN_TOPDOWN         20
-#define BTN_LEFTRIGHT       21
-#define BMP_PAGEDIR         22
-#define IMG_LEFTRIGHT       23
-#define IMG_TOPDOWN         24
-#define BTN_PAGENO          25
-#define ED_PAGENO           26
-#define FL_PAGEDIR          29
-
-#define FT_SCALEMODE        30
-#define LB_SCALEMODE        31
-#define ED_SCALEALL         32
-#define ED_SCALEPAGENUM     34
-#define ED_SCALEPAGEWIDTH   35
-#define ED_SCALEPAGEHEIGHT  36
-#define FL_SCALE            39
-
-#define FT_SCALEFACTOR      51
-#define FT_SCALEPAGEWIDTH   52
-#define FT_SCALEPAGEHEIGHT  53
-#define FT_SCALEPAGENUM     54
-
-// List box entries "Scaling mode"
-#define SC_TPTABLE_SCALE_PERCENT    0
-#define SC_TPTABLE_SCALE_TO         1
-#define SC_TPTABLE_SCALE_TO_PAGES   2
+#define IMG_LEFTRIGHT       (SC_DIALOGS_START + 43 + 23)
+#define IMG_TOPDOWN         (SC_DIALOGS_START + 43 + 24)
 
 //================================================
 // Dialog: Druckbereiche

sc/source/ui/pagedlg/pagedlg.src

@@ -150,254 +150,16 @@ ModelessDialog RID_SCDLG_AREAS
     };
 };
 
-TabPage RID_SCPAGE_TABLE
-{
-    Hide = TRUE ;
-    HelpId = HID_SCPAGE_TABLE ;
-    SVLook = TRUE ;
-    Pos = MAP_APPFONT ( 0 , 0 ) ;
-    Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
-    CheckBox BTN_HEADER
-    {
-        HelpID = "sc:CheckBox:RID_SCPAGE_TABLE:BTN_HEADER";
-        Pos = MAP_APPFONT ( 12 , 73 ) ;
-        Size = MAP_APPFONT ( 142 , 10 ) ;
-        Text [ en-US ] = "~Column and row headers" ;
-        TabStop = TRUE ;
-    };
-    CheckBox BTN_GRID
-    {
-        HelpID = "sc:CheckBox:RID_SCPAGE_TABLE:BTN_GRID";
-        Pos = MAP_APPFONT ( 12 , 87 ) ;
-        Size = MAP_APPFONT ( 142 , 10 ) ;
-        Text [ en-US ] = "~Grid" ;
-        TabStop = TRUE ;
-    };
-    CheckBox BTN_NOTES
-    {
-        HelpID = "sc:CheckBox:RID_SCPAGE_TABLE:BTN_NOTES";
-            Pos = MAP_APPFONT ( 12 , 101 ) ;
-        Size = MAP_APPFONT ( 142 , 10 ) ;
-        Text [ en-US ] = "~Comments" ;
-        TabStop = TRUE ;
-    };
-    CheckBox BTN_OBJECTS
-    {
-        HelpID = "sc:CheckBox:RID_SCPAGE_TABLE:BTN_OBJECTS";
-        Pos = MAP_APPFONT ( 12 , 115 ) ;
-        Size = MAP_APPFONT ( 142 , 10 ) ;
-        Text [ en-US ] = "~Objects/graphics" ;
-        TabStop = TRUE ;
-    };
-    CheckBox BTN_CHARTS
-    {
-        HelpID = "sc:CheckBox:RID_SCPAGE_TABLE:BTN_CHARTS";
-        Pos = MAP_APPFONT ( 160 , 73 ) ;
-        Size = MAP_APPFONT ( 91 , 10 ) ;
-        Text [ en-US ] = "Ch~arts" ;
-        TabStop = TRUE ;
-    };
-    CheckBox BTN_DRAWINGS
-    {
-        HelpID = "sc:CheckBox:RID_SCPAGE_TABLE:BTN_DRAWINGS";
-        Pos = MAP_APPFONT ( 160 , 87 ) ;
-        Size = MAP_APPFONT ( 91 , 10 ) ;
-        Text [ en-US ] = "~Drawing objects" ;
-        TabStop = TRUE ;
-    };
-    CheckBox BTN_FORMULAS
-    {
-        HelpID = "sc:CheckBox:RID_SCPAGE_TABLE:BTN_FORMULAS";
-        Pos = MAP_APPFONT ( 160 , 101 ) ;
-        Size = MAP_APPFONT ( 91 , 10 ) ;
-        Text [ en-US ] = "~Formulas" ;
-        TabStop = TRUE ;
-    };
-    CheckBox BTN_NULLVALS
-    {
-        HelpID = "sc:CheckBox:RID_SCPAGE_TABLE:BTN_NULLVALS";
-        Pos = MAP_APPFONT ( 160 , 115 ) ;
-        Size = MAP_APPFONT ( 91 , 10 ) ;
-        Text [ en-US ] = "Zero ~values" ;
-        TabStop = TRUE ;
-    };
-    FixedLine FL_PRINT
-    {
-        Pos = MAP_APPFONT ( 6 , 62 ) ;
-        Size = MAP_APPFONT ( 248 , 8 ) ;
-        Text [ en-US ] = "Print" ;
-    };
-    RadioButton BTN_TOPDOWN
-    {
-        HelpID = "sc:RadioButton:RID_SCPAGE_TABLE:BTN_TOPDOWN";
-        Pos = MAP_APPFONT ( 12 , 14 ) ;
-        Size = MAP_APPFONT ( 142 , 10 ) ;
-        Text [ en-US ] = "~Top to bottom, then right" ;
-        TabStop = TRUE ;
-    };
-    RadioButton BTN_LEFTRIGHT
-    {
-        HelpID = "sc:RadioButton:RID_SCPAGE_TABLE:BTN_LEFTRIGHT";
-        Pos = MAP_APPFONT ( 12 , 28 ) ;
-        Size = MAP_APPFONT ( 142 , 10 ) ;
-        Text [ en-US ] = "~Left to right, then down" ;
-        TabStop = TRUE ;
-    };
-    FixedImage BMP_PAGEDIR
-    {
-        Pos = MAP_APPFONT ( 160 , 14 ) ;
-        Size = MAP_APPFONT ( 25 , 25 ) ;
-    };
-    Image IMG_LEFTRIGHT
+Image IMG_LEFTRIGHT
     {
         ImageBitmap = Bitmap { File = "lftrgt.png" ; };
         MaskColor = STD_MASKCOLOR;
     };
-    Image IMG_TOPDOWN
+Image IMG_TOPDOWN
     {
         ImageBitmap = Bitmap { File = "topdown.png" ; };
         MaskColor = STD_MASKCOLOR;
     };
-    CheckBox BTN_PAGENO
-    {
-        HelpID = "sc:CheckBox:RID_SCPAGE_TABLE:BTN_PAGENO";
-        Pos = MAP_APPFONT ( 12 , 46 ) ;
-        Size = MAP_APPFONT ( 90 , 10 ) ;
-        Text [ en-US ] = "First ~page number" ;
-        TabStop = TRUE ;
-    };
-    NumericField ED_PAGENO
-    {
-        HelpID = "sc:NumericField:RID_SCPAGE_TABLE:ED_PAGENO";
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 106 , 44 ) ;
-        Size = MAP_APPFONT ( 30 , 12 ) ;
-        TabStop = TRUE ;
-        Spin = TRUE ;
-        Minimum = 1 ;
-        Maximum = 9999 ;
-        SpinSize = 1 ;
-        Repeat = TRUE ;
-    };
-    FixedLine FL_PAGEDIR
-    {
-        Pos = MAP_APPFONT ( 6 , 3 ) ;
-        Size = MAP_APPFONT ( 248 , 8 ) ;
-        Text [ en-US ] = "Page order" ;
-    };
-    FixedText FT_SCALEMODE
-    {
-        Pos = MAP_APPFONT( 12, 144 );
-        Size = MAP_APPFONT( 124, 8 );
-        Text [ en-US ] = "Scaling ~mode";
-    };
-    ListBox LB_SCALEMODE
-    {
-        HelpID = "sc:ListBox:RID_SCPAGE_TABLE:LB_SCALEMODE";
-        Border = TRUE;
-        Pos = MAP_APPFONT( 12, 155 );
-        Size = MAP_APPFONT( 124, 60 );
-        DropDown = TRUE;
-        StringList [ en-US ] =
-        {
-            < "Reduce/enlarge printout"; SC_TPTABLE_SCALE_PERCENT; >;
-            < "Fit print range(s) to width/height"; SC_TPTABLE_SCALE_TO; >;
-            < "Fit print range(s) on number of pages"; SC_TPTABLE_SCALE_TO_PAGES; >;
-        };
-    };
-    MetricField ED_SCALEALL
-    {
-        HelpID = "sc:MetricField:RID_SCPAGE_TABLE:ED_SCALEALL";
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 218 , 155 ) ;
-        Size = MAP_APPFONT ( 30 , 12 ) ;
-        TabStop = TRUE ;
-        Spin = TRUE ;
-        Repeat = TRUE ;
-        Minimum = 10 ;
-        Maximum = 400 ;
-        First = 15 ;
-        Last = 200 ;
-        SpinSize = 1 ;
-        Unit = FUNIT_CUSTOM ;
-        CustomUnitText = "%" ;
-    };
-    NumericField ED_SCALEPAGEWIDTH
-    {
-        HelpID = "sc:NumericField:RID_SCPAGE_TABLE:ED_SCALEPAGEWIDTH";
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 218 , 144 ) ;
-        Size = MAP_APPFONT ( 30 , 12 ) ;
-        TabStop = TRUE ;
-        Hide = TRUE ;
-        Spin = TRUE ;
-        Repeat = TRUE ;
-        Minimum = 1 ;
-        Maximum = 1000 ;
-        SpinSize = 1 ;
-    };
-    NumericField ED_SCALEPAGEHEIGHT
-    {
-        HelpID = "sc:NumericField:RID_SCPAGE_TABLE:ED_SCALEPAGEHEIGHT";
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 218 , 160 ) ;
-        Size = MAP_APPFONT ( 30 , 12 ) ;
-        TabStop = TRUE ;
-        Hide = TRUE ;
-        Spin = TRUE ;
-        Repeat = TRUE ;
-        Minimum = 1 ;
-        Maximum = 1000 ;
-        SpinSize = 1 ;
-    };
-    NumericField ED_SCALEPAGENUM
-    {
-        HelpID = "sc:NumericField:RID_SCPAGE_TABLE:ED_SCALEPAGENUM";
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 218 , 155 ) ;
-        Size = MAP_APPFONT ( 30 , 12 ) ;
-        TabStop = TRUE ;
-        Hide = TRUE ;
-        Spin = TRUE ;
-        Repeat = TRUE ;
-        Minimum = 1 ;
-        Maximum = 1000 ;
-        SpinSize = 1 ;
-    };
-    FixedText FT_SCALEFACTOR
-    {
-        Pos = MAP_APPFONT( 148, 157 );
-        Size = MAP_APPFONT( 68 , 8 );
-        Hide = TRUE;
-        Text [ en-US ] = "~Scaling factor";
-    };
-    FixedText FT_SCALEPAGEWIDTH
-    {
-        Pos = MAP_APPFONT( 148, 146 );
-        Size = MAP_APPFONT( 68 , 8 );
-        Hide = TRUE;
-        Text [ en-US ] = "~Width in pages";
-    };
-    FixedText FT_SCALEPAGEHEIGHT
-    {
-        Pos = MAP_APPFONT( 148, 162 );
-        Size = MAP_APPFONT( 68 , 8 );
-        Hide = TRUE;
-        Text [ en-US ] = "H~eight in pages";
-    };
-    FixedText FT_SCALEPAGENUM
-    {
-        Pos = MAP_APPFONT( 148, 157 );
-        Size = MAP_APPFONT( 68, 8 );
-        Hide = TRUE;
-        Text [ en-US ] = "N~umber of pages";
-    };
-    FixedLine FL_SCALE
-    {
-        Pos = MAP_APPFONT ( 6 , 131 ) ;
-        Size = MAP_APPFONT ( 248 , 8 ) ;
-        Text [ en-US ] = "Scale" ;
-    };
-};
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */