sfx2/uiconfig/ui/safemodequerydialog.ui | 3 +-- svx/source/dialog/crashreportdlg.cxx | 7 ++++--- svx/source/dialog/crashreportdlg.hxx | 3 ++- svx/uiconfig/ui/crashreportdlg.ui | 18 +++++++++++------- 4 files changed, 18 insertions(+), 13 deletions(-)
New commits: commit c51dc04cc3cd48e7d5ab51a1f88e36bda8707c73 Author: Andras Timar <[email protected]> Date: Wed Apr 12 17:06:37 2017 +0200 Collabora Crashreport Dialog Change-Id: Id44e446684993984cf5778c82eb0a990bdd2f465 diff --git a/svx/source/dialog/crashreportdlg.cxx b/svx/source/dialog/crashreportdlg.cxx index ed56b67678af..7d94dc40f551 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(); @@ -95,7 +95,8 @@ IMPL_LINK(CrashReportDialog, BtnHdl, Button*, pBtn, void) mpEditPostUpload->SetText("Error!"); 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 6236cd7babc6..df16e78e8bf1 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">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">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">Click here to send an email to [email protected]. +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:[email protected]?subject=Crash report: %CRASHID</property> </object> <packing> <property name="expand">False</property> commit ff707db0a86bd78ac32efb0d7d5b039c85d636b3 Author: Katarina Behrens <[email protected]> Date: Tue Dec 13 16:12:06 2016 +0100 SafeMode: s/LibreOffice/%PRODUCTNAME/, small UI changes nouns are written Upper Case only in German also Cancel button looks odd as secondary Change-Id: Id1b051cbb86ab69ea88c7b1da2cda3eb19f063de Reviewed-on: https://gerrit.libreoffice.org/31971 Reviewed-by: Katarina Behrens <[email protected]> Tested-by: Katarina Behrens <[email protected]> (cherry picked from commit 8020215f1f502d30a5045689b865afc0092f126f) diff --git a/sfx2/uiconfig/ui/safemodequerydialog.ui b/sfx2/uiconfig/ui/safemodequerydialog.ui index 60d6b3a426ed..6d9ba3a618be 100644 --- a/sfx2/uiconfig/ui/safemodequerydialog.ui +++ b/sfx2/uiconfig/ui/safemodequerydialog.ui @@ -32,7 +32,6 @@ <property name="expand">False</property> <property name="fill">True</property> <property name="position">0</property> - <property name="secondary">True</property> </packing> </child> <child> @@ -61,7 +60,7 @@ <object class="GtkLabel" id="label"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Are you sure you want to restart %PRODUCTNAME and enter the Safe Mode?</property> + <property name="label" translatable="yes">Are you sure you want to restart %PRODUCTNAME and enter safe mode?</property> <property name="wrap">True</property> <property name="max_width_chars">80</property> <property name="lines">2</property> diff --git a/svx/uiconfig/ui/crashreportdlg.ui b/svx/uiconfig/ui/crashreportdlg.ui index aa8e925179a2..6236cd7babc6 100644 --- a/svx/uiconfig/ui/crashreportdlg.ui +++ b/svx/uiconfig/ui/crashreportdlg.ui @@ -113,7 +113,7 @@ Thank you for your help in improving %PRODUCTNAME.</property> </child> <child> <object class="GtkCheckButton" id="check_safemode"> - <property name="label" translatable="yes">Restart LibreOffice to enter Safe Mode</property> + <property name="label" translatable="yes">Restart %PRODUCTNAME to enter safe mode</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
