move General options page to cui and adapt code

Change-Id: I724db9d199ad15d31f8daf2329ceb9cd46fdefda

cui/UI_cui.mk

@@ -36,6 +36,7 @@ $(eval $(call gb_UI_add_uifiles,cui,\
 	cui/uiconfig/ui/optadvancedpage \
 	cui/uiconfig/ui/optappearancepage \
 	cui/uiconfig/ui/optfontspage \
+	cui/uiconfig/ui/optgeneralpage \
 	cui/uiconfig/ui/optpathspage \
 	cui/uiconfig/ui/optsecuritypage \
 	cui/uiconfig/ui/personalization_tab \

cui/source/inc/helpid.hrc

@@ -49,7 +49,6 @@
 #define HID_OFA_CONNPOOL_DRIVERLIST "CUI_HID_OFA_CONNPOOL_DRIVERLIST"
 #define UID_OFA_CONNPOOL_DRIVERLIST_BACK "CUI_UID_OFA_CONNPOOL_DRIVERLIST_BACK"
 #define HID_OFA_FONT_SUBST_CLB "CUI_HID_OFA_FONT_SUBST_CLB"
-#define HID_OFA_TP_MISC "CUI_HID_OFA_TP_MISC"
 #define HID_OFA_TP_VIEW "CUI_HID_OFA_TP_VIEW"
 #define HID_OFA_TP_LANGUAGES "CUI_HID_OFA_TP_LANGUAGES"
 #define HID_OFA_TP_MEMORY "CUI_HID_OFA_TP_MEMORY"

cui/source/options/optgdlg.hrc

@@ -87,21 +87,6 @@
 #define ROW_FL_SELECTION        (ROW_LB_MOUSEMIDDLE + RSC_CD_DROPDOWN_HEIGHT + RSC_SP_FLGR_SPACE_X)
 #define ROW_CB_SELECTION        (ROW_FL_SELECTION + RSC_CD_FIXEDLINE_HEIGHT + ROWSPACE)
 
-// tabpage general -------------------------------------------------------
-
-#define FL_HELP                     10
-#define CB_TOOLTIP                  11
-#define CB_EXTHELP                  12
-#define CB_HELPAGENT                13
-#define PB_HELPAGENT_RESET          14
-
-#define FL_TWOFIGURE                40
-#define FT_INTERPRET                41
-#define NF_YEARVALUE                42
-#define FT_TOYEAR                   43
-#define FL_PRINTDLG                 44
-#define CB_PRINTDLG                 45
-
 // tabpage view ----------------------------------------------------------
 // #i95644# 10 .. 14 freed, may be reused
 

cui/source/options/optgdlg.hxx

@@ -36,29 +36,24 @@ class OfaMiscTabPage : public SfxTabPage
 {
     using TabPage::DeactivatePage;
 private:
-    FixedLine           aHelpFL;
-    CheckBox            aToolTipsCB;
-    CheckBox            aExtHelpCB;
-    CheckBox            aHelpAgentCB;
-    PushButton          aHelpAgentResetBtn;
+    CheckBox*     m_pToolTipsCB;
+    CheckBox*     m_pExtHelpCB;
+    CheckBox*     m_pHelpAgentCB;
+    PushButton*   m_pHelpAgentResetBtn;
 
-    FixedLine           aFileDlgFL;
-    ReadOnlyImage       aFileDlgROImage;
-    CheckBox            aFileDlgCB;
+    FixedImage*   m_pFileDlgROImage;
+    CheckBox*     m_pFileDlgCB;
 
-    FixedLine           aPrintDlgFL;
-    CheckBox            aPrintDlgCB;
+    CheckBox*     m_pPrintDlgCB;
 
-    FixedLine           aDocStatusFL;
-    CheckBox            aDocStatusCB;
-    CheckBox            aSaveAlwaysCB;
+    CheckBox*     m_pDocStatusCB;
+    CheckBox*     m_pSaveAlwaysCB;
 
-    FixedLine           aTwoFigureFL;
-    FixedText           aInterpretFT;
-    NumericField        aYearValueField;
-    FixedText           aToYearFT;
+    VclContainer* m_pYearFrame;
+    NumericField* m_pYearValueField;
+    FixedText*    m_pToYearFT;
 
-    String              aStrDateInfo;
+    OUString      m_aStrDateInfo;
 
     DECL_LINK( TwoFigureHdl, NumericField* );
     DECL_LINK( TwoFigureConfigHdl, NumericField* );

cui/source/options/optgdlg.src

@@ -20,133 +20,6 @@
 #include "optgdlg.hrc"
 #include "helpid.hrc"
 
- //****************************************************************************
- //
- // TabPage Sonstiges
- //
- //****************************************************************************
-
-TabPage OFA_TP_MISC
-{
-    HelpID = HID_OFA_TP_MISC ;
-    SVLook = TRUE ;
-    Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
-    Hide = TRUE ;
-    FixedLine FL_HELP
-    {
-        Pos = MAP_APPFONT( COL0, ROW0 );
-        Size = MAP_APPFONT( WHOLE_WIDTH, RSC_CD_FIXEDLINE_HEIGHT );
-        Text [ en-US ] = "Help";
-    };
-    CheckBox CB_TOOLTIP
-    {
-        HelpID = "cui:CheckBox:OFA_TP_MISC:CB_TOOLTIP";
-        Pos = MAP_APPFONT( COL1, ROW1 );
-        Size = MAP_APPFONT( COL3 - COL1, RSC_CD_CHECKBOX_HEIGHT );
-        Text [ en-US ] = "~Tips";
-    };
-    CheckBox CB_EXTHELP
-    {
-        HelpID = "cui:CheckBox:OFA_TP_MISC:CB_EXTHELP";
-        Pos = MAP_APPFONT( COL3, ROW1 );
-        Size = MAP_APPFONT( WHOLE_WIDTH - COL3, RSC_CD_CHECKBOX_HEIGHT );
-        Text [ en-US ] = "~Extended tips";
-    };
-    CheckBox CB_HELPAGENT
-    {
-        HelpID = "cui:CheckBox:OFA_TP_MISC:CB_HELPAGENT";
-        Pos = MAP_APPFONT( COL1, ROW3 );
-        Size = MAP_APPFONT( COL3 - COL1, RSC_CD_CHECKBOX_HEIGHT );
-        Text [ en-US ] = "~Help Agent";
-    };
-    PushButton PB_HELPAGENT_RESET
-    {
-        HelpID = "cui:PushButton:OFA_TP_MISC:PB_HELPAGENT_RESET";
-        Pos = MAP_APPFONT( COL3, ROW3 );
-        Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH + 20, RSC_CD_PUSHBUTTON_HEIGHT );
-        Text [ en-US ] = "~Reset Help Agent";
-    };
-    FixedLine FL_FILEDLG
-    {
-        Pos = MAP_APPFONT( COL0, ROW4 );
-        Size = MAP_APPFONT( WHOLE_WIDTH, RSC_CD_FIXEDLINE_HEIGHT );
-        Text [ en-US ] = "Open/Save dialogs";
-    };
-    FixedImage FI_FILEDLG_RO
-    {
-        Pos = MAP_APPFONT( COL1 - 7, ROW5 + 2 );
-        Size = MAP_APPFONT( 6, 6 );
-        Hide = TRUE;
-    };
-    CheckBox CB_FILEDLG
-    {
-        HelpID = "cui:CheckBox:OFA_TP_MISC:CB_FILEDLG";
-        Pos = MAP_APPFONT( COL1, ROW5 );
-        Size = MAP_APPFONT( WHOLE_WIDTH, RSC_CD_CHECKBOX_HEIGHT );
-        Text [ en-US ] = "~Use %PRODUCTNAME dialogs";
-    };
-    FixedLine FL_PRINTDLG
-    {
-        Pos = MAP_APPFONT( COL0, ROW6 );
-        Size = MAP_APPFONT( WHOLE_WIDTH, RSC_CD_FIXEDLINE_HEIGHT );
-        Text [ en-US ] = "Print dialogs";
-    };
-    CheckBox CB_PRINTDLG
-    {
-        Pos = MAP_APPFONT( COL1, ROW7 );
-        Size = MAP_APPFONT( WHOLE_WIDTH - COL1, RSC_CD_CHECKBOX_HEIGHT );
-        Text [ en-US ] = "Use %PRODUCTNAME ~dialogs";
-    };
-    FixedLine FL_DOCSTATUS
-    {
-        Pos = MAP_APPFONT( COL0, ROW8 );
-        Size = MAP_APPFONT( WHOLE_WIDTH, RSC_CD_FIXEDLINE_HEIGHT );
-        Text [ en-US ] = "Document status";
-    };
-    CheckBox CB_DOCSTATUS
-    {
-        HelpID = "cui:CheckBox:OFA_TP_MISC:CB_DOCSTATUS";
-        Pos = MAP_APPFONT( COL1, ROW9 );
-        Size = MAP_APPFONT( WHOLE_WIDTH - COL1, RSC_CD_CHECKBOX_HEIGHT );
-        Text [ en-US ] = "~Printing sets \"document modified\" status";
-    };
-    CheckBox CB_SAVE_ALWAYS
-    {
-        Pos = MAP_APPFONT( COL1, ROW10 );
-        Size = MAP_APPFONT( WHOLE_WIDTH - COL1, RSC_CD_CHECKBOX_HEIGHT );
-        Text [ en-US ] = "Allow to save document even when the document is not modified";
-    };
-    FixedLine FL_TWOFIGURE
-    {
-        Pos = MAP_APPFONT( COL0, ROW11 );
-        Size = MAP_APPFONT( WHOLE_WIDTH, RSC_CD_FIXEDLINE_HEIGHT );
-        Text [ en-US ] = "Year (two digits)" ;
-    };
-    FixedText FT_INTERPRET
-    {
-        Pos = MAP_APPFONT( COL1, OFFS_TEXTBOX_FIXEDTEXT(ROW12) );
-        Size = MAP_APPFONT( DIFF( COL1, COL3), RSC_CD_FIXEDTEXT_HEIGHT );
-        Text [ en-US ] = "Interpret as years between";
-    };
-    NumericField NF_YEARVALUE
-    {
-        HelpID = "cui:NumericField:OFA_TP_MISC:NF_YEARVALUE";
-        Border = TRUE ;
-        Pos = MAP_APPFONT( COL4, ROW12 );
-        Size = MAP_APPFONT( EDIT_WIDTH, RSC_CD_TEXTBOX_HEIGHT );
-        Minimum = 1583 ;
-        Maximum = 9857 ;
-        Spin = TRUE ;
-        Repeat = TRUE ;
-    };
-    FixedText FT_TOYEAR
-    {
-        Pos = MAP_APPFONT( COL6, OFFS_TEXTBOX_FIXEDTEXT(ROW12) );
-        Size = MAP_APPFONT( WHOLE_WIDTH - COL6, RSC_CD_FIXEDTEXT_HEIGHT );
-        Text [ en-US ] = "and " ;
-    };
-};
-
  //****************************************************************************
  //
  // TabPage Ansicht