summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndras Timar <andras.timar@collabora.com>2017-04-12 17:06:37 +0200
committerAron Budea <aron.budea@collabora.com>2018-07-10 22:51:57 +0200
commitf7274fb80a3b7f7949f8b2b017fc196ffbe5c529 (patch)
treedc4783cabeec0ec8fbc00ab058163d8cc483f97a
parent95a73f5e3222c4cbb9a77a12b37610b982ea1f06 (diff)
Collabora Crashreport Dialog
(cherry picked from commit c51dc04cc3cd48e7d5ab51a1f88e36bda8707c73) Change-Id: Id44e446684993984cf5778c82eb0a990bdd2f465
-rw-r--r--svx/source/dialog/crashreportdlg.cxx7
-rw-r--r--svx/source/dialog/crashreportdlg.hxx3
-rw-r--r--svx/uiconfig/ui/crashreportdlg.ui16
3 files changed, 16 insertions, 10 deletions
diff --git a/svx/source/dialog/crashreportdlg.cxx b/svx/source/dialog/crashreportdlg.cxx
index 70799f969bba..c446aee7570f 100644
--- a/svx/source/dialog/crashreportdlg.cxx
+++ b/svx/source/dialog/crashreportdlg.cxx
@@ -31,7 +31,7 @@ CrashReportDialog::CrashReportDialog(vcl::Window* pParent):
get(mpBtnClose, "btn_close");
get(mpEditPreUpload, "ed_pre");
get(mpEditPostUpload, "ed_post");
- get(mpFtBugReport, "ed_bugreport");
+ get(mpBugReportMailto, "bugreport_mailto");
get(mpCBSafeMode, "check_safemode");
maSuccessMsg = mpEditPostUpload->GetText();
@@ -54,7 +54,7 @@ void CrashReportDialog::dispose()
mpBtnClose.clear();
mpEditPreUpload.clear();
mpEditPostUpload.clear();
- mpFtBugReport.clear();
+ mpBugReportMailto.clear();
mpCBSafeMode.clear();
Dialog::dispose();
@@ -97,7 +97,8 @@ IMPL_LINK(CrashReportDialog, BtnHdl, Button*, pBtn, void)
}
mpBtnClose->Show();
- mpFtBugReport->Show();
+ mpBugReportMailto->SetURL(mpFtBugReport->GetURL().replaceAll("%CRASHID", aCrashID.replaceAll("Crash-ID=","")));
+ mpBugReportMailto->Show();
mpEditPreUpload->Hide();
mpEditPostUpload->Show();
mpBtnSend->Hide();
diff --git a/svx/source/dialog/crashreportdlg.hxx b/svx/source/dialog/crashreportdlg.hxx
index b0014364bd06..a564670bad55 100644
--- a/svx/source/dialog/crashreportdlg.hxx
+++ b/svx/source/dialog/crashreportdlg.hxx
@@ -13,6 +13,7 @@
#include <vcl/dialog.hxx>
#include <vcl/button.hxx>
#include <vcl/fixed.hxx>
+#include <vcl/fixedhyper.hxx>
#include <vcl/edit.hxx>
#include <vcl/vclmedit.hxx>
@@ -35,7 +36,7 @@ private:
VclPtr<Button> mpBtnClose;
VclPtr<FixedText> mpEditPreUpload;
VclPtr<VclMultiLineEdit> mpEditPostUpload;
- VclPtr<VclMultiLineEdit> mpFtBugReport;
+ VclPtr<FixedHyperlink> mpBugReportMailto;
VclPtr<CheckBox> mpCBSafeMode;
OUString maSuccessMsg;
diff --git a/svx/uiconfig/ui/crashreportdlg.ui b/svx/uiconfig/ui/crashreportdlg.ui
index ed3247bc6a26..de23777495d3 100644
--- a/svx/uiconfig/ui/crashreportdlg.ui
+++ b/svx/uiconfig/ui/crashreportdlg.ui
@@ -87,7 +87,7 @@ You can help us to fix this issue by sending an anonymous crash report to the %P
<property name="xalign">0</property>
<property name="label" 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>
+http://crashreport.collaboraoffice.com/stats/crash_details/%CRASHID</property>
<property name="wrap">True</property>
<property name="selectable">True</property>
</object>
@@ -98,12 +98,16 @@ crashreport.collaboraoffice.com/stats/crash_details/%CRASHID</property>
</packing>
</child>
<child>
- <object class="GtkTextView" id="ed_bugreport">
- <property name="can_focus">False</property>
- <property name="label" 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.
+ <object class="GtkLinkButton" id="bugreport_mailto">
+ <property name="label" translatable="yes" context="crashreportdlg|ed_post">Click here to send an email to support@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="wrap">True</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:support@collaboraoffice.com?subject=Crash report: %CRASHID</property>
</object>
<packing>
<property name="expand">False</property>