Merge pull request #2518 from jlawyerorg/bug/typo-aktenkonto

fixed typo - Fremgeld > Fremdgeld in Aktenkonto
jlawyerorg · Aug 1, 2024 · 4fb006b · 4fb006b
2 parents 327f697 + 31eefa6
commit 4fb006b
Show file tree

Hide file tree

Showing 2 changed files with 61 additions and 4 deletions.
diff --git a/j-lawyer-client/src/com/jdimension/jlawyer/client/editors/files/ArchiveFilePanel.form b/j-lawyer-client/src/com/jdimension/jlawyer/client/editors/files/ArchiveFilePanel.form
@@ -1872,15 +1872,72 @@
                                 <Column editable="false" title="von/an" type="java.lang.Object"/>
                                 <Column editable="false" title="Einnahmen" type="java.lang.Float"/>
                                 <Column editable="false" title="Ausgaben" type="java.lang.Float"/>
-                                <Column editable="false" title="Fremgeld ein" type="java.lang.Float"/>
+                                <Column editable="false" title="Fremdgeld ein" type="java.lang.Float"/>
                                 <Column editable="false" title="Fremdgeld aus" type="java.lang.Float"/>
                                 <Column editable="false" title="Auslagen ein" type="java.lang.Float"/>
                                 <Column editable="false" title="Auslagen aus" type="java.lang.Float"/>
                                 <Column editable="false" title="Beleg" type="java.lang.Object"/>
                                 <Column editable="false" title="Kommentar" type="java.lang.String"/>
                               </Table>
                             </Property>
+                            <Property name="columnModel" type="javax.swing.table.TableColumnModel" editor="org.netbeans.modules.form.editors2.TableColumnModelEditor">
+                              <TableColumnModel selectionModel="0">
+                                <Column maxWidth="-1" minWidth="-1" prefWidth="-1" resizable="true">
+                                  <Title/>
+                                  <Editor/>
+                                  <Renderer/>
+                                </Column>
+                                <Column maxWidth="-1" minWidth="-1" prefWidth="-1" resizable="true">
+                                  <Title/>
+                                  <Editor/>
+                                  <Renderer/>
+                                </Column>
+                                <Column maxWidth="-1" minWidth="-1" prefWidth="-1" resizable="true">
+                                  <Title/>
+                                  <Editor/>
+                                  <Renderer/>
+                                </Column>
+                                <Column maxWidth="-1" minWidth="-1" prefWidth="-1" resizable="true">
+                                  <Title/>
+                                  <Editor/>
+                                  <Renderer/>
+                                </Column>
+                                <Column maxWidth="-1" minWidth="-1" prefWidth="-1" resizable="true">
+                                  <Title/>
+                                  <Editor/>
+                                  <Renderer/>
+                                </Column>
+                                <Column maxWidth="-1" minWidth="-1" prefWidth="-1" resizable="true">
+                                  <Title/>
+                                  <Editor/>
+                                  <Renderer/>
+                                </Column>
+                                <Column maxWidth="-1" minWidth="-1" prefWidth="-1" resizable="true">
+                                  <Title/>
+                                  <Editor/>
+                                  <Renderer/>
+                                </Column>
+                                <Column maxWidth="-1" minWidth="-1" prefWidth="-1" resizable="true">
+                                  <Title/>
+                                  <Editor/>
+                                  <Renderer/>
+                                </Column>
+                                <Column maxWidth="-1" minWidth="-1" prefWidth="-1" resizable="true">
+                                  <Title/>
+                                  <Editor/>
+                                  <Renderer/>
+                                </Column>
+                                <Column maxWidth="-1" minWidth="-1" prefWidth="-1" resizable="true">
+                                  <Title/>
+                                  <Editor/>
+                                  <Renderer/>
+                                </Column>
+                              </TableColumnModel>
+                            </Property>
                             <Property name="showGrid" type="boolean" value="false"/>
+                            <Property name="tableHeader" type="javax.swing.table.JTableHeader" editor="org.netbeans.modules.form.editors2.JTableHeaderEditor">
+                              <TableHeader reorderingAllowed="true" resizingAllowed="true"/>
+                            </Property>
                           </Properties>
                           <Events>
                             <EventHandler event="mouseClicked" listener="java.awt.event.MouseListener" parameters="java.awt.event.MouseEvent" handler="tblAccountEntriesMouseClicked"/>
@@ -2248,7 +2305,7 @@
                     <Component class="javax.swing.JButton" name="cmdDuplicateAccountEntry">
                       <Properties>
                         <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-                          <Image iconType="3" name="/icons/editcopy.png"/>
+                          <Image iconType="3" name="/icons/editcopy2.png"/>
                         </Property>
                         <Property name="toolTipText" type="java.lang.String" value="Buchung duplizieren"/>
                       </Properties>

diff --git a/j-lawyer-client/src/com/jdimension/jlawyer/client/editors/files/ArchiveFilePanel.java b/j-lawyer-client/src/com/jdimension/jlawyer/client/editors/files/ArchiveFilePanel.java
@@ -2980,7 +2980,7 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
 
             },
             new String [] {
-                "Datum", "von/an", "Einnahmen", "Ausgaben", "Fremgeld ein", "Fremdgeld aus", "Auslagen ein", "Auslagen aus", "Beleg", "Kommentar"
+                "Datum", "von/an", "Einnahmen", "Ausgaben", "Fremdgeld ein", "Fremdgeld aus", "Auslagen ein", "Auslagen aus", "Beleg", "Kommentar"
             }
         ) {
             Class[] types = new Class [] {
@@ -3171,7 +3171,7 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
             }
         });
 
-        cmdDuplicateAccountEntry.setIcon(new javax.swing.ImageIcon(getClass().getResource("/icons/editcopy.png"))); // NOI18N
+        cmdDuplicateAccountEntry.setIcon(new javax.swing.ImageIcon(getClass().getResource("/icons/editcopy2.png"))); // NOI18N
         cmdDuplicateAccountEntry.setToolTipText("Buchung duplizieren");
         cmdDuplicateAccountEntry.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {