include/svx/fmresids.hrc | 6
svx/UIConfig_svx.mk | 1
svx/inc/fmhelp.hrc | 1
svx/source/form/datanavi.cxx | 311 +++++--------------------------
svx/source/form/datanavi.src | 54 ++---
svx/source/inc/datanavi.hrc | 7
svx/source/inc/datanavi.hxx | 129 +++++++++++--
svx/uiconfig/ui/addsubmissiondialog.ui | 323 +++++++++++++++++++++++++++++++++
sw/source/ui/dialog/swdlgfact.hxx | 2
9 files changed, 524 insertions(+), 310 deletions(-)
New commits:
commit accbda12df38ecd4cf120bf30b38c81db64a2118
Author: Caolán McNamara <caol...@redhat.com>
Date: Fri Dec 27 14:19:42 2013 +0000
convert add submission dialog to .ui
and drop the rather lunatic over engineering hackery to make 6 local strings
non local
Change-Id: I619e3d6b5a2205a10407eed98eb3ca83945267e3
diff --git a/include/svx/fmresids.hrc b/include/svx/fmresids.hrc
index c44ae4b..3991dd3 100644
--- a/include/svx/fmresids.hrc
+++ b/include/svx/fmresids.hrc
@@ -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)
diff --git a/svx/UIConfig_svx.mk b/svx/UIConfig_svx.mk
index 41fb585..f2a8087 100644
--- a/svx/UIConfig_svx.mk
+++ b/svx/UIConfig_svx.mk
@@ -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 \
diff --git a/svx/inc/fmhelp.hrc b/svx/inc/fmhelp.hrc
index fbe9c7c..953ea76 100644
--- a/svx/inc/fmhelp.hrc
+++ b/svx/inc/fmhelp.hrc
@@ -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"
diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx
index 656f854..e16abb2 100644
--- a/svx/source/form/datanavi.cxx
+++ b/svx/source/form/datanavi.cxx
@@ -23,13 +23,11 @@
#include "fmservs.hxx"
#include "datanavi.hrc"
-#include "svx/fmresids.hrc"
#include "fmhelp.hrc"
#include <svx/svxids.hrc>
#include <tools/rcid.h>
#include <tools/diagnose_ex.h>
-#include "svx/xmlexchg.hxx"
-#include <svx/dialmgr.hxx>
+#include <svx/xmlexchg.hxx>
#include <svx/fmshell.hxx>
#include <svtools/miscopt.hxx>
#include <unotools/pathoptions.hxx>
@@ -767,191 +765,6 @@ namespace svxform
return m_aItemList.InsertEntry(
sName, aImage, aImage, pParent, sal_False, LIST_APPEND, _pNewNode
);
}
- //------------------------------------------------------------------------
- class lcl_ResourceString
- {
- protected:
- lcl_ResourceString()
- {
- }
-
- lcl_ResourceString( const lcl_ResourceString& );
-
- virtual ~lcl_ResourceString()
- {
- }
-
- // load UI resources from resource file
- void init()
- {
- // create a resource manager, for the svx resource file
- // and the UI locale
- ResMgr* pResMgr = ResMgr::CreateResMgr(
- "svx", Application::GetSettings().GetUILanguageTag() );
-
- // load the resources for the AddSubmission modal dialog.
- // This will create our own resource context.
- ResId aRes( RID_SVXDLG_ADD_SUBMISSION, *pResMgr );
- aRes.SetRT( RSC_MODALDIALOG );
- pResMgr->GetResource( aRes );
-
- // now, we can access the local resources from the dialog's
- // resource context
- _initResources(pResMgr);
-
- // clean up: remove context, and delete the resource manager
- // ( Increment(..) is needed since PopContext() requires that
- // the file pointer is at the end. )
- pResMgr->Increment( pResMgr->GetRemainSize() );
- pResMgr->PopContext();
- delete pResMgr;
- }
-
- // load resources... to be overloaded in sub-classes
- virtual void _initResources( ResMgr* pMgr ) = 0;
- };
-
- class lcl_ReplaceString : public lcl_ResourceString
- {
- OUString m_sDoc_UI;
- OUString m_sInstance_UI;
- OUString m_sNone_UI;
-
- OUString m_sDoc_API;
- OUString m_sInstance_API;
- OUString m_sNone_API;
-
- lcl_ReplaceString() :
- lcl_ResourceString(),
- m_sDoc_API( "all" ),
- m_sInstance_API( "instance" ),
- m_sNone_API( "none" )
- {
- init();
- }
-
- lcl_ReplaceString( const lcl_ReplaceString& );
-
- virtual ~lcl_ReplaceString()
- {
- }
-
- // load UI resources from resource file
- virtual void _initResources( ResMgr * pMgr )
- {
- // now, we can access the local resources from the dialog's
- // resource context
- m_sDoc_UI = ResId( STR_REPLACE_DOC, *pMgr ).toString();
- m_sInstance_UI = ResId( STR_REPLACE_INST, *pMgr ).toString();
- m_sNone_UI = ResId( STR_REPLACE_NONE, *pMgr ).toString();
- }
-
- public:
-
- /** create and obtain the singleton instance */
- static const lcl_ReplaceString& get()
- {
- // keep the singleton instance here
- static lcl_ReplaceString* m_pInstance = NULL;
-
- if( m_pInstance == NULL )
- m_pInstance = new lcl_ReplaceString();
- return *m_pInstance;
- }
-
- /** 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 lcl_MethodString : public lcl_ResourceString
- {
- OUString m_sPost_UI;
- OUString m_sPut_UI;
- OUString m_sGet_UI;
-
- OUString m_sPost_API;
- OUString m_sPut_API;
- OUString m_sGet_API;
-
- lcl_MethodString() :
- lcl_ResourceString(),
- m_sPost_API( "post" ),
- m_sPut_API( "put" ),
- m_sGet_API( "get" )
- {
- init();
- }
-
- lcl_MethodString( const lcl_MethodString& );
-
- virtual ~lcl_MethodString()
- {
- }
-
- // load UI resources from resource file
- virtual void _initResources(ResMgr* pMgr)
- {
- m_sPost_UI = ResId( STR_METHOD_POST, *pMgr ).toString();
- m_sPut_UI = ResId( STR_METHOD_PUT, *pMgr ).toString();
- m_sGet_UI = ResId( STR_METHOD_GET, *pMgr ).toString();
- }
-
- public:
-
- /** create and obtain the singleton instance */
- static const lcl_MethodString& get()
- {
- // keep the singleton instance here
- static lcl_MethodString* m_pInstance = NULL;
-
- if( m_pInstance == NULL )
- m_pInstance = new lcl_MethodString();
- return *m_pInstance;
- }
-
- /** 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;
- }
- };
//------------------------------------------------------------------------
SvTreeListEntry* XFormsPage::AddEntry( const Reference< XPropertySet >&
_rEntry )
@@ -978,7 +791,7 @@ namespace svxform
// Method
_rEntry->getPropertyValue( PN_SUBMISSION_METHOD ) >>= sTemp;
sEntry = SVX_RESSTR( RID_STR_DATANAV_SUBM_METHOD );
- sEntry += lcl_MethodString::get().toUI( sTemp );
+ sEntry += m_aMethodString.toUI( sTemp );
m_aItemList.InsertEntry( sEntry, aImage, aImage, pEntry );
// Ref
_rEntry->getPropertyValue( PN_SUBMISSION_REF ) >>= sTemp;
@@ -993,7 +806,7 @@ namespace svxform
// Replace
_rEntry->getPropertyValue( PN_SUBMISSION_REPLACE ) >>= sTemp;
sEntry = SVX_RESSTR( RID_STR_DATANAV_SUBM_REPLACE );
- sEntry += lcl_ReplaceString::get().toUI( sTemp );
+ sEntry += m_aReplaceString.toUI( sTemp );
m_aItemList.InsertEntry( sEntry, aImage, aImage, pEntry );
}
catch ( Exception& )
@@ -1065,12 +878,12 @@ namespace svxform
m_aItemList.SetEntryText( pChild, sEntry );
_rEntry->getPropertyValue( PN_SUBMISSION_METHOD ) >>= sTemp;
sEntry = SVX_RESSTR( RID_STR_DATANAV_SUBM_METHOD );
- sEntry += lcl_MethodString::get().toUI( sTemp );
+ sEntry += m_aMethodString.toUI( sTemp );
pChild = m_aItemList.GetEntry( pEntry, nPos++ );
m_aItemList.SetEntryText( pChild, sEntry );
_rEntry->getPropertyValue( PN_SUBMISSION_REPLACE ) >>= sTemp;
sEntry = SVX_RESSTR( RID_STR_DATANAV_SUBM_REPLACE );
- sEntry += lcl_ReplaceString::get().toUI( sTemp );
+ sEntry += m_aReplaceString.toUI( sTemp );
pChild = m_aItemList.GetEntry( pEntry, nPos++ );
m_aItemList.SetEntryText( pChild, sEntry );
}
@@ -3347,40 +3160,24 @@ namespace svxform
AddSubmissionDialog::AddSubmissionDialog(
Window* pParent, ItemNode* _pNode,
- const Reference< css::xforms::XFormsUIHelper1 >& _rUIHelper ) :
-
- ModalDialog( pParent, SVX_RES( RID_SVXDLG_ADD_SUBMISSION ) ),
-
- m_aSubmissionFL ( this, SVX_RES( FL_SUBMISSION ) ),
- m_aNameFT ( this, SVX_RES( FT_SUBMIT_NAME ) ),
- m_aNameED ( this, SVX_RES( ED_SUBMIT_NAME ) ),
- m_aActionFT ( this, SVX_RES( FT_SUBMIT_ACTION ) ),
- m_aActionED ( this, SVX_RES( ED_SUBMIT_ACTION ) ),
- m_aMethodFT ( this, SVX_RES( FT_SUBMIT_METHOD ) ),
- m_aMethodLB ( this, SVX_RES( LB_SUBMIT_METHOD ) ),
- m_aRefFT ( this, SVX_RES( FT_SUBMIT_REF ) ),
- m_aRefED ( this, SVX_RES( ED_SUBMIT_REF ) ),
- m_aRefBtn ( this, SVX_RES( PB_SUBMIT_REF ) ),
- m_aBindFT ( this, SVX_RES( FT_SUBMIT_BIND ) ),
- m_aBindLB ( this, SVX_RES( LB_SUBMIT_BIND ) ),
- m_aReplaceFT ( this, SVX_RES( FT_SUBMIT_REPLACE ) ),
- m_aReplaceLB ( this, SVX_RES( LB_SUBMIT_REPLACE ) ),
-
- m_aButtonsFL ( this, SVX_RES( FL_DATANAV_BTN ) ),
- m_aOKBtn ( this, SVX_RES( BTN_DATANAV_OK ) ),
- m_aEscBtn ( this, SVX_RES( BTN_DATANAV_ESC ) ),
- m_aHelpBtn ( this, SVX_RES( BTN_DATANAV_HELP ) ),
-
- m_pItemNode ( _pNode ),
- m_xUIHelper ( _rUIHelper )
-
+ const Reference< css::xforms::XFormsUIHelper1 >& _rUIHelper)
+ : ModalDialog(pParent, "AddSubmissionDialog",
+ "svx/ui/addsubmissiondialog.ui")
+ , m_pItemNode(_pNode)
+ , m_xUIHelper(_rUIHelper)
{
- FillAllBoxes(); // we need local resources here, so call before
FreeResource!!!
-
- FreeResource();
+ get(m_pNameED, "name");
+ get(m_pActionED, "action");
+ get(m_pMethodLB, "method");
+ get(m_pRefED, "expression");
+ get(m_pRefBtn, "browse");
+ get(m_pBindLB, "binding");
+ get(m_pReplaceLB, "replace");
+ get(m_pOKBtn, "ok");
+ FillAllBoxes();
- m_aRefBtn.SetClickHdl( LINK( this, AddSubmissionDialog, RefHdl ) );
- m_aOKBtn.SetClickHdl( LINK( this, AddSubmissionDialog, OKHdl ) );
+ m_pRefBtn->SetClickHdl( LINK( this, AddSubmissionDialog, RefHdl ) );
+ m_pOKBtn->SetClickHdl( LINK( this, AddSubmissionDialog, OKHdl ) );
}
//------------------------------------------------------------------------
@@ -3395,9 +3192,9 @@ namespace svxform
IMPL_LINK_NOARG(AddSubmissionDialog, RefHdl)
{
AddConditionDialog aDlg( this, PN_BINDING_EXPR, m_xTempBinding );
- aDlg.SetCondition( m_aRefED.GetText() );
+ aDlg.SetCondition( m_pRefED->GetText() );
if ( aDlg.Execute() == RET_OK )
- m_aRefED.SetText( aDlg.GetCondition() );
+ m_pRefED->SetText( aDlg.GetCondition() );
return 0;
}
@@ -3405,7 +3202,7 @@ namespace svxform
//------------------------------------------------------------------------
IMPL_LINK_NOARG(AddSubmissionDialog, OKHdl)
{
- OUString sName(m_aNameED.GetText());
+ OUString sName(m_pNameED->GetText());
if(sName.isEmpty()) {
ErrorBox aErrorBox(this,SVX_RES(RID_ERR_EMPTY_SUBMISSIONNAME));
@@ -3437,23 +3234,23 @@ namespace svxform
if ( m_xSubmission.is() )
{
- OUString sTemp = m_aNameED.GetText();
+ OUString sTemp = m_pNameED->GetText();
try
{
m_xSubmission->setPropertyValue( PN_SUBMISSION_ID, makeAny(
sTemp ) );
- sTemp = m_aActionED.GetText();
+ sTemp = m_pActionED->GetText();
m_xSubmission->setPropertyValue( PN_SUBMISSION_ACTION,
makeAny( sTemp ) );
- sTemp = lcl_MethodString::get().toAPI(
m_aMethodLB.GetSelectEntry() );
+ sTemp = m_aMethodString.toAPI( m_pMethodLB->GetSelectEntry() );
m_xSubmission->setPropertyValue( PN_SUBMISSION_METHOD,
makeAny( sTemp ) );
- sTemp = m_aRefED.GetText();
+ sTemp = m_pRefED->GetText();
m_xSubmission->setPropertyValue( PN_SUBMISSION_REF, makeAny(
sTemp ) );
- OUString sEntry = m_aBindLB.GetSelectEntry();
+ OUString sEntry = m_pBindLB->GetSelectEntry();
sal_Int32 nColonIdx = sEntry.indexOf(':');
if (nColonIdx != -1)
sEntry = sEntry.copy(0, nColonIdx);
sTemp = sEntry;
m_xSubmission->setPropertyValue( PN_SUBMISSION_BIND, makeAny(
sTemp ) );
- sTemp = lcl_ReplaceString::get().toAPI(
m_aReplaceLB.GetSelectEntry() );
+ sTemp = m_aReplaceString.toAPI( m_pReplaceLB->GetSelectEntry()
);
m_xSubmission->setPropertyValue( PN_SUBMISSION_REPLACE,
makeAny( sTemp ) );
}
catch ( Exception& )
@@ -3470,10 +3267,10 @@ namespace svxform
void AddSubmissionDialog::FillAllBoxes()
{
// method box
- m_aMethodLB.InsertEntry( SVX_RESSTR( STR_METHOD_POST ) );
- m_aMethodLB.InsertEntry( SVX_RESSTR( STR_METHOD_PUT ) );
- m_aMethodLB.InsertEntry( SVX_RESSTR( STR_METHOD_GET ) );
- m_aMethodLB.SelectEntryPos(0);
+ m_pMethodLB->InsertEntry( SVX_RESSTR( RID_STR_METHOD_POST ) );
+ m_pMethodLB->InsertEntry( SVX_RESSTR( RID_STR_METHOD_PUT ) );
+ m_pMethodLB->InsertEntry( SVX_RESSTR( RID_STR_METHOD_GET ) );
+ m_pMethodLB->SelectEntryPos(0);
// binding box
Reference< css::xforms::XModel > xModel( m_xUIHelper, UNO_QUERY );
@@ -3501,7 +3298,7 @@ namespace svxform
sEntry += sDelim;
xPropSet->getPropertyValue( PN_BINDING_EXPR )
>>= sTemp;
sEntry += sTemp;
- m_aBindLB.InsertEntry( sEntry );
+ m_pBindLB->InsertEntry( sEntry );
if ( !m_xTempBinding.is() )
m_xTempBinding = xPropSet;
@@ -3529,9 +3326,9 @@ namespace svxform
}
// replace box
- m_aReplaceLB.InsertEntry( SVX_RESSTR( STR_REPLACE_NONE ) );
- m_aReplaceLB.InsertEntry( SVX_RESSTR( STR_REPLACE_INST ) );
- m_aReplaceLB.InsertEntry( SVX_RESSTR( STR_REPLACE_DOC ) );
+ m_pReplaceLB->InsertEntry( SVX_RESSTR( RID_STR_REPLACE_NONE ) );
+ m_pReplaceLB->InsertEntry( SVX_RESSTR( RID_STR_REPLACE_INST ) );
+ m_pReplaceLB->InsertEntry( SVX_RESSTR( RID_STR_REPLACE_DOC ) );
// init the controls with the values of the submission
@@ -3542,33 +3339,33 @@ namespace svxform
try
{
m_xSubmission->getPropertyValue( PN_SUBMISSION_ID ) >>= sTemp;
- m_aNameED.SetText( sTemp );
+ m_pNameED->SetText( sTemp );
m_xSubmission->getPropertyValue( PN_SUBMISSION_ACTION ) >>=
sTemp;
- m_aActionED.SetText( sTemp );
+ m_pActionED->SetText( sTemp );
m_xSubmission->getPropertyValue( PN_SUBMISSION_REF ) >>= sTemp;
- m_aRefED.SetText( sTemp );
+ m_pRefED->SetText( sTemp );
m_xSubmission->getPropertyValue( PN_SUBMISSION_METHOD ) >>=
sTemp;
- sTemp = lcl_MethodString::get().toUI( sTemp );
- sal_uInt16 nPos = m_aMethodLB.GetEntryPos( sTemp );
+ sTemp = m_aMethodString.toUI( sTemp );
+ sal_uInt16 nPos = m_pMethodLB->GetEntryPos( sTemp );
if ( LISTBOX_ENTRY_NOTFOUND == nPos )
- nPos = m_aMethodLB.InsertEntry( sTemp );
- m_aMethodLB.SelectEntryPos( nPos );
+ nPos = m_pMethodLB->InsertEntry( sTemp );
+ m_pMethodLB->SelectEntryPos( nPos );
m_xSubmission->getPropertyValue( PN_SUBMISSION_BIND ) >>=
sTemp;
- nPos = m_aBindLB.GetEntryPos( sTemp );
+ nPos = m_pBindLB->GetEntryPos( sTemp );
if ( LISTBOX_ENTRY_NOTFOUND == nPos )
- nPos = m_aBindLB.InsertEntry( sTemp );
- m_aBindLB.SelectEntryPos( nPos );
+ nPos = m_pBindLB->InsertEntry( sTemp );
+ m_pBindLB->SelectEntryPos( nPos );
m_xSubmission->getPropertyValue( PN_SUBMISSION_REPLACE ) >>=
sTemp;
- sTemp = lcl_ReplaceString::get().toUI( sTemp );
+ sTemp = m_aReplaceString.toUI( sTemp );
if ( sTemp.isEmpty() )
- sTemp = m_aReplaceLB.GetEntry(0); // first entry == "none"
- nPos = m_aReplaceLB.GetEntryPos( sTemp );
+ sTemp = m_pReplaceLB->GetEntry(0); // first entry == "none"
+ nPos = m_pReplaceLB->GetEntryPos( sTemp );
if ( LISTBOX_ENTRY_NOTFOUND == nPos )
- nPos = m_aReplaceLB.InsertEntry( sTemp );
- m_aReplaceLB.SelectEntryPos( nPos );
+ nPos = m_pReplaceLB->InsertEntry( sTemp );
+ m_pReplaceLB->SelectEntryPos( nPos );
}
catch ( Exception& )
{
@@ -3576,7 +3373,7 @@ namespace svxform
}
}
- m_aRefBtn.Enable( m_xTempBinding.is() );
+ m_pRefBtn->Enable( m_xTempBinding.is() );
}
//========================================================================
diff --git a/svx/source/form/datanavi.src b/svx/source/form/datanavi.src
index 21b4b94..98255db 100644
--- a/svx/source/form/datanavi.src
+++ b/svx/source/form/datanavi.src
@@ -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
diff --git a/svx/source/inc/datanavi.hrc b/svx/source/inc/datanavi.hrc
index b49e704..f8bd426 100644
--- a/svx/source/inc/datanavi.hrc
+++ b/svx/source/inc/datanavi.hrc
@@ -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
diff --git a/svx/source/inc/datanavi.hxx b/svx/source/inc/datanavi.hxx
index 517b030..3a99b1d 100644
--- a/svx/source/inc/datanavi.hxx
+++ b/svx/source/inc/datanavi.hxx
@@ -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;
diff --git a/svx/uiconfig/ui/addsubmissiondialog.ui
b/svx/uiconfig/ui/addsubmissiondialog.ui
new file mode 100644
index 0000000..6ec2caf
--- /dev/null
+++ b/svx/uiconfig/ui/addsubmissiondialog.ui
@@ -0,0 +1,323 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+ <!-- interface-requires gtk+ 3.0 -->
+ <object class="GtkDialog" id="AddSubmissionDialog">
+ <property name="can_focus">False</property>
+ <property name="border_width">6</property>
+ <property name="title" translatable="yes">Add Submission</property>
+ <property name="type_hint">dialog</property>
+ <child internal-child="vbox">
+ <object class="GtkBox" id="dialog-vbox1">
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">12</property>
+ <child internal-child="action_area">
+ <object class="GtkButtonBox" id="dialog-action_area1">
+ <property name="can_focus">False</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="ok">
+ <property name="label">gtk-ok</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="has_default">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="cancel">
+ <property name="label">gtk-cancel</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="help">
+ <property name="label">gtk-help</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame" id="frame1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment" id="alignment1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="top_padding">6</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkGrid" id="grid3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">12</property>
+ <property name="row_homogeneous">True</property>
+ <child>
+ <object class="GtkEntry" id="name">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="valign">center</property>
+ <property name="invisible_char">â¢</property>
+ <property name="width_chars">46</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ <property name="width">2</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label"
translatable="yes">_Name</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">name</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="urlft">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Binding
e_xpression</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">expression</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">3</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="browse">
+ <property name="label"
translatable="yes">_...</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="valign">center</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">3</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label"
translatable="yes">_Action</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">action</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="action">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="valign">center</property>
+ <property name="invisible_char">â¢</property>
+ <property name="width_chars">46</property>
+ <property name="invisible_char_set">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">1</property>
+ <property name="width">2</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label"
translatable="yes">_Method</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">method</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBoxText" id="method">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <property name="entry_text_column">0</property>
+ <property name="id_column">1</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">2</property>
+ <property name="width">2</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="expression">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="valign">center</property>
+ <property name="invisible_char">â¢</property>
+ <property name="width_chars">46</property>
+ <property name="invisible_char_set">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">3</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label5">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label"
translatable="yes">_Binding</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">binding</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">4</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label6">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label"
translatable="yes">_Replace</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">replace</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">5</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBoxText" id="binding">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <property name="entry_text_column">0</property>
+ <property name="id_column">1</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">4</property>
+ <property name="width">2</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBoxText" id="replace">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <property name="entry_text_column">0</property>
+ <property name="id_column">1</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">5</property>
+ <property name="width">2</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Submission</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <action-widgets>
+ <action-widget response="0">ok</action-widget>
+ <action-widget response="0">cancel</action-widget>
+ <action-widget response="0">help</action-widget>
+ </action-widgets>
+ </object>
+</interface>
commit f206aa708c362e7064b442da54726a4e306384bc
Author: Caolán McNamara <caol...@redhat.com>
Date: Fri Dec 27 14:09:59 2013 +0000
drop SfxNoLayoutSingleTabDialog declarations
Change-Id: I1ceeff76292f9d9884112a69ecdd6052184a657c
diff --git a/sw/source/ui/dialog/swdlgfact.hxx
b/sw/source/ui/dialog/swdlgfact.hxx
index e025c48..94cc59f 100644
--- a/sw/source/ui/dialog/swdlgfact.hxx
+++ b/sw/source/ui/dialog/swdlgfact.hxx
@@ -22,7 +22,6 @@
#include "swabstdlg.hxx"
class SwInsertAbstractDlg;
-class SfxNoLayoutSingleTabDialog;
class SwAsciiFilterDlg;
class Dialog;
class SwBreakDlg;
@@ -83,7 +82,6 @@ class AbstractSwInsertAbstractDlg_Impl : public
AbstractSwInsertAbstractDlg
virtual sal_uInt8 GetPara() const ;
};
-class SfxNoLayoutSingleTabDialog;
class SwAbstractSfxDialog_Impl :public SfxAbstractDialog
{
DECL_ABSTDLG_BASE(SwAbstractSfxDialog_Impl,SfxModalDialog)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
