bin/upload_symbols.py | 4 ++--
desktop/source/app/crashreport.cxx | 4 ++--
svx/source/dialog/crashreportdlg.cxx | 7 ++++---
svx/source/dialog/crashreportdlg.hxx | 3 ++-
svx/uiconfig/ui/crashreportdlg.ui | 16 ++++++++++------
5 files changed, 20 insertions(+), 14 deletions(-)
New commits:
commit 0bb37c036eb6c518faec0d3d9e336ae13212b946
Author: Andras Timar <andras.ti...@collabora.com>
AuthorDate: Wed Apr 12 17:06:37 2017 +0200
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Tue Sep 17 12:53:30 2019 +0200
Collabora Crashreport Dialog
(cherry picked from commit c51dc04cc3cd48e7d5ab51a1f88e36bda8707c73)
Change-Id: Id44e446684993984cf5778c82eb0a990bdd2f465
fix previous commit
Change-Id: I204f83aede085bbe4f5bd6937238b2117e51c86a
(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>
diff --git a/svx/source/dialog/crashreportdlg.cxx
b/svx/source/dialog/crashreportdlg.cxx
index 70799f969bba..21581b0a865c 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(mpBugReportMailto->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 e48a8ebc5b12..2651979a0c62 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
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="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:supp...@collaboraoffice.com?subject=Crash report:
%CRASHID</property>
</object>
<packing>
<property name="expand">False</property>
commit 2b8a648756dd8fc5ef2497c996ad3b9e5161cfc7
Author: Andras Timar <andras.ti...@collabora.com>
AuthorDate: Wed Mar 29 16:55:17 2017 +0200
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Tue Sep 17 12:53:14 2019 +0200
enable crashreport on Windows
(cherry picked from commit ce263269dff121af85634ada7870f33632e02bdd)
Change-Id: I55df3da63919f76afcd4905b1898287e26c8c4f1
Reviewed-on: https://gerrit.libreoffice.org/78401
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Andras Timar <andras.ti...@collabora.com>
diff --git a/bin/upload_symbols.py b/bin/upload_symbols.py
index 72a03b6e56db..381f08a5ebd1 100755
--- a/bin/upload_symbols.py
+++ b/bin/upload_symbols.py
@@ -19,8 +19,8 @@ def main():
print("Usage: upload-symbols.py symbols.zip config.ini \"long
explanation\" [--system]")
sys.exit(1)
- upload_url = "http://crashreport.libreoffice.org/upload/";
- login_url = "http://crashreport.libreoffice.org/accounts/login/";
+ upload_url = "http://crashreport.collaboraoffice.com/upload/";
+ login_url = "http://crashreport.collaboraoffice.com/accounts/login/";
config = configparser.ConfigParser()
config.read(sys.argv[2])
diff --git a/desktop/source/app/crashreport.cxx
b/desktop/source/app/crashreport.cxx
index 4a702f4420bd..79daace2b16f 100644
--- a/desktop/source/app/crashreport.cxx
+++ b/desktop/source/app/crashreport.cxx
@@ -76,7 +76,7 @@ void CrashReporter::writeCommonInfo()
ucbhelper::InternetProxyDecider
proxy_decider(::comphelper::getProcessComponentContext());
const OUString protocol = "https";
- const OUString url = "crashreport.libreoffice.org";
+ const OUString url = "crashreport.collaboraoffice.com";
const sal_Int32 port = 443;
const ucbhelper::InternetProxyServer proxy_server =
proxy_decider.getProxy(protocol, url, port);
@@ -84,7 +84,7 @@ void CrashReporter::writeCommonInfo()
// limit the amount of code that needs to be executed before the crash
reporting
std::string ini_path = CrashReporter::getIniFileName();
std::ofstream minidump_file(ini_path, std::ios_base::trunc);
- minidump_file << "ProductName=LibreOffice\n";
+ minidump_file << "ProductName=CollaboraOffice\n";
minidump_file << "Version=" LIBO_VERSION_DOTTED "\n";
minidump_file << "BuildID=" << utl::Bootstrap::getBuildIdData("") << "\n";
minidump_file << "URL=" << protocol << "://" << url << "/submit/\n";
diff --git a/svx/uiconfig/ui/crashreportdlg.ui
b/svx/uiconfig/ui/crashreportdlg.ui
index a627dd2a1949..e48a8ebc5b12 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.libreoffice.org/stats/crash_details/%CRASHID</property>
+crashreport.collaboraoffice.com/stats/crash_details/%CRASHID</property>
<property name="wrap">True</property>
<property name="selectable">True</property>
</object>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
