[Libreoffice-commits] core.git: 2 commits - sw/inc sw/source sw/uiconfig sw/UIConfig_swriter.mk
Caolán McNamara
caolanm at redhat.com
Sat Aug 17 03:52:58 PDT 2013
sw/UIConfig_swriter.mk | 3
sw/inc/globals.hrc | 19 --
sw/inc/swabstdlg.hxx | 11 -
sw/source/ui/dialog/swdlgfact.cxx | 26 ---
sw/source/ui/dialog/swdlgfact.hxx | 9 -
sw/source/ui/frmdlg/frmdlg.cxx | 185 ++++++++++++-------------
sw/source/ui/frmdlg/frmpage.cxx | 52 +++----
sw/source/ui/frmdlg/frmpage.src | 182 -------------------------
sw/source/ui/inc/frmdlg.hxx | 30 ++--
sw/source/ui/inc/frmpage.hxx | 10 -
sw/source/ui/shells/frmsh.cxx | 18 +-
sw/source/ui/shells/grfsh.cxx | 6
sw/source/ui/shells/textsh.cxx | 6
sw/source/ui/uiview/view.src | 24 ---
sw/uiconfig/swriter/ui/framedialog.ui | 217 ++++++++++++++++++++++++++++++
sw/uiconfig/swriter/ui/objectdialog.ui | 203 ++++++++++++++++++++++++++++
sw/uiconfig/swriter/ui/picturedialog.ui | 231 ++++++++++++++++++++++++++++++++
17 files changed, 823 insertions(+), 409 deletions(-)
New commits:
commit 713592e5e923498dac21f09b11dfecd180accf5b
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Aug 17 11:40:16 2013 +0100
finally, some unused dialogs
Change-Id: I673a5868db62f391b2186104ff6c641d84bffd8a
diff --git a/sw/inc/globals.hrc b/sw/inc/globals.hrc
index acd65b1..652eeed 100644
--- a/sw/inc/globals.hrc
+++ b/sw/inc/globals.hrc
@@ -86,15 +86,8 @@
// DIALOGS -----------------------------------------------------------
-#define DLG_THESAURUS (RC_GLOBALS_BEGIN + 2)
#define DLG_SPECIAL (RC_GLOBALS_BEGIN + 3)
-// QUERYBOX ---------------------------------------------------------
-
-#define DLG_WRAP (RC_GLOBALS_BEGIN + 4)
-#define DLG_BODY (RC_GLOBALS_BEGIN + 5)
-#define DLG_PRT_FIELDNAME (RC_GLOBALS_BEGIN + 6)
-
// INFOBOX ------------------------------------------------------------
#define ERR_CLPBRD_READ (RC_GLOBALS_BEGIN + 1)
diff --git a/sw/source/ui/uiview/view.src b/sw/source/ui/uiview/view.src
index 7798860..2dafb93 100644
--- a/sw/source/ui/uiview/view.src
+++ b/sw/source/ui/uiview/view.src
@@ -41,36 +41,12 @@ ImageButton BTN_PAGEDOWN
SmallStyle = TRUE ;
SYMBOL = IMAGEBUTTON_PAGEDOWN ;
};
-QueryBox DLG_WRAP
-{
- BUTTONS = WB_YES_NO ;
- DEFBUTTON = WB_DEF_YES ;
- Message [ en-US ] = "Do you want to continue checking at the beginning of the document?" ;
-};
-QueryBox DLG_BODY
-{
- BUTTONS = WB_YES_NO ;
- DEFBUTTON = WB_DEF_NO ;
- Message [ en-US ] = "Do you want to check the main text?" ;
-};
-QueryBox DLG_PRT_FIELDNAME
-{
- BUTTONS = WB_YES_NO_CANCEL ;
- DEFBUTTON = WB_DEF_CANCEL ;
- Message [ en-US ] = "Show field commands option is checked.\nDo you want to print the document with field names?" ;
-};
QueryBox DLG_SPECIAL
{
BUTTONS = WB_YES_NO ;
DEFBUTTON = WB_DEF_NO ;
Message [ en-US ] = "Do you want check the special regions?" ;
};
-QueryBox DLG_THESAURUS
-{
- BUTTONS = WB_YES_NO ;
- DEFBUTTON = WB_DEF_NO ;
- Message [ en-US ] = "This word appears in the list of words you want to avoid! Start thesaurus?" ;
-};
QueryBox DLG_SPECIAL_FORCED
{
BUTTONS = WB_YES_NO ;
commit 4164f905393f62aad0e7ae6595aa54658b87a818
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Aug 16 16:24:53 2013 +0100
convert ole/picture/frame dialogs to .ui
Change-Id: I0a0e8e8a03bd86a583b1d43489eb5b1ca8f98592
diff --git a/sw/UIConfig_swriter.mk b/sw/UIConfig_swriter.mk
index 79b5c29..4a2209a 100644
--- a/sw/UIConfig_swriter.mk
+++ b/sw/UIConfig_swriter.mk
@@ -96,6 +96,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/swriter,\
sw/uiconfig/swriter/ui/footnotepage \
sw/uiconfig/swriter/ui/footnoteareapage \
sw/uiconfig/swriter/ui/footnotesendnotestabpage \
+ sw/uiconfig/swriter/ui/framedialog \
sw/uiconfig/swriter/ui/frmaddpage \
sw/uiconfig/swriter/ui/frmtypepage \
sw/uiconfig/swriter/ui/frmurlpage \
@@ -120,6 +121,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/swriter,\
sw/uiconfig/swriter/ui/newuserindexdialog \
sw/uiconfig/swriter/ui/numparapage \
sw/uiconfig/swriter/ui/numberingnamedialog \
+ sw/uiconfig/swriter/ui/objectdialog \
sw/uiconfig/swriter/ui/optcomparison \
sw/uiconfig/swriter/ui/optfonttabpage \
sw/uiconfig/swriter/ui/optformataidspage \
@@ -134,6 +136,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/swriter,\
sw/uiconfig/swriter/ui/querysavelabeldialog \
sw/uiconfig/swriter/ui/queryshowchangesdialog \
sw/uiconfig/swriter/ui/paradialog \
+ sw/uiconfig/swriter/ui/picturedialog \
sw/uiconfig/swriter/ui/previewzoomdialog \
sw/uiconfig/swriter/ui/printoptionspage \
sw/uiconfig/swriter/ui/printeroptions \
diff --git a/sw/inc/globals.hrc b/sw/inc/globals.hrc
index 2eb0020..acd65b1 100644
--- a/sw/inc/globals.hrc
+++ b/sw/inc/globals.hrc
@@ -139,24 +139,12 @@
#define TP_OPTTEST_PAGE (RC_GLOBALS_BEGIN + 25)
#define TP_OPTPRINT_PAGE (RC_GLOBALS_BEGIN + 26)
-#define TP_FRM_STD (RC_GLOBALS_BEGIN + 31)
-
#define TP_GRF_EXT (RC_GLOBALS_BEGIN + 35)
-#define DLG_FRM_STD (RC_GLOBALS_BEGIN + 36)
-#define DLG_FRM_GRF (RC_GLOBALS_BEGIN + 37)
-#define DLG_FRM_OLE (RC_GLOBALS_BEGIN + 38)
-
-#define TP_MACRO_ASSIGN (RC_GLOBALS_BEGIN + 40)
-#define TP_FRM_URL (RC_GLOBALS_BEGIN + 42)
-
#define TP_CONTENT_OPT (RC_GLOBALS_BEGIN + 45)
#define TP_STD_FONT (RC_GLOBALS_BEGIN + 47)
#define TP_CONDCOLL (RC_GLOBALS_BEGIN + 48)
-#define TP_FRM_WRAP (RC_GLOBALS_BEGIN + 49)
-#define TP_FRM_ADD (RC_GLOBALS_BEGIN + 51)
-
#define TP_NUMBER (RC_GLOBALS_BEGIN + 57)
#define TP_FLD_DB (RC_GLOBALS_BEGIN + 64)
diff --git a/sw/inc/swabstdlg.hxx b/sw/inc/swabstdlg.hxx
index 3042195..a66211a 100644
--- a/sw/inc/swabstdlg.hxx
+++ b/sw/inc/swabstdlg.hxx
@@ -391,14 +391,13 @@ public:
virtual AbstractSwModalRedlineAcceptDlg * CreateSwModalRedlineAcceptDlg(Window *pParent) = 0;
virtual VclAbstractDialog* CreateTblMergeDialog( Window* pParent, sal_Bool& rWithPrev ) = 0; //add for SwMergeTblDlg
- virtual SfxAbstractTabDialog* CreateFrmTabDialog( int nResId,
+ virtual SfxAbstractTabDialog* CreateFrmTabDialog(const OString &rDialogType,
SfxViewFrame *pFrame, Window *pParent,
const SfxItemSet& rCoreSet,
- sal_Bool bNewFrm = sal_True,
- sal_uInt16 nResType = DLG_FRM_STD,
- sal_Bool bFmt = sal_False,
- sal_uInt16 nDefPage = 0,
- const String* pFmtStr = 0) = 0; //add for SwFrmDlg
+ bool bNewFrm = true,
+ bool bFmt = false,
+ OString sDefPage = OString(),
+ const String* pFmtStr = 0) = 0; //add for SwFrmDlg
// @param nSlot
// Identifies optional Slot by which the creation of the Template (Style) dialog is triggered.
// Currently used, if nRegion == SFX_STYLE_FAMILY_PAGE in order to activate certain dialog pane
diff --git a/sw/source/ui/dialog/swdlgfact.cxx b/sw/source/ui/dialog/swdlgfact.cxx
index 43edbae..4c7093f 100644
--- a/sw/source/ui/dialog/swdlgfact.cxx
+++ b/sw/source/ui/dialog/swdlgfact.cxx
@@ -931,30 +931,16 @@ VclAbstractDialog * SwAbstractDialogFactory_Impl::CreateTblMergeDialog(Window* p
return new VclAbstractDialog_Impl( pDlg );
}
-SfxAbstractTabDialog* SwAbstractDialogFactory_Impl::CreateFrmTabDialog( int nResId,
+SfxAbstractTabDialog* SwAbstractDialogFactory_Impl::CreateFrmTabDialog(const OString &rDialogType,
SfxViewFrame *pFrame, Window *pParent,
const SfxItemSet& rCoreSet,
- sal_Bool bNewFrm,
- sal_uInt16 nResType,
- sal_Bool bFmt,
- sal_uInt16 nDefPage,
+ bool bNewFrm,
+ bool bFmt,
+ OString sDefPage,
const String* pFmtStr ) //add for SwFrmDlg
{
- SfxTabDialog* pDlg=NULL;
- switch ( nResId )
- {
- case DLG_FRM_GRF :
- case DLG_FRM_OLE :
- case DLG_FRM_STD :
- pDlg = new SwFrmDlg( pFrame, pParent, rCoreSet, bNewFrm, nResType, bFmt, nDefPage, pFmtStr );
- break;
- default:
- break;
- }
-
- if ( pDlg )
- return new AbstractTabDialog_Impl( pDlg );
- return 0;
+ SfxTabDialog* pDlg = new SwFrmDlg(pFrame, pParent, rCoreSet, bNewFrm, rDialogType, bFmt, sDefPage, pFmtStr);
+ return new AbstractTabDialog_Impl(pDlg);
}
SfxAbstractApplyTabDialog* SwAbstractDialogFactory_Impl::CreateTemplateDialog(
diff --git a/sw/source/ui/dialog/swdlgfact.hxx b/sw/source/ui/dialog/swdlgfact.hxx
index 4dbc08e..6838b59 100644
--- a/sw/source/ui/dialog/swdlgfact.hxx
+++ b/sw/source/ui/dialog/swdlgfact.hxx
@@ -490,13 +490,12 @@ public:
virtual AbstractSwModalRedlineAcceptDlg * CreateSwModalRedlineAcceptDlg(Window *pParent); //add for SwModalRedlineAcceptDlg
virtual VclAbstractDialog* CreateTblMergeDialog(Window* pParent, sal_Bool& rWithPrev); //add for SwMergeTblDlg
- virtual SfxAbstractTabDialog* CreateFrmTabDialog( int nResId,
+ virtual SfxAbstractTabDialog* CreateFrmTabDialog( const OString &rDialogType,
SfxViewFrame *pFrame, Window *pParent,
const SfxItemSet& rCoreSet,
- sal_Bool bNewFrm = sal_True,
- sal_uInt16 nResType = DLG_FRM_STD,
- sal_Bool bFmt = sal_False,
- sal_uInt16 nDefPage = 0,
+ bool bNewFrm = true,
+ bool bFmt = false,
+ OString sDefPage = OString(),
const String* pFmtStr = 0); //add for SwFrmDlg
virtual SfxAbstractApplyTabDialog* CreateTemplateDialog(
Window* pParent,
diff --git a/sw/source/ui/frmdlg/frmdlg.cxx b/sw/source/ui/frmdlg/frmdlg.cxx
index 32cb560..a1d6220 100644
--- a/sw/source/ui/frmdlg/frmdlg.cxx
+++ b/sw/source/ui/frmdlg/frmdlg.cxx
@@ -49,20 +49,32 @@
SwFrmDlg::SwFrmDlg( SfxViewFrame* pViewFrame,
Window* pParent,
const SfxItemSet& rCoreSet,
- sal_Bool bNewFrm,
- sal_uInt16 nResType,
- sal_Bool bFormat,
- sal_uInt16 nDefPage,
- const String* pStr) :
-
- SfxTabDialog(pViewFrame, pParent, SW_RES(nResType), &rCoreSet, pStr != 0),
- m_bFormat(bFormat),
- m_bNew(bNewFrm),
- m_rSet(rCoreSet),
- m_nDlgType(nResType),
- m_pWrtShell(((SwView*)pViewFrame->GetViewShell())->GetWrtShellPtr())
+ bool bNewFrm,
+ OString sResType,
+ bool bFormat,
+ OString sDefPage,
+ const String* pStr)
+
+ : SfxTabDialog(pViewFrame, pParent, sResType,
+ OUString("modules/swriter/ui/") +
+ OStringToOUString(sResType.toAsciiLowerCase(), RTL_TEXTENCODING_UTF8) +
+ (".ui"), &rCoreSet, pStr != 0)
+ , m_bFormat(bFormat)
+ , m_bNew(bNewFrm)
+ , m_rSet(rCoreSet)
+ , m_sDlgType(sResType)
+ , m_pWrtShell(((SwView*)pViewFrame->GetViewShell())->GetWrtShellPtr())
+ , m_nStdId(0)
+ , m_nAddId(0)
+ , m_nWrapId(0)
+ , m_nUrlId(0)
+ , m_nPictureId(0)
+ , m_nCropId(0)
+ , m_nColumnId(0)
+ , m_nBackgroundId(0)
+ , m_nMacroId(0)
+ , m_nBorderId(0)
{
- FreeResource();
sal_uInt16 nHtmlMode = ::GetHtmlMode(m_pWrtShell->GetView().GetDocShell());
m_bHTMLMode = static_cast< sal_Bool >(nHtmlMode & HTMLMODE_ON);
@@ -76,49 +88,45 @@ SwFrmDlg::SwFrmDlg( SfxViewFrame* pViewFrame,
aTmp += ')';
}
- AddTabPage(TP_FRM_STD, SwFrmPage::Create, 0);
- AddTabPage(TP_FRM_ADD, SwFrmAddPage::Create, 0);
- AddTabPage(TP_FRM_WRAP, SwWrapTabPage::Create, 0);
- AddTabPage(TP_FRM_URL, SwFrmURLPage::Create, 0);
- if(m_nDlgType == DLG_FRM_GRF)
+ m_nStdId = AddTabPage("type", SwFrmPage::Create, 0);
+ m_nAddId = AddTabPage("options", SwFrmAddPage::Create, 0);
+ m_nWrapId = AddTabPage("wrap", SwWrapTabPage::Create, 0);
+ m_nUrlId = AddTabPage("hyperlink", SwFrmURLPage::Create, 0);
+ if (m_sDlgType == "PictureDialog")
{
- AddTabPage( TP_GRF_EXT, SwGrfExtPage::Create, 0 );
- AddTabPage( RID_SVXPAGE_GRFCROP );
+ m_nPictureId = AddTabPage("picture", SwGrfExtPage::Create, 0);
+ m_nCropId = AddTabPage("crop", RID_SVXPAGE_GRFCROP);
}
- if (m_nDlgType == DLG_FRM_STD)
+ if (m_sDlgType == "FrameDialog")
{
- AddTabPage(TP_COLUMN, SwColumnPage::Create, 0);
+ m_nColumnId = AddTabPage("columns", SwColumnPage::Create, 0);
}
SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "Dialogdiet fail!");
- AddTabPage(TP_BACKGROUND, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), 0 );
- AddTabPage( TP_MACRO_ASSIGN, pFact->GetTabPageCreatorFunc(RID_SVXPAGE_MACROASSIGN), 0);
- AddTabPage( TP_BORDER, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BORDER ), 0 );
+ m_nBackgroundId = AddTabPage("background", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), 0);
+ m_nMacroId = AddTabPage("macro", pFact->GetTabPageCreatorFunc(RID_SVXPAGE_MACROASSIGN), 0);
+ m_nBorderId = AddTabPage("borders", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BORDER ), 0);
if(m_bHTMLMode)
{
- switch( m_nDlgType )
+ if (m_sDlgType == "FrameDialog" || m_sDlgType == "ObjectDialog")
{
- case DLG_FRM_STD:
- RemoveTabPage(TP_COLUMN);
- // no break
- case DLG_FRM_OLE:
- RemoveTabPage(TP_FRM_URL);
- RemoveTabPage(TP_MACRO_ASSIGN);
- break;
- case DLG_FRM_GRF:
- RemoveTabPage(RID_SVXPAGE_GRFCROP);
- break;
+ if (m_sDlgType == "FrameDialog")
+ RemoveTabPage("columns");
+ RemoveTabPage("hyperlink");
+ RemoveTabPage("macro");
}
- if( m_nDlgType != DLG_FRM_STD )
- RemoveTabPage(TP_BACKGROUND);
+ else if (m_sDlgType == "PictureDialog")
+ RemoveTabPage("crop");
+ if( m_sDlgType != "FrameDialog" )
+ RemoveTabPage("background");
}
if (m_bNew)
- SetCurPageId(TP_FRM_STD);
+ SetCurPageId("type");
- if (nDefPage)
- SetCurPageId(nDefPage);
+ if (!sDefPage.isEmpty())
+ SetCurPageId(sDefPage);
}
SwFrmDlg::~SwFrmDlg()
@@ -128,77 +136,66 @@ SwFrmDlg::~SwFrmDlg()
void SwFrmDlg::PageCreated( sal_uInt16 nId, SfxTabPage &rPage )
{
SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool()));
- switch ( nId )
+ if (nId == m_nStdId)
{
- case TP_FRM_STD:
((SwFrmPage&)rPage).SetNewFrame(m_bNew);
((SwFrmPage&)rPage).SetFormatUsed(m_bFormat);
- ((SwFrmPage&)rPage).SetFrmType(m_nDlgType);
- break;
-
- case TP_FRM_ADD:
+ ((SwFrmPage&)rPage).SetFrmType(m_sDlgType);
+ }
+ else if (nId == m_nAddId)
+ {
((SwFrmAddPage&)rPage).SetFormatUsed(m_bFormat);
- ((SwFrmAddPage&)rPage).SetFrmType(m_nDlgType);
+ ((SwFrmAddPage&)rPage).SetFrmType(m_sDlgType);
((SwFrmAddPage&)rPage).SetNewFrame(m_bNew);
((SwFrmAddPage&)rPage).SetShell(m_pWrtShell);
- break;
-
- case TP_FRM_WRAP:
+ }
+ else if (nId == m_nWrapId)
+ {
((SwWrapTabPage&)rPage).SetNewFrame(m_bNew);
((SwWrapTabPage&)rPage).SetFormatUsed(m_bFormat, sal_False);
((SwWrapTabPage&)rPage).SetShell(m_pWrtShell);
- break;
-
- case TP_COLUMN:
- {
- ((SwColumnPage&)rPage).SetFrmMode(sal_True);
- ((SwColumnPage&)rPage).SetFormatUsed(m_bFormat);
-
- const SwFmtFrmSize& rSize = (const SwFmtFrmSize&)
- m_rSet.Get( RES_FRM_SIZE );
- ((SwColumnPage&)rPage).SetPageWidth( rSize.GetWidth() );
- }
- break;
+ }
+ else if (nId == m_nColumnId)
+ {
+ ((SwColumnPage&)rPage).SetFrmMode(sal_True);
+ ((SwColumnPage&)rPage).SetFormatUsed(m_bFormat);
- case TP_MACRO_ASSIGN:
- {
+ const SwFmtFrmSize& rSize = (const SwFmtFrmSize&)
+ m_rSet.Get( RES_FRM_SIZE );
+ ((SwColumnPage&)rPage).SetPageWidth( rSize.GetWidth() );
+ }
+ else if (nId == m_nMacroId)
+ {
SfxAllItemSet aNewSet(*aSet.GetPool());
aNewSet.Put( SwMacroAssignDlg::AddEvents(
- DLG_FRM_GRF == m_nDlgType ? MACASSGN_GRAPHIC : DLG_FRM_OLE == m_nDlgType ? MACASSGN_OLE : MACASSGN_FRMURL ) );
- if ( m_pWrtShell )
+ m_sDlgType == "PictureDialog" ? MACASSGN_GRAPHIC : m_sDlgType == "ObjectDialog" ? MACASSGN_OLE : MACASSGN_FRMURL ) );
+ if (m_pWrtShell)
rPage.SetFrame( m_pWrtShell->GetView().GetViewFrame()->GetFrame().GetFrameInterface() );
rPage.PageCreated(aNewSet);
- break;
- }
-
- case TP_BACKGROUND:
- if( DLG_FRM_STD == m_nDlgType )
- {
- sal_Int32 nFlagType = SVX_SHOW_SELECTOR;
- if(!m_bHTMLMode)
- nFlagType |= SVX_ENABLE_TRANSPARENCY;
- aSet.Put (SfxUInt32Item(SID_FLAG_TYPE, nFlagType));
-
- SvxGradientListItem aGradientListItem(m_pWrtShell->GetDoc()->GetOrCreateDrawModel()->GetGradientList(), SID_GRADIENT_LIST);
- aSet.Put(aGradientListItem);
+ }
+ else if (nId == m_nBackgroundId && m_sDlgType == "FrameDialog")
+ {
+ sal_Int32 nFlagType = SVX_SHOW_SELECTOR;
+ if (!m_bHTMLMode)
+ nFlagType |= SVX_ENABLE_TRANSPARENCY;
+ aSet.Put (SfxUInt32Item(SID_FLAG_TYPE, nFlagType));
- XFillStyleItem aFillStyleItem(((const XFillStyleItem&)m_rSet.Get(RES_FILL_STYLE)).GetValue(), SID_SW_ATTR_FILL_STYLE);
- aSet.Put(aFillStyleItem);
+ SvxGradientListItem aGradientListItem(m_pWrtShell->GetDoc()->GetOrCreateDrawModel()->GetGradientList(), SID_GRADIENT_LIST);
+ aSet.Put(aGradientListItem);
- const XFillGradientItem& rFillGradientItem = (const XFillGradientItem&)m_rSet.Get(RES_FILL_GRADIENT);
- XFillGradientItem aFillGradientItem(rFillGradientItem.GetName(), rFillGradientItem.GetGradientValue(), SID_SW_ATTR_FILL_GRADIENT);
- aSet.Put(aFillGradientItem);
+ XFillStyleItem aFillStyleItem(((const XFillStyleItem&)m_rSet.Get(RES_FILL_STYLE)).GetValue(), SID_SW_ATTR_FILL_STYLE);
+ aSet.Put(aFillStyleItem);
- rPage.PageCreated(aSet);
- }
- break;
+ const XFillGradientItem& rFillGradientItem = (const XFillGradientItem&)m_rSet.Get(RES_FILL_GRADIENT);
+ XFillGradientItem aFillGradientItem(rFillGradientItem.GetName(), rFillGradientItem.GetGradientValue(), SID_SW_ATTR_FILL_GRADIENT);
+ aSet.Put(aFillGradientItem);
- case TP_BORDER:
- {
- aSet.Put (SfxUInt16Item(SID_SWMODE_TYPE,SW_BORDER_MODE_FRAME));
- rPage.PageCreated(aSet);
- }
- break;
+ rPage.PageCreated(aSet);
+ }
+ else if (nId == m_nBorderId)
+ {
+ aSet.Put (SfxUInt16Item(SID_SWMODE_TYPE,SW_BORDER_MODE_FRAME));
+ rPage.PageCreated(aSet);
}
}
diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx
index 062f6fd..d73634d 100644
--- a/sw/source/ui/frmdlg/frmpage.cxx
+++ b/sw/source/ui/frmdlg/frmpage.cxx
@@ -622,7 +622,6 @@ SwFrmPage::SwFrmPage(Window *pParent, const SfxItemSet &rSet)
bIsInRightToLeft(sal_False),
bHtmlMode(sal_False),
nHtmlMode(0),
- nDlgType(0),
nUpperBorder(0),
nLowerBorder(0),
fWidthHeightRatio(1.0),
@@ -901,7 +900,7 @@ void SwFrmPage::Reset( const SfxItemSet &rSet )
}
}
- if ( nDlgType == DLG_FRM_GRF || nDlgType == DLG_FRM_OLE )
+ if ( sDlgType == "PictureDialog" || sDlgType == "ObjectDialog" )
{
OSL_ENSURE(pSh , "shell not found");
//OS: only for the variant Insert/Graphic/Properties
@@ -916,7 +915,7 @@ void SwFrmPage::Reset( const SfxItemSet &rSet )
EnableGraficMode();
}
- if ( nDlgType == DLG_FRM_GRF )
+ if ( sDlgType == "PictureDialog" )
m_pFixedRatioCB->Check( sal_False );
else
{
@@ -980,7 +979,7 @@ void SwFrmPage::Reset( const SfxItemSet &rSet )
m_pAutoHeightCB->Enable(sal_False);
m_pAutoWidthCB->Enable(sal_False);
m_pMirrorPagesCB->Show(sal_False);
- if(nDlgType == DLG_FRM_STD)
+ if (sDlgType == "FrameDialog")
m_pFixedRatioCB->Enable(sal_False);
// i#18732 hide checkbox in HTML mode
m_pFollowTextFlowCB->Show(sal_False);
@@ -1835,7 +1834,7 @@ IMPL_LINK_NOARG(SwFrmPage, RangeModifyHdl)
SwTwips nMaxWidth(aVal.nMaxWidth);
SwTwips nMaxHeight(aVal.nMaxHeight);
- if (aVal.bAutoHeight && (nDlgType == DLG_FRM_GRF || nDlgType == DLG_FRM_OLE))
+ if (aVal.bAutoHeight && (sDlgType == "PictureDialog" || sDlgType == "ObjectDialog"))
{
SwTwips nTmp = std::min(nWidth * nMaxHeight / std::max(nHeight, 1L), nMaxHeight);
m_aWidthED.SetMax(m_aWidthED.NormalizePercent(nTmp), FUNIT_TWIP);
@@ -2129,7 +2128,7 @@ void SwFrmPage::Init(const SfxItemSet& rSet, sal_Bool bReset)
m_aHeightED.Enable( !bSizeFixed );
// size controls for math OLE objects
- if ( DLG_FRM_OLE == nDlgType && ! bNew )
+ if ( sDlgType == "ObjectDialog" && ! bNew )
{
// disable width and height for math objects
const SvGlobalName& rFactNm( pSh->GetOLEObject()->getClassID() );
@@ -2803,14 +2802,12 @@ IMPL_LINK_NOARG(SwFrmURLPage, InsertFileHdl)
return 0;
}
-SwFrmAddPage::SwFrmAddPage(Window *pParent, const SfxItemSet &rSet ) :
- SfxTabPage(pParent, "FrmAddPage" , "modules/swriter/ui/frmaddpage.ui", rSet),
- pWrtSh(0),
-
- nDlgType(0),
- bHtmlMode(sal_False),
- bFormat(sal_False),
- bNew(sal_False)
+SwFrmAddPage::SwFrmAddPage(Window *pParent, const SfxItemSet &rSet)
+ : SfxTabPage(pParent, "FrmAddPage" , "modules/swriter/ui/frmaddpage.ui", rSet)
+ , pWrtSh(0)
+ , bHtmlMode(sal_False)
+ , bFormat(sal_False)
+ , bNew(sal_False)
{
get(pNameFrame, "nameframe");
get(pNameFT,"name_label");
@@ -2855,7 +2852,7 @@ void SwFrmAddPage::Reset(const SfxItemSet &rSet )
pEditInReadonlyCB->Hide();
pPrintFrameCB->Hide();
}
- if ( DLG_FRM_GRF == nDlgType || DLG_FRM_OLE == nDlgType )
+ if (sDlgType == "PictureDialog" || sDlgType == "ObjectDialog")
{
pEditInReadonlyCB->Hide();
if (bHtmlMode)
@@ -2882,19 +2879,14 @@ void SwFrmAddPage::Reset(const SfxItemSet &rSet )
OSL_ENSURE(pWrtSh, "keine Shell?");
if( bNew || !aTmpName1.Len() )
-
- switch( nDlgType )
- {
- case DLG_FRM_GRF:
- aTmpName1 = pWrtSh->GetUniqueGrfName();
- break;
- case DLG_FRM_OLE:
- aTmpName1 = pWrtSh->GetUniqueOLEName();
- break;
- default:
- aTmpName1 = pWrtSh->GetUniqueFrameName();
- break;
- }
+ {
+ if (sDlgType == "PictureDialog")
+ aTmpName1 = pWrtSh->GetUniqueGrfName();
+ else if (sDlgType == "ObjectDialog")
+ aTmpName1 = pWrtSh->GetUniqueOLEName();
+ else
+ aTmpName1 = pWrtSh->GetUniqueFrameName();
+ }
pNameED->SetText( aTmpName1 );
pNameED->SaveValue();
@@ -2906,7 +2898,7 @@ void SwFrmAddPage::Reset(const SfxItemSet &rSet )
pNameFT->Enable( sal_False );
pAltNameFT->Enable(sal_False);
}
- if(nDlgType == DLG_FRM_STD && pAltNameFT->IsVisible())
+ if (sDlgType == "FrameDialog" && pAltNameFT->IsVisible())
{
pAltNameFT->Hide();
pAltNameED->Hide();
@@ -2987,7 +2979,7 @@ void SwFrmAddPage::Reset(const SfxItemSet &rSet )
// textflow
SfxItemState eState;
if( (!bHtmlMode || (0 != (nHtmlMode&HTMLMODE_SOME_STYLES)))
- && DLG_FRM_GRF != nDlgType && DLG_FRM_OLE != nDlgType &&
+ && sDlgType != "PictureDialog" && sDlgType != "ObjectDialog" &&
SFX_ITEM_UNKNOWN != ( eState = rSet.GetItemState(
RES_FRAMEDIR, sal_True )) )
{
diff --git a/sw/source/ui/frmdlg/frmpage.src b/sw/source/ui/frmdlg/frmpage.src
index 82f1511..2b0edb8 100644
--- a/sw/source/ui/frmdlg/frmpage.src
+++ b/sw/source/ui/frmdlg/frmpage.src
@@ -23,188 +23,6 @@
#include "helpid.h"
#include "svx/dialogs.hrc"
-TabDialog DLG_FRM_STD
-{
- OutputSize = TRUE ;
- SVLook = TRUE ;
- Text [ en-US ] = "Frame" ;
- Moveable = TRUE ;
- TabControl 1
- {
- OutputSize = TRUE ;
- PageList =
- {
- PageItem
- {
- Identifier = TP_FRM_STD ;
- PageResID = TP_FRM_STD ;
- Text [ en-US ] = "Type" ;
- };
- PageItem
- {
- Identifier = TP_FRM_ADD ;
- PageResID = TP_FRM_ADD ;
- Text [ en-US ] = "Options" ;
- };
- PageItem
- {
- Identifier = TP_FRM_WRAP ;
- PageResID = TP_FRM_WRAP ;
- Text [ en-US ] = "Wrap" ;
- };
- PageItem
- {
- Identifier = TP_FRM_URL ;
- PageResID = TP_FRM_URL ;
- Text [ en-US ] = "Hyperlink" ;
- };
- PageItem
- {
- Identifier = TP_BORDER ;
- PageResID = TP_BORDER ;
- Text [ en-US ] = "Borders" ;
- };
- PageItem
- {
- Identifier = TP_BACKGROUND ;
- PageResID = TP_BACKGROUND ;
- Text [ en-US ] = "Background" ;
- };
- PageItem
- {
- Identifier = TP_COLUMN ;
- PageResID = TP_COLUMN ;
- Text [ en-US ] = "Columns" ;
- };
- PageItem
- {
- Identifier = TP_MACRO_ASSIGN ;
- Text [ en-US ] = "Macro" ;
- };
- };
- };
-};
-TabDialog DLG_FRM_GRF
-{
- SVLook = TRUE ;
- Text [ en-US ] = "Picture" ;
- Moveable = TRUE ;
- TabControl 1
- {
- OutputSize = TRUE ;
- PageList =
- {
- PageItem
- {
- Identifier = TP_FRM_STD ;
- PageResID = TP_FRM_STD ;
- Text [ en-US ] = "Type" ;
- };
- PageItem
- {
- Identifier = TP_FRM_ADD ;
- PageResID = TP_FRM_ADD ;
- Text [ en-US ] = "Options" ;
- };
- PageItem
- {
- Identifier = TP_FRM_WRAP ;
- PageResID = TP_FRM_WRAP ;
- Text [ en-US ] = "Wrap" ;
- };
- PageItem
- {
- Identifier = TP_FRM_URL ;
- PageResID = TP_FRM_URL ;
- Text [ en-US ] = "Hyperlink" ;
- };
- PageItem
- {
- Identifier = TP_GRF_EXT ;
- PageResID = TP_GRF_EXT ;
- Text [ en-US ] = "Picture" ;
- };
- PageItem
- {
- Identifier = RID_SVXPAGE_GRFCROP;
- PageResID = RID_SVXPAGE_GRFCROP;
- Text [ en-US ] = "Crop" ;
- };
- PageItem
- {
- Identifier = TP_BORDER ;
- PageResID = TP_BORDER ;
- Text [ en-US ] = "Borders" ;
- };
- PageItem
- {
- Identifier = TP_BACKGROUND ;
- PageResID = TP_BACKGROUND ;
- Text [ en-US ] = "Background" ;
- };
- PageItem
- {
- Identifier = TP_MACRO_ASSIGN ;
- Text [ en-US ] = "Macro" ;
- };
- };
- };
-};
-TabDialog DLG_FRM_OLE
-{
- OutputSize = TRUE ;
- SVLook = TRUE ;
- Text [ en-US ] = "Object" ;
- Moveable = TRUE ;
- TabControl 1
- {
- OutputSize = TRUE ;
- PageList =
- {
- PageItem
- {
- Identifier = TP_FRM_STD ;
- PageResID = TP_FRM_STD ;
- Text [ en-US ] = "Type" ;
- };
- PageItem
- {
- Identifier = TP_FRM_ADD ;
- PageResID = TP_FRM_ADD ;
- Text [ en-US ] = "Options" ;
- };
- PageItem
- {
- Identifier = TP_FRM_WRAP ;
- PageResID = TP_FRM_WRAP ;
- Text [ en-US ] = "Wrap" ;
- };
- PageItem
- {
- Identifier = TP_FRM_URL ;
- PageResID = TP_FRM_URL ;
- Text [ en-US ] = "Hyperlink" ;
- };
- PageItem
- {
- Identifier = TP_BORDER ;
- PageResID = TP_BORDER ;
- Text [ en-US ] = "Borders" ;
- };
- PageItem
- {
- Identifier = TP_BACKGROUND ;
- PageResID = TP_BACKGROUND ;
- Text [ en-US ] = "Background" ;
- };
- PageItem
- {
- Identifier = TP_MACRO_ASSIGN ;
- Text [ en-US ] = "Macro" ;
- };
- };
- };
-};
TabPage TP_GRF_EXT
{
Hide = TRUE ;
diff --git a/sw/source/ui/inc/frmdlg.hxx b/sw/source/ui/inc/frmdlg.hxx
index ad3f41b..4b19361 100644
--- a/sw/source/ui/inc/frmdlg.hxx
+++ b/sw/source/ui/inc/frmdlg.hxx
@@ -29,28 +29,38 @@ class SwWrtShell;
--------------------------------------------------------------------*/
class SwFrmDlg : public SfxTabDialog
{
- sal_Bool m_bFormat;
- sal_Bool m_bNew;
- sal_Bool m_bHTMLMode;
+ bool m_bFormat;
+ bool m_bNew;
+ bool m_bHTMLMode;
const SfxItemSet& m_rSet;
- sal_uInt16 m_nDlgType;
- SwWrtShell* m_pWrtShell;
+ OString m_sDlgType;
+ SwWrtShell* m_pWrtShell;
+ sal_uInt16 m_nStdId;
+ sal_uInt16 m_nAddId;
+ sal_uInt16 m_nWrapId;
+ sal_uInt16 m_nUrlId;
+ sal_uInt16 m_nPictureId;
+ sal_uInt16 m_nCropId;
+ sal_uInt16 m_nColumnId;
+ sal_uInt16 m_nBackgroundId;
+ sal_uInt16 m_nMacroId;
+ sal_uInt16 m_nBorderId;
virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage );
public:
SwFrmDlg( SfxViewFrame *pFrame, Window *pParent,
const SfxItemSet& rCoreSet,
- sal_Bool bNewFrm = sal_True,
- sal_uInt16 nResType = DLG_FRM_STD,
- sal_Bool bFmt = sal_False,
- sal_uInt16 nDefPage = 0,
+ bool bNewFrm = false,
+ OString sResType = OString("FrameDialog"),
+ bool bFmt = false,
+ OString sDefPage = OString(),
const String* pFmtStr = 0);
~SwFrmDlg();
- inline SwWrtShell* GetWrtShell() { return m_pWrtShell; }
+ SwWrtShell* GetWrtShell() { return m_pWrtShell; }
};
#endif // _FRMDLG_HXX
diff --git a/sw/source/ui/inc/frmpage.hxx b/sw/source/ui/inc/frmpage.hxx
index e22b57f..26de98c 100644
--- a/sw/source/ui/inc/frmpage.hxx
+++ b/sw/source/ui/inc/frmpage.hxx
@@ -104,7 +104,7 @@ class SwFrmPage: public SfxTabPage
sal_Bool bIsInRightToLeft; // current frame is in right-to-left environment - strings are exchanged
sal_Bool bHtmlMode;
sal_uInt16 nHtmlMode;
- sal_uInt16 nDlgType;
+ OString sDlgType;
Size aGrfSize;
Size aWrap;
SwTwips nUpperBorder;
@@ -194,8 +194,8 @@ public:
void SetNewFrame(sal_Bool bNewFrame) { bNew = bNewFrame; }
void SetFormatUsed(sal_Bool bFmt);
- void SetFrmType(sal_uInt16 nType) { nDlgType = nType; }
- inline sal_Bool IsInGraficMode( void ) { return nDlgType == DLG_FRM_GRF || nDlgType == DLG_FRM_OLE; }
+ void SetFrmType(const OString &rType) { sDlgType = rType; }
+ inline sal_Bool IsInGraficMode( void ) { return sDlgType == "PictureDialog" || sDlgType == "ObjectDialog"; }
void EnableVerticalPositioning( bool bEnable );
};
@@ -296,7 +296,7 @@ class SwFrmAddPage : public SfxTabPage
SwWrtShell* pWrtSh;
- sal_uInt16 nDlgType;
+ OString sDlgType;
sal_Bool bHtmlMode;
sal_Bool bFormat;
sal_Bool bNew;
@@ -316,7 +316,7 @@ public:
virtual void Reset(const SfxItemSet &rSet);
void SetFormatUsed(sal_Bool bFmt);
- void SetFrmType(sal_uInt16 nType) { nDlgType = nType; }
+ void SetFrmType(const OString &rType) { sDlgType = rType; }
void SetNewFrame(sal_Bool bNewFrame) { bNew = bNewFrame; }
void SetShell(SwWrtShell* pSh) { pWrtSh = pSh; }
diff --git a/sw/source/ui/shells/frmsh.cxx b/sw/source/ui/shells/frmsh.cxx
index 0e413d8..9e35ee6 100644
--- a/sw/source/ui/shells/frmsh.cxx
+++ b/sw/source/ui/shells/frmsh.cxx
@@ -146,7 +146,7 @@ void SwFrameShell::Execute(SfxRequest &rReq)
if (!pArgs)
{
// Frame already exists, open frame dialog for editing.
- SfxUInt16Item aDefPage(FN_FORMAT_FRAME_DLG, TP_COLUMN);
+ SfxStringItem aDefPage(FN_FORMAT_FRAME_DLG, "columns");
rSh.GetView().GetViewFrame()->GetDispatcher()->Execute( FN_FORMAT_FRAME_DLG,
SFX_CALLMODE_SYNCHRON|SFX_CALLMODE_RECORD,
&aDefPage, 0L );
@@ -463,29 +463,29 @@ void SwFrameShell::Execute(SfxRequest &rReq)
const uno::Reference < embed::XEmbeddedObject > xObj( rSh.GetOleRef() );
aSet.Put( SfxBoolItem( FN_OLE_IS_MATH, xObj.is() && SotExchange::IsMath( xObj->getClassID() ) ) );
- sal_uInt16 nDefPage = 0;
+ OString sDefPage;
if(pArgs && pArgs->GetItemState(FN_FORMAT_FRAME_DLG, sal_False, &pItem) == SFX_ITEM_SET)
- nDefPage = ((SfxUInt16Item *)pItem)->GetValue();
+ sDefPage = OUStringToOString(((SfxStringItem *)pItem)->GetValue(), RTL_TEXTENCODING_UTF8);
aSet.Put(SfxFrameItem( SID_DOCFRAME, &GetView().GetViewFrame()->GetTopFrame()));
FieldUnit eMetric = ::GetDfltMetric(0 != PTR_CAST(SwWebView, &GetView()));
SW_MOD()->PutItem(SfxUInt16Item(SID_ATTR_METRIC, static_cast< sal_uInt16 >(eMetric) ));
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "Dialogdiet fail!");
- SfxAbstractTabDialog* pDlg = pFact->CreateFrmTabDialog( DLG_FRM_STD,
+ SfxAbstractTabDialog* pDlg = pFact->CreateFrmTabDialog(
+ nSel & nsSelectionType::SEL_GRF ? "PictureDialog" :
+ nSel & nsSelectionType::SEL_OLE ? "ObjectDialog":
+ "FrameDialog",
GetView().GetViewFrame(),
GetView().GetWindow(),
aSet, sal_False,
- nSel & nsSelectionType::SEL_GRF ? DLG_FRM_GRF :
- nSel & nsSelectionType::SEL_OLE ? DLG_FRM_OLE :
- DLG_FRM_STD,
sal_False,
- nDefPage);
+ sDefPage);
OSL_ENSURE(pDlg, "Dialogdiet fail!");
if ( nSlot == FN_DRAW_WRAP_DLG )
{
- pDlg->SetCurPageId(TP_FRM_WRAP);
+ pDlg->SetCurPageId("wrap");
}
if ( pDlg->Execute() )
diff --git a/sw/source/ui/shells/grfsh.cxx b/sw/source/ui/shells/grfsh.cxx
index 911d1e2..d277bcb 100644
--- a/sw/source/ui/shells/grfsh.cxx
+++ b/sw/source/ui/shells/grfsh.cxx
@@ -288,14 +288,14 @@ void SwGrfShell::Execute(SfxRequest &rReq)
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "Dialogdiet fail!");
- SfxAbstractTabDialog* pDlg = pFact->CreateFrmTabDialog( DLG_FRM_GRF,
+ SfxAbstractTabDialog* pDlg = pFact->CreateFrmTabDialog("PictureDialog",
GetView().GetViewFrame(),
GetView().GetWindow(),
- aSet, sal_False, DLG_FRM_GRF);
+ aSet, false);
OSL_ENSURE(pDlg, "Dialogdiet fail!");
if (nSlot == FN_DRAW_WRAP_DLG)
- pDlg->SetCurPageId(TP_FRM_WRAP);
+ pDlg->SetCurPageId("wrap");
if( pDlg->Execute() )
{
diff --git a/sw/source/ui/shells/textsh.cxx b/sw/source/ui/shells/textsh.cxx
index 3551749..abf9bec 100644
--- a/sw/source/ui/shells/textsh.cxx
+++ b/sw/source/ui/shells/textsh.cxx
@@ -578,8 +578,10 @@ void SwTextShell::ExecInsert(SfxRequest &rReq)
SW_MOD()->PutItem(SfxUInt16Item(SID_ATTR_METRIC, static_cast< sal_uInt16 >(eMetric)));
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "Dialogdiet fail!");
- SfxAbstractTabDialog* pDlg = pFact->CreateFrmTabDialog( DLG_FRM_STD,
- GetView().GetViewFrame(), &GetView().GetViewFrame()->GetWindow(), aSet, sal_True);
+ SfxAbstractTabDialog* pDlg = pFact->CreateFrmTabDialog("FrameDialog",
+ GetView().GetViewFrame(),
+ &GetView().GetViewFrame()->GetWindow(),
+ aSet, true);
OSL_ENSURE(pDlg, "Dialogdiet fail!");
if(pDlg->Execute() == RET_OK && pDlg->GetOutputItemSet())
{
diff --git a/sw/uiconfig/swriter/ui/framedialog.ui b/sw/uiconfig/swriter/ui/framedialog.ui
new file mode 100644
index 0000000..a010245
--- /dev/null
+++ b/sw/uiconfig/swriter/ui/framedialog.ui
@@ -0,0 +1,217 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+ <!-- interface-requires gtk+ 3.0 -->
+ <object class="GtkDialog" id="FrameDialog">
+ <property name="can_focus">False</property>
+ <property name="border_width">6</property>
+ <property name="title" translatable="yes">Frame</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">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="reset">
+ <property name="label">gtk-revert-to-saved</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">4</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="GtkNotebook" id="tabcontrol">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <child>
+ <placeholder/>
+ </child>
+ <child type="tab">
+ <object class="GtkLabel" id="type">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Type</property>
+ </object>
+ <packing>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child type="tab">
+ <object class="GtkLabel" id="options">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Options</property>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child type="tab">
+ <object class="GtkLabel" id="wrap">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Wrap</property>
+ </object>
+ <packing>
+ <property name="position">2</property>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child type="tab">
+ <object class="GtkLabel" id="hyperlink">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Hyperlink</property>
+ </object>
+ <packing>
+ <property name="position">3</property>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child type="tab">
+ <object class="GtkLabel" id="borders">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Borders</property>
+ </object>
+ <packing>
+ <property name="position">4</property>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child type="tab">
+ <object class="GtkLabel" id="background">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Background</property>
+ </object>
+ <packing>
+ <property name="position">5</property>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child type="tab">
+ <object class="GtkLabel" id="columns">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Columns</property>
+ </object>
+ <packing>
+ <property name="position">6</property>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child type="tab">
+ <object class="GtkLabel" id="macro">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Macro</property>
+ </object>
+ <packing>
+ <property name="position">7</property>
+ <property name="tab_fill">False</property>
+ </packing>
+ </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-widget response="0">reset</action-widget>
+ </action-widgets>
+ </object>
+</interface>
diff --git a/sw/uiconfig/swriter/ui/objectdialog.ui b/sw/uiconfig/swriter/ui/objectdialog.ui
new file mode 100644
index 0000000..dc48bdf
--- /dev/null
+++ b/sw/uiconfig/swriter/ui/objectdialog.ui
@@ -0,0 +1,203 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+ <!-- interface-requires gtk+ 3.0 -->
+ <object class="GtkDialog" id="ObjectDialog">
+ <property name="can_focus">False</property>
+ <property name="border_width">6</property>
+ <property name="title" translatable="yes">Object</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">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="reset">
+ <property name="label">gtk-revert-to-saved</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">4</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="GtkNotebook" id="tabcontrol">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <child>
+ <placeholder/>
+ </child>
+ <child type="tab">
+ <object class="GtkLabel" id="type">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Type</property>
+ </object>
+ <packing>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child type="tab">
+ <object class="GtkLabel" id="options">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Options</property>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child type="tab">
+ <object class="GtkLabel" id="wrap">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Wrap</property>
+ </object>
+ <packing>
+ <property name="position">2</property>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child type="tab">
+ <object class="GtkLabel" id="hyperlink">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Hyperlink</property>
+ </object>
+ <packing>
+ <property name="position">3</property>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child type="tab">
+ <object class="GtkLabel" id="borders">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Borders</property>
+ </object>
+ <packing>
+ <property name="position">4</property>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child type="tab">
+ <object class="GtkLabel" id="background">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Background</property>
+ </object>
+ <packing>
+ <property name="position">5</property>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child type="tab">
+ <object class="GtkLabel" id="macro">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Macro</property>
+ </object>
+ <packing>
+ <property name="position">6</property>
+ <property name="tab_fill">False</property>
+ </packing>
+ </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-widget response="0">reset</action-widget>
+ </action-widgets>
+ </object>
+</interface>
diff --git a/sw/uiconfig/swriter/ui/picturedialog.ui b/sw/uiconfig/swriter/ui/picturedialog.ui
new file mode 100644
index 0000000..71e3140
--- /dev/null
+++ b/sw/uiconfig/swriter/ui/picturedialog.ui
@@ -0,0 +1,231 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+ <!-- interface-requires gtk+ 3.0 -->
+ <object class="GtkDialog" id="PictureDialog">
+ <property name="can_focus">False</property>
+ <property name="border_width">6</property>
+ <property name="title" translatable="yes">Picture</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">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="reset">
+ <property name="label">gtk-revert-to-saved</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">4</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="GtkNotebook" id="tabcontrol">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <child>
+ <placeholder/>
+ </child>
+ <child type="tab">
+ <object class="GtkLabel" id="type">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Type</property>
+ </object>
+ <packing>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child type="tab">
+ <object class="GtkLabel" id="options">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Options</property>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child type="tab">
+ <object class="GtkLabel" id="wrap">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Wrap</property>
+ </object>
+ <packing>
+ <property name="position">2</property>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child type="tab">
+ <object class="GtkLabel" id="hyperlink">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Hyperlink</property>
+ </object>
+ <packing>
+ <property name="position">3</property>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child type="tab">
+ <object class="GtkLabel" id="picture">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Picture</property>
+ </object>
+ <packing>
+ <property name="position">4</property>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child type="tab">
+ <object class="GtkLabel" id="crop">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Crop</property>
+ </object>
+ <packing>
+ <property name="position">5</property>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child type="tab">
+ <object class="GtkLabel" id="borders">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Borders</property>
+ </object>
+ <packing>
+ <property name="position">6</property>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child type="tab">
+ <object class="GtkLabel" id="background">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Background</property>
+ </object>
+ <packing>
+ <property name="position">7</property>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child type="tab">
+ <object class="GtkLabel" id="macro">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Macro</property>
+ </object>
+ <packing>
+ <property name="position">8</property>
+ <property name="tab_fill">False</property>
+ </packing>
+ </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-widget response="0">reset</action-widget>
+ </action-widgets>
+ </object>
+</interface>
More information about the Libreoffice-commits
mailing list