diff options
author | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2021-05-25 13:30:38 +0200 |
---|---|---|
committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2021-05-26 00:29:00 +0200 |
commit | 15ab55c092e0b474827abe104b73c5bfab6ef28c (patch) | |
tree | c9189516786794e229ac1d356eb17e0c85c4b290 /svx | |
parent | 4d800dd7b58291386850d69570d027192419c5a0 (diff) |
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 <lohmaier+LibreOffice@googlemail.com>
Diffstat (limited to 'svx')
-rw-r--r-- | svx/source/dialog/crashreportdlg.cxx | 9 | ||||
-rw-r--r-- | svx/source/dialog/crashreportdlg.hxx | 1 | ||||
-rw-r--r-- | svx/uiconfig/ui/crashreportdlg.ui | 16 |
3 files changed, 25 insertions, 1 deletions
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 <desktop/crashreport.hxx> #include <sfx2/safemode.hxx> #include <comphelper/processfactory.hxx> +#include <i18nlangtag/languagetag.hxx> +#include <unotools/configmgr.hxx> +#include <officecfg/Office/Common.hxx> #include <com/sun/star/task/OfficeRestartManager.hpp> #include <com/sun/star/task/XInteractionHandler.hpp> @@ -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<weld::TextView> mxEditPostUpload; std::unique_ptr<weld::TextView> mxFtBugReport; std::unique_ptr<weld::CheckButton> mxCBSafeMode; + std::unique_ptr<weld::LinkButton> 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.</property> <packing> <property name="expand">False</property> <property name="fill">False</property> - <property name="position">4</property> + <property name="position">5</property> </packing> </child> <child> @@ -139,6 +139,20 @@ You can help us to fix this issue by sending an anonymous crash report to the %P <property name="position">3</property> </packing> </child> + <child> + <object class="GtkLinkButton" id="btnPrivacyPolicy"> + <property name="label" translatable="yes" context="crashreportdlg|privacy">Privacy Policy</property> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="relief">none</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">4</property> + </packing> + </child> </object> </child> <child type="titlebar"> |