From 1104ccc61ec1bc517409a66d6371012b7202ee60 Mon Sep 17 00:00:00 2001 From: RalfBarkow Date: Fri, 7 Jun 2024 13:11:21 +0200 Subject: [PATCH] refactor(CErrorLog): see No more "Send error log as email" #513 Rename "Fehlerbericht" to "Konsole" and put Session Log first. NB. General Log is a list of the last 3 session logs. Both logs have Java Version information added to the top. --- .../zettelkasten/CErrorLog.form | 42 +++++++------- .../zettelkasten/CErrorLog.java | 58 +++++++++---------- .../resources/CErrorLog.properties | 2 +- 3 files changed, 51 insertions(+), 51 deletions(-) diff --git a/src/main/java/de/danielluedecke/zettelkasten/CErrorLog.form b/src/main/java/de/danielluedecke/zettelkasten/CErrorLog.form index 9de1c4b8..80ad79ab 100644 --- a/src/main/java/de/danielluedecke/zettelkasten/CErrorLog.form +++ b/src/main/java/de/danielluedecke/zettelkasten/CErrorLog.form @@ -65,17 +65,17 @@ - + - + - - + + @@ -83,26 +83,25 @@ - + - + - + - - + @@ -110,31 +109,31 @@ - + - + - + - + - - + + @@ -142,25 +141,26 @@ - + - + - + + - + @@ -168,14 +168,14 @@ - + - + diff --git a/src/main/java/de/danielluedecke/zettelkasten/CErrorLog.java b/src/main/java/de/danielluedecke/zettelkasten/CErrorLog.java index 7a5c53e5..112f25be 100644 --- a/src/main/java/de/danielluedecke/zettelkasten/CErrorLog.java +++ b/src/main/java/de/danielluedecke/zettelkasten/CErrorLog.java @@ -230,12 +230,12 @@ private void initComponents() { jButton2 = new javax.swing.JButton(); jTabbedPane1 = new javax.swing.JTabbedPane(); - jPanel1 = new javax.swing.JPanel(); - jScrollPane1 = new javax.swing.JScrollPane(); - jTextArea1 = new javax.swing.JTextArea(); jPanel2 = new javax.swing.JPanel(); jScrollPane2 = new javax.swing.JScrollPane(); jTextArea2 = new javax.swing.JTextArea(); + jPanel1 = new javax.swing.JPanel(); + jScrollPane1 = new javax.swing.JScrollPane(); + jTextArea1 = new javax.swing.JTextArea(); setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE); org.jdesktop.application.ResourceMap resourceMap = org.jdesktop.application.Application.getInstance().getContext().getResourceMap(CErrorLog.class); @@ -254,6 +254,32 @@ public void actionPerformed(java.awt.event.ActionEvent evt) { jTabbedPane1.setMinimumSize(new java.awt.Dimension(60, 60)); jTabbedPane1.setName("jTabbedPane1"); // NOI18N + jPanel2.setMinimumSize(new java.awt.Dimension(25, 25)); + jPanel2.setName("jPanel2"); // NOI18N + + jScrollPane2.setBorder(null); + jScrollPane2.setMinimumSize(new java.awt.Dimension(25, 25)); + jScrollPane2.setName("jScrollPane2"); // NOI18N + + jTextArea2.setLineWrap(true); + jTextArea2.setWrapStyleWord(true); + jTextArea2.setMinimumSize(new java.awt.Dimension(25, 25)); + jTextArea2.setName("jTextArea2"); // NOI18N + jScrollPane2.setViewportView(jTextArea2); + + javax.swing.GroupLayout jPanel2Layout = new javax.swing.GroupLayout(jPanel2); + jPanel2.setLayout(jPanel2Layout); + jPanel2Layout.setHorizontalGroup( + jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addComponent(jScrollPane2, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + ); + jPanel2Layout.setVerticalGroup( + jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addComponent(jScrollPane2, javax.swing.GroupLayout.DEFAULT_SIZE, 367, Short.MAX_VALUE) + ); + + jTabbedPane1.addTab(resourceMap.getString("jPanel2.TabConstraints.tabTitle"), jPanel2); // NOI18N + jPanel1.setMinimumSize(new java.awt.Dimension(25, 25)); jPanel1.setName("jPanel1"); // NOI18N @@ -281,32 +307,6 @@ public void actionPerformed(java.awt.event.ActionEvent evt) { jTabbedPane1.addTab(resourceMap.getString("jPanel1.TabConstraints.tabTitle"), jPanel1); // NOI18N - jPanel2.setMinimumSize(new java.awt.Dimension(25, 25)); - jPanel2.setName("jPanel2"); // NOI18N - - jScrollPane2.setBorder(null); - jScrollPane2.setMinimumSize(new java.awt.Dimension(25, 25)); - jScrollPane2.setName("jScrollPane2"); // NOI18N - - jTextArea2.setLineWrap(true); - jTextArea2.setWrapStyleWord(true); - jTextArea2.setMinimumSize(new java.awt.Dimension(25, 25)); - jTextArea2.setName("jTextArea2"); // NOI18N - jScrollPane2.setViewportView(jTextArea2); - - javax.swing.GroupLayout jPanel2Layout = new javax.swing.GroupLayout(jPanel2); - jPanel2.setLayout(jPanel2Layout); - jPanel2Layout.setHorizontalGroup( - jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(jScrollPane2, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - ); - jPanel2Layout.setVerticalGroup( - jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(jScrollPane2, javax.swing.GroupLayout.DEFAULT_SIZE, 367, Short.MAX_VALUE) - ); - - jTabbedPane1.addTab(resourceMap.getString("jPanel2.TabConstraints.tabTitle"), jPanel2); // NOI18N - javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane()); getContentPane().setLayout(layout); layout.setHorizontalGroup( diff --git a/src/main/resources/de/danielluedecke/zettelkasten/resources/CErrorLog.properties b/src/main/resources/de/danielluedecke/zettelkasten/resources/CErrorLog.properties index d3282e39..3a172221 100644 --- a/src/main/resources/de/danielluedecke/zettelkasten/resources/CErrorLog.properties +++ b/src/main/resources/de/danielluedecke/zettelkasten/resources/CErrorLog.properties @@ -2,6 +2,6 @@ FormErrorLog.title=Konsole errorMsg=Helfen Sie mit, den Zettelkasten zu verbessern! Sofern Sie eine Fehlermeldung erhalten haben, senden Sie bitte den unten stehenden Bericht per E-Mail an den Autor! Sobald Sie die Schaltfl\u00e4che unten bet\u00e4tigen, \u00f6ffnet sich Ihr E-Mail-Programm. F\u00fcgen Sie dann den Text ein und schicken Sie die E-Mail ab. Sie helfen damit sehr, das Programm zu verbessern! Vielen Dank! jButton2.text=Schlie\u00dfen jPanel1.TabConstraints.tabTitle=General Log -jPanel2.TabConstraints.tabTitle=Session-Log +jPanel2.TabConstraints.tabTitle=Session Log infoMsg=F\u00fcgen Sie bitte nun den Text in die E-Mail ein (Strg+V oder Befehl+V)
und schicken Sie die E-Mail ab. infoTitle=Bericht senden