diff options
author | Olivier Hallot <ohallot@collabora.co.uk> | 2016-07-07 19:57:48 -0300 |
---|---|---|
committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2016-08-11 14:23:28 +0000 |
commit | 20469b56502687f85ce0fa9e5f7a50273daa3e91 (patch) | |
tree | b1810e0c873fa02b3c4be10901fc233451b3fcec | |
parent | 1fcb7eafd95ebed7f5532d86a8cd8cd89196883e (diff) |
tdf#96015 (part) links to Askbot in the Help menu
Add the entry "~Get help online" to the modules
Help menu.
on click, the system browser opens
http://hub.libreoffice.org/forum/?&LOlang=<lang>
<lang> is obtained from .getLocale()
That in turn will redirect to e.g. askbot (but only few languages are
using it at the moment) or other nl-specific resources.
(nl-projects can request corresponding targets from infa, without the
need to change the code – cf rdm#1983)
The link can/should be extended to also include the version of LO and
the currently used module to allow finer grained redirects.
Change-Id: I56108dba4dd2684405623c4586103fc8ff9bea56
Reviewed-on: https://gerrit.libreoffice.org/27028
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
25 files changed, 68 insertions, 0 deletions
diff --git a/basctl/uiconfig/basicide/menubar/menubar.xml b/basctl/uiconfig/basicide/menubar/menubar.xml index 4d680f6c5f2b..66bcfa5b6c4c 100644 --- a/basctl/uiconfig/basicide/menubar/menubar.xml +++ b/basctl/uiconfig/basicide/menubar/menubar.xml @@ -97,6 +97,7 @@ <menu:menuitem menu:id=".uno:HelpIndex"/> <menu:menuitem menu:id=".uno:ExtendedHelp"/> <menu:menuseparator/> + <menu:menuitem menu:id=".uno:QuestionAnswers"/> <menu:menuitem menu:id=".uno:SendFeedback"/> <menu:menuseparator/> <menu:menuitem menu:id=".uno:ShowLicense"/> diff --git a/chart2/uiconfig/menubar/menubar.xml b/chart2/uiconfig/menubar/menubar.xml index b4d579a2a1b0..98c5aabdd54e 100644 --- a/chart2/uiconfig/menubar/menubar.xml +++ b/chart2/uiconfig/menubar/menubar.xml @@ -168,6 +168,7 @@ <menu:menuitem menu:id=".uno:HelpIndex"/> <menu:menuitem menu:id=".uno:ExtendedHelp"/> <menu:menuseparator/> + <menu:menuitem menu:id=".uno:QuestionAnswers"/> <menu:menuitem menu:id=".uno:SendFeedback"/> <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 38760fdd0c28..13da527b2c18 100644 --- a/dbaccess/uiconfig/dbapp/menubar/menubar.xml +++ b/dbaccess/uiconfig/dbapp/menubar/menubar.xml @@ -153,6 +153,7 @@ <menu:menuitem menu:id=".uno:HelpIndex"/> <menu:menuitem menu:id=".uno:ExtendedHelp"/> <menu:menuseparator/> + <menu:menuitem menu:id=".uno:QuestionAnswers"/> <menu:menuitem menu:id=".uno:SendFeedback"/> <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 b60371f44f86..7ee3833a8642 100644 --- a/dbaccess/uiconfig/dbquery/menubar/menubar.xml +++ b/dbaccess/uiconfig/dbquery/menubar/menubar.xml @@ -94,6 +94,7 @@ <menu:menuitem menu:id=".uno:HelpIndex"/> <menu:menuitem menu:id=".uno:ExtendedHelp"/> <menu:menuseparator/> + <menu:menuitem menu:id=".uno:QuestionAnswers"/> <menu:menuitem menu:id=".uno:SendFeedback"/> <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 f4a9ffc1e493..fc6aaa76e294 100644 --- a/dbaccess/uiconfig/dbrelation/menubar/menubar.xml +++ b/dbaccess/uiconfig/dbrelation/menubar/menubar.xml @@ -77,6 +77,7 @@ <menu:menuitem menu:id=".uno:HelpIndex"/> <menu:menuitem menu:id=".uno:ExtendedHelp"/> <menu:menuseparator/> + <menu:menuitem menu:id=".uno:QuestionAnswers"/> <menu:menuitem menu:id=".uno:SendFeedback"/> <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 63982adf15f0..077f4552ea15 100644 --- a/dbaccess/uiconfig/dbtable/menubar/menubar.xml +++ b/dbaccess/uiconfig/dbtable/menubar/menubar.xml @@ -78,6 +78,7 @@ <menu:menuitem menu:id=".uno:HelpIndex"/> <menu:menuitem menu:id=".uno:ExtendedHelp"/> <menu:menuseparator/> + <menu:menuitem menu:id=".uno:QuestionAnswers"/> <menu:menuitem menu:id=".uno:SendFeedback"/> <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 95c327e9c900..805e968ce286 100644 --- a/dbaccess/uiconfig/dbtdata/menubar/menubar.xml +++ b/dbaccess/uiconfig/dbtdata/menubar/menubar.xml @@ -86,6 +86,7 @@ <menu:menuitem menu:id=".uno:HelpIndex"/> <menu:menuitem menu:id=".uno:ExtendedHelp"/> <menu:menuseparator/> + <menu:menuitem menu:id=".uno:QuestionAnswers"/> <menu:menuitem menu:id=".uno:SendFeedback"/> <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 39d113b12451..3e16a788e65d 100644 --- a/extensions/uiconfig/sbibliography/menubar/menubar.xml +++ b/extensions/uiconfig/sbibliography/menubar/menubar.xml @@ -79,6 +79,7 @@ <menu:menuitem menu:id=".uno:HelpIndex"/> <menu:menuitem menu:id=".uno:ExtendedHelp"/> <menu:menuseparator/> + <menu:menuitem menu:id=".uno:QuestionAnswers"/> <menu:menuitem menu:id=".uno:SendFeedback"/> <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 cc2bdaf9b11b..427194dcad5f 100644 --- a/framework/uiconfig/startmodule/menubar/menubar.xml +++ b/framework/uiconfig/startmodule/menubar/menubar.xml @@ -49,6 +49,7 @@ <menu:menupopup> <menu:menuitem menu:id=".uno:HelpIndex"/> <menu:menuseparator/> + <menu:menuitem menu:id=".uno:QuestionAnswers"/> <menu:menuitem menu:id=".uno:SendFeedback"/> <menu:menuseparator/> <menu:menuitem menu:id=".uno:ShowLicense"/> diff --git a/include/sfx2/sfxsids.hrc b/include/sfx2/sfxsids.hrc index b39390a010b7..fbbea370c1e7 100644 --- a/include/sfx2/sfxsids.hrc +++ b/include/sfx2/sfxsids.hrc @@ -88,6 +88,7 @@ #define SID_EMOJI_CONTROL (SID_SFX_START + 405) #define SID_HELPMENU (SID_SFX_START + 410) #define SID_SEND_FEEDBACK (SID_SFX_START + 421) +#define SID_Q_AND_A (SID_SFX_START + 422) #define SID_SHOW_LICENSE (SID_SFX_START + 1683) #define SID_SHOW_CREDITS (SID_SFX_START + 1711) #define SID_HELP_TUTORIALS (SID_SFX_START + 1695) diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu index 6bb9f213a062..684312059806 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu @@ -4642,6 +4642,11 @@ <value xml:lang="en-US">Send Feedback...</value> </prop> </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> + </prop> + </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> diff --git a/reportdesign/uiconfig/dbreport/menubar/menubar.xml b/reportdesign/uiconfig/dbreport/menubar/menubar.xml index 02487c794b0d..ce70f4ad9e62 100644 --- a/reportdesign/uiconfig/dbreport/menubar/menubar.xml +++ b/reportdesign/uiconfig/dbreport/menubar/menubar.xml @@ -283,6 +283,7 @@ <menu:menuitem menu:id=".uno:HelpIndex"/> <menu:menuitem menu:id=".uno:ExtendedHelp"/> <menu:menuseparator/> + <menu:menuitem menu:id=".uno:QuestionAnswers"/> <menu:menuitem menu:id=".uno:SendFeedback"/> <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 c7cf78d11f7d..d7f782619130 100644 --- a/sc/uiconfig/scalc/menubar/menubar.xml +++ b/sc/uiconfig/scalc/menubar/menubar.xml @@ -666,6 +666,7 @@ <menu:menuitem menu:id=".uno:HelpIndex"/> <menu:menuitem menu:id=".uno:ExtendedHelp"/> <menu:menuseparator/> + <menu:menuitem menu:id=".uno:QuestionAnswers"/> <menu:menuitem menu:id=".uno:SendFeedback"/> <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 0095780fe7f1..e8f1a06df671 100644 --- a/sd/uiconfig/sdraw/menubar/menubar.xml +++ b/sd/uiconfig/sdraw/menubar/menubar.xml @@ -370,6 +370,7 @@ <menu:menuitem menu:id=".uno:HelpIndex"/> <menu:menuitem menu:id=".uno:ExtendedHelp"/> <menu:menuseparator/> + <menu:menuitem menu:id=".uno:QuestionAnswers"/> <menu:menuitem menu:id=".uno:SendFeedback"/> <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 3402212ffcf9..d5fc3c18ea7a 100644 --- a/sd/uiconfig/simpress/menubar/menubar.xml +++ b/sd/uiconfig/simpress/menubar/menubar.xml @@ -602,6 +602,7 @@ <menu:menuitem menu:id=".uno:HelpIndex"/> <menu:menuitem menu:id=".uno:ExtendedHelp"/> <menu:menuseparator/> + <menu:menuitem menu:id=".uno:QuestionAnswers"/> <menu:menuitem menu:id=".uno:SendFeedback"/> <menu:menuseparator/> <menu:menuitem menu:id=".uno:ShowLicense"/> diff --git a/sfx2/sdi/appslots.sdi b/sfx2/sdi/appslots.sdi index 962eac3a716e..85191e6666fb 100644 --- a/sfx2/sdi/appslots.sdi +++ b/sfx2/sdi/appslots.sdi @@ -151,6 +151,10 @@ interface Application [ ExecMethod = MiscExec_Impl ; ] + SID_Q_AND_A + [ + ExecMethod = MiscExec_Impl ; + ] SID_SHOW_LICENSE [ ExecMethod = MiscExec_Impl ; diff --git a/sfx2/sdi/sfx.sdi b/sfx2/sdi/sfx.sdi index 3edca8d4162a..023c84af7dd0 100644 --- a/sfx2/sdi/sfx.sdi +++ b/sfx2/sdi/sfx.sdi @@ -5064,6 +5064,21 @@ SfxVoidItem SendFeedback SID_SEND_FEEDBACK ToolBoxConfig = TRUE, GroupId = GID_APPLICATION; ] +SfxVoidItem QuestionAnswers SID_Q_AND_A +() +[ + 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 1f2c3dda91ef..7a0d18a3f7ee 100644 --- a/sfx2/source/appl/appserv.cxx +++ b/sfx2/source/appl/appserv.cxx @@ -451,6 +451,29 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq ) break; } + case SID_Q_AND_A: + { + // 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); + try + { + uno::Reference< css::system::XSystemShellExecute > xSystemShellExecute( + css::system::SystemShellExecute::create(::comphelper::getProcessComponentContext()) ); + xSystemShellExecute->execute( sURL, OUString(), css::system::SystemShellExecuteFlags::URIS_ONLY ); + } + catch ( uno::Exception& ) + { + } + break; + } case SID_SHOW_LICENSE: { ScopedVclPtrInstance< LicenseDialog > aDialog; diff --git a/starmath/uiconfig/smath/menubar/menubar.xml b/starmath/uiconfig/smath/menubar/menubar.xml index 6b45d6129e31..b7fe639dd8c6 100644 --- a/starmath/uiconfig/smath/menubar/menubar.xml +++ b/starmath/uiconfig/smath/menubar/menubar.xml @@ -143,6 +143,7 @@ <menu:menuitem menu:id=".uno:HelpIndex"/> <menu:menuitem menu:id=".uno:ExtendedHelp"/> <menu:menuseparator/> + <menu:menuitem menu:id=".uno:QuestionAnswers"/> <menu:menuitem menu:id=".uno:SendFeedback"/> <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 a9cc7416bb02..2287f81f96a0 100644 --- a/sw/uiconfig/sglobal/menubar/menubar.xml +++ b/sw/uiconfig/sglobal/menubar/menubar.xml @@ -486,6 +486,7 @@ <menu:menuitem menu:id=".uno:HelpIndex"/> <menu:menuitem menu:id=".uno:ExtendedHelp"/> <menu:menuseparator/> + <menu:menuitem menu:id=".uno:QuestionAnswers"/> <menu:menuitem menu:id=".uno:SendFeedback"/> <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 b4dce273a1db..e6b5fed4cd24 100644 --- a/sw/uiconfig/sweb/menubar/menubar.xml +++ b/sw/uiconfig/sweb/menubar/menubar.xml @@ -416,6 +416,7 @@ <menu:menuitem menu:id=".uno:HelpIndex"/> <menu:menuitem menu:id=".uno:ExtendedHelp"/> <menu:menuseparator/> + <menu:menuitem menu:id=".uno:QuestionAnswers"/> <menu:menuitem menu:id=".uno:SendFeedback"/> <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 e3f2c857efe3..ae5ac51e8109 100644 --- a/sw/uiconfig/swform/menubar/menubar.xml +++ b/sw/uiconfig/swform/menubar/menubar.xml @@ -480,6 +480,7 @@ <menu:menuitem menu:id=".uno:HelpIndex"/> <menu:menuitem menu:id=".uno:ExtendedHelp"/> <menu:menuseparator/> + <menu:menuitem menu:id=".uno:QuestionAnswers"/> <menu:menuitem menu:id=".uno:SendFeedback"/> <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 c72ae0fdeeed..f63c1de5449b 100644 --- a/sw/uiconfig/swreport/menubar/menubar.xml +++ b/sw/uiconfig/swreport/menubar/menubar.xml @@ -482,6 +482,7 @@ <menu:menuitem menu:id=".uno:HelpIndex"/> <menu:menuitem menu:id=".uno:ExtendedHelp"/> <menu:menuseparator/> + <menu:menuitem menu:id=".uno:QuestionAnswers"/> <menu:menuitem menu:id=".uno:SendFeedback"/> <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 2002dad09aab..8f3c51cde1c1 100644 --- a/sw/uiconfig/swriter/menubar/menubar.xml +++ b/sw/uiconfig/swriter/menubar/menubar.xml @@ -729,6 +729,7 @@ <menu:menuitem menu:id=".uno:HelpIndex"/> <menu:menuitem menu:id=".uno:ExtendedHelp"/> <menu:menuseparator/> + <menu:menuitem menu:id=".uno:QuestionAnswers"/> <menu:menuitem menu:id=".uno:SendFeedback"/> <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 288f4460c466..1b7a155c195f 100644 --- a/sw/uiconfig/swxform/menubar/menubar.xml +++ b/sw/uiconfig/swxform/menubar/menubar.xml @@ -482,6 +482,7 @@ <menu:menuitem menu:id=".uno:HelpIndex"/> <menu:menuitem menu:id=".uno:ExtendedHelp"/> <menu:menuseparator/> + <menu:menuitem menu:id=".uno:QuestionAnswers"/> <menu:menuitem menu:id=".uno:SendFeedback"/> <menu:menuseparator/> <menu:menuitem menu:id=".uno:ShowLicense"/> |