diff options
author | heiko tietze <tietze.heiko@gmail.com> | 2018-10-02 12:16:39 +0200 |
---|---|---|
committer | Heiko Tietze <tietze.heiko@gmail.com> | 2018-10-09 16:09:20 +0200 |
commit | e0aa9310299181cea87c5723a933ffd5ee4afe22 (patch) | |
tree | 194f2d1aeb8a24e84a355cbbf876569b648dbadd | |
parent | b0a0a3dddb9dc46c07b334eeba3f92df662563be (diff) |
tdf#120264 - Access to "Get Involved"
UNO command SID_GETINVOLVED added with access to the website
from all main menus under Help
Dispensable ellipsis removed from other UNO commands around Help
Change-Id: I79536be3de31f55a7b208bcdd5a243e05b3d3668
Reviewed-on: https://gerrit.libreoffice.org/61238
Tested-by: Jenkins
Reviewed-by: Heiko Tietze <tietze.heiko@gmail.com>
25 files changed, 60 insertions, 5 deletions
diff --git a/basctl/uiconfig/basicide/menubar/menubar.xml b/basctl/uiconfig/basicide/menubar/menubar.xml index 54accb5691db..290bb6a7de36 100644 --- a/basctl/uiconfig/basicide/menubar/menubar.xml +++ b/basctl/uiconfig/basicide/menubar/menubar.xml @@ -165,6 +165,7 @@ <menu:menuseparator/> <menu:menuitem menu:id=".uno:SafeMode"/> <menu:menuseparator/> + <menu:menuitem menu:id=".uno:GetInvolved"/> <menu:menuitem menu:id=".uno:Donation"/> <menu:menuseparator/> <menu:menuitem menu:id=".uno:ShowLicense"/> diff --git a/chart2/uiconfig/menubar/menubar.xml b/chart2/uiconfig/menubar/menubar.xml index 65cef6328d37..979f97529019 100644 --- a/chart2/uiconfig/menubar/menubar.xml +++ b/chart2/uiconfig/menubar/menubar.xml @@ -164,6 +164,7 @@ <menu:menuseparator/> <menu:menuitem menu:id=".uno:SafeMode"/> <menu:menuseparator/> + <menu:menuitem menu:id=".uno:GetInvolved"/> <menu:menuitem menu:id=".uno:Donation"/> <menu:menuseparator/> <menu:menuitem menu:id=".uno:ShowLicense"/> diff --git a/dbaccess/uiconfig/dbapp/menubar/menubar.xml b/dbaccess/uiconfig/dbapp/menubar/menubar.xml index 9c6b619a4ed6..af28378f8b70 100644 --- a/dbaccess/uiconfig/dbapp/menubar/menubar.xml +++ b/dbaccess/uiconfig/dbapp/menubar/menubar.xml @@ -148,6 +148,7 @@ <menu:menuseparator/> <menu:menuitem menu:id=".uno:SafeMode"/> <menu:menuseparator/> + <menu:menuitem menu:id=".uno:GetInvolved"/> <menu:menuitem menu:id=".uno:Donation"/> <menu:menuseparator/> <menu:menuitem menu:id=".uno:ShowLicense"/> diff --git a/dbaccess/uiconfig/dbquery/menubar/menubar.xml b/dbaccess/uiconfig/dbquery/menubar/menubar.xml index 7d2a633d29ed..e0084a41ea36 100644 --- a/dbaccess/uiconfig/dbquery/menubar/menubar.xml +++ b/dbaccess/uiconfig/dbquery/menubar/menubar.xml @@ -102,6 +102,7 @@ <menu:menuseparator/> <menu:menuitem menu:id=".uno:SafeMode"/> <menu:menuseparator/> + <menu:menuitem menu:id=".uno:GetInvolved"/> <menu:menuitem menu:id=".uno:Donation"/> <menu:menuseparator/> <menu:menuitem menu:id=".uno:ShowLicense"/> diff --git a/dbaccess/uiconfig/dbrelation/menubar/menubar.xml b/dbaccess/uiconfig/dbrelation/menubar/menubar.xml index ac109df9185b..240852a06ef2 100644 --- a/dbaccess/uiconfig/dbrelation/menubar/menubar.xml +++ b/dbaccess/uiconfig/dbrelation/menubar/menubar.xml @@ -85,6 +85,7 @@ <menu:menuseparator/> <menu:menuitem menu:id=".uno:SafeMode"/> <menu:menuseparator/> + <menu:menuitem menu:id=".uno:GetInvolved"/> <menu:menuitem menu:id=".uno:Donation"/> <menu:menuseparator/> <menu:menuitem menu:id=".uno:ShowLicense"/> diff --git a/dbaccess/uiconfig/dbtable/menubar/menubar.xml b/dbaccess/uiconfig/dbtable/menubar/menubar.xml index b64ea8fd86ba..32a0cfee1b14 100644 --- a/dbaccess/uiconfig/dbtable/menubar/menubar.xml +++ b/dbaccess/uiconfig/dbtable/menubar/menubar.xml @@ -86,6 +86,7 @@ <menu:menuseparator/> <menu:menuitem menu:id=".uno:SafeMode"/> <menu:menuseparator/> + <menu:menuitem menu:id=".uno:GetInvolved"/> <menu:menuitem menu:id=".uno:Donation"/> <menu:menuseparator/> <menu:menuitem menu:id=".uno:ShowLicense"/> diff --git a/dbaccess/uiconfig/dbtdata/menubar/menubar.xml b/dbaccess/uiconfig/dbtdata/menubar/menubar.xml index 485416e34a29..c812cb7c8fb9 100644 --- a/dbaccess/uiconfig/dbtdata/menubar/menubar.xml +++ b/dbaccess/uiconfig/dbtdata/menubar/menubar.xml @@ -94,6 +94,7 @@ <menu:menuseparator/> <menu:menuitem menu:id=".uno:SafeMode"/> <menu:menuseparator/> + <menu:menuitem menu:id=".uno:GetInvolved"/> <menu:menuitem menu:id=".uno:Donation"/> <menu:menuseparator/> <menu:menuitem menu:id=".uno:ShowLicense"/> diff --git a/extensions/uiconfig/sbibliography/menubar/menubar.xml b/extensions/uiconfig/sbibliography/menubar/menubar.xml index 691e381d9a67..b502c396e6ff 100644 --- a/extensions/uiconfig/sbibliography/menubar/menubar.xml +++ b/extensions/uiconfig/sbibliography/menubar/menubar.xml @@ -62,6 +62,7 @@ <menu:menuseparator/> <menu:menuitem menu:id=".uno:SafeMode"/> <menu:menuseparator/> + <menu:menuitem menu:id=".uno:GetInvolved"/> <menu:menuitem menu:id=".uno:Donation"/> <menu:menuseparator/> <menu:menuitem menu:id=".uno:ShowLicense"/> diff --git a/framework/uiconfig/startmodule/menubar/menubar.xml b/framework/uiconfig/startmodule/menubar/menubar.xml index 401d353a670e..70d49f7e4359 100644 --- a/framework/uiconfig/startmodule/menubar/menubar.xml +++ b/framework/uiconfig/startmodule/menubar/menubar.xml @@ -67,6 +67,7 @@ <menu:menuseparator/> <menu:menuitem menu:id=".uno:SafeMode"/> <menu:menuseparator/> + <menu:menuitem menu:id=".uno:GetInvolved"/> <menu:menuitem menu:id=".uno:Donation"/> <menu:menuseparator/> <menu:menuitem menu:id=".uno:ShowLicense"/> diff --git a/include/sfx2/sfxsids.hrc b/include/sfx2/sfxsids.hrc index bbf108841bd1..80d262e20625 100644 --- a/include/sfx2/sfxsids.hrc +++ b/include/sfx2/sfxsids.hrc @@ -92,6 +92,7 @@ class SfxDocumentInfoItem; #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_GETINVOLVED (SID_SFX_START + 425) #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 dbcbbc2b7d9e..f808ea927ea1 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu @@ -5037,7 +5037,7 @@ </node> <node oor:name=".uno:SendFeedback" oor:op="replace"> <prop oor:name="Label" oor:type="xs:string"> - <value xml:lang="en-US">Send Feedback...</value> + <value xml:lang="en-US">Send Feedback</value> </prop> <prop oor:name="Properties" oor:type="xs:int"> <value>1</value> @@ -5045,7 +5045,15 @@ </node> <node oor:name=".uno:QuestionAnswers" oor:op="replace"> <prop oor:name="Label" oor:type="xs:string"> - <value xml:lang="en-US">~Get Help Online...</value> + <value xml:lang="en-US">~Get Help Online</value> + </prop> + <prop oor:name="Properties" oor:type="xs:int"> + <value>1</value> + </prop> + </node> + <node oor:name=".uno:GetInvolved" oor:op="replace"> + <prop oor:name="Label" oor:type="xs:string"> + <value xml:lang="en-US">Get ~Involved</value> </prop> <prop oor:name="Properties" oor:type="xs:int"> <value>1</value> @@ -5053,7 +5061,7 @@ </node> <node oor:name=".uno:Documentation" oor:op="replace"> <prop oor:name="Label" oor:type="xs:string"> - <value xml:lang="en-US">~User Guides...</value> + <value xml:lang="en-US">~User Guides</value> </prop> </node> <node oor:name=".uno:Donation" oor:op="replace"> @@ -5066,12 +5074,12 @@ </node> <node oor:name=".uno:ShowLicense" oor:op="replace"> <prop oor:name="Label" oor:type="xs:string"> - <value xml:lang="en-US">License Information...</value> + <value xml:lang="en-US">License Information</value> </prop> </node> <node oor:name=".uno:ShowCredits" oor:op="replace"> <prop oor:name="Label" oor:type="xs:string"> - <value xml:lang="en-US">%PRODUCTNAME Credits...</value> + <value xml:lang="en-US">%PRODUCTNAME Credits</value> </prop> </node> <node oor:name=".uno:StatusBarVisible" oor:op="replace"> diff --git a/reportdesign/uiconfig/dbreport/menubar/menubar.xml b/reportdesign/uiconfig/dbreport/menubar/menubar.xml index 051b7d900f5b..2bd3344fd94a 100644 --- a/reportdesign/uiconfig/dbreport/menubar/menubar.xml +++ b/reportdesign/uiconfig/dbreport/menubar/menubar.xml @@ -280,6 +280,7 @@ <menu:menuseparator/> <menu:menuitem menu:id=".uno:SafeMode"/> <menu:menuseparator/> + <menu:menuitem menu:id=".uno:GetInvolved"/> <menu:menuitem menu:id=".uno:Donation"/> <menu:menuseparator/> <menu:menuitem menu:id=".uno:ShowLicense"/> diff --git a/sc/uiconfig/scalc/menubar/menubar.xml b/sc/uiconfig/scalc/menubar/menubar.xml index b5bc8c05b6b8..cba9ba4ed06c 100644 --- a/sc/uiconfig/scalc/menubar/menubar.xml +++ b/sc/uiconfig/scalc/menubar/menubar.xml @@ -777,6 +777,7 @@ <menu:menuseparator/> <menu:menuitem menu:id=".uno:SafeMode"/> <menu:menuseparator/> + <menu:menuitem menu:id=".uno:GetInvolved"/> <menu:menuitem menu:id=".uno:Donation"/> <menu:menuseparator/> <menu:menuitem menu:id=".uno:ShowLicense"/> diff --git a/sd/uiconfig/sdraw/menubar/menubar.xml b/sd/uiconfig/sdraw/menubar/menubar.xml index f519c1739c2a..a52a87201265 100644 --- a/sd/uiconfig/sdraw/menubar/menubar.xml +++ b/sd/uiconfig/sdraw/menubar/menubar.xml @@ -590,6 +590,7 @@ <menu:menuseparator/> <menu:menuitem menu:id=".uno:SafeMode"/> <menu:menuseparator/> + <menu:menuitem menu:id=".uno:GetInvolved"/> <menu:menuitem menu:id=".uno:Donation"/> <menu:menuseparator/> <menu:menuitem menu:id=".uno:ShowLicense"/> diff --git a/sd/uiconfig/simpress/menubar/menubar.xml b/sd/uiconfig/simpress/menubar/menubar.xml index 84e264c58cb6..6c3379ac5ab7 100644 --- a/sd/uiconfig/simpress/menubar/menubar.xml +++ b/sd/uiconfig/simpress/menubar/menubar.xml @@ -628,6 +628,7 @@ <menu:menuseparator/> <menu:menuitem menu:id=".uno:SafeMode"/> <menu:menuseparator/> + <menu:menuitem menu:id=".uno:GetInvolved"/> <menu:menuitem menu:id=".uno:Donation"/> <menu:menuseparator/> <menu:menuitem menu:id=".uno:ShowLicense"/> diff --git a/sfx2/sdi/appslots.sdi b/sfx2/sdi/appslots.sdi index da6d084403fe..e46e29741243 100644 --- a/sfx2/sdi/appslots.sdi +++ b/sfx2/sdi/appslots.sdi @@ -132,6 +132,10 @@ interface Application [ ExecMethod = MiscExec_Impl ; ] + SID_GETINVOLVED + [ + ExecMethod = MiscExec_Impl ; + ] SID_SHOW_LICENSE [ ExecMethod = MiscExec_Impl ; diff --git a/sfx2/sdi/sfx.sdi b/sfx2/sdi/sfx.sdi index 235544588174..11225f17868e 100644 --- a/sfx2/sdi/sfx.sdi +++ b/sfx2/sdi/sfx.sdi @@ -4912,6 +4912,21 @@ SfxVoidItem Donation SID_DONATION MenuConfig = TRUE, GroupId = SfxGroupId::Application; ] +SfxVoidItem GetInvolved SID_GETINVOLVED +() +[ + AutoUpdate = FALSE, + FastCall = FALSE, + ReadOnlyDoc = TRUE, + Toggle = FALSE, + Container = FALSE, + RecordAbsolute = FALSE, + RecordPerSet; + + AccelConfig = TRUE, + MenuConfig = TRUE, + GroupId = SfxGroupId::Application; +] SfxVoidItem ShowLicense SID_SHOW_LICENSE () diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx index fb111b64a935..2917dfcd0a11 100644 --- a/sfx2/source/appl/appserv.cxx +++ b/sfx2/source/appl/appserv.cxx @@ -549,6 +549,13 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq ) sfx2::openUriExternally(sURL, false); break; } + case SID_GETINVOLVED: + { + // Open get involved/join us page based on locales + OUString sURL("https://hub.libreoffice.org/joinus/?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. diff --git a/starmath/uiconfig/smath/menubar/menubar.xml b/starmath/uiconfig/smath/menubar/menubar.xml index 35529de1f77d..7e90d811c5c2 100644 --- a/starmath/uiconfig/smath/menubar/menubar.xml +++ b/starmath/uiconfig/smath/menubar/menubar.xml @@ -155,6 +155,7 @@ <menu:menuseparator/> <menu:menuitem menu:id=".uno:SafeMode"/> <menu:menuseparator/> + <menu:menuitem menu:id=".uno:GetInvolved"/> <menu:menuitem menu:id=".uno:Donation"/> <menu:menuseparator/> <menu:menuitem menu:id=".uno:ShowLicense"/> diff --git a/sw/uiconfig/sglobal/menubar/menubar.xml b/sw/uiconfig/sglobal/menubar/menubar.xml index 4e3b76f70398..1a6390cc9e64 100644 --- a/sw/uiconfig/sglobal/menubar/menubar.xml +++ b/sw/uiconfig/sglobal/menubar/menubar.xml @@ -780,6 +780,7 @@ <menu:menuseparator/> <menu:menuitem menu:id=".uno:SafeMode"/> <menu:menuseparator/> + <menu:menuitem menu:id=".uno:GetInvolved"/> <menu:menuitem menu:id=".uno:Donation"/> <menu:menuseparator/> <menu:menuitem menu:id=".uno:ShowLicense"/> diff --git a/sw/uiconfig/sweb/menubar/menubar.xml b/sw/uiconfig/sweb/menubar/menubar.xml index 99dba081a7f3..0eb7501234d8 100644 --- a/sw/uiconfig/sweb/menubar/menubar.xml +++ b/sw/uiconfig/sweb/menubar/menubar.xml @@ -653,6 +653,7 @@ <menu:menuseparator/> <menu:menuitem menu:id=".uno:SafeMode"/> <menu:menuseparator/> + <menu:menuitem menu:id=".uno:GetInvolved"/> <menu:menuitem menu:id=".uno:Donation"/> <menu:menuseparator/> <menu:menuitem menu:id=".uno:ShowLicense"/> diff --git a/sw/uiconfig/swform/menubar/menubar.xml b/sw/uiconfig/swform/menubar/menubar.xml index 08645a2889f9..7db1f104ae1a 100644 --- a/sw/uiconfig/swform/menubar/menubar.xml +++ b/sw/uiconfig/swform/menubar/menubar.xml @@ -498,6 +498,7 @@ <menu:menuseparator/> <menu:menuitem menu:id=".uno:SafeMode"/> <menu:menuseparator/> + <menu:menuitem menu:id=".uno:GetInvolved"/> <menu:menuitem menu:id=".uno:Donation"/> <menu:menuseparator/> <menu:menuitem menu:id=".uno:ShowLicense"/> diff --git a/sw/uiconfig/swreport/menubar/menubar.xml b/sw/uiconfig/swreport/menubar/menubar.xml index b394fe95c35a..036963d78c4a 100644 --- a/sw/uiconfig/swreport/menubar/menubar.xml +++ b/sw/uiconfig/swreport/menubar/menubar.xml @@ -499,6 +499,7 @@ <menu:menuseparator/> <menu:menuitem menu:id=".uno:SafeMode"/> <menu:menuseparator/> + <menu:menuitem menu:id=".uno:GetInvolved"/> <menu:menuitem menu:id=".uno:Donation"/> <menu:menuseparator/> <menu:menuitem menu:id=".uno:ShowLicense"/> diff --git a/sw/uiconfig/swriter/menubar/menubar.xml b/sw/uiconfig/swriter/menubar/menubar.xml index 532e8b8d6c73..e8b9f31fea51 100644 --- a/sw/uiconfig/swriter/menubar/menubar.xml +++ b/sw/uiconfig/swriter/menubar/menubar.xml @@ -780,6 +780,7 @@ <menu:menuseparator/> <menu:menuitem menu:id=".uno:SafeMode"/> <menu:menuseparator/> + <menu:menuitem menu:id=".uno:GetInvolved"/> <menu:menuitem menu:id=".uno:Donation"/> <menu:menuseparator/> <menu:menuitem menu:id=".uno:ShowLicense"/> diff --git a/sw/uiconfig/swxform/menubar/menubar.xml b/sw/uiconfig/swxform/menubar/menubar.xml index 4faa10e6adce..92d25d001568 100644 --- a/sw/uiconfig/swxform/menubar/menubar.xml +++ b/sw/uiconfig/swxform/menubar/menubar.xml @@ -780,6 +780,7 @@ <menu:menuseparator/> <menu:menuitem menu:id=".uno:SafeMode"/> <menu:menuseparator/> + <menu:menuitem menu:id=".uno:GetInvolved"/> <menu:menuitem menu:id=".uno:Donation"/> <menu:menuseparator/> <menu:menuitem menu:id=".uno:ShowLicense"/> |