convert additem dialog to .ui

Change-Id: Id85ad8dc81089b62a82eafbcea1b04ddccdbc50d

include/svx/fmresids.hrc

@@ -61,7 +61,6 @@
 
 // Dialog-Id's -----------------------------------------------------------
 #define RID_SVX_FMEXPLORER                          (RID_FORMS_START + 6)
-#define RID_SVXDLG_ADD_DATAITEM                     (RID_FORMS_START + 12)
 #define RID_SVXDLG_ADD_CONDITION                    (RID_FORMS_START + 13)
 #define RID_SVXDLG_NAMESPACE_ITEM                   (RID_FORMS_START + 14)
 
@@ -178,6 +177,10 @@
 #define RID_STR_PROPTITLE_SPINBUTTON                (RID_FORMS_START + 100)
 #define RID_STR_PROPTITLE_HIDDEN                    (RID_FORMS_START + 101)
     // FREE
+#define RID_STR_ELEMENT                             (RID_FORMS_START + 114)
+#define RID_STR_ATTRIBUTE                           (RID_FORMS_START + 115)
+#define RID_STR_BINDING                             (RID_FORMS_START + 116)
+#define RID_STR_BINDING_EXPR                        (RID_FORMS_START + 117)
 #define RID_STR_METHOD_POST                         (RID_FORMS_START + 118)
 #define RID_STR_METHOD_PUT                          (RID_FORMS_START + 119)
 #define RID_STR_METHOD_GET                          (RID_FORMS_START + 120)

svx/UIConfig_svx.mk

