hongshaorou/openrocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve bug report formatting

Browse Source
This commit is contained in:
Sibo Van Gool 2022-01-28 22:34:03 +01:00
parent 68032e88ff
commit e48804feab
1 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
swing/src/net/sf/openrocket/gui/dialogs/BugReportDialog.java
View File

@ -14,10 +14,12 @@ import java.util.TreeSet;
import javax.swing.JButton;
import javax.swing.JDialog;
import javax.swing.JEditorPane;
import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.JScrollPane;
import javax.swing.JTextArea;
import javax.swing.JTextPane;
import com.jogamp.opengl.JoglVersion;
@ -68,11 +70,13 @@ public class BugReportDialog extends JDialog {
panel.add(new JLabel(trans.get("bugreport.dlg.otherwise") + " "),
"gapleft para, split 2, gapright rel");
panel.add(new URLLabel(REPORT_EMAIL_URL, REPORT_EMAIL), "growx, wrap para");
final JTextArea textArea = new JTextArea(message, 20, 70);
textArea.setEditable(true);
panel.add(new JScrollPane(textArea), "grow, wrap");
final JEditorPane editorPane = new JEditorPane("text/html", message.replace("\n", "<br>"));
editorPane.putClientProperty(JTextPane.HONOR_DISPLAY_PROPERTIES, true);
editorPane.setPreferredSize(new Dimension(600, 400));
editorPane.setEditable(true);
editorPane.setCaretPosition(0); // Scroll to the top by default
panel.add(new JScrollPane(editorPane), "grow, wrap");
panel.add(new StyledLabel(trans.get("bugreport.lbl.Theinformation"), -1), "wrap para");
@ -106,17 +110,18 @@ public class BugReportDialog extends JDialog {
StringBuilder sb = new StringBuilder();
sb.append("---------- Bug report ----------\n");
sb.append("<html>---------- Bug report ----------\n");
sb.append('\n');
sb.append("Include detailed steps on how to trigger the bug:\n");
sb.append("<b>Include detailed steps on how to trigger the bug:</b>\n");
sb.append("<i>(You can edit text directly in this window)</i>\n");
sb.append('\n');
sb.append("1. \n");
sb.append("2. \n");
sb.append("3. \n");
sb.append('\n');
sb.append("What does the software do and what in your opinion should it do in the " +
"case described above:\n");
sb.append("<b>What does the software do and what in your opinion should it do in the " +
"case described above:</b>\n");
sb.append('\n');
sb.append('\n');
sb.append('\n');
@ -133,7 +138,7 @@ public class BugReportDialog extends JDialog {
addSystemInformation(sb);
sb.append("---------- Error log ----------\n");
addErrorLog(sb);
sb.append("---------- End of bug report ----------\n");
sb.append("---------- End of bug report ----------</html>\n");
sb.append('\n');
BugReportDialog reportDialog = new BugReportDialog(parent,
@ -152,14 +157,15 @@ public class BugReportDialog extends JDialog {
public static void showExceptionDialog(Window parent, Thread t, Throwable e) {
StringBuilder sb = new StringBuilder();
sb.append("---------- Bug report ----------\n");
sb.append('\n');
sb.append("Please include a description about what actions you were " +
"performing when the exception occurred:\n");
sb.append('\n');
sb.append('\n');
sb.append("<html>---------- Bug report ----------\n");
sb.append('\n');
sb.append("<b>Please include a description about what actions you were " +
"performing when the exception occurred:</b>\n");
sb.append("<i>(You can edit text directly in this window)</i>\n");
sb.append('\n');
sb.append("1. \n");
sb.append("2. \n");
sb.append("3. \n");
sb.append("Include your email address (optional; it helps if we can " +
@ -191,7 +197,7 @@ public class BugReportDialog extends JDialog {
addSystemInformation(sb);
sb.append("---------- Error log ----------\n");
addErrorLog(sb);
sb.append("---------- End of bug report ----------\n");
sb.append("---------- End of bug report ----------</html>\n");
sb.append('\n');
BugReportDialog reportDialog =