From 611fa93dbea632287caa7a49a4981e6b3830f80b Mon Sep 17 00:00:00 2001 From: SiboVG Date: Thu, 1 Dec 2022 14:43:03 +0100 Subject: [PATCH] Reformat bug report dialog --- core/resources/l10n/messages.properties | 6 +++--- core/resources/l10n/messages_ja.properties | 2 +- core/resources/l10n/messages_nl.properties | 2 +- core/resources/l10n/messages_uk_UA.properties | 2 +- .../openrocket/gui/dialogs/BugReportDialog.java | 16 ++++++++++------ 5 files changed, 16 insertions(+), 12 deletions(-) diff --git a/core/resources/l10n/messages.properties b/core/resources/l10n/messages.properties index fc47de6a3..5d88d8684 100644 --- a/core/resources/l10n/messages.properties +++ b/core/resources/l10n/messages.properties @@ -157,14 +157,14 @@ bugreport.dlg.but.Sendbugreport.Ttip = Automatically send the bug report to the bugreport.dlg.successmsg1 = Bug report successfully sent. bugreport.dlg.successmsg2 = Thank you for helping make OpenRocket better! bugreport.dlg.successmsg3 = Bug report sent -bugreport.dlg.connectedInternet = To submit a bug online, include the text below at: -bugreport.dlg.otherwise = To submit a bug via email, send the text below to: +bugreport.dlg.connectedInternet =    To submit a bug online, include the text below at: +bugreport.dlg.otherwise =    To submit a bug via email, send the text below to: bugreport.lbl.Theinformation = The information above may be included in a public bug report. Make sure it does not contain any sensitive information you do not want to be made public. bugreport.dlg.failedmsg1 = OpenRocket was unable to send the bug report: bugreport.dlg.failedmsg2 = Please send the report manually to bugreport.dlg.failedmsg3 = Error sending report bugreport.reportDialog.txt = Bugs can be reported at the OpenRocket Github project site or by email. -bugreport.reportDialog.txt2 = Please include a short description about what you were doing when the exception occurred. +bugreport.reportDialog.txt2 = Sorry for the bug\u2026 \u2639 Please help us fix it by sending this bug report! bugreport.dlg.provideDescription = Please provide a description of the bug first. bugreport.dlg.provideDescription.title = Bug description missing diff --git a/core/resources/l10n/messages_ja.properties b/core/resources/l10n/messages_ja.properties index 4b6f4f3ce..862f12ab1 100644 --- a/core/resources/l10n/messages_ja.properties +++ b/core/resources/l10n/messages_ja.properties @@ -146,7 +146,7 @@ bugreport.dlg.failedmsg1 = OpenRocket was unable to send the bug report: bugreport.dlg.failedmsg2 = Please send the report manually to bugreport.dlg.failedmsg3 = Error sending report bugreport.reportDialog.txt = You can report a bug in OpenRocket by filling in and submitting the form below.
You can also report bugs and include attachments on the project web site. -bugreport.reportDialog.txt2 = Please include a short description about what you were doing when the exception occurred. +bugreport.reportDialog.txt2 = Sorry for the bug\u2026 \u2639 Please help us fix it by sending this bug report! bugreport.dlg.provideDescription = Please provide a description of the bug first. bugreport.dlg.provideDescription.title = Bug description missing diff --git a/core/resources/l10n/messages_nl.properties b/core/resources/l10n/messages_nl.properties index c010211fc..d00fd2d53 100644 --- a/core/resources/l10n/messages_nl.properties +++ b/core/resources/l10n/messages_nl.properties @@ -150,7 +150,7 @@ bugreport.dlg.failedmsg1 = OpenRocket was niet in staat om het foutrapport te ve bugreport.dlg.failedmsg2 = Stuur het rapport handmatig naar bugreport.dlg.failedmsg3 = Fout bij verzenden rapport bugreport.reportDialog.txt = Fouten kunnen worden gemeld op de OpenRocket Github projectsite of via e-mail. -bugreport.reportDialog.txt2 = Geef een korte beschrijving van wat u aan het doen was toen de uitzondering zich voordeed. +bugreport.reportDialog.txt2 = Sorry voor de fout \u2026 \u2639 Help ons het op te lossen door dit rapport te versturen! bugreport.dlg.provideDescription = Geef eerst een beschrijving van de fout. bugreport.dlg.provideDescription.title = Foutbeschrijving ontbreekt diff --git a/core/resources/l10n/messages_uk_UA.properties b/core/resources/l10n/messages_uk_UA.properties index 169171641..988ca8d0b 100644 --- a/core/resources/l10n/messages_uk_UA.properties +++ b/core/resources/l10n/messages_uk_UA.properties @@ -153,7 +153,7 @@ bugreport.dlg.failedmsg1 = OpenRocket was unable to send the bug report: bugreport.dlg.failedmsg2 = Please send the report manually to bugreport.dlg.failedmsg3 = Error sending report bugreport.reportDialog.txt = You can report a bug in OpenRocket by filling in and submitting the form below.
You can also report bugs and include attachments on the project web site. -bugreport.reportDialog.txt2 = Please include a short description about what you were doing when the exception occurred. +bugreport.reportDialog.txt2 = Sorry for the bug\u2026 \u2639 Please help us fix it by sending this bug report! bugreport.dlg.provideDescription = Please provide a description of the bug first. bugreport.dlg.provideDescription.title = Bug description missing diff --git a/swing/src/net/sf/openrocket/gui/dialogs/BugReportDialog.java b/swing/src/net/sf/openrocket/gui/dialogs/BugReportDialog.java index 946ecd224..4683a6a15 100644 --- a/swing/src/net/sf/openrocket/gui/dialogs/BugReportDialog.java +++ b/swing/src/net/sf/openrocket/gui/dialogs/BugReportDialog.java @@ -53,15 +53,15 @@ public class BugReportDialog extends JDialog { JPanel panel = new JPanel(new MigLayout("fill")); // Some fscking Swing bug that makes html labels initially way too high - JLabel label = new JLabel(labelText); - Dimension d = label.getPreferredSize(); + StyledLabel titleLabel = new StyledLabel(labelText, 0); + Dimension d = titleLabel.getPreferredSize(); d.width = 100000; - label.setMaximumSize(d); - panel.add(label, "gapleft para, wrap para"); + titleLabel.setMaximumSize(d); + panel.add(titleLabel, "gapleft para, wrap para"); //// If connected to the Internet, you can simply click //// Send bug report. - label = new JLabel(trans.get("bugreport.dlg.connectedInternet")); + JLabel label = new JLabel(trans.get("bugreport.dlg.connectedInternet")); panel.add(label, "gapleft para, split 2, gapright rel"); panel.add(new URLLabel(NEW_ISSUES_URL), "growx, wrap para"); @@ -160,13 +160,17 @@ public class BugReportDialog extends JDialog { sb.append("---------- Bug report ----------\n"); sb.append('\n'); - sb.append("Please include a description about what actions you were " + + sb.append("Please include a description about what actions you were " + "performing when the exception occurred:\n"); sb.append("(You can edit text directly in this window)\n"); sb.append('\n'); sb.append("1. \n"); sb.append("2. \n"); sb.append("3. \n"); + + sb.append("\n"); + sb.append("If possible, please send us the .ork file that caused the bug.\n"); + sb.append('\n'); sb.append("Include your email address (optional; it helps if we can " +