From 9cb1fe80b2dfd3684205277f5222df3d743d09d7 Mon Sep 17 00:00:00 2001 From: Olivier Date: Mon, 27 Feb 2017 16:49:07 -0300 Subject: tdf#105831 Add Donate entry on Help menu The full implementation depends on infra Task #2179 https://redmine.documentfoundation.org/issues/2179 revision1: change to https, per demand of #2179 Removed ellipsis Code changed as suggested Change call to pass BCP47 string, with language as fallback. task #2179 will be reviewed accordingly. Change-Id: I573542da0f394d7128faab0106df852d622c98b3 Reviewed-on: https://gerrit.libreoffice.org/34693 Tested-by: Jenkins Reviewed-by: Eike Rathke --- basctl/uiconfig/basicide/menubar/menubar.xml | 2 ++ chart2/uiconfig/menubar/menubar.xml | 2 ++ dbaccess/uiconfig/dbapp/menubar/menubar.xml | 2 ++ dbaccess/uiconfig/dbquery/menubar/menubar.xml | 2 ++ dbaccess/uiconfig/dbrelation/menubar/menubar.xml | 2 ++ dbaccess/uiconfig/dbtable/menubar/menubar.xml | 2 ++ dbaccess/uiconfig/dbtdata/menubar/menubar.xml | 2 ++ .../uiconfig/sbibliography/menubar/menubar.xml | 2 ++ framework/uiconfig/startmodule/menubar/menubar.xml | 2 ++ include/sfx2/sfxsids.hrc | 1 + .../org/openoffice/Office/UI/GenericCommands.xcu | 5 +++++ reportdesign/uiconfig/dbreport/menubar/menubar.xml | 2 ++ sc/uiconfig/scalc/menubar/menubar.xml | 2 ++ sd/uiconfig/sdraw/menubar/menubar.xml | 2 ++ sd/uiconfig/simpress/menubar/menubar.xml | 2 ++ sfx2/sdi/appslots.sdi | 4 ++++ sfx2/sdi/sfx.sdi | 15 ++++++++++++++ sfx2/source/appl/appserv.cxx | 23 ++++++++++++---------- starmath/uiconfig/smath/menubar/menubar.xml | 2 ++ sw/uiconfig/sglobal/menubar/menubar.xml | 2 ++ sw/uiconfig/sweb/menubar/menubar.xml | 2 ++ sw/uiconfig/swform/menubar/menubar.xml | 2 ++ sw/uiconfig/swreport/menubar/menubar.xml | 2 ++ sw/uiconfig/swriter/menubar/menubar.xml | 2 ++ sw/uiconfig/swxform/menubar/menubar.xml | 2 ++ 25 files changed, 78 insertions(+), 10 deletions(-) diff --git a/basctl/uiconfig/basicide/menubar/menubar.xml b/basctl/uiconfig/basicide/menubar/menubar.xml index 45e667b37c99..6cee9b9d61f8 100644 --- a/basctl/uiconfig/basicide/menubar/menubar.xml +++ b/basctl/uiconfig/basicide/menubar/menubar.xml @@ -103,6 +103,8 @@ + + diff --git a/chart2/uiconfig/menubar/menubar.xml b/chart2/uiconfig/menubar/menubar.xml index 5d3c33749cc2..430ddba9540d 100644 --- a/chart2/uiconfig/menubar/menubar.xml +++ b/chart2/uiconfig/menubar/menubar.xml @@ -174,6 +174,8 @@ + + diff --git a/dbaccess/uiconfig/dbapp/menubar/menubar.xml b/dbaccess/uiconfig/dbapp/menubar/menubar.xml index 063e769839a3..27ddebe9634d 100644 --- a/dbaccess/uiconfig/dbapp/menubar/menubar.xml +++ b/dbaccess/uiconfig/dbapp/menubar/menubar.xml @@ -153,6 +153,8 @@ + + diff --git a/dbaccess/uiconfig/dbquery/menubar/menubar.xml b/dbaccess/uiconfig/dbquery/menubar/menubar.xml index b027a308ac0c..4ec39f316a70 100644 --- a/dbaccess/uiconfig/dbquery/menubar/menubar.xml +++ b/dbaccess/uiconfig/dbquery/menubar/menubar.xml @@ -100,6 +100,8 @@ + + diff --git a/dbaccess/uiconfig/dbrelation/menubar/menubar.xml b/dbaccess/uiconfig/dbrelation/menubar/menubar.xml index 4c54eedf14eb..6ef7dd1f775d 100644 --- a/dbaccess/uiconfig/dbrelation/menubar/menubar.xml +++ b/dbaccess/uiconfig/dbrelation/menubar/menubar.xml @@ -83,6 +83,8 @@ + + diff --git a/dbaccess/uiconfig/dbtable/menubar/menubar.xml b/dbaccess/uiconfig/dbtable/menubar/menubar.xml index 6490b70030c4..7f20c8ee7efb 100644 --- a/dbaccess/uiconfig/dbtable/menubar/menubar.xml +++ b/dbaccess/uiconfig/dbtable/menubar/menubar.xml @@ -84,6 +84,8 @@ + + diff --git a/dbaccess/uiconfig/dbtdata/menubar/menubar.xml b/dbaccess/uiconfig/dbtdata/menubar/menubar.xml index 5a86fb05a96c..aa9808994e75 100644 --- a/dbaccess/uiconfig/dbtdata/menubar/menubar.xml +++ b/dbaccess/uiconfig/dbtdata/menubar/menubar.xml @@ -92,6 +92,8 @@ + + diff --git a/extensions/uiconfig/sbibliography/menubar/menubar.xml b/extensions/uiconfig/sbibliography/menubar/menubar.xml index b5139ae08693..3714cd0da057 100644 --- a/extensions/uiconfig/sbibliography/menubar/menubar.xml +++ b/extensions/uiconfig/sbibliography/menubar/menubar.xml @@ -85,6 +85,8 @@ + + diff --git a/framework/uiconfig/startmodule/menubar/menubar.xml b/framework/uiconfig/startmodule/menubar/menubar.xml index 718c4561b150..17deb149722d 100644 --- a/framework/uiconfig/startmodule/menubar/menubar.xml +++ b/framework/uiconfig/startmodule/menubar/menubar.xml @@ -57,6 +57,8 @@ + + diff --git a/include/sfx2/sfxsids.hrc b/include/sfx2/sfxsids.hrc index 78f2ab27f1a3..9d800e917613 100644 --- a/include/sfx2/sfxsids.hrc +++ b/include/sfx2/sfxsids.hrc @@ -85,6 +85,7 @@ #define SID_SEND_FEEDBACK (SID_SFX_START + 421) #define SID_Q_AND_A (SID_SFX_START + 422) #define SID_DOCUMENTATION (SID_SFX_START + 423) +#define SID_DONATION (SID_SFX_START + 424) #define SID_SHOW_LICENSE (SID_SFX_START + 1683) #define SID_SHOW_CREDITS (SID_SFX_START + 1711) diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu index f21ec5ac9d74..3daa07530731 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu @@ -4894,6 +4894,11 @@ ~User Guides... + + + Donate to LibreOffice + + License Information... diff --git a/reportdesign/uiconfig/dbreport/menubar/menubar.xml b/reportdesign/uiconfig/dbreport/menubar/menubar.xml index e80df87e805d..3130e5281f59 100644 --- a/reportdesign/uiconfig/dbreport/menubar/menubar.xml +++ b/reportdesign/uiconfig/dbreport/menubar/menubar.xml @@ -289,6 +289,8 @@ + + diff --git a/sc/uiconfig/scalc/menubar/menubar.xml b/sc/uiconfig/scalc/menubar/menubar.xml index 25a5d9235833..5ec8e3fc4cbe 100644 --- a/sc/uiconfig/scalc/menubar/menubar.xml +++ b/sc/uiconfig/scalc/menubar/menubar.xml @@ -742,6 +742,8 @@ + + diff --git a/sd/uiconfig/sdraw/menubar/menubar.xml b/sd/uiconfig/sdraw/menubar/menubar.xml index 27698b9bc5f5..fc1d25b9c7b8 100644 --- a/sd/uiconfig/sdraw/menubar/menubar.xml +++ b/sd/uiconfig/sdraw/menubar/menubar.xml @@ -382,6 +382,8 @@ + + diff --git a/sd/uiconfig/simpress/menubar/menubar.xml b/sd/uiconfig/simpress/menubar/menubar.xml index e7b8568f0f30..92686e824ffc 100644 --- a/sd/uiconfig/simpress/menubar/menubar.xml +++ b/sd/uiconfig/simpress/menubar/menubar.xml @@ -619,6 +619,8 @@ + + diff --git a/sfx2/sdi/appslots.sdi b/sfx2/sdi/appslots.sdi index 12ad63616f37..5f228a2ff137 100644 --- a/sfx2/sdi/appslots.sdi +++ b/sfx2/sdi/appslots.sdi @@ -137,6 +137,10 @@ interface Application [ ExecMethod = MiscExec_Impl ; ] + SID_DONATION + [ + ExecMethod = MiscExec_Impl ; + ] SID_SHOW_LICENSE [ ExecMethod = MiscExec_Impl ; diff --git a/sfx2/sdi/sfx.sdi b/sfx2/sdi/sfx.sdi index 03b536d3c4d6..c69d7699410b 100644 --- a/sfx2/sdi/sfx.sdi +++ b/sfx2/sdi/sfx.sdi @@ -4844,6 +4844,21 @@ SfxVoidItem Documentation SID_DOCUMENTATION MenuConfig = TRUE, GroupId = GID_APPLICATION; ] +SfxVoidItem Donation SID_DONATION +() +[ + AutoUpdate = FALSE, + FastCall = FALSE, + ReadOnlyDoc = TRUE, + Toggle = FALSE, + Container = FALSE, + RecordAbsolute = FALSE, + RecordPerSet; + + AccelConfig = TRUE, + MenuConfig = TRUE, + GroupId = GID_APPLICATION; +] SfxVoidItem ShowLicense SID_SHOW_LICENSE () diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx index a4a8b84dae44..d9910d314a70 100644 --- a/sfx2/source/appl/appserv.cxx +++ b/sfx2/source/appl/appserv.cxx @@ -493,7 +493,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq ) case SID_SEND_FEEDBACK: { OUString module = SfxHelp::GetCurrentModuleIdentifier(); - OUString sURL("http://hub.libreoffice.org/send-feedback/?LOversion=" + utl::ConfigManager::getAboutBoxProductVersion() + + OUString sURL("https://hub.libreoffice.org/send-feedback/?LOversion=" + utl::ConfigManager::getAboutBoxProductVersion() + "&LOlocale=" + utl::ConfigManager::getLocale() + "&LOmodule=" + module.copy(module.lastIndexOf('.') + 1 ) ); sfx2::openUriExternally(sURL, false); break; @@ -503,21 +503,24 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq ) { // Askbot has URL's normalized to languages, not locales // Get language from locale: ll or lll or ll-CC or lll-CC - sal_Int32 ix = utl::ConfigManager::getLocale().indexOf("-",0); - OUString aLang; - if (ix == -1) - aLang = utl::ConfigManager::getLocale(); - else - aLang = utl::ConfigManager::getLocale().copy(0,ix); - - OUString sURL("http://hub.libreoffice.org/forum/?LOlang=" + aLang); + OUString aLang = LanguageTag(utl::ConfigManager::getLocale()).getLanguage(); + OUString sURL("https://hub.libreoffice.org/forum/?LOlang=" + aLang); sfx2::openUriExternally(sURL, false); break; } case SID_DOCUMENTATION: { // Open documentation page based on locales - OUString sURL("http://hub.libreoffice.org/documentation/?LOlocale=" + utl::ConfigManager::getLocale()); + OUString sURL("https://hub.libreoffice.org/documentation/?LOlocale=" + utl::ConfigManager::getLocale()); + sfx2::openUriExternally(sURL, false); + break; + } + case SID_DONATION: + { + // Open donation page based on language + script (BCP47) with language as fall back. + OUString aLang = LanguageTag(utl::ConfigManager::getLocale()).getLanguage(); + OUString aBcp47 = LanguageTag(utl::ConfigManager::getLocale()).getBcp47(); + OUString sURL("https://hub.libreoffice.org/donation/?BCP47=" + aBcp47 + "&LOlang=" + aLang ); sfx2::openUriExternally(sURL, false); break; } diff --git a/starmath/uiconfig/smath/menubar/menubar.xml b/starmath/uiconfig/smath/menubar/menubar.xml index 75d9d5ceaadb..9367961a692e 100644 --- a/starmath/uiconfig/smath/menubar/menubar.xml +++ b/starmath/uiconfig/smath/menubar/menubar.xml @@ -149,6 +149,8 @@ + + diff --git a/sw/uiconfig/sglobal/menubar/menubar.xml b/sw/uiconfig/sglobal/menubar/menubar.xml index bf02e0fe30d5..2c5e690ba8c8 100644 --- a/sw/uiconfig/sglobal/menubar/menubar.xml +++ b/sw/uiconfig/sglobal/menubar/menubar.xml @@ -493,6 +493,8 @@ + + diff --git a/sw/uiconfig/sweb/menubar/menubar.xml b/sw/uiconfig/sweb/menubar/menubar.xml index 2a09328ef379..0b28a1f5503e 100644 --- a/sw/uiconfig/sweb/menubar/menubar.xml +++ b/sw/uiconfig/sweb/menubar/menubar.xml @@ -423,6 +423,8 @@ + + diff --git a/sw/uiconfig/swform/menubar/menubar.xml b/sw/uiconfig/swform/menubar/menubar.xml index a6c33067deb4..6f85776d74db 100644 --- a/sw/uiconfig/swform/menubar/menubar.xml +++ b/sw/uiconfig/swform/menubar/menubar.xml @@ -487,6 +487,8 @@ + + diff --git a/sw/uiconfig/swreport/menubar/menubar.xml b/sw/uiconfig/swreport/menubar/menubar.xml index 156db6698c06..9807628f2e7b 100644 --- a/sw/uiconfig/swreport/menubar/menubar.xml +++ b/sw/uiconfig/swreport/menubar/menubar.xml @@ -489,6 +489,8 @@ + + diff --git a/sw/uiconfig/swriter/menubar/menubar.xml b/sw/uiconfig/swriter/menubar/menubar.xml index 4cd2089d6f74..373958867fb2 100644 --- a/sw/uiconfig/swriter/menubar/menubar.xml +++ b/sw/uiconfig/swriter/menubar/menubar.xml @@ -761,6 +761,8 @@ + + diff --git a/sw/uiconfig/swxform/menubar/menubar.xml b/sw/uiconfig/swxform/menubar/menubar.xml index fd8e6b0a5bf7..d3534b91a531 100644 --- a/sw/uiconfig/swxform/menubar/menubar.xml +++ b/sw/uiconfig/swxform/menubar/menubar.xml @@ -489,6 +489,8 @@ + + -- cgit