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 index b9392c7fd..c07f0ef51 100755 --- 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 @@ -82,6 +82,17 @@ + + + + + + + + + + + @@ -163,17 +174,6 @@ - - - - - - - - - - - @@ -279,12 +279,12 @@ - + - + @@ -299,17 +299,6 @@ - - - - - - - - - - - @@ -332,6 +321,17 @@ + + + + + + + + + + + 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 index ca838e2dd..1ee035022 100755 --- 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 @@ -1756,6 +1756,7 @@ private void initComponents() { mnuEditReview = new javax.swing.JMenuItem(); mnuRemoveReview = new javax.swing.JMenuItem(); documentsPopup = new javax.swing.JPopupMenu(); + mnuDuplicateDocumentAsPdf = new javax.swing.JMenuItem(); mnuCopyFilesToClipboard = new javax.swing.JMenuItem(); mnuOpenDocument = new javax.swing.JMenuItem(); mnuOpenDocumentWith = new javax.swing.JMenu(); @@ -1763,7 +1764,6 @@ private void initComponents() { mnuOpenDocumentLibreOffice = new javax.swing.JMenuItem(); mnuSaveDocumentsLocally = new javax.swing.JMenuItem(); mnuDuplicateDocument = new javax.swing.JMenuItem(); - mnuDuplicateDocumentAs = new javax.swing.JMenuItem(); mnuCopyDocumentToOtherCase = new javax.swing.JMenuItem(); mnuMoveDocumentToOtherCase = new javax.swing.JMenuItem(); mnuRenameDocument = new javax.swing.JMenuItem(); @@ -1775,11 +1775,11 @@ private void initComponents() { mnuSendMessageForDocument = new javax.swing.JMenuItem(); mnuRemoveDocument = new javax.swing.JMenuItem(); jSeparator11 = new javax.swing.JPopupMenu.Separator(); - mnuPdfActions = new javax.swing.JMenu(); + mnuPdfAndConvertActions = new javax.swing.JMenu(); mnuShrinkPdf = new javax.swing.JMenuItem(); - mnuDuplicateDocumentAsPdf = new javax.swing.JMenuItem(); mnuSaveDocumentsLocallyPdf = new javax.swing.JMenuItem(); mnuSaveDocumentEncrypted = new javax.swing.JMenuItem(); + mnuDuplicateDocumentAs = new javax.swing.JMenuItem(); jSeparator1 = new javax.swing.JPopupMenu.Separator(); mnuSendDocument = new javax.swing.JMenuItem(); mnuSendDocumentPDF = new javax.swing.JMenuItem(); @@ -2035,6 +2035,15 @@ public void actionPerformed(java.awt.event.ActionEvent evt) { }); reviewsPopup.add(mnuRemoveReview); + mnuDuplicateDocumentAsPdf.setIcon(new javax.swing.ImageIcon(getClass().getResource("/icons16/pdf.png"))); // NOI18N + mnuDuplicateDocumentAsPdf.setText("als PDF zur Akte speichern"); + mnuDuplicateDocumentAsPdf.addActionListener(new java.awt.event.ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent evt) { + mnuDuplicateDocumentAsPdfActionPerformed(evt); + } + }); + documentsPopup.add(mnuDuplicateDocumentAsPdf); + mnuCopyFilesToClipboard.setFont(mnuCopyFilesToClipboard.getFont()); mnuCopyFilesToClipboard.setIcon(new javax.swing.ImageIcon(getClass().getResource("/icons16/editpaste.png"))); // NOI18N mnuCopyFilesToClipboard.setText("in Zwischenablage kopieren"); @@ -2095,15 +2104,6 @@ public void actionPerformed(java.awt.event.ActionEvent evt) { }); documentsPopup.add(mnuDuplicateDocument); - mnuDuplicateDocumentAs.setIcon(new javax.swing.ImageIcon(getClass().getResource("/icons/filesave.png"))); // NOI18N - mnuDuplicateDocumentAs.setText("ablegen als ..."); - mnuDuplicateDocumentAs.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent evt) { - mnuDuplicateDocumentAsActionPerformed(evt); - } - }); - documentsPopup.add(mnuDuplicateDocumentAs); - mnuCopyDocumentToOtherCase.setIcon(new javax.swing.ImageIcon(getClass().getResource("/icons/editcopy.png"))); // NOI18N mnuCopyDocumentToOtherCase.setText("in andere Akte kopieren"); mnuCopyDocumentToOtherCase.addActionListener(new java.awt.event.ActionListener() { @@ -2189,8 +2189,8 @@ public void actionPerformed(java.awt.event.ActionEvent evt) { documentsPopup.add(mnuRemoveDocument); documentsPopup.add(jSeparator11); - mnuPdfActions.setIcon(new javax.swing.ImageIcon(getClass().getResource("/icons16/pdf.png"))); // NOI18N - mnuPdfActions.setText("PDF-Aktionen"); + mnuPdfAndConvertActions.setIcon(new javax.swing.ImageIcon(getClass().getResource("/icons16/pdf.png"))); // NOI18N + mnuPdfAndConvertActions.setText("PDF und Konvertierung"); mnuShrinkPdf.setIcon(new javax.swing.ImageIcon(getClass().getResource("/icons16/material/compress_24dp_0E72B5.png"))); // NOI18N mnuShrinkPdf.setText("PDF verkleinern"); @@ -2200,16 +2200,7 @@ public void actionPerformed(java.awt.event.ActionEvent evt) { mnuShrinkPdfActionPerformed(evt); } }); - mnuPdfActions.add(mnuShrinkPdf); - - mnuDuplicateDocumentAsPdf.setIcon(new javax.swing.ImageIcon(getClass().getResource("/icons16/pdf.png"))); // NOI18N - mnuDuplicateDocumentAsPdf.setText("als PDF zur Akte speichern"); - mnuDuplicateDocumentAsPdf.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent evt) { - mnuDuplicateDocumentAsPdfActionPerformed(evt); - } - }); - mnuPdfActions.add(mnuDuplicateDocumentAsPdf); + mnuPdfAndConvertActions.add(mnuShrinkPdf); mnuSaveDocumentsLocallyPdf.setIcon(new javax.swing.ImageIcon(getClass().getResource("/icons/filesave.png"))); // NOI18N mnuSaveDocumentsLocallyPdf.setText("als PDF lokal speichern"); @@ -2218,7 +2209,7 @@ public void actionPerformed(java.awt.event.ActionEvent evt) { mnuSaveDocumentsLocallyPdfActionPerformed(evt); } }); - mnuPdfActions.add(mnuSaveDocumentsLocallyPdf); + mnuPdfAndConvertActions.add(mnuSaveDocumentsLocallyPdf); mnuSaveDocumentEncrypted.setIcon(new javax.swing.ImageIcon(getClass().getResource("/icons16/gpg.png"))); // NOI18N mnuSaveDocumentEncrypted.setText("verschlüsseltes PDF exportieren"); @@ -2227,9 +2218,18 @@ public void actionPerformed(java.awt.event.ActionEvent evt) { mnuSaveDocumentEncryptedActionPerformed(evt); } }); - mnuPdfActions.add(mnuSaveDocumentEncrypted); + mnuPdfAndConvertActions.add(mnuSaveDocumentEncrypted); + + mnuDuplicateDocumentAs.setIcon(new javax.swing.ImageIcon(getClass().getResource("/icons/filesave.png"))); // NOI18N + mnuDuplicateDocumentAs.setText("ablegen als ..."); + mnuDuplicateDocumentAs.addActionListener(new java.awt.event.ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent evt) { + mnuDuplicateDocumentAsActionPerformed(evt); + } + }); + mnuPdfAndConvertActions.add(mnuDuplicateDocumentAs); - documentsPopup.add(mnuPdfActions); + documentsPopup.add(mnuPdfAndConvertActions); documentsPopup.add(jSeparator1); mnuSendDocument.setIcon(new javax.swing.ImageIcon(getClass().getResource("/icons/mail_send_2.png"))); // NOI18N @@ -7803,7 +7803,7 @@ public void drop(DropTargetDropEvent dtde) { private javax.swing.JMenuItem mnuOpenDocumentMicrosoftOffice; private javax.swing.JMenu mnuOpenDocumentWith; private javax.swing.JMenuItem mnuOpenInExternalMailer; - private javax.swing.JMenu mnuPdfActions; + private javax.swing.JMenu mnuPdfAndConvertActions; private javax.swing.JMenuItem mnuPostponeReview; private javax.swing.JMenuItem mnuRemoveDocument; private javax.swing.JMenuItem mnuRemoveReview;