diff --git a/j-lawyer-client/src/com/jdimension/jlawyer/client/editors/files/AddDocumentFromTemplateDialog.form b/j-lawyer-client/src/com/jdimension/jlawyer/client/editors/files/AddDocumentFromTemplateDialog.form
index 0c2192f1..0cdf1c4a 100755
--- a/j-lawyer-client/src/com/jdimension/jlawyer/client/editors/files/AddDocumentFromTemplateDialog.form
+++ b/j-lawyer-client/src/com/jdimension/jlawyer/client/editors/files/AddDocumentFromTemplateDialog.form
@@ -36,29 +36,29 @@
-
-
+
+
-
+
-
+
-
+
-
+
@@ -105,10 +105,10 @@
-
+
-
+
@@ -119,7 +119,7 @@
-
+
@@ -318,62 +318,82 @@
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
@@ -395,24 +415,8 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -431,7 +435,27 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -443,7 +467,19 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -497,7 +533,7 @@
-
+
@@ -610,118 +646,59 @@
-
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/j-lawyer-client/src/com/jdimension/jlawyer/client/editors/files/AddDocumentFromTemplateDialog.java b/j-lawyer-client/src/com/jdimension/jlawyer/client/editors/files/AddDocumentFromTemplateDialog.java
index 62b36550..6adf5997 100755
--- a/j-lawyer-client/src/com/jdimension/jlawyer/client/editors/files/AddDocumentFromTemplateDialog.java
+++ b/j-lawyer-client/src/com/jdimension/jlawyer/client/editors/files/AddDocumentFromTemplateDialog.java
@@ -778,7 +778,6 @@ public AddDocumentFromTemplateDialog(java.awt.Frame parent, boolean modal, Archi
this.pnlPartiesPanel.setListener(this);
ComponentUtils.decorateSplitPane(jSplitPane1);
- ComponentUtils.decorateSplitPane(this.splitPlaceholders);
ComponentUtils.decorateSplitPane(splitMain);
String[] colNames = new String[]{"Platzhalter", "Wert"};
@@ -831,11 +830,9 @@ public AddDocumentFromTemplateDialog(java.awt.Frame parent, boolean modal, Archi
this.jSplitPane1.setDividerLocation(0.5d);
ComponentUtils.restoreSplitPane(splitMain, this.getClass(), "splitMain");
- ComponentUtils.restoreSplitPane(this.splitPlaceholders, this.getClass(), "splitPlaceholders");
ComponentUtils.restoreSplitPane(this.jSplitPane1, this.getClass(), "jSplitPane1");
ComponentUtils.persistSplitPane(splitMain, this.getClass(), "splitMain");
- ComponentUtils.persistSplitPane(this.splitPlaceholders, this.getClass(), "splitPlaceholders");
ComponentUtils.persistSplitPane(this.jSplitPane1, this.getClass(), "jSplitPane1");
List headTemplates = new ArrayList<>();
@@ -1005,12 +1002,12 @@ private void initComponents() {
radioReviewTypeNone = new javax.swing.JRadioButton();
quickDateSelectionPanel = new com.jdimension.jlawyer.client.components.QuickDateSelectionPanel();
calendarSelectionButton1 = new com.jdimension.jlawyer.client.calendar.CalendarSelectionButton();
- jPanel2 = new javax.swing.JPanel();
- splitPlaceholders = new javax.swing.JSplitPane();
+ tabPlaceholders = new javax.swing.JTabbedPane();
+ jPanel7 = new javax.swing.JPanel();
+ pnlPartiesPanel = new com.jdimension.jlawyer.client.editors.files.PartiesPanel();
+ jPanel8 = new javax.swing.JPanel();
jScrollPane1 = new javax.swing.JScrollPane();
tblPlaceHolders = new javax.swing.JTable();
- pnlPartiesPanel = new com.jdimension.jlawyer.client.editors.files.PartiesPanel();
- lblPlaceholderHint = new javax.swing.JLabel();
jPanel6 = new javax.swing.JPanel();
jPanel1 = new javax.swing.JPanel();
txtTemplateFilter = new javax.swing.JTextField();
@@ -1023,12 +1020,11 @@ private void initComponents() {
cmdClearFilter = new javax.swing.JButton();
jLabel2 = new javax.swing.JLabel();
cmbLetterHeads = new javax.swing.JComboBox<>();
- jPanel3 = new javax.swing.JPanel();
- cmbDictateSigns = new javax.swing.JComboBox();
- jLabel7 = new javax.swing.JLabel();
- txtFileName = new javax.swing.JTextField();
jLabel1 = new javax.swing.JLabel();
+ txtFileName = new javax.swing.JTextField();
chkGeneratePDF = new javax.swing.JCheckBox();
+ cmbDictateSigns = new javax.swing.JComboBox();
+ jLabel7 = new javax.swing.JLabel();
cmdNameTemplate = new javax.swing.JButton();
cmdAddAndOpen = new javax.swing.JButton();
@@ -1178,11 +1174,25 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
.addContainerGap(org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
);
- jPanel2.setBorder(javax.swing.BorderFactory.createTitledBorder("Platzhalter"));
+ org.jdesktop.layout.GroupLayout jPanel7Layout = new org.jdesktop.layout.GroupLayout(jPanel7);
+ jPanel7.setLayout(jPanel7Layout);
+ jPanel7Layout.setHorizontalGroup(
+ jPanel7Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(0, 450, Short.MAX_VALUE)
+ .add(jPanel7Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(pnlPartiesPanel, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 450, Short.MAX_VALUE))
+ );
+ jPanel7Layout.setVerticalGroup(
+ jPanel7Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(0, 276, Short.MAX_VALUE)
+ .add(jPanel7Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(jPanel7Layout.createSequentialGroup()
+ .addContainerGap()
+ .add(pnlPartiesPanel, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 264, Short.MAX_VALUE)
+ .addContainerGap()))
+ );
- splitPlaceholders.setDividerLocation(300);
- splitPlaceholders.setOrientation(javax.swing.JSplitPane.VERTICAL_SPLIT);
- splitPlaceholders.setResizeWeight(0.5);
+ tabPlaceholders.addTab("Beteiligte", jPanel7);
tblPlaceHolders.setModel(new javax.swing.table.DefaultTableModel(
new Object [][] {
@@ -1199,36 +1209,26 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
tblPlaceHolders.getTableHeader().setReorderingAllowed(false);
jScrollPane1.setViewportView(tblPlaceHolders);
- splitPlaceholders.setLeftComponent(jScrollPane1);
- splitPlaceholders.setRightComponent(pnlPartiesPanel);
-
- lblPlaceholderHint.setIcon(new javax.swing.ImageIcon(getClass().getResource("/icons/info.png"))); // NOI18N
- lblPlaceholderHint.setText("keine leeren Platzhalterwerte");
- lblPlaceholderHint.setToolTipText("Bearbeiten der Platzhalterwerte durch Doppelklick möglich");
-
- org.jdesktop.layout.GroupLayout jPanel2Layout = new org.jdesktop.layout.GroupLayout(jPanel2);
- jPanel2.setLayout(jPanel2Layout);
- jPanel2Layout.setHorizontalGroup(
- jPanel2Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(jPanel2Layout.createSequentialGroup()
- .addContainerGap()
- .add(jPanel2Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(splitPlaceholders, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 0, Short.MAX_VALUE)
- .add(jPanel2Layout.createSequentialGroup()
- .add(lblPlaceholderHint)
- .add(0, 0, Short.MAX_VALUE)))
- .addContainerGap())
+ org.jdesktop.layout.GroupLayout jPanel8Layout = new org.jdesktop.layout.GroupLayout(jPanel8);
+ jPanel8.setLayout(jPanel8Layout);
+ jPanel8Layout.setHorizontalGroup(
+ jPanel8Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(0, 450, Short.MAX_VALUE)
+ .add(jPanel8Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(jScrollPane1, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 450, Short.MAX_VALUE))
);
- jPanel2Layout.setVerticalGroup(
- jPanel2Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(org.jdesktop.layout.GroupLayout.TRAILING, jPanel2Layout.createSequentialGroup()
- .addContainerGap()
- .add(lblPlaceholderHint)
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(splitPlaceholders, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 581, Short.MAX_VALUE)
- .addContainerGap())
+ jPanel8Layout.setVerticalGroup(
+ jPanel8Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(0, 276, Short.MAX_VALUE)
+ .add(jPanel8Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(org.jdesktop.layout.GroupLayout.TRAILING, jPanel8Layout.createSequentialGroup()
+ .addContainerGap()
+ .add(jScrollPane1, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 264, Short.MAX_VALUE)
+ .addContainerGap()))
);
+ tabPlaceholders.addTab("Platzhalter", jPanel8);
+
org.jdesktop.layout.GroupLayout jPanel5Layout = new org.jdesktop.layout.GroupLayout(jPanel5);
jPanel5.setLayout(jPanel5Layout);
jPanel5Layout.setHorizontalGroup(
@@ -1236,7 +1236,7 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
.add(jPanel5Layout.createSequentialGroup()
.addContainerGap()
.add(jPanel5Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(jPanel2, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .add(tabPlaceholders, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 450, Short.MAX_VALUE)
.add(jPanel4, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
.addContainerGap())
);
@@ -1244,7 +1244,7 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
jPanel5Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
.add(jPanel5Layout.createSequentialGroup()
.addContainerGap()
- .add(jPanel2, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .add(tabPlaceholders)
.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
.add(jPanel4, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
.addContainerGap())
@@ -1339,20 +1339,11 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
.add(jLabel3)
.add(cmdClearFilter))
.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(jSplitPane1, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 616, Short.MAX_VALUE)
+ .add(jSplitPane1, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 320, Short.MAX_VALUE)
.addContainerGap())
);
- jPanel3.setBorder(javax.swing.BorderFactory.createTitledBorder("Dokumenterstellung"));
-
- cmbDictateSigns.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "Item 1", "Item 2", "Item 3", "Item 4" }));
- cmbDictateSigns.addItemListener(new java.awt.event.ItemListener() {
- public void itemStateChanged(java.awt.event.ItemEvent evt) {
- cmbDictateSignsItemStateChanged(evt);
- }
- });
-
- jLabel7.setText("Diktatzeichen:");
+ jLabel1.setText("Dateiname:");
txtFileName.addKeyListener(new java.awt.event.KeyAdapter() {
public void keyPressed(java.awt.event.KeyEvent evt) {
@@ -1360,8 +1351,6 @@ public void keyPressed(java.awt.event.KeyEvent evt) {
}
});
- jLabel1.setText("Dateiname:");
-
chkGeneratePDF.setFont(chkGeneratePDF.getFont());
chkGeneratePDF.setText("zusätzlich als PDF ablegen");
chkGeneratePDF.addActionListener(new java.awt.event.ActionListener() {
@@ -1370,6 +1359,15 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
}
});
+ cmbDictateSigns.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "Item 1", "Item 2", "Item 3", "Item 4" }));
+ cmbDictateSigns.addItemListener(new java.awt.event.ItemListener() {
+ public void itemStateChanged(java.awt.event.ItemEvent evt) {
+ cmbDictateSignsItemStateChanged(evt);
+ }
+ });
+
+ jLabel7.setText("Diktatzeichen:");
+
cmdNameTemplate.setIcon(new javax.swing.ImageIcon(getClass().getResource("/icons/edit.png"))); // NOI18N
cmdNameTemplate.addMouseListener(new java.awt.event.MouseAdapter() {
public void mouseReleased(java.awt.event.MouseEvent evt) {
@@ -1377,44 +1375,6 @@ public void mouseReleased(java.awt.event.MouseEvent evt) {
}
});
- org.jdesktop.layout.GroupLayout jPanel3Layout = new org.jdesktop.layout.GroupLayout(jPanel3);
- jPanel3.setLayout(jPanel3Layout);
- jPanel3Layout.setHorizontalGroup(
- jPanel3Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(jPanel3Layout.createSequentialGroup()
- .addContainerGap()
- .add(jPanel3Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(jLabel7)
- .add(jLabel1))
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(jPanel3Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(cmbDictateSigns, 0, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
- .add(jPanel3Layout.createSequentialGroup()
- .add(chkGeneratePDF)
- .add(0, 82, Short.MAX_VALUE))
- .add(jPanel3Layout.createSequentialGroup()
- .add(txtFileName)
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(cmdNameTemplate)))
- .addContainerGap())
- );
- jPanel3Layout.setVerticalGroup(
- jPanel3Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(jPanel3Layout.createSequentialGroup()
- .addContainerGap()
- .add(jPanel3Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
- .add(txtFileName, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
- .add(jLabel1)
- .add(cmdNameTemplate))
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(chkGeneratePDF)
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(jPanel3Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
- .add(cmbDictateSigns, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
- .add(jLabel7, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 15, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
- .addContainerGap(org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
- );
-
org.jdesktop.layout.GroupLayout jPanel6Layout = new org.jdesktop.layout.GroupLayout(jPanel6);
jPanel6.setLayout(jPanel6Layout);
jPanel6Layout.setHorizontalGroup(
@@ -1423,7 +1383,21 @@ public void mouseReleased(java.awt.event.MouseEvent evt) {
.addContainerGap()
.add(jPanel6Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
.add(jPanel1, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
- .add(jPanel3, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+ .add(jPanel6Layout.createSequentialGroup()
+ .add(jPanel6Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(jLabel7)
+ .add(jLabel1))
+ .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
+ .add(jPanel6Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(jPanel6Layout.createSequentialGroup()
+ .add(txtFileName)
+ .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
+ .add(cmdNameTemplate))
+ .add(jPanel6Layout.createSequentialGroup()
+ .add(jPanel6Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING, false)
+ .add(org.jdesktop.layout.GroupLayout.LEADING, cmbDictateSigns, 0, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .add(org.jdesktop.layout.GroupLayout.LEADING, chkGeneratePDF, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+ .add(0, 56, Short.MAX_VALUE)))))
.addContainerGap())
);
jPanel6Layout.setVerticalGroup(
@@ -1432,7 +1406,17 @@ public void mouseReleased(java.awt.event.MouseEvent evt) {
.addContainerGap()
.add(jPanel1, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(jPanel3, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
+ .add(jPanel6Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
+ .add(txtFileName, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
+ .add(jLabel1)
+ .add(cmdNameTemplate))
+ .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
+ .add(chkGeneratePDF)
+ .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
+ .add(jPanel6Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
+ .add(cmbDictateSigns, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
+ .add(jLabel7, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 15, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
+ .addContainerGap())
);
splitMain.setLeftComponent(jPanel6);
@@ -1449,26 +1433,26 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
getContentPane().setLayout(layout);
layout.setHorizontalGroup(
layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(org.jdesktop.layout.GroupLayout.TRAILING, layout.createSequentialGroup()
- .addContainerGap(org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .add(layout.createSequentialGroup()
+ .add(341, 341, 341)
.add(cmdAddAndOpen)
.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
.add(cmdAdd)
.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
.add(cmdCancel)
- .add(10, 10, 10))
- .add(splitMain, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 940, Short.MAX_VALUE)
+ .addContainerGap(30, Short.MAX_VALUE))
+ .add(org.jdesktop.layout.GroupLayout.TRAILING, splitMain, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 0, Short.MAX_VALUE)
);
layout.setVerticalGroup(
layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
.add(layout.createSequentialGroup()
.add(splitMain)
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED)
+ .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
.add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
.add(cmdCancel)
.add(cmdAdd)
.add(cmdAddAndOpen))
- .addContainerGap())
+ .add(12, 12, 12))
);
pack();
@@ -1832,7 +1816,14 @@ private void templateSelection() {
emptyValues++;
}
}
- ThreadUtils.setLabel(this.lblPlaceholderHint, emptyValues + " leere Platzhalterwerte");
+
+ if(emptyValues>0) {
+ this.tabPlaceholders.setIconAt(1, new javax.swing.ImageIcon(getClass().getResource("/icons/messagebox_warning.png")));
+ } else {
+ this.tabPlaceholders.setIconAt(1, null);
+ }
+ this.tabPlaceholders.setToolTipTextAt(1, emptyValues + " leere Platzhalterwerte");
+
ThreadUtils.setTableModel(this.tblPlaceHolders, model);
ArrayList partiesInTemplate = new ArrayList<>();
@@ -2054,16 +2045,15 @@ public static void main(String args[]) {
private javax.swing.JLabel jLabel7;
private javax.swing.JLabel jLabel8;
private javax.swing.JPanel jPanel1;
- private javax.swing.JPanel jPanel2;
- private javax.swing.JPanel jPanel3;
private javax.swing.JPanel jPanel4;
private javax.swing.JPanel jPanel5;
private javax.swing.JPanel jPanel6;
+ private javax.swing.JPanel jPanel7;
+ private javax.swing.JPanel jPanel8;
private javax.swing.JScrollPane jScrollPane1;
private javax.swing.JScrollPane jScrollPane2;
private javax.swing.JScrollPane jScrollPane3;
private javax.swing.JSplitPane jSplitPane1;
- private javax.swing.JLabel lblPlaceholderHint;
private javax.swing.JList lstTemplates;
private com.jdimension.jlawyer.client.editors.files.PartiesPanel pnlPartiesPanel;
private javax.swing.JPopupMenu popNameTemplates;
@@ -2072,7 +2062,7 @@ public static void main(String args[]) {
private javax.swing.JRadioButton radioReviewTypeNone;
private javax.swing.JRadioButton radioReviewTypeRespite;
private javax.swing.JSplitPane splitMain;
- private javax.swing.JSplitPane splitPlaceholders;
+ private javax.swing.JTabbedPane tabPlaceholders;
private javax.swing.JTable tblPlaceHolders;
private javax.swing.JTree treeFolders;
private javax.swing.JTextField txtFileName;