diff options
| -rw-r--r-- | cui/source/dialogs/gallery.src | 77 | ||||
| -rw-r--r-- | cui/source/inc/helpid.hrc | 6 | ||||
| -rw-r--r-- | extensions/inc/extensio.hrc | 19 | ||||
| -rw-r--r-- | extensions/source/propctrlr/formhelpid.hrc | 20 |
4 files changed, 86 insertions, 36 deletions
diff --git a/cui/source/dialogs/gallery.src b/cui/source/dialogs/gallery.src index 50ea2074bf6d..e4db69f6f73d 100644 --- a/cui/source/dialogs/gallery.src +++ b/cui/source/dialogs/gallery.src @@ -31,6 +31,7 @@ #include <sfx2/sfxsids.hrc> #include "helpid.hrc" #include "gallery.hrc" +#include <svx/exthelpid.hrc> #define MASKCOLOR MaskColor = Color { Red = 0xFFFF ; Green = 0x0000 ; Blue = 0xFFFF ; }; @@ -56,6 +57,33 @@ TabDialog RID_SVXTABDLG_GALLERY /******************************************************************************/ +TabDialog RID_SVXTABDLG_GALLERYTHEME +{ + OutputSize = TRUE ; + SVLook = TRUE ; + Text [ en-US ] = "Properties of " ; + Moveable = TRUE ; + TabControl 1 + { + OutputSize = TRUE ; + PageList = + { + PageItem + { + Identifier = RID_SVXTABPAGE_GALLERY_GENERAL ; + Text [ en-US ] = "General" ; + }; + PageItem + { + Identifier = RID_SVXTABPAGE_GALLERYTHEME_FILES ; + Text [ en-US ] = "Files" ; + }; + }; + }; +}; + +/******************************************************************************/ + TabPage RID_SVXTABPAGE_GALLERY_GENERAL { HelpId = HID_GALLERY_PROPERTIES_GENERAL; @@ -215,6 +243,53 @@ TabPage RID_SVXTABPAGE_GALLERYTHEME_FILES /******************************************************************************/ +ModalDialog RID_SVXDLG_GALLERY_TITLE +{ + HelpId = HID_GALLERY_TITLE; + OutputSize = TRUE ; + Border = TRUE ; + SVLook = TRUE ; + Size = MAP_APPFONT ( 168 , 63 ) ; + Text [ en-US ] = "Enter Title" ; + Moveable = TRUE ; + + OkButton BTN_OK + { + DefButton = TRUE ; + Pos = MAP_APPFONT ( 112 , 6 ) ; + Size = MAP_APPFONT ( 50 , 14 ) ; + TabStop = TRUE ; + }; + CancelButton BTN_CANCEL + { + Pos = MAP_APPFONT ( 112 , 23 ) ; + Size = MAP_APPFONT ( 50 , 14 ) ; + TabStop = TRUE ; + }; + HelpButton BTN_HELP + { + Pos = MAP_APPFONT ( 112 , 43 ) ; + Size = MAP_APPFONT ( 50 , 14 ) ; + TabStop = TRUE ; + }; + + FixedLine FL_TITLE + { + Pos = MAP_APPFONT ( 6 , 6 ) ; + Size = MAP_APPFONT ( 100 , 8 ) ; + Text [ en-US ] = "Title" ; + }; + Edit EDT_TITLE + { + HelpId = HID_GALLERY_TITLE_EDIT; + Border = TRUE ; + Pos = MAP_APPFONT ( 12 , 18 ) ; + Size = MAP_APPFONT ( 88, 12 ) ; + }; +}; + +/******************************************************************************/ + ModalDialog RID_SVXDLG_GALLERY_SEARCH_PROGRESS { HelpId = HID_GALLERY_SEARCH ; @@ -288,7 +363,7 @@ ModalDialog RID_SVXDLG_GALLERY_TAKE_PROGRESS ModalDialog RID_SVXDLG_GALLERY_ACTUALIZE_PROGRESS { - HelpId = HID_GALLERY_ACTUALIZE_PROGRESS; + HelpId = HID_GALLERY_ACTUALIZE; OutputSize = TRUE ; Border = TRUE ; SVLook = TRUE ; diff --git a/cui/source/inc/helpid.hrc b/cui/source/inc/helpid.hrc index 0a23adcf03d0..ad0f7ad12a89 100644 --- a/cui/source/inc/helpid.hrc +++ b/cui/source/inc/helpid.hrc @@ -347,7 +347,7 @@ #define HID_PAGE_TEXTATTR (HID_CUI_START + 308) #define HID_TEXTATTR_CTL_POSITION (HID_CUI_START + 309) #define HID_TRANS_POSITION_SIZE (HID_CUI_START + 310) -#define HID_GALLERY_ACTUALIZE_PROGRESS (HID_CUI_START + 311) +// free #define HID_SVXPAGE_CHAR_NAME (HID_CUI_START + 312) #define HID_SVXPAGE_CHAR_EFFECTS (HID_CUI_START + 313) #define HID_SVXPAGE_CHAR_POSITION (HID_CUI_START + 314) @@ -371,6 +371,8 @@ #define HID_PASTE_DLG (HID_CUI_START + 333) #define HID_LINKDLG_TABLB (HID_CUI_START + 334) #define HID_MACRO_HEADERTABLISTBOX (HID_CUI_START + 335) +#define HID_GALLERY_ENTER_TITLE (HID_CUI_START + 336) +#define HID_GALLERY_TITLE_EDIT (HID_CUI_START + 337) // please adjust ACT_SVX_HID_END2 below if you add entries here! @@ -378,7 +380,7 @@ // Overrun check --------------------------------------------------------- // ----------------------------------------------------------------------- -#define ACT_CUI_HID_END HID_CUI_START + 335 +#define ACT_CUI_HID_END HID_CUI_START + 337 #if ACT_CUI_HID_END > HID_CUI_END #error Resource-Ueberlauf in #line, #file diff --git a/extensions/inc/extensio.hrc b/extensions/inc/extensio.hrc index f763ce8f81c6..6c5e0e488b4c 100644 --- a/extensions/inc/extensio.hrc +++ b/extensions/inc/extensio.hrc @@ -55,7 +55,6 @@ #define HID_BIB_TBX_TABLE (HID_EXTENSIONS_START + 3) #define HID_BIB_TBX_SEARCH (HID_EXTENSIONS_START + 4) #define HID_BIB_TBX_AUTOFILTER (HID_EXTENSIONS_START + 5) - #define HID_BIB_IDENTIFIER_POS (HID_EXTENSIONS_START + 6) #define HID_BIB_AUTHORITYTYPE_POS (HID_EXTENSIONS_START + 7) #define HID_BIB_AUTHOR_POS (HID_EXTENSIONS_START + 8) @@ -87,12 +86,10 @@ #define HID_BIB_CUSTOM3_POS (HID_EXTENSIONS_START + 34) #define HID_BIB_CUSTOM4_POS (HID_EXTENSIONS_START + 35) #define HID_BIB_CUSTOM5_POS (HID_EXTENSIONS_START + 36) - #define HID_BIB_DB_TBX (HID_EXTENSIONS_START + 37) #define HID_BIB_DB_GRIDCTRL (HID_EXTENSIONS_START + 38) #define HID_BIB_CONTROL_PAGE (HID_EXTENSIONS_START + 39) #define HID_BIB_CONTROL_PARENT (HID_EXTENSIONS_START + 40) - #define HID_GRIDWIZARD_PREVIOUS (HID_EXTENSIONS_START + 41) #define HID_GRIDWIZARD_NEXT (HID_EXTENSIONS_START + 42) #define HID_GRIDWIZARD_CANCEL (HID_EXTENSIONS_START + 43) @@ -114,27 +111,21 @@ #define UID_DBIWIZARD_QUERIES (HID_EXTENSIONS_START + 59) #define UID_DBIWIZARD_FORMS (HID_EXTENSIONS_START + 60) #define UID_DBIWIZARD_FORMS_SAVETO (HID_EXTENSIONS_START + 61) - #define UID_BIB_FRAME_WINDOW (HID_EXTENSIONS_START + 62) - #define HID_ABSPILOT_PREVIOUS (HID_EXTENSIONS_START + 63) #define HID_ABSPILOT_NEXT (HID_EXTENSIONS_START + 64) #define HID_ABSPILOT_CANCEL (HID_EXTENSIONS_START + 65) #define HID_ABSPILOT_FINISH (HID_EXTENSIONS_START + 66) #define UID_ABSPILOT_HELP (HID_EXTENSIONS_START + 67) #define HID_ABSPILOT (HID_EXTENSIONS_START + 68) - #define HID_DBIWIZARD (HID_EXTENSIONS_START + 69) #define UID_DBIWIZARD_HELP (HID_EXTENSIONS_START + 70) #define HID_DBIWIZARD_FILESELECTION (HID_EXTENSIONS_START + 71) - #define HID_BIB_DELETE_RECORD (HID_EXTENSIONS_START + 72) #define HID_BIB_INSERT_RECORD (HID_EXTENSIONS_START + 73) - #define HID_DLG_MAPPING (HID_EXTENSIONS_START + 74) #define HID_DLG_DBCHANGE (HID_EXTENSIONS_START + 75) #define HID_SELECTION_TLB (HID_EXTENSIONS_START + 76) - #define HID_CHECK_FOR_UPD_DLG (HID_EXTENSIONS_START + 77) #define HID_CHECK_FOR_UPD_CLOSE (HID_EXTENSIONS_START + 78) #define HID_CHECK_FOR_UPD_PAUSE (HID_EXTENSIONS_START + 80) @@ -149,7 +140,7 @@ // please adjust HID_LAST_EXTENSIONS_ID if you add new ids here! // you probably have to insert your new helpid into util/hidother.hrc, too! -#define HID_LAST_EXTENSIONS_ID HID_CHECK_FOR_UPD_CANCEL +#define HID_LAST_EXTENSIONS_ID (HID_EXTENSIONS_START + 87) #if HID_LAST_EXTENSIONS_ID > HID_EXTENSIONS_END #error id overflow @@ -330,10 +321,10 @@ #define HID_PROP_XSD_MIN_EXCLUSIVE (HID_FORMS_START + 172) #define HID_PROP_UNCHECKEDREFVALUE (HID_FORMS_START + 173) #define HID_PROP_SUBMISSION_ID (HID_FORMS_START + 174) - // FREE - // FREE - // FREE - // FREE +#define HID_FM_PROPDLG_TABCTR (HID_FORMS_START + 175) +#define HID_FM_PROPDLG_TAB_GENERAL (HID_FORMS_START + 176) +#define HID_FM_PROPDLG_TAB_DATA (HID_FORMS_START + 177) +#define HID_FM_PROPDLG_TAB_EVT (HID_FORMS_START + 178) // FREE #define UID_PROP_DLG_FONT_TYPE (HID_FORMS_START + 180) #define UID_PROP_DLG_IMAGE_URL (HID_FORMS_START + 181) diff --git a/extensions/source/propctrlr/formhelpid.hrc b/extensions/source/propctrlr/formhelpid.hrc index e6f4aebee5dd..851a9f30307f 100644 --- a/extensions/source/propctrlr/formhelpid.hrc +++ b/extensions/source/propctrlr/formhelpid.hrc @@ -31,25 +31,7 @@ #ifndef _EXTENSIONS_FORMCTRLR_FORMHELPID_HRC_ #define _EXTENSIONS_FORMCTRLR_FORMHELPID_HRC_ -#ifndef _SOLAR_HRC -#include <svl/solar.hrc> -#endif - -// TODO: create a new help id range in <svl/solar.hrc> -// at the moment, the help ids are ripped from svx/inc/fmhelper.hrc -// (the old property browser was implemented in svx) - -#define HID_PROPCONTROLLER_START HID_FORMS_START + 400 - -// FREE -// FREE -// FREE -// FREE -// FREE -#define HID_FM_PROPDLG_TABCTR (HID_PROPCONTROLLER_START + 5) -#define HID_FM_PROPDLG_TAB_GENERAL (HID_PROPCONTROLLER_START + 6) -#define HID_FM_PROPDLG_TAB_DATA (HID_PROPCONTROLLER_START + 7) -#define HID_FM_PROPDLG_TAB_EVT (HID_PROPCONTROLLER_START + 8) +#include <extensio.hrc> #endif // _EXTENSIONS_FORMCTRLR_FORMHELPID_HRC_ |