svx/source/dialog/crashreportdlg.cxx | 5 +++--
svx/source/dialog/crashreportdlg.hxx | 2 +-
svx/uiconfig/ui/crashreportdlg.ui | 23 +++++++++++------------
3 files changed, 15 insertions(+), 15 deletions(-)
New commits:
commit 543cd2d2a99072d0aa5797be29275a575261f31c
Author: Andras Timar <andras.ti...@collabora.com>
AuthorDate: Wed Apr 12 17:06:37 2017 +0200
Commit: Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Thu May 21 17:13:12 2020 +0200
Collabora Crashreport Dialog
(cherry picked from commit c51dc04cc3cd48e7d5ab51a1f88e36bda8707c73)
fix previous commit
(cherry picked from commit 4553bc1bfa72dce55566971e27b94f3a5bfcdc79)
Reviewed-on: https://gerrit.libreoffice.org/78402
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Andras Timar <andras.ti...@collabora.com>
204f83aede085bbe4f5bd6937238b2117e51c86a
Change-Id: Id44e446684993984cf5778c82eb0a990bdd2f465
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94478
Tested-by: Mike Kaganski <mike.kagan...@collabora.com>
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
diff --git a/svx/source/dialog/crashreportdlg.cxx
b/svx/source/dialog/crashreportdlg.cxx
index 85801277c27c..52cec8fc770c 100644
--- a/svx/source/dialog/crashreportdlg.cxx
+++ b/svx/source/dialog/crashreportdlg.cxx
@@ -29,7 +29,7 @@ CrashReportDialog::CrashReportDialog(weld::Window* pParent)
, mxBtnClose(m_xBuilder->weld_button("btn_close"))
, mxEditPreUpload(m_xBuilder->weld_label("ed_pre"))
, mxEditPostUpload(m_xBuilder->weld_text_view("ed_post"))
- , mxFtBugReport(m_xBuilder->weld_text_view("ed_bugreport"))
+ , mxBugReportMailto(m_xBuilder->weld_link_button("bugreport_mailto"))
, mxCBSafeMode(m_xBuilder->weld_check_button("check_safemode"))
{
maSuccessMsg = mxEditPostUpload->get_text();
@@ -84,7 +84,8 @@ IMPL_LINK(CrashReportDialog, BtnHdl, weld::Button&, rBtn,
void)
}
mxBtnClose->show();
- mxFtBugReport->show();
+
mxBugReportMailto->set_uri(mxBugReportMailto->get_uri().replaceAll("%CRASHID",
aCrashID.replaceAll("Crash-ID=","")));
+ mxBugReportMailto->show();
mxEditPostUpload->show();
mxBtnSend->set_sensitive(false);
mxBtnCancel->set_sensitive(false);
diff --git a/svx/source/dialog/crashreportdlg.hxx
b/svx/source/dialog/crashreportdlg.hxx
index f913cabac43f..1c436c1c7639 100644
--- a/svx/source/dialog/crashreportdlg.hxx
+++ b/svx/source/dialog/crashreportdlg.hxx
@@ -25,7 +25,7 @@ private:
std::unique_ptr<weld::Button> mxBtnClose;
std::unique_ptr<weld::Label> mxEditPreUpload;
std::unique_ptr<weld::TextView> mxEditPostUpload;
- std::unique_ptr<weld::TextView> mxFtBugReport;
+ std::unique_ptr<weld::LinkButton> mxBugReportMailto;
std::unique_ptr<weld::CheckButton> mxCBSafeMode;
OUString maSuccessMsg;
diff --git a/svx/uiconfig/ui/crashreportdlg.ui
b/svx/uiconfig/ui/crashreportdlg.ui
index b5de76bec904..9cdd939b2157 100644
--- a/svx/uiconfig/ui/crashreportdlg.ui
+++ b/svx/uiconfig/ui/crashreportdlg.ui
@@ -5,12 +5,7 @@
<object class="GtkTextBuffer" id="textbuffer1">
<property name="text" translatable="yes"
context="crashreportdlg|ed_post">The crash report was successfully uploaded.
You can soon find the report at:
-crashreport.collaboraoffice.com/stats/crash_details/%CRASHID</property>
- </object>
- <object class="GtkTextBuffer" id="textbuffer2">
- <property name="text" translatable="yes"
context="crashreportdlg|ed_bugreport">Please check the report and if no bug
report is connected to the crash report yet, open a new bug report at
bugs.documentfoundation.org.
-Add detailed instructions on how to reproduce the crash and the shown crash ID
into the crash report field.
-Thank you for your help in improving %PRODUCTNAME.</property>
+http://crashreport.collaboraoffice.com/stats/crash_details/%CRASHID</property>
</object>
<object class="GtkDialog" id="CrashReportDialog">
<property name="can_focus">False</property>
@@ -112,12 +107,16 @@ You can help us to fix this issue by sending an anonymous
crash report to the %P
</packing>
</child>
<child>
- <object class="GtkTextView" id="ed_bugreport">
- <property name="can_focus">False</property>
- <property name="editable">False</property>
- <property name="cursor_visible">False</property>
- <property name="buffer">textbuffer2</property>
- <property name="accepts_tab">False</property>
+ <object class="GtkLinkButton" id="bugreport_mailto">
+ <property name="label" translatable="yes"
context="crashreportdlg|ed_post"> Click here to send an email to
supp...@collaboraoffice.com.
+In the message body please add detailed instructions on how to reproduce the
crash.
+Thank you for your help in improving %PRODUCTNAME.</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="has_tooltip">True</property>
+ <property name="relief">none</property>
+ <property name="xalign">0</property>
+ <property
name="uri">mailto:supp...@collaboraoffice.com?subject=Crash report:
%CRASHID</property>
</object>
<packing>
<property name="expand">False</property>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
