From 15ab55c092e0b474827abe104b73c5bfab6ef28c Mon Sep 17 00:00:00 2001 From: Christian Lohmaier Date: Tue, 25 May 2021 13:30:38 +0200 Subject: add privacy URL to crashreport dialog & updatecheck tab in options Change-Id: I35cda87c35876469bf581be223bc608e29f07b09 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116105 Tested-by: Jenkins Reviewed-by: Christian Lohmaier --- svx/source/dialog/crashreportdlg.cxx | 9 +++++++++ svx/source/dialog/crashreportdlg.hxx | 1 + svx/uiconfig/ui/crashreportdlg.ui | 16 +++++++++++++++- 3 files changed, 25 insertions(+), 1 deletion(-) (limited to 'svx') diff --git a/svx/source/dialog/crashreportdlg.cxx b/svx/source/dialog/crashreportdlg.cxx index 2845541d0b78..33c879866cfd 100644 --- a/svx/source/dialog/crashreportdlg.cxx +++ b/svx/source/dialog/crashreportdlg.cxx @@ -12,6 +12,9 @@ #include #include #include +#include +#include +#include #include #include @@ -25,6 +28,7 @@ CrashReportDialog::CrashReportDialog(weld::Window* pParent) , mxEditPostUpload(m_xBuilder->weld_text_view("ed_post")) , mxFtBugReport(m_xBuilder->weld_text_view("ed_bugreport")) , mxCBSafeMode(m_xBuilder->weld_check_button("check_safemode")) + , mxPrivacyPolicyButton(m_xBuilder->weld_link_button("btnPrivacyPolicy")) { maSuccessMsg = mxEditPostUpload->get_text(); @@ -36,6 +40,11 @@ CrashReportDialog::CrashReportDialog(weld::Window* pParent) mxBtnSend->connect_clicked(LINK(this, CrashReportDialog, BtnHdl)); mxBtnCancel->connect_clicked(LINK(this, CrashReportDialog, BtnHdl)); mxBtnClose->connect_clicked(LINK(this, CrashReportDialog, BtnHdl)); + + mxPrivacyPolicyButton->set_uri( + officecfg::Office::Common::Menus::PrivacyPolicyURL::get() + + "?type=crashreport&LOvers=" + utl::ConfigManager::getProductVersion() + + "&LOlocale=" + LanguageTag(utl::ConfigManager::getUILocale()).getBcp47()); } CrashReportDialog::~CrashReportDialog() {} diff --git a/svx/source/dialog/crashreportdlg.hxx b/svx/source/dialog/crashreportdlg.hxx index f913cabac43f..868f86c58e68 100644 --- a/svx/source/dialog/crashreportdlg.hxx +++ b/svx/source/dialog/crashreportdlg.hxx @@ -27,6 +27,7 @@ private: std::unique_ptr mxEditPostUpload; std::unique_ptr mxFtBugReport; std::unique_ptr mxCBSafeMode; + std::unique_ptr mxPrivacyPolicyButton; OUString maSuccessMsg; diff --git a/svx/uiconfig/ui/crashreportdlg.ui b/svx/uiconfig/ui/crashreportdlg.ui index 98779d897820..3b661706ca31 100644 --- a/svx/uiconfig/ui/crashreportdlg.ui +++ b/svx/uiconfig/ui/crashreportdlg.ui @@ -75,7 +75,7 @@ Thank you for your help in improving %PRODUCTNAME. False False - 4 + 5 @@ -139,6 +139,20 @@ You can help us to fix this issue by sending an anonymous crash report to the %P 3 + + + Privacy Policy + True + True + True + none + + + False + True + 4 + + -- cgit