summaryrefslogtreecommitdiff
path: root/sfx2
diff options
context:
space:
mode:
authorThorsten Behrens <tbehrens@novell.com>2010-11-05 14:30:55 +0100
committerThorsten Behrens <tbehrens@novell.com>2010-11-05 14:30:55 +0100
commit00d6d03478bc8ddb3ebd07ff47f54c9668c242d9 (patch)
tree0311d8634bc53fe4b9eeeb566880484b1ad93f40 /sfx2
parent5a2063c425aabd3090b839bd7fa8c64eec902cfd (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.
Diffstat (limited to 'sfx2')
-rw-r--r--sfx2/inc/sfx2/sfxsids.hrc1
-rw-r--r--sfx2/sdi/appslots.sdi4
-rwxr-xr-xsfx2/sdi/sfx.sdi25
-rw-r--r--sfx2/source/appl/appserv.cxx27
4 files changed, 53 insertions, 4 deletions
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 &) {