[Libreoffice-commits] core.git: 2 commits - helpcontent2 sw/inc sw/source sw/uiconfig sw/UIConfig_swriter.mk
helpcontent2|2 sw/UIConfig_swriter.mk |1 sw/inc/globals.hrc | 15 -- sw/inc/helpid.h |1 sw/inc/index.hrc|1 sw/inc/swabstdlg.hxx|2 sw/source/ui/dialog/swdlgfact.cxx | 23 --- sw/source/ui/dialog/swdlgfact.hxx |2 sw/source/ui/inc/swuicnttab.hxx | 26 ++-- sw/source/ui/index/cnttab.cxx | 98 ++- sw/source/ui/index/cnttab.hrc |2 sw/source/ui/index/cnttab.src | 62 - sw/source/ui/shells/textidx.cxx |2 sw/source/ui/utlui/glbltree.cxx |2 sw/uiconfig/swriter/ui/tocdialog.ui | 233 15 files changed, 307 insertions(+), 165 deletions(-) New commits: commit 194c692a7fe4949684920eba53ab4dfcc3391895 Author: Caolán McNamara Date: Fri Aug 23 12:59:04 2013 +0100 convert toc dialog to .ui this should stop the intermittent redraw glitch and the toc dialog initially appearing shoved up against the left edge of the screen Change-Id: Id1dad162f110cd9140d2603a2b3b43ef64e703ca diff --git a/sw/UIConfig_swriter.mk b/sw/UIConfig_swriter.mk index e718dc9..030e5653 100644 --- a/sw/UIConfig_swriter.mk +++ b/sw/UIConfig_swriter.mk @@ -169,6 +169,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/swriter,\ sw/uiconfig/swriter/ui/splittable \ sw/uiconfig/swriter/ui/statisticsinfopage \ sw/uiconfig/swriter/ui/stringinput \ + sw/uiconfig/swriter/ui/tocdialog \ sw/uiconfig/swriter/ui/tocstylespage \ sw/uiconfig/swriter/ui/tablecolumnpage \ sw/uiconfig/swriter/ui/tableproperties \ diff --git a/sw/inc/globals.hrc b/sw/inc/globals.hrc index c0580cc..31e300b 100644 --- a/sw/inc/globals.hrc +++ b/sw/inc/globals.hrc @@ -117,31 +117,18 @@ // TABPAGES --- -#define TP_BACKGROUND (RC_GLOBALS_BEGIN + 11) -#define TP_BORDER (RC_GLOBALS_BEGIN + 12) -#define TP_COLUMN (RC_GLOBALS_BEGIN + 13) - #define TP_DOC_STAT (RC_GLOBALS_BEGIN + 15) // Sw-pages -#define TP_OPTTEST_PAGE (RC_GLOBALS_BEGIN + 25) #define TP_OPTPRINT_PAGE(RC_GLOBALS_BEGIN + 26) -#define TP_CONTENT_OPT (RC_GLOBALS_BEGIN + 45) -#define TP_STD_FONT (RC_GLOBALS_BEGIN + 47) - -#define TP_OPTSHDWCRSR (RC_GLOBALS_BEGIN + 70) - - -#define TP_OPTCAPTION_PAGE (RC_GLOBALS_BEGIN + 78) +#define TP_OPTCAPTION_PAGE (RC_GLOBALS_BEGIN + 77) #define DLG_SVXTEST_NUM_BULLET (RC_GLOBALS_BEGIN + 79) -#define DLG_MULTI_TOX (RC_GLOBALS_BEGIN + 89) #define TP_TOX_SELECT (RC_GLOBALS_BEGIN + 90) #define TP_TOX_ENTRY(RC_GLOBALS_BEGIN + 91) #define TP_TOX_STYLES (RC_GLOBALS_BEGIN + 92) #define DLG_ADD_IDX_STYLES (RC_GLOBALS_BEGIN + 94) -#define TP_OPTCOMPATIBILITY_PAGE(RC_GLOBALS_BEGIN + 103) //maximum: RC_GLOBALS_BEGIN + 120 diff --git a/sw/inc/helpid.h b/sw/inc/helpid.h index 88ff694..d74754a 100644 --- a/sw/inc/helpid.h +++ b/sw/inc/helpid.h @@ -129,7 +129,6 @@ #define HID_FILEDLG_SRCVIEW "SW_HID_FILEDLG_SRCVIEW" #define HID_FILEDLG_WIZDOKU "SW_HID_FILEDLG_WIZDOKU" -#define HID_MULTI_TOX_DLG "SW_HID_MULTI_TOX_DLG" #define HID_GLBLTREE_EDIT_LINK "SW_HID_GLBLTREE_EDIT_LINK" #define HID_FORMAT_NAME_OBJECT_NAME "SW_HID_FORMAT_NAME_OBJECT_NAME" diff --git a/sw/inc/index.hrc b/sw/inc/index.hrc index 99ec6e5..7797f65 100644 --- a/sw/inc/index.hrc +++ b/sw/inc/index.hrc @@ -40,6 +40,7 @@ #define STR_FILE_NOT_FOUND (RC_INDEX_BEGIN + 18) #define DLG_CHANGE_AUTH_ENTRY (RC_INDEX_BEGIN + 19) +#define STR_USER_DEFINED_INDEX (RC_INDEX_BEGIN + 20) #endif // _INDEX_HRC diff --git a/sw/inc/swabstdlg.hxx b/sw/inc/swabstdlg.hxx index c5b26d5..7a6402c 100644 --- a/sw/inc/swabstdlg.hxx +++ b/sw/inc/swabstdlg.hxx @@ -435,7 +435,7 @@ public: Window* pParent, const SfxItemSet* pSwItemSet, SwWrtShell &) = 0; //add for SwSvxNumBulletTabDialog, SwOutlineTabDialog -virtual AbstractMultiTOXTabDialog* CreateMultiTOXTabDialog( int nResId, +virtual AbstractMultiTOXTabDialog* CreateMultiTOXTabDialog( Window* pParent, const SfxItemSet& rSet, SwWrtShell &rShell, SwTOXBase* pCurTOX, sal_uInt16 nToxType = USHRT_MAX, diff --git a/sw/source/ui/dialog/swdlgfact.cxx b/sw/source/ui/
[Libreoffice-commits] core.git: 2 commits - helpcontent2 sw/inc sw/source sw/uiconfig sw/UIConfig_swriter.mk
helpcontent2 |2 sw/UIConfig_swriter.mk |1 sw/inc/helpid.h|1 sw/source/ui/inc/misc.hrc |1 sw/source/ui/misc/glossary.cxx | 79 +++- sw/source/ui/misc/glossary.hrc | 44 sw/source/ui/misc/glossary.src | 89 - sw/uiconfig/swriter/ui/renameautotextdialog.ui | 240 + 8 files changed, 275 insertions(+), 182 deletions(-) New commits: commit 1e197c5a41e45f0d0ae211518aee93339392973c Author: Caolán McNamara Date: Fri Apr 26 15:37:22 2013 +0100 convert autotext rename dialog to .ui Change-Id: I8cf878de00ede3c25163526a6863ec734b9815a9 diff --git a/sw/UIConfig_swriter.mk b/sw/UIConfig_swriter.mk index 2341919..2486c93 100644 --- a/sw/UIConfig_swriter.mk +++ b/sw/UIConfig_swriter.mk @@ -97,6 +97,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/swriter,\ sw/uiconfig/swriter/ui/previewzoomdialog \ sw/uiconfig/swriter/ui/printoptionspage \ sw/uiconfig/swriter/ui/printeroptions \ + sw/uiconfig/swriter/ui/renameautotextdialog \ sw/uiconfig/swriter/ui/renameobjectdialog \ sw/uiconfig/swriter/ui/rowheight \ sw/uiconfig/swriter/ui/sortdialog \ diff --git a/sw/inc/helpid.h b/sw/inc/helpid.h index ab344ca..4a3473c 100644 --- a/sw/inc/helpid.h +++ b/sw/inc/helpid.h @@ -309,7 +309,6 @@ #define HID_EDIT_FORMULA "SW_HID_EDIT_FORMULA" #define HID_INSERT_FILE "SW_HID_INSERT_FILE" #define HID_FORMAT_PAGE "SW_HID_FORMAT_PAGE" -#define HID_RENAME_GLOSSARY "SW_HID_RENAME_GLOSSARY" #define HID_CONFIG_MENU "SW_HID_CONFIG_MENU" #define HID_NAVIGATION_PI "SW_HID_NAVIGATION_PI" #define HID_ENVELOP_PRINT "SW_HID_ENVELOP_PRINT" diff --git a/sw/source/ui/inc/misc.hrc b/sw/source/ui/inc/misc.hrc index c8a4f7d..aa37171a 100644 --- a/sw/source/ui/inc/misc.hrc +++ b/sw/source/ui/inc/misc.hrc @@ -26,7 +26,6 @@ #define DLG_INSERT_BOOKMARK (RC_MISC_BEGIN + 17) #define DLG_NUM_NAMES (RC_MISC_BEGIN + 18) #define DLG_SORTING (RC_MISC_BEGIN + 19) -#define DLG_RENAME_GLOS (RC_MISC_BEGIN + 25) #define DLG_TAB_OUTLINE (RC_MISC_BEGIN + 31) diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx index 1e275db..3494051 100644 --- a/sw/source/ui/misc/glossary.cxx +++ b/sw/source/ui/misc/glossary.cxx @@ -64,7 +64,6 @@ #include #include #include -#include #include #include @@ -116,17 +115,11 @@ struct GroupUserData */ class SwNewGlosNameDlg : public ModalDialog { -FixedText aNNFT; -EditaNewName; -FixedText aNSFT; -NoSpaceEdit aNewShort; -OKButtonaOk; -CancelButtonaCancel; -FixedText aONFT; -EditaOldName; -FixedText aOSFT; -EditaOldShort; -FixedLine aFL; +Edit*m_pNewName; +NoSpaceEdit* m_pNewShort; +OKButton*m_pOk; +Edit*m_pOldName; +Edit*m_pOldShort; protected: DECL_LINK( Modify, Edit * ); @@ -137,34 +130,28 @@ public: const String& rOldName, const String& rOldShort ); -String GetNewName() const { return aNewName.GetText(); } -String GetNewShort() const { return aNewShort.GetText(); } +String GetNewName() const { return m_pNewName->GetText(); } +String GetNewShort() const { return m_pNewShort->GetText(); } }; SwNewGlosNameDlg::SwNewGlosNameDlg(Window* pParent, const String& rOldName, -const String& rOldShort ) : -ModalDialog( pParent, SW_RES( DLG_RENAME_GLOS ) ), -aNNFT (this, SW_RES( FT_NN)), -aNewName(this, SW_RES( ED_NN)), -aNSFT (this, SW_RES( FT_NS)), -aNewShort(this,SW_RES( ED_NS)), -aOk (this, SW_RES( BT_OKNEW)), -aCancel (this, SW_RES( BT_CANCEL)), -aONFT (this, SW_RES( FT_ON)), -aOldName(this, SW_RES( ED_ON)), -aOSFT (this, SW_RES( FT_OS)), -aOldShort(this,SW_RES( ED_OS)), -aFL(this, SW_RES( FL_NN)) - +const String& rOldShort ) +: ModalDialog(pParent, "RenameAutoTextDialog", +"modules/swriter/ui/renameautotextdialog.ui") { -FreeResource(); -aOldName.SetText( rOldName ); -aOldShort.SetText( rOldShort ); -aNewName.SetModifyHdl(LINK(this, SwNewGlosNameDlg, Modify )); -aNewShort.SetModifyHdl(LINK(this, SwNewGlosNameDlg, Modify )); -aOk.SetCl
[Libreoffice-commits] core.git: 2 commits - helpcontent2 sw/inc sw/source sw/uiconfig sw/UIConfig_swriter.mk
helpcontent2|2 sw/UIConfig_swriter.mk |1 sw/inc/helpid.h |1 sw/inc/index.hrc|1 sw/source/ui/index/idxmrk.hrc |1 sw/source/ui/index/idxmrk.src | 33 -- sw/source/ui/index/swuiidxmrk.cxx | 117 ++--- sw/uiconfig/swriter/ui/createauthorentry.ui | 347 8 files changed, 383 insertions(+), 120 deletions(-) New commits: commit b191f53860eebf12de6b7cf0a7ddea21a17382e8 Author: Caolán McNamara Date: Mon Apr 29 10:54:14 2013 +0100 convert create author entry dialog to .ui format Change-Id: Ia36b42be8f5caa93937e870467c95f47439d9c9e diff --git a/sw/UIConfig_swriter.mk b/sw/UIConfig_swriter.mk index 6a1c63c..b4bd3de 100644 --- a/sw/UIConfig_swriter.mk +++ b/sw/UIConfig_swriter.mk @@ -72,6 +72,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/swriter,\ sw/uiconfig/swriter/ui/columnpage \ sw/uiconfig/swriter/ui/columnwidth \ sw/uiconfig/swriter/ui/converttexttable \ + sw/uiconfig/swriter/ui/createauthorentry \ sw/uiconfig/swriter/ui/dropdownfielddialog \ sw/uiconfig/swriter/ui/endnotepage \ sw/uiconfig/swriter/ui/editcategories \ diff --git a/sw/inc/helpid.h b/sw/inc/helpid.h index fc5a1ca..4adc14c 100644 --- a/sw/inc/helpid.h +++ b/sw/inc/helpid.h @@ -186,7 +186,6 @@ #define HID_DLG_ADD_IDX_STYLES "SW_HID_DLG_ADD_IDX_STYLES" #define HID_ADD_STYLES_TLB "SW_HID_ADD_STYLES_TLB" #define HID_OLE_CHECKLB "SW_HID_OLE_CHECKLB" -#define HID_DLG_CREATE_AUTH_ENTRY "SW_HID_DLG_CREATE_AUTH_ENTRY" #define HID_TP_PRIVATE_DATA "SW_HID_TP_PRIVATE_DATA" #define HID_TP_BUSINESS_DATA "SW_HID_TP_BUSINESS_DATA" diff --git a/sw/inc/index.hrc b/sw/inc/index.hrc index ef5c224..c16cc54 100644 --- a/sw/inc/index.hrc +++ b/sw/inc/index.hrc @@ -33,7 +33,6 @@ #define STR_ALPHA (RC_INDEX_BEGIN + 7) #define STR_LEVEL (RC_INDEX_BEGIN + 8) -#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) diff --git a/sw/source/ui/index/idxmrk.hrc b/sw/source/ui/index/idxmrk.hrc index 86e9bca..2a748b7 100644 --- a/sw/source/ui/index/idxmrk.hrc +++ b/sw/source/ui/index/idxmrk.hrc @@ -19,7 +19,6 @@ #define PB_OK 22 #define PB_CANCEL 23 #define PB_HELP 24 -#define FL_ENTRIES 25 #define FL_NAME 37 #define FT_NAME 38 #define ED_NAME 39 diff --git a/sw/source/ui/index/idxmrk.src b/sw/source/ui/index/idxmrk.src index 3797bf8..3f78a53 100644 --- a/sw/source/ui/index/idxmrk.src +++ b/sw/source/ui/index/idxmrk.src @@ -85,39 +85,6 @@ String STR_IDXMRK_INSERT Text [ en-US ] = "Insert Index Entry" ; }; -ModalDialog DLG_CREATE_AUTH_ENTRY -{ -HelpId = HID_DLG_CREATE_AUTH_ENTRY; -OutputSize = TRUE ; -SVLook = TRUE ; -Size = MAP_APPFONT ( 365 , 203 ) ; -Moveable = TRUE ; -OKButton PB_OK -{ -Pos = MAP_APPFONT ( 312 , 6 ) ; -Size = MAP_APPFONT ( 50 , 14 ) ; -TabStop = TRUE ; -DefButton = TRUE ; -}; -CancelButton PB_CANCEL -{ -Pos = MAP_APPFONT ( 312 , 23 ) ; -Size = MAP_APPFONT ( 50 , 14 ) ; -}; -HelpButton PB_HELP -{ -Pos = MAP_APPFONT ( 312 , 43 ) ; -Size = MAP_APPFONT ( 50 , 14 ) ; -}; -FixedLine FL_ENTRIES -{ -Pos = MAP_APPFONT ( 6 , 3 ) ; -Size = MAP_APPFONT ( 300 , 8 ) ; -Text [ en-US ] = "Entry data"; -}; -Text [ en-US ] = "Define 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 79948ae..0844d5a 100644 --- a/sw/source/ui/index/swuiidxmrk.cxx +++ b/sw/source/ui/index/swuiidxmrk.cxx @@ -30,6 +30,7 @@ #include #include #include +#include #include #include #include @@ -1032,16 +1033,12 @@ void SwIndexMarkModalDlg::Apply() class SwCreateAuthEntryDlg_Impl : public ModalDialog { -FixedLine aEntriesFL; - FixedText* pFixedTexts[AUTH_FIELD_END]; ListBox*pTypeListBox; ComboBox* pIdentifierBox; Edit* pEdits[AUTH_FIELD_END]; -OKButtonaOKBT; -CancelButtonaCancelBT; -HelpButton aHelpBT; +OKButton* m_pOKBT; LinkaShortNameCheckLink; @@ -1475,77 +1472,48 @@ SwCreateAuthEntryDlg_Impl::SwCreateAuthEntryDlg_Impl(Window* pParent, const String pFields[], SwWrtShell& rSh, sal_Bool bNewEntry, -bool bCreate) : -ModalDialog(pParent, SW_RES(DLG_CREATE_AUTH_ENTRY)