Kaydet (Commit) accbda12 authored tarafından Caolán McNamara's avatar Caolán McNamara

convert add submission dialog to .ui

and drop the rather lunatic over engineering hackery to make 6 local strings
non local

Change-Id: I619e3d6b5a2205a10407eed98eb3ca83945267e3
üst f206aa70
......@@ -180,6 +180,12 @@
#define RID_STR_PROPTITLE_SPINBUTTON (RID_FORMS_START + 100)
#define RID_STR_PROPTITLE_HIDDEN (RID_FORMS_START + 101)
// FREE
#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)
#define RID_STR_REPLACE_NONE (RID_FORMS_START + 121)
#define RID_STR_REPLACE_INST (RID_FORMS_START + 122)
#define RID_STR_REPLACE_DOC (RID_FORMS_START + 123)
#define RID_STR_DATANAVIGATOR (RID_FORMS_START + 124)
#define RID_STR_DATANAV_SUBM_PARENT (RID_FORMS_START + 125)
#define RID_STR_DATANAV_SUBM_ID (RID_FORMS_START + 126)
......
......@@ -14,6 +14,7 @@ $(eval $(call gb_UIConfig_add_uifiles,svx,\
svx/uiconfig/ui/addinstancedialog \
svx/uiconfig/ui/addmodeldialog \
svx/uiconfig/ui/addnamespacedialog \
svx/uiconfig/ui/addsubmissiondialog \
svx/uiconfig/ui/asianphoneticguidedialog \
svx/uiconfig/ui/chineseconversiondialog \
svx/uiconfig/ui/compressgraphicdialog \
......
......@@ -74,7 +74,6 @@
#define HID_XFORMS_MODELS_LIST "SVX_HID_XFORMS_MODELS_LIST"
#define HID_XFORMS_MODELS_MENUBTN "SVX_HID_XFORMS_MODELS_MENUBTN"
#define HID_XFORMS_INSTANCES_MENUBTN "SVX_HID_XFORMS_INSTANCES_MENUBTN"
#define HID_XFORMS_ADDSUBMISSION_DLG "SVX_HID_XFORMS_ADDSUBMISSION_DLG"
#define HID_XFORMS_MID_INSERT_CONTROL "SVX_HID_XFORMS_MID_INSERT_CONTROL"
#define HID_XFORMS_TAB_CONTROL "SVX_HID_XFORMS_TAB_CONTROL"
#define HID_FM_DELETEROWS "SVX_HID_FM_DELETEROWS"
......
This diff is collapsed.
......@@ -710,7 +710,6 @@ ModalDialog RID_SVXDLG_NAMESPACE_ITEM
ModalDialog RID_SVXDLG_ADD_SUBMISSION
{
HelpID = HID_XFORMS_ADDSUBMISSION_DLG ;
OutputSize = TRUE ;
SVLook = TRUE ;
Size = MAP_APPFONT ( 180 , 136 ) ;
......@@ -841,31 +840,36 @@ ModalDialog RID_SVXDLG_ADD_SUBMISSION
Size = MAP_APPFONT ( 50 , 14 ) ;
TabStop = TRUE ;
};
};
String STR_METHOD_POST
{
Text [ en-US ] = "Post" ;
};
String STR_METHOD_PUT
{
Text [ en-US ] = "Put" ;
};
String STR_METHOD_GET
{
Text [ en-US ] = "Get" ;
};
String STR_REPLACE_NONE
{
Text [ en-US ] = "None" ;
};
String STR_REPLACE_INST
{
Text [ en-US ] = "Instance" ;
};
String STR_REPLACE_DOC
{
Text [ en-US ] = "Document" ;
};
String RID_STR_METHOD_POST
{
Text [ en-US ] = "Post" ;
};
String RID_STR_METHOD_PUT
{
Text [ en-US ] = "Put" ;
};
String RID_STR_METHOD_GET
{
Text [ en-US ] = "Get" ;
};
String RID_STR_REPLACE_NONE
{
Text [ en-US ] = "None" ;
};
String RID_STR_REPLACE_INST
{
Text [ en-US ] = "Instance" ;
};
String RID_STR_REPLACE_DOC
{
Text [ en-US ] = "Document" ;
};
String RID_STR_DATANAV_SUBM_PARENT
......
......@@ -142,13 +142,6 @@
#define FT_SUBMIT_REPLACE 22
#define LB_SUBMIT_REPLACE 23
#define STR_METHOD_POST 10
#define STR_METHOD_PUT 11
#define STR_METHOD_GET 12
#define STR_REPLACE_NONE 13
#define STR_REPLACE_INST 14
#define STR_REPLACE_DOC 15
// class AddModelDialog
#define FL_MODEL 10
#define FT_MODEL_NAME 11
......
......@@ -34,6 +34,8 @@
#include <sfx2/dockwin.hxx>
#include <sfx2/childwin.hxx>
#include <sfx2/ctrlitem.hxx>
#include <svx/dialmgr.hxx>
#include <svx/fmresids.hrc>
#include <svx/svxdllapi.h>
#include <rtl/ref.hxx>
#include <com/sun/star/beans/XPropertySet.hpp>
......@@ -132,10 +134,108 @@ namespace svxform
void RemoveEntry( SvTreeListEntry* _pEntry );
};
class ReplaceString
{
OUString m_sDoc_UI;
OUString m_sInstance_UI;
OUString m_sNone_UI;
OUString m_sDoc_API;
OUString m_sInstance_API;
OUString m_sNone_API;
ReplaceString( const ReplaceString& );
public:
ReplaceString() :
m_sDoc_API( "all" ),
m_sInstance_API( "instance" ),
m_sNone_API( "none" )
{
m_sDoc_UI = SVX_RESSTR(RID_STR_REPLACE_DOC);
m_sInstance_UI = SVX_RESSTR(RID_STR_REPLACE_INST);
m_sNone_UI = SVX_RESSTR(RID_STR_REPLACE_NONE);
}
/** convert submission replace string from API value to UI value.
Use 'none' as default. */
OUString toUI( const OUString& rStr ) const
{
if( rStr == m_sDoc_API )
return m_sDoc_UI;
else if( rStr == m_sInstance_API )
return m_sInstance_UI;
else
return m_sNone_UI;
}
/** convert submission replace string from UI to API.
Use 'none' as default. */
OUString toAPI( const OUString& rStr ) const
{
if( rStr == m_sDoc_UI )
return m_sDoc_API;
else if( rStr == m_sInstance_UI )
return m_sInstance_API;
else
return m_sNone_API;
}
};
class MethodString
{
OUString m_sPost_UI;
OUString m_sPut_UI;
OUString m_sGet_UI;
OUString m_sPost_API;
OUString m_sPut_API;
OUString m_sGet_API;
MethodString( const MethodString& );
public:
MethodString() :
m_sPost_API( "post" ),
m_sPut_API( "put" ),
m_sGet_API( "get" )
{
m_sPost_UI = SVX_RESSTR(RID_STR_METHOD_POST);
m_sPut_UI = SVX_RESSTR(RID_STR_METHOD_PUT);
m_sGet_UI = SVX_RESSTR(RID_STR_METHOD_GET);
}
/** convert from API to UI; put is default. */
OUString toUI( const OUString& rStr ) const
{
if( rStr == m_sGet_API )
return m_sGet_UI;
else if( rStr == m_sPost_API )
return m_sPost_UI;
else
return m_sPut_UI;
}
/** convert from UI to API; put is default */
OUString toAPI( const OUString& rStr ) const
{
if( rStr == m_sGet_UI )
return m_sGet_API;
else if( rStr == m_sPost_UI )
return m_sPost_API;
else
return m_sPut_API;
}
};
//========================================================================
class XFormsPage : public TabPage
{
private:
MethodString m_aMethodString;
ReplaceString m_aReplaceString;
ToolBox m_aToolBox;
DataTreeListBox m_aItemList;
......@@ -464,25 +564,18 @@ namespace svxform
class AddSubmissionDialog : public ModalDialog
{
private:
FixedLine m_aSubmissionFL;
FixedText m_aNameFT;
Edit m_aNameED;
FixedText m_aActionFT;
Edit m_aActionED;
FixedText m_aMethodFT;
ListBox m_aMethodLB;
FixedText m_aRefFT;
Edit m_aRefED;
PushButton m_aRefBtn;
FixedText m_aBindFT;
ListBox m_aBindLB;
FixedText m_aReplaceFT;
ListBox m_aReplaceLB;
MethodString m_aMethodString;
ReplaceString m_aReplaceString;
FixedLine m_aButtonsFL;
OKButton m_aOKBtn;
CancelButton m_aEscBtn;
HelpButton m_aHelpBtn;
Edit* m_pNameED;
Edit* m_pActionED;
ListBox* m_pMethodLB;
Edit* m_pRefED;
PushButton* m_pRefBtn;
ListBox* m_pBindLB;
ListBox* m_pReplaceLB;
OKButton* m_pOKBtn;
ItemNode* m_pItemNode;
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment