From 9c965c0490f4e1c5d7d12a4f898c8e733d0d055d Mon Sep 17 00:00:00 2001 From: j-dimension Date: Tue, 7 Nov 2023 23:32:33 +0100 Subject: [PATCH] fixed scrolling, removed description text area and turned it into a tooltip. close #2186 --- .../files/TimesheetDialogEntryPanel.form | 21 +------------------ .../files/TimesheetDialogEntryPanel.java | 20 ++++-------------- 2 files changed, 5 insertions(+), 36 deletions(-) diff --git a/j-lawyer-client/src/com/jdimension/jlawyer/client/editors/files/TimesheetDialogEntryPanel.form b/j-lawyer-client/src/com/jdimension/jlawyer/client/editors/files/TimesheetDialogEntryPanel.form index e547f4163..f7f8b9a39 100644 --- a/j-lawyer-client/src/com/jdimension/jlawyer/client/editors/files/TimesheetDialogEntryPanel.form +++ b/j-lawyer-client/src/com/jdimension/jlawyer/client/editors/files/TimesheetDialogEntryPanel.form @@ -21,14 +21,13 @@ - + - @@ -46,8 +45,6 @@ - - @@ -87,22 +84,6 @@ - - - - - - - - - - - - - - - - diff --git a/j-lawyer-client/src/com/jdimension/jlawyer/client/editors/files/TimesheetDialogEntryPanel.java b/j-lawyer-client/src/com/jdimension/jlawyer/client/editors/files/TimesheetDialogEntryPanel.java index 969d06596..89eb5d5d1 100644 --- a/j-lawyer-client/src/com/jdimension/jlawyer/client/editors/files/TimesheetDialogEntryPanel.java +++ b/j-lawyer-client/src/com/jdimension/jlawyer/client/editors/files/TimesheetDialogEntryPanel.java @@ -678,7 +678,7 @@ public class TimesheetDialogEntryPanel extends javax.swing.JPanel { private Timesheet entry=null; /** - * Creates new form TimesheetLogEntryPanel + * Creates new form TimesheetDialogEntryPanel * @param parent */ public TimesheetDialogEntryPanel(TimesheetLogDialog parent) { @@ -700,8 +700,8 @@ public void setEntry(Timesheet ts) { this.lblCase.setText(dto.getFileNumber() + " " + StringUtils.nonEmpty(dto.getName()) + " " + StringUtils.nonEmpty(dto.getReason())); } this.lblName.setText(ts.getName()); - this.taDescription.setText(ts.getDescription()); - this.taDescription.setToolTipText(ts.getDescription()); + this.lblName.setToolTipText(ts.getDescription()); + this.lblCase.setToolTipText(ts.getDescription()); } /** @@ -716,8 +716,6 @@ private void initComponents() { lblCase = new javax.swing.JLabel(); cmdAddLog = new javax.swing.JButton(); lblName = new javax.swing.JLabel(); - jScrollPane1 = new javax.swing.JScrollPane(); - taDescription = new javax.swing.JTextArea(); chkLimited = new javax.swing.JCheckBox(); lblCase.setFont(lblCase.getFont().deriveFont(lblCase.getFont().getStyle() | java.awt.Font.BOLD, lblCase.getFont().getSize()+2)); @@ -733,11 +731,6 @@ public void actionPerformed(java.awt.event.ActionEvent evt) { lblName.setFont(lblName.getFont()); lblName.setText("jLabel2"); - taDescription.setEditable(false); - taDescription.setColumns(20); - taDescription.setRows(5); - jScrollPane1.setViewportView(taDescription); - chkLimited.setText("jCheckBox1"); chkLimited.setEnabled(false); @@ -750,12 +743,11 @@ public void actionPerformed(java.awt.event.ActionEvent evt) { .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(layout.createSequentialGroup() .addComponent(chkLimited) - .addGap(0, 0, Short.MAX_VALUE)) + .addGap(0, 143, Short.MAX_VALUE)) .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup() .addComponent(cmdAddLog) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(lblName, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) - .addComponent(jScrollPane1, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, 272, Short.MAX_VALUE) .addComponent(lblCase, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) .addContainerGap()) ); @@ -769,8 +761,6 @@ public void actionPerformed(java.awt.event.ActionEvent evt) { .addComponent(lblName, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .addComponent(cmdAddLog, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(jScrollPane1, javax.swing.GroupLayout.PREFERRED_SIZE, 47, javax.swing.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) .addComponent(chkLimited) .addContainerGap()) ); @@ -784,9 +774,7 @@ private void cmdAddLogActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIR // Variables declaration - do not modify//GEN-BEGIN:variables private javax.swing.JCheckBox chkLimited; private javax.swing.JButton cmdAddLog; - private javax.swing.JScrollPane jScrollPane1; private javax.swing.JLabel lblCase; private javax.swing.JLabel lblName; - private javax.swing.JTextArea taDescription; // End of variables declaration//GEN-END:variables }