@@ -11,6 +11,7 @@ $(eval $(call gb_UIConfig_UIConfig,svx))
 
 $(eval $(call gb_UIConfig_add_uifiles,svx,\
 	svx/uiconfig/ui/acceptrejectchangesdialog \
+	svx/uiconfig/ui/adddataitemdialog \
 	svx/uiconfig/ui/addinstancedialog \
 	svx/uiconfig/ui/addmodeldialog \
 	svx/uiconfig/ui/addnamespacedialog \

svx/inc/fmhelp.hrc

@@ -53,7 +53,6 @@
 #define UID_FORMPROPBROWSER_FRAME                             "SVX_UID_FORMPROPBROWSER_FRAME"
 #define UID_ABSOLUTE_RECORD_WINDOW                            "SVX_UID_ABSOLUTE_RECORD_WINDOW"
 #define HID_DATA_NAVIGATOR_WIN                                "SVX_HID_DATA_NAVIGATOR_WIN"
-#define HID_XFORMS_ADDDATAITEM_DLG                            "SVX_HID_XFORMS_ADDDATAITEM_DLG"
 #define HID_XFORMS_ADDCONDITION_DLG                           "SVX_HID_XFORMS_ADDCONDITION_DLG"
 #define HID_XFORMS_NAMESPACEITEM_DLG                          "SVX_HID_XFORMS_NAMESPACEITEM_DLG"
 #define HID_XFORMS_NAMESPACEITEM_LIST                         "SVX_HID_XFORMS_NAMESPACEITEM_LIST"

svx/source/form/datanavi.src

@@ -307,199 +307,6 @@ ErrorBox RID_ERR_EMPTY_SUBMISSIONNAME
     Message [ en-US ] = "The submission must have a name." ;
 };
 
-ModalDialog RID_SVXDLG_ADD_DATAITEM
-{
-    HelpID = HID_XFORMS_ADDDATAITEM_DLG ;
-    OutputSize = TRUE ;
-    SVLook = TRUE ;
-    Size = MAP_APPFONT ( 180 , 186 ) ;
-    Moveable = TRUE ;
-    FixedLine FL_ITEM
-    {
-        Pos = MAP_APPFONT ( 4 , 3 ) ;
-        Size = MAP_APPFONT ( 172 , 8 ) ;
-        Text [ en-US ] = "Item" ;
-    };
-    FixedText FT_NAME
-    {
-        Pos = MAP_APPFONT ( 6 , 15 ) ;
-        Size = MAP_APPFONT ( 69 , 8 ) ;
-        LeftLabel = TRUE ;
-        Text [ en-US ] = "~Name" ;
-    };
-    Edit ED_NAME
-    {
-        HelpID = "svx:Edit:RID_SVXDLG_ADD_DATAITEM:ED_NAME";
-        Pos = MAP_APPFONT ( 78 , 14 ) ;
-        Size = MAP_APPFONT ( 96 , 12 ) ;
-        Border = TRUE ;
-    };
-    FixedText FT_DEFAULT
-    {
-        Pos = MAP_APPFONT ( 6 , 30 ) ;
-        Size = MAP_APPFONT ( 69 , 8 ) ;
-        LeftLabel = TRUE ;
-        Text [ en-US ] = "~Default Value" ;
-    };
-    Edit ED_DEFAULT
-    {
-        HelpID = "svx:Edit:RID_SVXDLG_ADD_DATAITEM:ED_DEFAULT";
-        Pos = MAP_APPFONT ( 78 , 29 ) ;
-        Size = MAP_APPFONT ( 96 , 12 ) ;
-        Border = TRUE ;
-    };
-    PushButton PB_DEFAULT
-    {
-        HelpID = "svx:PushButton:RID_SVXDLG_ADD_DATAITEM:PB_DEFAULT";
-        Pos = MAP_APPFONT ( 160 , 29 ) ;
-        Size = MAP_APPFONT ( 14 , 14 ) ;
-        TabStop = TRUE ;
-        Hide = TRUE ;
-        Text = "..." ;
-    };
-    FixedLine FL_SETTINGS
-    {
-        Pos = MAP_APPFONT ( 4 , 44 ) ;
-        Size = MAP_APPFONT ( 172 , 8 ) ;
-        Text [ en-US ] = "Settings" ;
-    };
-    FixedText FT_DATATYPE
-    {
-        Pos = MAP_APPFONT ( 6 , 56 ) ;
-        Size = MAP_APPFONT ( 69 , 8 ) ;
-        LeftLabel = TRUE ;
-        Text [ en-US ] = "~Data Type" ;
-    };
-    ListBox LB_DATATYPE
-    {
-        HelpID = "svx:ListBox:RID_SVXDLG_ADD_DATAITEM:LB_DATATYPE";
-        Pos = MAP_APPFONT ( 78 , 55 ) ;
-        Size = MAP_APPFONT ( 96 , 45 ) ;
-        Border = TRUE ;
-        DropDown = TRUE;
-    };
-    CheckBox CB_REQUIRED
-    {
-        HelpID = "svx:CheckBox:RID_SVXDLG_ADD_DATAITEM:CB_REQUIRED";
-        Pos = MAP_APPFONT ( 6 , 72 ) ;
-        Size = MAP_APPFONT ( 69 , 10 ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "~Required" ;
-    };
-    PushButton PB_REQUIRED
-    {
-        HelpID = "svx:PushButton:RID_SVXDLG_ADD_DATAITEM:PB_REQUIRED";
-        Pos = MAP_APPFONT ( 78 , 70 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "Condition" ;
-    };
-    CheckBox CB_RELEVANT
-    {
-        HelpID = "svx:CheckBox:RID_SVXDLG_ADD_DATAITEM:CB_RELEVANT";
-        Pos = MAP_APPFONT ( 6 , 89 ) ;
-        Size = MAP_APPFONT ( 69 , 10 ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "R~elevant" ;
-    };
-    PushButton PB_RELEVANT
-    {
-        HelpID = "svx:PushButton:RID_SVXDLG_ADD_DATAITEM:PB_RELEVANT";
-        Pos = MAP_APPFONT ( 78 , 87 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "Condition" ;
-    };
-    CheckBox CB_CONSTRAINT
-    {
-        HelpID = "svx:CheckBox:RID_SVXDLG_ADD_DATAITEM:CB_CONSTRAINT";
-        Pos = MAP_APPFONT ( 6 , 106 ) ;
-        Size = MAP_APPFONT ( 69 , 10 ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "~Constraint" ;
-    };
-    PushButton PB_CONSTRAINT
-    {
-        HelpID = "svx:PushButton:RID_SVXDLG_ADD_DATAITEM:PB_CONSTRAINT";
-        Pos = MAP_APPFONT ( 78 , 104 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "Condition" ;
-    };
-    CheckBox CB_READONLY
-    {
-        HelpID = "svx:CheckBox:RID_SVXDLG_ADD_DATAITEM:CB_READONLY";
-        Pos = MAP_APPFONT ( 6 , 123 ) ;
-        Size = MAP_APPFONT ( 69 , 10 ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "Read-~only" ;
-    };
-    PushButton PB_READONLY
-    {
-        HelpID = "svx:PushButton:RID_SVXDLG_ADD_DATAITEM:PB_READONLY";
-        Pos = MAP_APPFONT ( 78 , 121 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "Condition" ;
-    };
-    CheckBox CB_CALCULATE
-    {
-        HelpID = "svx:CheckBox:RID_SVXDLG_ADD_DATAITEM:CB_CALCULATE";
-        Pos = MAP_APPFONT ( 6 , 140 ) ;
-        Size = MAP_APPFONT ( 69 , 10 ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "Calc~ulate" ;
-    };
-    PushButton PB_CALCULATE
-    {
-        HelpID = "svx:PushButton:RID_SVXDLG_ADD_DATAITEM:PB_CALCULATE";
-        Pos = MAP_APPFONT ( 78 , 138 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "Condition" ;
-    };
-    FixedLine FL_DATANAV_BTN
-    {
-        Pos = MAP_APPFONT ( 4 , 155 ) ;
-        Size = MAP_APPFONT ( 172 , 8 ) ;
-    };
-    OKButton BTN_DATANAV_OK
-    {
-        Pos = MAP_APPFONT ( 15 , 166 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        TabStop = TRUE ;
-        DefButton = TRUE ;
-    };
-    CancelButton BTN_DATANAV_ESC
-    {
-        Pos = MAP_APPFONT ( 68 , 166 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        TabStop = TRUE ;
-    };
-    HelpButton BTN_DATANAV_HELP
-    {
-        Pos = MAP_APPFONT ( 124 , 166 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        TabStop = TRUE ;
-    };
-    String STR_FIXEDLINE_ELEMENT
-    {
-        Text [ en-US ] = "Element" ;
-    };
-    String STR_FIXEDLINE_ATTRIBUTE
-    {
-        Text [ en-US ] = "Attribute" ;
-    };
-    String STR_FIXEDLINE_BINDING
-    {
-        Text [ en-US ] = "Binding" ;
-    };
-    String STR_FIXEDTEXT_BINDING
-    {
-        Text [ en-US ] = "Binding expression" ;
-    };
-};
-
 Menu RID_MENU_DATANAVIGATOR
 {
     ItemList =
@@ -742,81 +549,120 @@ String RID_STR_DATANAV_SUBM_PARENT
 {
     Text [ en-US ] = "Submission: " ;
 };
+
 String RID_STR_DATANAV_SUBM_ID
 {
     Text [ en-US ] = "ID: " ;
 };
+
 String RID_STR_DATANAV_SUBM_BIND
 {
     Text [ en-US ] = "Binding: " ;
 };
+
 String RID_STR_DATANAV_SUBM_REF
 {
     Text [ en-US ] = "Reference: " ;
 };
+
 String RID_STR_DATANAV_SUBM_ACTION
 {
     Text [ en-US ] = "Action: " ;
 };
+
 String RID_STR_DATANAV_SUBM_METHOD
 {
     Text [ en-US ] = "Method: " ;
 };
+
 String RID_STR_DATANAV_SUBM_REPLACE
 {
     Text [ en-US ] = "Replace: " ;
 };
+
 String RID_STR_DATANAV_ADD_ELEMENT
 {
     Text [ en-US ] = "Add Element" ;
 };
+
 String RID_STR_DATANAV_EDIT_ELEMENT
 {
     Text [ en-US ] = "Edit Element" ;
 };
+
 String RID_STR_DATANAV_REMOVE_ELEMENT
 {
     Text [ en-US ] = "Delete Element" ;
 };
+
 String RID_STR_DATANAV_ADD_ATTRIBUTE
 {
     Text [ en-US ] = "Add Attribute" ;
 };
+
 String RID_STR_DATANAV_EDIT_ATTRIBUTE
 {
     Text [ en-US ] = "Edit Attribute" ;
 };
+
 String RID_STR_DATANAV_REMOVE_ATTRIBUTE
 {
     Text [ en-US ] = "Delete Attribute" ;
 };
+
 String RID_STR_DATANAV_ADD_BINDING
 {
     Text [ en-US ] = "Add Binding" ;
 };
+
 String RID_STR_DATANAV_EDIT_BINDING
 {
     Text [ en-US ] = "Edit Binding" ;
 };
+
 String RID_STR_DATANAV_REMOVE_BINDING
 {
     Text [ en-US ] = "Delete Binding" ;
 };
+
 String RID_STR_DATANAV_ADD_SUBMISSION
 {
     Text [ en-US ] = "Add Submission" ;
 };
+
 String RID_STR_DATANAV_EDIT_SUBMISSION
 {
     Text [ en-US ] = "Edit Submission" ;
 };
+
 String RID_STR_DATANAV_REMOVE_SUBMISSION
 {
     Text [ en-US ] = "Delete Submission" ;
 };
+
 String RID_STR_DATANAV_LINKWARN_BUTTON
 {
     Text [ en-US ] = "~Edit" ;
 };
 
+String RID_STR_ELEMENT
+{
+    Text [ en-US ] = "Element" ;
+};
+
+String RID_STR_ATTRIBUTE
+{
+    Text [ en-US ] = "Attribute" ;
+};
+
+String RID_STR_BINDING
+{
+    Text [ en-US ] = "Binding" ;
+};
+
+String RID_STR_BINDING_EXPR
+{
+    Text [ en-US ] = "Binding expression" ;
+};
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

svx/source/inc/datanavi.hrc

@@ -83,32 +83,6 @@
 #define IID_TEXT                5
 #define IID_OTHER               6
 
-// class AddDataItemDialog
-#define FL_ITEM                 10
-#define FT_NAME                 11
-#define ED_NAME                 12
-#define FT_DEFAULT              13
-#define ED_DEFAULT              14
-#define PB_DEFAULT              15
-#define FL_SETTINGS             16
-#define FT_DATATYPE             17
-#define LB_DATATYPE             18
-#define CB_REQUIRED             19
-#define PB_REQUIRED             20
-#define CB_RELEVANT             21
-#define PB_RELEVANT             22
-#define CB_CONSTRAINT           23
-#define PB_CONSTRAINT           24
-#define CB_READONLY             25
-#define PB_READONLY             26
-#define CB_CALCULATE            27
-#define PB_CALCULATE            28
-
-#define STR_FIXEDLINE_ELEMENT   10
-#define STR_FIXEDLINE_ATTRIBUTE 11
-#define STR_FIXEDLINE_BINDING   12
-#define STR_FIXEDTEXT_BINDING   13
-
 // class AddConditionDialog
 #define FT_CONDITION            10
 #define ED_CONDITION            11

svx/source/inc/datanavi.hxx

@@ -21,6 +21,7 @@
 
 #include <vcl/dialog.hxx>
 #include <vcl/fixed.hxx>
+#include <vcl/layout.hxx>
 #include <vcl/lstbox.hxx>
 #include <vcl/menubtn.hxx>
 #include <vcl/msgbox.hxx>
@@ -408,32 +409,30 @@ namespace svxform
     {
     private:
 
-        FixedLine           m_aItemFL;
-        FixedText           m_aNameFT;
-        Edit                m_aNameED;
-        FixedText           m_aDefaultFT;
-        Edit                m_aDefaultED;
-        PushButton          m_aDefaultBtn;
-
-        FixedLine           m_aSettingsFL;
-        FixedText           m_aDataTypeFT;
-        ListBox             m_aDataTypeLB;
-
-        CheckBox            m_aRequiredCB;
-        PushButton          m_aRequiredBtn;
-        CheckBox            m_aRelevantCB;
-        PushButton          m_aRelevantBtn;
-        CheckBox            m_aConstraintCB;
-        PushButton          m_aConstraintBtn;
-        CheckBox            m_aReadonlyCB;
-        PushButton          m_aReadonlyBtn;
-        CheckBox            m_aCalculateCB;
-        PushButton          m_aCalculateBtn;
+        VclFrame*           m_pItemFrame;
+        FixedText*          m_pNameFT;
+        Edit*               m_pNameED;
+        FixedText*          m_pDefaultFT;
+        Edit*               m_pDefaultED;
+        PushButton*         m_pDefaultBtn;
+
+        VclFrame*           m_pSettingsFrame;
+
+        FixedText*          m_pDataTypeFT;
+        ListBox*            m_pDataTypeLB;
+
+        CheckBox*           m_pRequiredCB;
+        PushButton*         m_pRequiredBtn;
+        CheckBox*           m_pRelevantCB;
+        PushButton*         m_pRelevantBtn;
+        CheckBox*           m_pConstraintCB;
+        PushButton*         m_pConstraintBtn;
+        CheckBox*           m_pReadonlyCB;
+        PushButton*         m_pReadonlyBtn;
+        CheckBox*           m_pCalculateCB;
+        PushButton*         m_pCalculateBtn;
 
-        FixedLine           m_aButtonsFL;
-        OKButton            m_aOKBtn;
-        CancelButton        m_aEscBtn;
-        HelpButton          m_aHelpBtn;
+        OKButton*           m_pOKBtn;
 
         XFormsUIHelper1_ref m_xUIHelper;
         XPropertySet_ref    m_xBinding;