[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - 2 commits - svx/source svx/uiconfig

Andras Timar andras.timar at collabora.com
Tue Jul 10 20:58:15 UTC 2018


 svx/source/dialog/crashreportdlg.cxx |   10 +++++-----
 svx/source/dialog/crashreportdlg.hxx |    5 +++--
 svx/uiconfig/ui/crashreportdlg.ui    |   21 +++++++++++----------
 3 files changed, 19 insertions(+), 17 deletions(-)

New commits:
commit 48fc3c776c17ecd6522f5890411fbbfa5aa02c5c
Author: Andras Timar <andras.timar at collabora.com>
Date:   Fri May 5 16:20:35 2017 +0200

    don't show inaccessible crashreport links
    
    (cherry picked from commit 0d045c85fb8dbdb7fa2e116ef9983e0a60bd2b99)
    
    Change-Id: I3c4ed28cb1a02049fb009f576943f80b8ba8e627

diff --git a/svx/source/dialog/crashreportdlg.cxx b/svx/source/dialog/crashreportdlg.cxx
index c446aee7570f..faa7b763665a 100644
--- a/svx/source/dialog/crashreportdlg.cxx
+++ b/svx/source/dialog/crashreportdlg.cxx
@@ -30,7 +30,7 @@ CrashReportDialog::CrashReportDialog(vcl::Window* pParent):
     get(mpBtnCancel, "btn_cancel");
     get(mpBtnClose, "btn_close");
     get(mpEditPreUpload, "ed_pre");
-    get(mpEditPostUpload, "ed_post");
+    get(mpEditPostUpload, "ft_post");
     get(mpBugReportMailto, "bugreport_mailto");
     get(mpCBSafeMode, "check_safemode");
 
@@ -39,7 +39,6 @@ CrashReportDialog::CrashReportDialog(vcl::Window* pParent):
     mpBtnSend->SetClickHdl(LINK(this, CrashReportDialog, BtnHdl));
     mpBtnCancel->SetClickHdl(LINK(this, CrashReportDialog, BtnHdl));
     mpBtnClose->SetClickHdl(LINK(this, CrashReportDialog, BtnHdl));
-    mpEditPostUpload->SetReadOnly();
 }
 
 CrashReportDialog::~CrashReportDialog()
diff --git a/svx/source/dialog/crashreportdlg.hxx b/svx/source/dialog/crashreportdlg.hxx
index a564670bad55..69474a870fb5 100644
--- a/svx/source/dialog/crashreportdlg.hxx
+++ b/svx/source/dialog/crashreportdlg.hxx
@@ -35,7 +35,7 @@ private:
     VclPtr<Button> mpBtnCancel;
     VclPtr<Button> mpBtnClose;
     VclPtr<FixedText> mpEditPreUpload;
-    VclPtr<VclMultiLineEdit> mpEditPostUpload;
+    VclPtr<FixedText> mpEditPostUpload;
     VclPtr<FixedHyperlink> mpBugReportMailto;
     VclPtr<CheckBox> mpCBSafeMode;
 
diff --git a/svx/uiconfig/ui/crashreportdlg.ui b/svx/uiconfig/ui/crashreportdlg.ui
index de23777495d3..bc2006925cd6 100644
--- a/svx/uiconfig/ui/crashreportdlg.ui
+++ b/svx/uiconfig/ui/crashreportdlg.ui
@@ -81,15 +81,12 @@ 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="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:
-http://crashreport.collaboraoffice.com/stats/crash_details/%CRASHID</property>
+            <property name="label" translatable="yes" context="crashreportdlg|ed_post">The crash report was successfully uploaded.</property>
             <property name="wrap">True</property>
-            <property name="selectable">True</property>
           </object>
           <packing>
             <property name="expand">False</property>
commit f7274fb80a3b7f7949f8b2b017fc196ffbe5c529
Author: Andras Timar <andras.timar at collabora.com>
Date:   Wed Apr 12 17:06:37 2017 +0200

    Collabora Crashreport Dialog
    
    (cherry picked from commit c51dc04cc3cd48e7d5ab51a1f88e36bda8707c73)
    
    Change-Id: Id44e446684993984cf5778c82eb0a990bdd2f465

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 at 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 at collaboraoffice.com?subject=Crash report: %CRASHID</property>
           </object>
           <packing>
             <property name="expand">False</property>


More information about the Libreoffice-commits mailing list