diff options
| author | Thorsten Behrens <tbehrens@novell.com> | 2010-11-25 23:10:13 +0100 |
|---|---|---|
| committer | Thorsten Behrens <tbehrens@novell.com> | 2010-11-25 23:13:42 +0100 |
| commit | dd7892c80c6690125ae294f702fd647b9de928a7 (patch) | |
| tree | 90ac1f462772914a81a5714c3db64771fb05d9b9 | |
| parent | e00482a2dbca458dedaca44dcc983272fbad05b3 (diff) | |
Put show credits entry into all app ui configs
* fix cmd url typo in GenericCommands.xcu
* build & deliver credits.odt
* avoid duplicate slot id for ShowCredits menu item
| -rw-r--r-- | framework/uiconfig/startmodule/menubar/menubar.xml | 2 | ||||
| -rwxr-xr-x | officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu | 2 | ||||
| -rw-r--r-- | readlicense_oo/odt/makefile.mk | 4 | ||||
| -rw-r--r-- | readlicense_oo/prj/d.lst | 1 | ||||
| -rw-r--r-- | sfx2/inc/sfx2/sfxsids.hrc | 2 |
5 files changed, 7 insertions, 4 deletions
diff --git a/framework/uiconfig/startmodule/menubar/menubar.xml b/framework/uiconfig/startmodule/menubar/menubar.xml index fac0b3c0815c..5ac4c3eb4b7c 100644 --- a/framework/uiconfig/startmodule/menubar/menubar.xml +++ b/framework/uiconfig/startmodule/menubar/menubar.xml @@ -76,7 +76,7 @@ <menu:menuseparator/> <menu:menuitem menu:id=".uno:ShowLicense"/> <menu:menuseparator/> - <menu:menuitem menu:id=".uno:Credits"/> + <menu:menuitem menu:id=".uno:ShowCredits"/> <menu:menuitem menu:id=".uno:About"/> </menu:menupopup> </menu:menu> diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu index 01ce2a378484..18d131cf35bb 100755 --- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu @@ -4145,7 +4145,7 @@ <value xml:lang="en-US">License Information...</value> </prop> </node> - <node oor:name=".uno:Credits" oor:op="replace"> + <node oor:name=".uno:ShowCredits" oor:op="replace"> <prop oor:name="Label" oor:type="xs:string"> <value xml:lang="en-US">%PRODUCTNAME Credits...</value> </prop> diff --git a/readlicense_oo/odt/makefile.mk b/readlicense_oo/odt/makefile.mk index 1e68a1722ef5..89cea1a3dc08 100644 --- a/readlicense_oo/odt/makefile.mk +++ b/readlicense_oo/odt/makefile.mk @@ -36,7 +36,7 @@ TARGET=odt # --- Files -------------------------------------------------------- -all: $(MISC)$/LICENSE.odt +all: $(MISC)$/LICENSE.odt $(MISC)$/CREDITS.odt # --- Targets ------------------------------------------------------ @@ -44,3 +44,5 @@ all: $(MISC)$/LICENSE.odt $(MISC)$/LICENSE.odt: LICENSE.odt $(COPY) LICENSE.odt $@ +$(MISC)$/CREDITS.odt: CREDITS.odt + $(COPY) CREDITS.odt $@ diff --git a/readlicense_oo/prj/d.lst b/readlicense_oo/prj/d.lst index 2a368beb7888..aa771c50111f 100644 --- a/readlicense_oo/prj/d.lst +++ b/readlicense_oo/prj/d.lst @@ -27,6 +27,7 @@ mkdir: %_DEST%\bin%_EXT%\ure ..\%__SRC%\misc\THIRDPARTYLICENSEREADME.html %_DEST%\bin%_EXT%\THIRDPARTYLICENSEREADME.html ..\%__SRC%\misc\LICENSE.odt %_DEST%\bin%_EXT%\LICENSE.odt +..\%__SRC%\misc\CREDITS.odt %_DEST%\bin%_EXT%\CREDITS.odt dos: echo ===================================================================== dos: echo Delivering README files diff --git a/sfx2/inc/sfx2/sfxsids.hrc b/sfx2/inc/sfx2/sfxsids.hrc index a0b8282895a3..d59ffddde17e 100644 --- a/sfx2/inc/sfx2/sfxsids.hrc +++ b/sfx2/inc/sfx2/sfxsids.hrc @@ -126,7 +126,7 @@ #define SID_HELP_HELPFILEBOX (SID_SFX_START + 419) #define SID_HELP_HELPFILEBOX_SELECTED (SID_SFX_START + 420) #define SID_SHOW_LICENSE (SID_SFX_START + 1683) -#define SID_SHOW_CREDITS (SID_SFX_START + 1684) +#define SID_SHOW_CREDITS (SID_SFX_START + 1711) #define SID_HELP_TUTORIALS (SID_SFX_START + 1695) // default-ids for document |