diff options
author | Thorsten Behrens <tbehrens@novell.com> | 2010-11-05 14:30:55 +0100 |
---|---|---|
committer | Thorsten Behrens <tbehrens@novell.com> | 2010-11-05 14:30:55 +0100 |
commit | 00d6d03478bc8ddb3ebd07ff47f54c9668c242d9 (patch) | |
tree | 0311d8634bc53fe4b9eeeb566880484b1ad93f40 | |
parent | 5a2063c425aabd3090b839bd7fa8c64eec902cfd (diff) |
Adds extra credits item to help menu
As agreed on yesterday, we want a dedicated credits document
displayed from the help menu. This is the UI/code change for that,
actual credits doc still missing.
-rw-r--r-- | framework/uiconfig/startmodule/menubar/menubar.xml | 1 | ||||
-rwxr-xr-x | officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu | 5 | ||||
-rw-r--r-- | sfx2/inc/sfx2/sfxsids.hrc | 1 | ||||
-rw-r--r-- | sfx2/sdi/appslots.sdi | 4 | ||||
-rwxr-xr-x | sfx2/sdi/sfx.sdi | 25 | ||||
-rw-r--r-- | sfx2/source/appl/appserv.cxx | 27 | ||||
-rw-r--r-- | svx/inc/globlmn_tmpl.hrc | 10 |
7 files changed, 69 insertions, 4 deletions
diff --git a/framework/uiconfig/startmodule/menubar/menubar.xml b/framework/uiconfig/startmodule/menubar/menubar.xml index b7bcbd51c2..fac0b3c081 100644 --- a/framework/uiconfig/startmodule/menubar/menubar.xml +++ b/framework/uiconfig/startmodule/menubar/menubar.xml @@ -76,6 +76,7 @@ <menu:menuseparator/> <menu:menuitem menu:id=".uno:ShowLicense"/> <menu:menuseparator/> + <menu:menuitem menu:id=".uno:Credits"/> <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 e154a5ea4b..15dd7d20f6 100755 --- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu @@ -4145,6 +4145,11 @@ <value xml:lang="en-US">License Information...</value> </prop> </node> + <node oor:name=".uno:Credits" oor:op="replace"> + <prop oor:name="Label" oor:type="xs:string"> + <value xml:lang="en-US">%PRODUCTNAME Credits...</value> + </prop> + </node> <node oor:name=".uno:StatusBarVisible" oor:op="replace"> <prop oor:name="Label" oor:type="xs:string"> <value xml:lang="en-US">Status ~Bar</value> diff --git a/sfx2/inc/sfx2/sfxsids.hrc b/sfx2/inc/sfx2/sfxsids.hrc index ae27983663..161237ba54 100644 --- a/sfx2/inc/sfx2/sfxsids.hrc +++ b/sfx2/inc/sfx2/sfxsids.hrc @@ -126,6 +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_HELP_TUTORIALS (SID_SFX_START + 1695) // default-ids for document diff --git a/sfx2/sdi/appslots.sdi b/sfx2/sdi/appslots.sdi index 6b736dac6a..026f8bb9a2 100644 --- a/sfx2/sdi/appslots.sdi +++ b/sfx2/sdi/appslots.sdi @@ -171,6 +171,10 @@ interface Application [ ExecMethod = MiscExec_Impl ; ] + SID_SHOW_CREDITS + [ + ExecMethod = MiscExec_Impl ; + ] SID_RECENTFILELIST [ ] diff --git a/sfx2/sdi/sfx.sdi b/sfx2/sdi/sfx.sdi index 2569249574..7e9b5ccc50 100755 --- a/sfx2/sdi/sfx.sdi +++ b/sfx2/sdi/sfx.sdi @@ -7391,6 +7391,31 @@ SfxVoidItem ShowLicense SID_SHOW_LICENSE ] //-------------------------------------------------------------------------- +SfxVoidItem ShowCredits SID_SHOW_CREDITS +() +[ + /* flags: */ + AutoUpdate = FALSE, + Cachable = Cachable, + FastCall = FALSE, + HasCoreId = FALSE, + HasDialog = FALSE, + ReadOnlyDoc = TRUE, + Toggle = FALSE, + Container = FALSE, + RecordAbsolute = FALSE, + RecordPerSet; + Synchron; + + /* config: */ + AccelConfig = TRUE, + MenuConfig = TRUE, + StatusBarConfig = FALSE, + ToolBoxConfig = TRUE, + GroupId = GID_APPLICATION; +] + +//-------------------------------------------------------------------------- SfxVoidItem HelpTutorials SID_HELP_TUTORIALS () [ diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx index 5cca2d5b50..3f1b44ee80 100644 --- a/sfx2/source/appl/appserv.cxx +++ b/sfx2/source/appl/appserv.cxx @@ -356,6 +356,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq ) break; } + case SID_SHOW_CREDITS: case SID_SHOW_LICENSE: { try { @@ -365,11 +366,29 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq ) args[0].Value <<= sal_True; args[1].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ReadOnly")); args[1].Value <<= sal_True; - + rtl::OUString aURL; - if ( checkURL ( "LICENSE.odt", aURL ) || - checkURL ( "LICENSE.html", aURL ) || - checkURL ( "LICENSE", aURL ) ) { + char const** pNames; + if( rReq.GetSlot() == SID_SHOW_LICENSE ) + { + static char const* pLicenseStrings[] = + { + "LICENSE.odt", "LICENSE.html", "LICENSE" + }; + pNames = pLicenseStrings; + } + else + { + static char const* pCreditsStrings[] = + { + "CREDITS.odt", "CREDITS.html", "CREDITS" + }; + pNames = pCreditsStrings; + } + + if ( checkURL ( pNames[0], aURL ) || + checkURL ( pNames[1], aURL ) || + checkURL ( pNames[2], aURL ) ) { xLoader->loadComponentFromURL( aURL, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_blank")), 0, args ); } } catch (const ::com::sun::star::uno::Exception &) { diff --git a/svx/inc/globlmn_tmpl.hrc b/svx/inc/globlmn_tmpl.hrc index 12312edfc0..23d5666796 100644 --- a/svx/inc/globlmn_tmpl.hrc +++ b/svx/inc/globlmn_tmpl.hrc @@ -1055,6 +1055,12 @@ HelpID = SID_SHOW_LICENSE ; \ Text [ en-US ] = "License information..." ; \ +#define ITEM_SHOW_CREDITS \ + Identifier = SID_SHOW_CREDITS ; \ + Command = ".uno:ShowCredits" ; \ + HelpID = SID_SHOW_CREDITS ; \ + Text [ en-US ] = "%PRODUCTNAME Credits..." ; + #define ITEM_HELP_ONLINE_REGISTRATION \ Identifier = SID_ONLINE_REGISTRATION ; \ Command = ".uno:OnlineRegistrationDlg" ; \ @@ -1114,6 +1120,10 @@ };\ MenuItem\ {\ + ITEM_SHOW_CREDITS\ + };\ + MenuItem\ + {\ ITEM_HELP_ABOUT\ About = TRUE ; \ };\ |