svx/source/dialog/crashreportdlg.cxx | 9 +++++----
svx/source/dialog/crashreportdlg.hxx | 2 +-
svx/uiconfig/ui/crashreportdlg.ui | 10 +++-------
3 files changed, 9 insertions(+), 12 deletions(-)
New commits:
commit 321b4048a41f501e88560ecf10837207a6b7f414
Author: Andras Timar <andras.ti...@collabora.com>
AuthorDate: Fri May 5 16:20:35 2017 +0200
Commit: Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Thu May 21 17:13:48 2020 +0200
don't show inaccessible crashreport links
(cherry picked from commit 0d045c85fb8dbdb7fa2e116ef9983e0a60bd2b99)
Change-Id: I3c4ed28cb1a02049fb009f576943f80b8ba8e627
Reviewed-on: https://gerrit.libreoffice.org/78403
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Andras Timar <andras.ti...@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94479
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 52cec8fc770c..1e51b66e5582 100644
--- a/svx/source/dialog/crashreportdlg.cxx
+++ b/svx/source/dialog/crashreportdlg.cxx
@@ -28,15 +28,16 @@ CrashReportDialog::CrashReportDialog(weld::Window* pParent)
, mxBtnCancel(m_xBuilder->weld_button("btn_cancel"))
, mxBtnClose(m_xBuilder->weld_button("btn_close"))
, mxEditPreUpload(m_xBuilder->weld_label("ed_pre"))
- , mxEditPostUpload(m_xBuilder->weld_text_view("ed_post"))
+ , mxEditPostUpload(m_xBuilder->weld_label("ft_post"))
, mxBugReportMailto(m_xBuilder->weld_link_button("bugreport_mailto"))
, mxCBSafeMode(m_xBuilder->weld_check_button("check_safemode"))
{
- maSuccessMsg = mxEditPostUpload->get_text();
+ maSuccessMsg = mxEditPostUpload->get_label();
auto nWidth = mxEditPreUpload->get_preferred_size().Width();
nWidth = std::max(nWidth, mxCBSafeMode->get_size_request().Width());
mxEditPreUpload->set_size_request(nWidth, -1);
+ mxEditPostUpload->set_size_request(nWidth, -1);
mxCBSafeMode->set_size_request(nWidth, -1);
mxBtnSend->connect_clicked(LINK(this, CrashReportDialog, BtnHdl));
@@ -76,11 +77,11 @@ IMPL_LINK(CrashReportDialog, BtnHdl, weld::Button&, rBtn,
void)
OUString aProcessedMessage = maSuccessMsg.replaceAll("%CRASHID",
aCrashID.replaceAll("Crash-ID=",""));
// vclbuilder seems to replace _ with ~ even in text
- mxEditPostUpload->set_text(aProcessedMessage.replaceAll("~", "_"));
+ mxEditPostUpload->set_label(aProcessedMessage.replaceAll("~",
"_"));
}
else
{
- mxEditPostUpload->set_text(aCrashID);
+ mxEditPostUpload->set_label(aCrashID);
}
mxBtnClose->show();
diff --git a/svx/source/dialog/crashreportdlg.hxx
b/svx/source/dialog/crashreportdlg.hxx
index 1c436c1c7639..256cf014c3fb 100644
--- a/svx/source/dialog/crashreportdlg.hxx
+++ b/svx/source/dialog/crashreportdlg.hxx
@@ -24,7 +24,7 @@ private:
std::unique_ptr<weld::Button> mxBtnCancel;
std::unique_ptr<weld::Button> mxBtnClose;
std::unique_ptr<weld::Label> mxEditPreUpload;
- std::unique_ptr<weld::TextView> mxEditPostUpload;
+ std::unique_ptr<weld::Label> mxEditPostUpload;
std::unique_ptr<weld::LinkButton> mxBugReportMailto;
std::unique_ptr<weld::CheckButton> mxCBSafeMode;
diff --git a/svx/uiconfig/ui/crashreportdlg.ui
b/svx/uiconfig/ui/crashreportdlg.ui
index 9cdd939b2157..a0e2877f74e3 100644
--- a/svx/uiconfig/ui/crashreportdlg.ui
+++ b/svx/uiconfig/ui/crashreportdlg.ui
@@ -3,9 +3,7 @@
<interface domain="svx">
<requires lib="gtk+" version="3.18"/>
<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:
-http://crashreport.collaboraoffice.com/stats/crash_details/%CRASHID</property>
+ <property name="text" translatable="yes"
context="crashreportdlg|ed_post">The crash report was successfully
uploaded.</property>
</object>
<object class="GtkDialog" id="CrashReportDialog">
<property name="can_focus">False</property>
@@ -92,13 +90,11 @@ 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_post">
+ <object class="GtkLabel" id="ft_post">
<property name="can_focus">False</property>
<property name="valign">center</property>
- <property name="editable">False</property>
- <property name="cursor_visible">False</property>
<property name="buffer">textbuffer1</property>
- <property name="accepts_tab">False</property>
+ <property name="wrap">True</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
