[Libreoffice-commits] .: 3 commits - sw/inc sw/source sw/uiconfig sw/UI_swriter.mk vcl/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Fri Oct 19 16:57:27 PDT 2012
sw/UI_swriter.mk | 1
sw/inc/helpid.h | 9
sw/inc/index.hrc | 3
sw/inc/swabstdlg.hxx | 2
sw/source/ui/app/app.src | 12 +
sw/source/ui/dialog/swdlgfact.cxx | 19 -
sw/source/ui/dialog/swdlgfact.hxx | 2
sw/source/ui/inc/app.hrc | 4
sw/source/ui/inc/swuiidxmrk.hxx | 45 +---
sw/source/ui/index/idxmrk.cxx | 2
sw/source/ui/index/idxmrk.src | 144 -------------
sw/source/ui/index/swuiidxmrk.cxx | 231 +++++++++------------
sw/uiconfig/swriter/ui/bibliographyentry.ui | 304 ++++++++++++++++++++++++++++
vcl/source/uipreviewer/previewer.cxx | 2
vcl/source/window/dialog.cxx | 4
15 files changed, 450 insertions(+), 334 deletions(-)
New commits:
commit 1cdad42cf9cfd868f717ab6b972be201f1f06b70
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Oct 19 18:20:58 2012 +0100
add bibliography entry ui
Change-Id: I9c442d40ccfbc381c5885fa016da448ce2912b93
diff --git a/sw/UI_swriter.mk b/sw/UI_swriter.mk
index 9e35278..1e99bf4 100644
--- a/sw/UI_swriter.mk
+++ b/sw/UI_swriter.mk
@@ -11,6 +11,7 @@ $(eval $(call gb_UI_UI,modules/swriter))
$(eval $(call gb_UI_add_uifiles,modules/swriter,\
sw/uiconfig/swriter/ui/autoformattable \
+ sw/uiconfig/swriter/ui/bibliographyentry \
sw/uiconfig/swriter/ui/charurlpage \
sw/uiconfig/swriter/ui/columnwidth \
sw/uiconfig/swriter/ui/converttexttable \
diff --git a/sw/inc/helpid.h b/sw/inc/helpid.h
index ca524fc..8f97e7b 100644
--- a/sw/inc/helpid.h
+++ b/sw/inc/helpid.h
@@ -384,8 +384,6 @@
#define HID_DLG_NEW_USER_IDX "SW_HID_DLG_NEW_USER_IDX"
#define HID_INSERT_IDX_MRK_OK "SW_HID_INSERT_IDX_MRK_OK"
#define HID_INSERT_IDX_MRK_CLOSE "SW_HID_INSERT_IDX_MRK_CLOSE"
-#define HID_INSERT_AUTH_MRK_OK "SW_HID_INSERT_AUTH_MRK_OK"
-#define HID_INSERT_AUTH_MRK_CLOSE "SW_HID_INSERT_AUTH_MRK_CLOSE"
#define HID_INSERT_IDX_MRK_DELETE "SW_HID_INSERT_IDX_MRK_DELETE"
#define HID_INSERT_IDX_MRK_NEW "SW_HID_INSERT_IDX_MRK_NEW"
#define HID_INSERT_IDX_MRK_PREV "SW_HID_INSERT_IDX_MRK_PREV"
@@ -399,9 +397,6 @@
#define HID_INSERT_IDX_MRK_LEVEL "SW_HID_INSERT_IDX_MRK_LEVEL"
#define HID_INSERT_IDX_MRK_MAIN_ENTRY "SW_HID_INSERT_IDX_MRK_MAIN_ENTRY"
#define HID_INSERT_IDX_MRK_APPLY_ALL "SW_HID_INSERT_IDX_MRK_APPLY_ALL"
-#define HID_INSERT_AUTH_MRK_ENTRY "SW_HID_INSERT_AUTH_MRK_ENTRY"
-#define HID_INSERT_AUTH_MRK_CREATE_ENTRY "SW_HID_INSERT_AUTH_MRK_CREATE_ENTRY"
-#define HID_INSERT_AUTH_MRK_EDIT_ENTRY "SW_HID_INSERT_AUTH_MRK_EDIT_ENTRY"
#define HID_TOKEN_WINDOW "SW_HID_TOKEN_WINDOW"
#define HID_AUTH_FIELD_IDENTIFIER "SW_HID_AUTH_FIELD_IDENTIFIER"
@@ -436,10 +431,6 @@
#define HID_AUTH_FIELD_CUSTOM5 "SW_HID_AUTH_FIELD_CUSTOM5"
#define HID_AUTH_FIELD_ISBN "SW_HID_AUTH_FIELD_ISBN"
-#define HID_AUTH_MARK_DLG_FROM_COMP_RB "SW_HID_AUTH_MARK_DLG_FROM_COMP_RB"
-#define HID_AUTH_MARK_DLG_FROM_DOC_RB "SW_HID_AUTH_MARK_DLG_FROM_DOC_RB"
-#define HID_AUTH_MARK_DLG_ID_LISTBOX "SW_HID_AUTH_MARK_DLG_ID_LISTBOX"
-
#define HID_INSERT_INDEX_ENTRY_LEVEL_LB "SW_HID_INSERT_INDEX_ENTRY_LEVEL_LB"
#define HID_INSERT_IDX_MRK_SRCH_CASESENSITIVE "SW_HID_INSERT_IDX_MRK_SRCH_CASESENSITIVE"
#define HID_INSERT_IDX_MRK_SRCH_WORDONLY "SW_HID_INSERT_IDX_MRK_SRCH_WORDONLY"
diff --git a/sw/inc/index.hrc b/sw/inc/index.hrc
index 6d07ec1..0d23e1d 100644
--- a/sw/inc/index.hrc
+++ b/sw/inc/index.hrc
@@ -32,15 +32,12 @@
#define STR_ALPHA (RC_INDEX_BEGIN + 7)
#define STR_LEVEL (RC_INDEX_BEGIN + 8)
-#define DLG_INSAUTHMARK (RC_INDEX_BEGIN + 9)
#define DLG_CREATE_AUTH_ENTRY (RC_INDEX_BEGIN + 10)
#define DLG_EDIT_IDXMARK (RC_INDEX_BEGIN + 11)
#define DLG_EDIT_AUTHMARK (RC_INDEX_BEGIN + 12)
#define STR_IDXMRK_INSERT (RC_INDEX_BEGIN + 13)
#define STR_IDXMRK_EDIT (RC_INDEX_BEGIN + 14)
-#define STR_AUTHMRK_EDIT (RC_INDEX_BEGIN + 15)
-#define STR_AUTHMRK_INSERT (RC_INDEX_BEGIN + 16)
#define DLG_NEW_USER_IDX (RC_INDEX_BEGIN + 17)
diff --git a/sw/inc/swabstdlg.hxx b/sw/inc/swabstdlg.hxx
index 056f3a2..bd499a7 100644
--- a/sw/inc/swabstdlg.hxx
+++ b/sw/inc/swabstdlg.hxx
@@ -480,7 +480,7 @@ public:
Window *pParent,
SfxChildWinInfo* pInfo,
sal_Bool bNew=sal_True) = 0; //add for SwIndexMarkFloatDlg
- virtual AbstractMarkFloatDlg* CreateAuthMarkFloatDlg( int nResId,
+ virtual AbstractMarkFloatDlg* CreateAuthMarkFloatDlg(
SfxBindings* pBindings,
SfxChildWindow* pChild,
Window *pParent,
diff --git a/sw/source/ui/app/app.src b/sw/source/ui/app/app.src
index 3492f9e..75c5340 100644
--- a/sw/source/ui/app/app.src
+++ b/sw/source/ui/app/app.src
@@ -660,6 +660,18 @@ String STR_SIMPLE
Text [ en-US ] = "Plain" ;
};
+String STR_AUTHMRK_EDIT
+{
+
+ Text [ en-US ] = "Edit Bibliography Entry";
+};
+
+String STR_AUTHMRK_INSERT
+{
+
+ Text [ en-US ] = "Insert Bibliography Entry";
+};
+
ToolBox RID_MODULE_TOOLBOX
{
HelpID = HID_MODULE_TOOLBOX ;
diff --git a/sw/source/ui/dialog/swdlgfact.cxx b/sw/source/ui/dialog/swdlgfact.cxx
index a851292..d3b7694 100644
--- a/sw/source/ui/dialog/swdlgfact.cxx
+++ b/sw/source/ui/dialog/swdlgfact.cxx
@@ -918,7 +918,6 @@ VclAbstractDialog * SwAbstractDialogFactory_Impl::CreateVclAbstractDialog ( Wind
case DLG_ROW_HEIGHT :
pDlg = new SwTableHeightDlg( pParent, rSh);
break;
-
case DLG_SORTING :
pDlg = new SwSortDlg( pParent, rSh);
break;
@@ -1445,25 +1444,15 @@ AbstractMarkFloatDlg * SwAbstractDialogFactory_Impl::CreateIndexMarkFloatDlg( in
return 0;
}
-AbstractMarkFloatDlg * SwAbstractDialogFactory_Impl::CreateAuthMarkFloatDlg( int nResId,
+AbstractMarkFloatDlg * SwAbstractDialogFactory_Impl::CreateAuthMarkFloatDlg(
SfxBindings* pBindings,
SfxChildWindow* pChild,
Window *pParent,
SfxChildWinInfo* pInfo,
- sal_Bool bNew ) //add for SwAuthMarkFloatDlg
+ sal_Bool bNew) //add for SwAuthMarkFloatDlg
{
- SwAuthMarkFloatDlg* pDlg=NULL;
- switch ( nResId )
- {
- case DLG_INSAUTHMARK :
- pDlg = new SwAuthMarkFloatDlg( pBindings, pChild, pParent, pInfo, bNew );
- break;
- default:
- break;
- }
- if ( pDlg )
- return new AbstractAuthMarkFloatDlg_Impl( pDlg );
- return 0;
+ SwAuthMarkFloatDlg* pDlg = new SwAuthMarkFloatDlg( pBindings, pChild, pParent, pInfo, bNew );
+ return new AbstractAuthMarkFloatDlg_Impl( pDlg );
}
AbstractSwWordCountFloatDlg * SwAbstractDialogFactory_Impl::CreateSwWordCountDialog(
diff --git a/sw/source/ui/dialog/swdlgfact.hxx b/sw/source/ui/dialog/swdlgfact.hxx
index 129b9e3..1f4c4b3 100644
--- a/sw/source/ui/dialog/swdlgfact.hxx
+++ b/sw/source/ui/dialog/swdlgfact.hxx
@@ -559,7 +559,7 @@ public:
Window *pParent,
SfxChildWinInfo* pInfo,
sal_Bool bNew=sal_True); //add for SwIndexMarkFloatDlg
- virtual AbstractMarkFloatDlg* CreateAuthMarkFloatDlg( int nResId,
+ virtual AbstractMarkFloatDlg* CreateAuthMarkFloatDlg(
SfxBindings* pBindings,
SfxChildWindow* pChild,
Window *pParent,
diff --git a/sw/source/ui/inc/app.hrc b/sw/source/ui/inc/app.hrc
index 565fa38..9131ac5 100644
--- a/sw/source/ui/inc/app.hrc
+++ b/sw/source/ui/inc/app.hrc
@@ -115,8 +115,10 @@
#define STR_COL (RC_APP_BEGIN + 127)
#define STR_ROW (RC_APP_BEGIN + 128)
#define STR_SIMPLE (RC_APP_BEGIN + 129)
+#define STR_AUTHMRK_EDIT (RC_APP_BEGIN + 130)
+#define STR_AUTHMRK_INSERT (RC_APP_BEGIN + 131)
-#define APP_ACT_END STR_SIMPLE
+#define APP_ACT_END STR_AUTHMRK_INSERT
#if APP_ACT_END > RC_APP_END
#error Resource-Id Ueberlauf in #file, #line
diff --git a/sw/source/ui/inc/swuiidxmrk.hxx b/sw/source/ui/inc/swuiidxmrk.hxx
index 82125c9..d57c153 100644
--- a/sw/source/ui/inc/swuiidxmrk.hxx
+++ b/sw/source/ui/inc/swuiidxmrk.hxx
@@ -189,34 +189,29 @@ public:
class SwAuthMarkModalDlg;
-class SwAuthMarkDlg : public Window
+class SwAuthorMarkPane
{
+ Dialog& m_rDialog;
+
static sal_Bool bIsFromComponent;
friend class SwAuthMarkModalDlg;
friend class SwAuthMarkFloatDlg;
- RadioButton aFromComponentRB;
- RadioButton aFromDocContentRB;
- FixedText aAuthorFT;
- FixedInfo aAuthorFI;
- FixedText aTitleFT;
- FixedInfo aTitleFI;
- FixedText aEntryFT;
- Edit aEntryED;
- ListBox aEntryLB;
+ RadioButton* m_pFromComponentRB;
+ RadioButton* m_pFromDocContentRB;
+ FixedText* m_pAuthorFI;
+ FixedText* m_pTitleFI;
+ Edit* m_pEntryED;
+ ListBox* m_pEntryLB;
- FixedLine aEntryFL;
+ PushButton* m_pActionBT;
+ PushButton* m_pCloseBT;
+ PushButton* m_pCreateEntryPB;
+ PushButton* m_pEditEntryPB;
- OKButton aOKBT;
- CancelButton aCancelBT;
- HelpButton aHelpBT;
- PushButton aCreateEntryPB;
- PushButton aEditEntryPB;
-
- String sChangeST;
- sal_Bool bNewEntry;
- sal_Bool bBibAccessInitialized;
+ sal_Bool bNewEntry;
+ sal_Bool bBibAccessInitialized;
SwWrtShell* pSh;
@@ -236,20 +231,18 @@ class SwAuthMarkDlg : public Window
DECL_LINK(EditModifyHdl, Edit*);
void InitControls();
- virtual void Activate();
+ void Activate();
public:
- SwAuthMarkDlg( Window *pParent,
- const ResId& rResId,
+ SwAuthorMarkPane( Dialog &rDialog,
sal_Bool bNew=sal_True);
- ~SwAuthMarkDlg();
void ReInitDlg(SwWrtShell& rWrtShell);
};
class SwAuthMarkFloatDlg : public SfxModelessDialog
{
- SwAuthMarkDlg aDlg;
+ SwAuthorMarkPane m_aContent;
virtual void Activate();
public:
SwAuthMarkFloatDlg( SfxBindings* pBindings,
@@ -262,7 +255,7 @@ class SwAuthMarkFloatDlg : public SfxModelessDialog
class SwAuthMarkModalDlg : public SvxStandardDialog
{
- SwAuthMarkDlg aDlg;
+ SwAuthorMarkPane m_aContent;
public:
SwAuthMarkModalDlg(Window *pParent, SwWrtShell& rSh);
diff --git a/sw/source/ui/index/idxmrk.cxx b/sw/source/ui/index/idxmrk.cxx
index 2784c07..55bc96d 100644
--- a/sw/source/ui/index/idxmrk.cxx
+++ b/sw/source/ui/index/idxmrk.cxx
@@ -102,7 +102,7 @@ SwInsertAuthMarkWrapper::SwInsertAuthMarkWrapper( Window *pParentWindow,
{
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!");
- pAbstDlg = pFact->CreateAuthMarkFloatDlg( DLG_INSAUTHMARK, pBindings, this, pParentWindow, pInfo );
+ pAbstDlg = pFact->CreateAuthMarkFloatDlg(pBindings, this, pParentWindow, pInfo);
OSL_ENSURE(pAbstDlg, "Dialogdiet fail!");
pWindow = pAbstDlg->GetWindow();
diff --git a/sw/source/ui/index/idxmrk.src b/sw/source/ui/index/idxmrk.src
index 12577d5..3263796 100644
--- a/sw/source/ui/index/idxmrk.src
+++ b/sw/source/ui/index/idxmrk.src
@@ -438,145 +438,12 @@ String STR_IDXMRK_EDIT
{
Text [ en-US ] = "Edit Index Entry" ;
};
+
String STR_IDXMRK_INSERT
{
Text [ en-US ] = "Insert Index Entry" ;
};
-#define AUTH_DIALOG_WINDOW \
- Window WIN_DLG \
- { \
- Pos = MAP_APPFONT ( 0 , 0 ) ; \
- Size = MAP_APPFONT ( 218 , 118 + RADIO_BUTTON_HEIGHT) ; \
- RadioButton RB_FROMCOMPONENT \
- { \
- Pos = MAP_APPFONT ( 12 , 14 ) ; \
- Size = MAP_APPFONT ( 147 , 12 ) ; \
- Text [ en-US ] = "From bibliography ~database";\
- }; \
- RadioButton RB_FROMDOCCONTENT \
- { \
- Pos = MAP_APPFONT ( 12, 29 ) ; \
- Size = MAP_APPFONT ( 147 , 12 ) ; \
- Text [ en-US ] = "~From document content";\
- }; \
- FixedText FT_AUTHOR \
- { \
- Pos = MAP_APPFONT ( 12 , 14 + RADIO_BUTTON_HEIGHT) ; \
- Size = MAP_APPFONT ( 60 , 8 ) ; \
- Text [ en-US ] = "Author";\
- }; \
- FixedText FI_AUTHOR \
- { \
- Pos = MAP_APPFONT ( 12 , 25 + RADIO_BUTTON_HEIGHT) ; \
- Size = MAP_APPFONT ( 140, 8 ) ; \
- WordBreak = TRUE; \
- }; \
- FixedText FT_TITLE \
- { \
- Pos = MAP_APPFONT ( 12 , 37 + RADIO_BUTTON_HEIGHT) ; \
- Size = MAP_APPFONT ( 60 , 8 ) ; \
- Text [ en-US ] = "Title";\
- }; \
- FixedText FI_TITLE \
- { \
- Pos = MAP_APPFONT ( 12 , 48 + RADIO_BUTTON_HEIGHT) ; \
- Size = MAP_APPFONT ( 140, 8 ) ; \
- WordBreak = TRUE; \
- }; \
- FixedText FT_ENTRY \
- { \
- Pos = MAP_APPFONT ( 12 , 62 + RADIO_BUTTON_HEIGHT) ; \
- Size = MAP_APPFONT ( 60 , 8 ) ; \
- Text [ en-US ] = "Short ~name";\
- }; \
- Edit ED_ENTRY \
- { \
- Border = TRUE ; \
- Pos = MAP_APPFONT ( 12 , 73 + RADIO_BUTTON_HEIGHT) ; \
- Size = MAP_APPFONT ( 140 , 12 ) ; \
- TabStop = TRUE ; \
- Left = TRUE ; \
- }; \
- ListBox LB_ENTRY \
- { \
- Border = TRUE ; \
- Pos = MAP_APPFONT ( 12 , 73 + RADIO_BUTTON_HEIGHT) ; \
- Size = MAP_APPFONT ( 140 , 50 ) ; \
- TabStop = TRUE ; \
- DropDown = TRUE ; \
- }; \
- FixedLine FL_ENTRY \
- { \
- Pos = MAP_APPFONT ( 6 , 3 ) ; \
- Size = MAP_APPFONT ( 146 , 8 ) ; \
- Text [ en-US ] = "Entry";\
- }; \
- OKButton PB_OK \
- { \
- Pos = MAP_APPFONT ( 162 , 6 ) ; \
- Size = MAP_APPFONT ( 50 , 14 ) ; \
- TabStop = TRUE ; \
- DefButton = TRUE ; \
- Text [ en-US ] = "Insert";\
- }; \
- CancelButton PB_CANCEL \
- { \
- Pos = MAP_APPFONT ( 162 , 23 ) ; \
- Size = MAP_APPFONT ( 50 , 14 ) ; \
- Text [ en-US ] = "Close";\
- }; \
- HelpButton PB_HELP \
- { \
- Pos = MAP_APPFONT ( 162 , 43 ) ; \
- Size = MAP_APPFONT ( 50 , 14 ) ; \
- }; \
- PushButton PB_CREATEENTRY \
- { \
- Pos = MAP_APPFONT ( 162 , 60 ) ; \
- Size = MAP_APPFONT ( 50 , 14 ) ; \
- Text [ en-US ] = "~New";\
- }; \
- PushButton PB_EDITENTRY \
- { \
- Pos = MAP_APPFONT ( 162 , 77 ) ; \
- Size = MAP_APPFONT ( 50 , 14 ) ; \
- Text [ en-US ] = "Edit";\
- }; \
- String ST_CHANGE \
- { \
- Text [ en-US ] = "Modify";\
- }; \
- };
-
-ModalDialog DLG_EDIT_AUTHMARK
-{
- OutputSize = TRUE ;
- Moveable = TRUE ;
- Closeable = TRUE ;
- Sizeable = FALSE ;
- HelpId = CMD_FN_EDIT_AUTH_ENTRY_DLG;
- SVLook = TRUE ;
- Size = MAP_APPFONT ( 218 , 118 ) ;
- #define RADIO_BUTTON_HEIGHT 0
- AUTH_DIALOG_WINDOW
- #undef RADIO_BUTTON_HEIGHT
-};
-ModelessDialog DLG_INSAUTHMARK
-{
- OutputSize = TRUE ;
- Moveable = TRUE ;
- Closeable = TRUE ;
- Sizeable = FALSE ;
-// Zoomable = TRUE ;
- HelpId = CMD_FN_INSERT_AUTH_ENTRY_DLG;
- SVLook = TRUE ;
- #define RADIO_BUTTON_HEIGHT 30
- Size = MAP_APPFONT ( 218 , 118 + RADIO_BUTTON_HEIGHT) ;
-// Moveable = TRUE ;
- AUTH_DIALOG_WINDOW
- #undef RADIO_BUTTON_HEIGHT
-};
ModalDialog DLG_CREATE_AUTH_ENTRY
{
HelpId = HID_DLG_CREATE_AUTH_ENTRY;
@@ -609,16 +476,7 @@ ModalDialog DLG_CREATE_AUTH_ENTRY
};
Text [ en-US ] = "Define Bibliography Entry";
};
-String STR_AUTHMRK_EDIT
-{
- Text [ en-US ] = "Edit Bibliography Entry";
-};
-String STR_AUTHMRK_INSERT
-{
-
- Text [ en-US ] = "Insert Bibliography Entry";
-};
QueryBox DLG_CHANGE_AUTH_ENTRY
{
BUTTONS = WB_YES_NO ;
diff --git a/sw/source/ui/index/swuiidxmrk.cxx b/sw/source/ui/index/swuiidxmrk.cxx
index 92f3a8b..30c9fb9 100644
--- a/sw/source/ui/index/swuiidxmrk.cxx
+++ b/sw/source/ui/index/swuiidxmrk.cxx
@@ -53,6 +53,7 @@
#include <multmrk.hxx>
#include <swundo.hxx> // for Undo-Ids
#include <cmdid.h>
+#include <app.hrc>
#include <index.hrc>
#include <idxmrk.hrc>
#include <swmodule.hxx>
@@ -1161,89 +1162,58 @@ static const TextInfo aTextInfoArr[] =
{AUTH_FIELD_CUSTOM5, HID_AUTH_FIELD_CUSTOM5 }
};
-sal_Bool SwAuthMarkDlg::bIsFromComponent = sal_True;
+sal_Bool SwAuthorMarkPane::bIsFromComponent = sal_True;
-SwAuthMarkDlg::SwAuthMarkDlg( Window *pParent,
- const ResId& rResId,
- sal_Bool bNewDlg) :
- Window(pParent, rResId),
- aFromComponentRB( this, ResId(RB_FROMCOMPONENT, *rResId.GetResMgr() )),
- aFromDocContentRB( this, ResId(RB_FROMDOCCONTENT, *rResId.GetResMgr() )),
-
- aAuthorFT( this, ResId(FT_AUTHOR, *rResId.GetResMgr() )),
- aAuthorFI( this, ResId(FI_AUTHOR, *rResId.GetResMgr() )),
- aTitleFT( this, ResId(FT_TITLE, *rResId.GetResMgr() )),
- aTitleFI( this, ResId(FI_TITLE, *rResId.GetResMgr() )),
- aEntryFT( this, ResId(FT_ENTRY, *rResId.GetResMgr() )),
- aEntryED( this, ResId(ED_ENTRY, *rResId.GetResMgr() )),
- aEntryLB( this, ResId(LB_ENTRY, *rResId.GetResMgr() )),
-
- aEntryFL( this, ResId(FL_ENTRY, *rResId.GetResMgr() )),
-
- aOKBT( this, ResId(PB_OK, *rResId.GetResMgr() )),
- aCancelBT( this, ResId(PB_CANCEL, *rResId.GetResMgr() )),
- aHelpBT( this, ResId(PB_HELP, *rResId.GetResMgr() )),
- aCreateEntryPB(this,ResId(PB_CREATEENTRY, *rResId.GetResMgr())),
- aEditEntryPB(this, ResId(PB_EDITENTRY, *rResId.GetResMgr())),
-
- sChangeST( ResId(ST_CHANGE, *rResId.GetResMgr())),
- bNewEntry(bNewDlg),
- bBibAccessInitialized(sal_False),
-
- pSh(0)
+SwAuthorMarkPane::SwAuthorMarkPane(Dialog &rDialog, sal_Bool bNewDlg)
+ : m_rDialog(rDialog)
+ , bNewEntry(bNewDlg)
+ , bBibAccessInitialized(sal_False)
+ , pSh(0)
{
- SetStyle(GetStyle()|WB_DIALOGCONTROL);
- FreeResource();
-
- aFromComponentRB.SetHelpId(HID_AUTH_MARK_DLG_FROM_COMP_RB);
- aFromDocContentRB.SetHelpId(HID_AUTH_MARK_DLG_FROM_DOC_RB );
- aEntryED.SetHelpId(HID_AUTH_MARK_DLG_ID_LISTBOX );
- aEntryLB.SetHelpId(HID_AUTH_MARK_DLG_ID_LISTBOX );
-
- aFromComponentRB.Show(bNewEntry);
- aFromDocContentRB.Show(bNewEntry);
- aFromComponentRB.Check(bIsFromComponent);
- aFromDocContentRB.Check(!bIsFromComponent);
-
- aOKBT .SetHelpId(HID_INSERT_AUTH_MRK_OK );
- aCancelBT .SetHelpId(HID_INSERT_AUTH_MRK_CLOSE);
- aEntryED .SetHelpId(HID_INSERT_AUTH_MRK_ENTRY );
- aCreateEntryPB .SetHelpId(HID_INSERT_AUTH_MRK_CREATE_ENTRY );
- aEditEntryPB .SetHelpId(HID_INSERT_AUTH_MRK_EDIT_ENTRY );
-
- aOKBT.SetClickHdl(LINK(this,SwAuthMarkDlg, InsertHdl));
- aCancelBT.SetClickHdl(LINK(this,SwAuthMarkDlg, CloseHdl));
- aCreateEntryPB.SetClickHdl(LINK(this,SwAuthMarkDlg, CreateEntryHdl));
- aEditEntryPB.SetClickHdl(LINK(this,SwAuthMarkDlg, CreateEntryHdl));
- aFromComponentRB.SetClickHdl(LINK(this,SwAuthMarkDlg, ChangeSourceHdl));
- aFromDocContentRB.SetClickHdl(LINK(this,SwAuthMarkDlg, ChangeSourceHdl));
- aEntryED.SetModifyHdl(LINK(this,SwAuthMarkDlg, EditModifyHdl));
-
- GetParent()->SetText(String(SW_RES(
- bNewEntry ? STR_AUTHMRK_INSERT : STR_AUTHMRK_EDIT)));
- aEntryED.Show(!bNewEntry);
- aEntryLB.Show(bNewEntry);
- if(!bNewEntry)
- {
- aOKBT.SetText(sChangeST);
- }
- else
+ m_rDialog.get(m_pFromComponentRB, "frombibliography");
+ m_rDialog.get(m_pFromDocContentRB, "fromdocument");
+ m_rDialog.get(m_pAuthorFI, "author");
+ m_rDialog.get(m_pTitleFI, "title");
+ m_rDialog.get(m_pEntryED, "entryed");
+ m_rDialog.get(m_pEntryLB, "entrylb");
+ m_rDialog.get(m_pActionBT,
+ bNewEntry ? OString("insert") : OString("modify"));
+ m_pActionBT->Show(true);
+ m_rDialog.get(m_pCloseBT, "close");
+ m_rDialog.get(m_pCreateEntryPB, "new");
+ m_rDialog.get(m_pEditEntryPB, "edit");
+
+ m_pFromComponentRB->Show(bNewEntry);
+ m_pFromDocContentRB->Show(bNewEntry);
+ m_pFromComponentRB->Check(bIsFromComponent);
+ m_pFromDocContentRB->Check(!bIsFromComponent);
+
+ m_pActionBT->SetClickHdl(LINK(this,SwAuthorMarkPane, InsertHdl));
+ m_pCloseBT->SetClickHdl(LINK(this,SwAuthorMarkPane, CloseHdl));
+ m_pCreateEntryPB->SetClickHdl(LINK(this,SwAuthorMarkPane, CreateEntryHdl));
+ m_pEditEntryPB->SetClickHdl(LINK(this,SwAuthorMarkPane, CreateEntryHdl));
+ m_pFromComponentRB->SetClickHdl(LINK(this,SwAuthorMarkPane, ChangeSourceHdl));
+ m_pFromDocContentRB->SetClickHdl(LINK(this,SwAuthorMarkPane, ChangeSourceHdl));
+ m_pEntryED->SetModifyHdl(LINK(this,SwAuthorMarkPane, EditModifyHdl));
+
+ m_rDialog.SetText(SW_RESSTR(
+ bNewEntry ? STR_AUTHMRK_INSERT : STR_AUTHMRK_EDIT));
+
+ m_pEntryED->Show(!bNewEntry);
+ m_pEntryLB->Show(bNewEntry);
+ if(bNewEntry)
{
- aEntryLB.SetSelectHdl(LINK(this, SwAuthMarkDlg, CompEntryHdl));
+ m_pEntryLB->SetSelectHdl(LINK(this, SwAuthorMarkPane, CompEntryHdl));
}
}
-SwAuthMarkDlg::~SwAuthMarkDlg()
-{
-}
-
-void SwAuthMarkDlg::ReInitDlg(SwWrtShell& rWrtShell)
+void SwAuthorMarkPane::ReInitDlg(SwWrtShell& rWrtShell)
{
pSh = &rWrtShell;
InitControls();
}
-IMPL_LINK_NOARG(SwAuthMarkDlg, CloseHdl)
+IMPL_LINK_NOARG(SwAuthorMarkPane, CloseHdl)
{
if(bNewEntry)
{
@@ -1253,7 +1223,7 @@ IMPL_LINK_NOARG(SwAuthMarkDlg, CloseHdl)
}
else
{
- ((SwAuthMarkModalDlg*)GetParent())->EndDialog(RET_CANCEL);
+ m_rDialog.EndDialog(RET_CANCEL);
}
return 0;
}
@@ -1275,7 +1245,7 @@ static String lcl_FindColumnEntry(const beans::PropertyValue* pFields, sal_Int32
return sRet;
}
-IMPL_LINK( SwAuthMarkDlg, CompEntryHdl, ListBox*, pBox)
+IMPL_LINK( SwAuthorMarkPane, CompEntryHdl, ListBox*, pBox)
{
String sEntry(pBox->GetSelectEntry());
if(bIsFromComponent)
@@ -1316,12 +1286,12 @@ IMPL_LINK( SwAuthMarkDlg, CompEntryHdl, ListBox*, pBox)
for(sal_uInt16 i = 0; i < AUTH_FIELD_END; i++)
m_sFields[i] = aEmptyStr;
}
- aAuthorFI.SetText(m_sFields[AUTH_FIELD_AUTHOR]);
- aTitleFI.SetText(m_sFields[AUTH_FIELD_TITLE]);
+ m_pAuthorFI->SetText(m_sFields[AUTH_FIELD_AUTHOR]);
+ m_pTitleFI->SetText(m_sFields[AUTH_FIELD_TITLE]);
return 0;
}
-IMPL_LINK_NOARG(SwAuthMarkDlg, InsertHdl)
+IMPL_LINK_NOARG(SwAuthorMarkPane, InsertHdl)
{
//insert or update the SwAuthorityField...
if(pSh)
@@ -1341,7 +1311,7 @@ IMPL_LINK_NOARG(SwAuthMarkDlg, InsertHdl)
bDifferent |= m_sFields[i] != pEntry->GetAuthorField((ToxAuthorityField)i);
if(bDifferent)
{
- QueryBox aQuery(this, SW_RES(DLG_CHANGE_AUTH_ENTRY));
+ QueryBox aQuery(&m_rDialog, SW_RES(DLG_CHANGE_AUTH_ENTRY));
if(RET_YES != aQuery.Execute())
return 0;
}
@@ -1376,9 +1346,9 @@ IMPL_LINK_NOARG(SwAuthMarkDlg, InsertHdl)
return 0;
}
-IMPL_LINK(SwAuthMarkDlg, CreateEntryHdl, PushButton*, pButton)
+IMPL_LINK(SwAuthorMarkPane, CreateEntryHdl, PushButton*, pButton)
{
- sal_Bool bCreate = pButton == &aCreateEntryPB;
+ sal_Bool bCreate = pButton == m_pCreateEntryPB;
String sOldId = m_sCreatedEntry[0];
for(sal_uInt16 i = 0; i < AUTH_FIELD_END; i++)
m_sCreatedEntry[i] = bCreate ? aEmptyStr : m_sFields[i];
@@ -1387,46 +1357,46 @@ IMPL_LINK(SwAuthMarkDlg, CreateEntryHdl, PushButton*, pButton)
*pSh, bNewEntry, bCreate);
if(bNewEntry)
{
- aDlg.SetCheckNameHdl(LINK(this, SwAuthMarkDlg, IsEntryAllowedHdl));
+ aDlg.SetCheckNameHdl(LINK(this, SwAuthorMarkPane, IsEntryAllowedHdl));
}
if(RET_OK == aDlg.Execute())
{
if(bCreate && sOldId.Len())
{
- aEntryLB.RemoveEntry(sOldId);
+ m_pEntryLB->RemoveEntry(sOldId);
}
for(sal_uInt16 i = 0; i < AUTH_FIELD_END; i++)
{
m_sFields[i] = aDlg.GetEntryText((ToxAuthorityField)i);
m_sCreatedEntry[i] = m_sFields[i];
}
- if(bNewEntry && !aFromDocContentRB.IsChecked())
+ if(bNewEntry && !m_pFromDocContentRB->IsChecked())
{
- aFromDocContentRB.Check(sal_True);
- ChangeSourceHdl(&aFromDocContentRB);
+ m_pFromDocContentRB->Check(sal_True);
+ ChangeSourceHdl(m_pFromDocContentRB);
}
if(bCreate)
{
OSL_ENSURE(LISTBOX_ENTRY_NOTFOUND ==
- aEntryLB.GetEntryPos(m_sFields[AUTH_FIELD_IDENTIFIER]),
+ m_pEntryLB->GetEntryPos(m_sFields[AUTH_FIELD_IDENTIFIER]),
"entry exists!");
- aEntryLB.InsertEntry(m_sFields[AUTH_FIELD_IDENTIFIER]);
- aEntryLB.SelectEntry(m_sFields[AUTH_FIELD_IDENTIFIER]);
+ m_pEntryLB->InsertEntry(m_sFields[AUTH_FIELD_IDENTIFIER]);
+ m_pEntryLB->SelectEntry(m_sFields[AUTH_FIELD_IDENTIFIER]);
}
- aEntryED.SetText(m_sFields[AUTH_FIELD_IDENTIFIER]);
- aAuthorFI.SetText(m_sFields[AUTH_FIELD_AUTHOR]);
- aTitleFI.SetText(m_sFields[AUTH_FIELD_TITLE]);
- aOKBT.Enable();
+ m_pEntryED->SetText(m_sFields[AUTH_FIELD_IDENTIFIER]);
+ m_pAuthorFI->SetText(m_sFields[AUTH_FIELD_AUTHOR]);
+ m_pTitleFI->SetText(m_sFields[AUTH_FIELD_TITLE]);
+ m_pActionBT->Enable();
}
return 0;
}
-IMPL_LINK(SwAuthMarkDlg, ChangeSourceHdl, RadioButton*, pButton)
+IMPL_LINK(SwAuthorMarkPane, ChangeSourceHdl, RadioButton*, pButton)
{
- sal_Bool bFromComp = (pButton == &aFromComponentRB);
+ sal_Bool bFromComp = (pButton == m_pFromComponentRB);
bIsFromComponent = bFromComp;
- aCreateEntryPB.Enable(!bIsFromComponent);
- aEntryLB.Clear();
+ m_pCreateEntryPB->Enable(!bIsFromComponent);
+ m_pEntryLB->Clear();
if(bIsFromComponent)
{
if(!bBibAccessInitialized)
@@ -1462,7 +1432,7 @@ IMPL_LINK(SwAuthMarkDlg, ChangeSourceHdl, RadioButton*, pButton)
const OUString* pNames = aIdentifiers.getConstArray();
for(sal_uInt16 i = 0; i < aIdentifiers.getLength(); i++)
{
- aEntryLB.InsertEntry(pNames[i]);
+ m_pEntryLB->InsertEntry(pNames[i]);
}
}
}
@@ -1475,21 +1445,21 @@ IMPL_LINK(SwAuthMarkDlg, ChangeSourceHdl, RadioButton*, pButton)
std::vector<String> aIds;
pFType->GetAllEntryIdentifiers( aIds );
for(size_t n = 0; n < aIds.size(); ++n)
- aEntryLB.InsertEntry(aIds[n]);
+ m_pEntryLB->InsertEntry(aIds[n]);
}
if(m_sCreatedEntry[AUTH_FIELD_IDENTIFIER].Len())
- aEntryLB.InsertEntry(m_sCreatedEntry[AUTH_FIELD_IDENTIFIER]);
+ m_pEntryLB->InsertEntry(m_sCreatedEntry[AUTH_FIELD_IDENTIFIER]);
}
- aEntryLB.SelectEntryPos(0);
- CompEntryHdl(&aEntryLB);
+ m_pEntryLB->SelectEntryPos(0);
+ CompEntryHdl(m_pEntryLB);
return 0;
}
-IMPL_LINK(SwAuthMarkDlg, EditModifyHdl, Edit*, pEdit)
+IMPL_LINK(SwAuthorMarkPane, EditModifyHdl, Edit*, pEdit)
{
- Link aAllowed = LINK(this, SwAuthMarkDlg, IsEntryAllowedHdl);
+ Link aAllowed = LINK(this, SwAuthorMarkPane, IsEntryAllowedHdl);
long nResult = aAllowed.Call(pEdit);
- aOKBT.Enable(nResult > 0);
+ m_pActionBT->Enable(nResult > 0);
if(nResult)
{
String sEntry(pEdit->GetText());
@@ -1499,13 +1469,13 @@ IMPL_LINK(SwAuthMarkDlg, EditModifyHdl, Edit*, pEdit)
return 0;
};
-IMPL_LINK(SwAuthMarkDlg, IsEntryAllowedHdl, Edit*, pEdit)
+IMPL_LINK(SwAuthorMarkPane, IsEntryAllowedHdl, Edit*, pEdit)
{
String sEntry = pEdit->GetText();
sal_Bool bAllowed = sal_False;
if(sEntry.Len())
{
- if(aEntryLB.GetEntryPos(sEntry) != LISTBOX_ENTRY_NOTFOUND)
+ if(m_pEntryLB->GetEntryPos(sEntry) != LISTBOX_ENTRY_NOTFOUND)
return 0;
else if(bIsFromComponent)
{
@@ -1521,16 +1491,16 @@ IMPL_LINK(SwAuthMarkDlg, IsEntryAllowedHdl, Edit*, pEdit)
return bAllowed;
}
-void SwAuthMarkDlg::InitControls()
+void SwAuthorMarkPane::InitControls()
{
OSL_ENSURE(pSh, "no shell?");
SwField* pField = pSh->GetCurFld();
OSL_ENSURE(bNewEntry || pField, "no current marker");
if(bNewEntry)
{
- ChangeSourceHdl(aFromComponentRB.IsChecked() ? &aFromComponentRB : &aFromDocContentRB);
- aCreateEntryPB.Enable(!aFromComponentRB.IsChecked());
- if(!aFromComponentRB.IsChecked() && m_sCreatedEntry[0].Len())
+ ChangeSourceHdl(m_pFromComponentRB->IsChecked() ? m_pFromComponentRB : m_pFromDocContentRB);
+ m_pCreateEntryPB->Enable(!m_pFromComponentRB->IsChecked());
+ if(!m_pFromComponentRB->IsChecked() && m_sCreatedEntry[0].Len())
for(sal_uInt16 i = 0; i < AUTH_FIELD_END; i++)
m_sFields[i] = m_sCreatedEntry[i];
}
@@ -1546,15 +1516,14 @@ void SwAuthMarkDlg::InitControls()
for(sal_uInt16 i = 0; i < AUTH_FIELD_END; i++)
m_sFields[i] = pEntry->GetAuthorField((ToxAuthorityField)i);
- aEntryED.SetText(pEntry->GetAuthorField(AUTH_FIELD_IDENTIFIER));
- aAuthorFI.SetText(pEntry->GetAuthorField(AUTH_FIELD_AUTHOR));
- aTitleFI.SetText(pEntry->GetAuthorField(AUTH_FIELD_TITLE));
+ m_pEntryED->SetText(pEntry->GetAuthorField(AUTH_FIELD_IDENTIFIER));
+ m_pAuthorFI->SetText(pEntry->GetAuthorField(AUTH_FIELD_AUTHOR));
+ m_pTitleFI->SetText(pEntry->GetAuthorField(AUTH_FIELD_TITLE));
}
-void SwAuthMarkDlg::Activate()
+void SwAuthorMarkPane::Activate()
{
- aOKBT.Enable(!pSh->HasReadonlySel());
- Window::Activate();
+ m_pActionBT->Enable(!pSh->HasReadonlySel());
}
SwCreateAuthEntryDlg_Impl::SwCreateAuthEntryDlg_Impl(Window* pParent,
@@ -1795,39 +1764,39 @@ SwAuthMarkFloatDlg::SwAuthMarkFloatDlg(SfxBindings* _pBindings,
SfxChildWindow* pChild,
Window *pParent,
SfxChildWinInfo* pInfo,
- sal_Bool bNew) :
- SfxModelessDialog(_pBindings, pChild, pParent, SW_RES(DLG_INSAUTHMARK)),
- aDlg(this, SW_RES(WIN_DLG), bNew)
+ sal_Bool bNew)
+ : SfxModelessDialog(_pBindings, pChild, pParent,
+ "BibliographyEntyDialog", "modules/swriter/ui/bibliographyentry.ui")
+ , m_aContent(*this, bNew)
{
- FreeResource();
Initialize(pInfo);
SwWrtShell* pWrtShell = ::GetActiveWrtShell();
OSL_ENSURE(pWrtShell, "No shell?");
- aDlg.ReInitDlg(*pWrtShell);
+ m_aContent.ReInitDlg(*pWrtShell);
}
-void SwAuthMarkFloatDlg::Activate()
+void SwAuthMarkFloatDlg::Activate()
{
SfxModelessDialog::Activate();
- aDlg.Activate();
+ m_aContent.Activate();
}
void SwAuthMarkFloatDlg::ReInitDlg(SwWrtShell& rWrtShell)
{
- aDlg.ReInitDlg( rWrtShell );
+ m_aContent.ReInitDlg( rWrtShell );
}
-SwAuthMarkModalDlg::SwAuthMarkModalDlg(Window *pParent, SwWrtShell& rSh) :
- SvxStandardDialog(pParent, SW_RES(DLG_EDIT_AUTHMARK)),
- aDlg(this, SW_RES(WIN_DLG), sal_False)
+SwAuthMarkModalDlg::SwAuthMarkModalDlg(Window *pParent, SwWrtShell& rSh)
+ : SvxStandardDialog(pParent, "BibliographyEntyDialog",
+ "modules/swriter/ui/bibliographyentry.ui")
+ , m_aContent(*this, sal_False)
{
- FreeResource();
- aDlg.ReInitDlg(rSh);
+ m_aContent.ReInitDlg(rSh);
}
-void SwAuthMarkModalDlg::Apply()
+void SwAuthMarkModalDlg::Apply()
{
- aDlg.InsertHdl(0);
+ m_aContent.InsertHdl(0);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/uiconfig/swriter/ui/bibliographyentry.ui b/sw/uiconfig/swriter/ui/bibliographyentry.ui
new file mode 100644
index 0000000..b6fa080
--- /dev/null
+++ b/sw/uiconfig/swriter/ui/bibliographyentry.ui
@@ -0,0 +1,304 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+ <!-- interface-requires gtk+ 3.0 -->
+ <object class="GtkDialog" id="BibliographyEntyDialog">
+ <property name="can_focus">False</property>
+ <property name="border_width">5</property>
+ <property name="title" translatable="yes">Insert Bibliography Entry</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="spacing">2</property>
+ <child internal-child="action_area">
+ <object class="GtkButtonBox" id="dialog-action_area1">
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <property name="layout_style">start</property>
+ <child>
+ <object class="GtkButton" id="insert">
+ <property name="label">Insert</property>
+ <property name="use_action_appearance">False</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="no_show_all">True</property>
+ <property name="use_action_appearance">False</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="modify">
+ <property name="label" translatable="yes">Modify</property>
+ <property name="use_action_appearance">False</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="no_show_all">True</property>
+ <property name="use_action_appearance">False</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="close">
+ <property name="label">gtk-close</property>
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_action_appearance">False</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>
+ <child>
+ <object class="GtkButton" id="help">
+ <property name="label">gtk-help</property>
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_action_appearance">False</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="new">
+ <property name="label">gtk-new</property>
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_action_appearance">False</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>
+ <child>
+ <object class="GtkButton" id="edit">
+ <property name="label">gtk-edit</property>
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_action_appearance">False</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">5</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="left_padding">12</property>
+ <child>
+ <object class="GtkGrid" id="grid1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="row_spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="label2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="margin_top">12</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Author</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="GtkLabel" id="label3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Title</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="author">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="width_chars">60</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="GtkLabel" id="label5">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Short name</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">6</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="title">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</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="GtkComboBox" id="entrylb">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">7</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="frombibliography">
+ <property name="label" translatable="yes">From bibliography database</property>
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
+ <property name="xalign">0</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">fromdocument</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="GtkRadioButton" id="fromdocument">
+ <property name="label" translatable="yes">From document content</property>
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">frombibliography</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="entryed">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">â—</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">8</property>
+ <property name="width">1</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"><b>Entry</b></property>
+ <property name="use_markup">True</property>
+ </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">insert</action-widget>
+ <action-widget response="0">modify</action-widget>
+ <action-widget response="0">close</action-widget>
+ <action-widget response="0">help</action-widget>
+ <action-widget response="0">new</action-widget>
+ <action-widget response="0">edit</action-widget>
+ </action-widgets>
+ </object>
+</interface>
commit 17d08d421e3d6ef48f8ad2b94537143aaf3a5ebb
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Oct 19 18:20:02 2012 +0100
use correct deferred parent window
Change-Id: Id9d56d9f014cee216f1478d764082b97ddd30b01
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index 7a17f0f..41b5b74 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -520,19 +520,19 @@ void Dialog::doDeferredInit(bool bResizable)
Dialog::Dialog(Window* pParent, const rtl::OString& rID, const rtl::OUString& rUIXMLDescription)
: SystemWindow( WINDOW_DIALOG )
- , mpDialogParent(pParent) //will be unset in doDeferredInit
, mbIsDefferedInit(true)
{
ImplInitDialogData();
+ mpDialogParent = pParent; //will be unset in doDeferredInit
m_pUIBuilder = new VclBuilder(this, getUIRootDir(), rUIXMLDescription, rID);
}
Dialog::Dialog(Window* pParent, const rtl::OString& rID, const rtl::OUString& rUIXMLDescription, WindowType nType)
: SystemWindow( nType )
- , mpDialogParent(pParent) //will be unset in doDeferredInit
, mbIsDefferedInit(true)
{
ImplInitDialogData();
+ mpDialogParent = pParent; //will be unset in doDeferredInit
m_pUIBuilder = new VclBuilder(this, getUIRootDir(), rUIXMLDescription, rID);
}
commit e92b3a092b48494a4fdc90f62685f668f59a874b
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Oct 19 17:12:47 2012 +0100
deliberately no parent for dialog
Change-Id: Id28797b9c40694e1b43d1fdd1205833562d760b9
diff --git a/vcl/source/uipreviewer/previewer.cxx b/vcl/source/uipreviewer/previewer.cxx
index dc16a2a..0fd77ae 100644
--- a/vcl/source/uipreviewer/previewer.cxx
+++ b/vcl/source/uipreviewer/previewer.cxx
@@ -61,7 +61,7 @@ int UIPreviewApp::Main()
try
{
- Dialog *pDialog = new Dialog(NULL, WB_STDDIALOG);
+ Dialog *pDialog = new Dialog(DIALOG_NO_PARENT, WB_STDDIALOG);
{
VclBuilder aBuilder(pDialog, rtl::OUString(), uifiles[0]);
More information about the Libreoffice-commits
mailing list