Skip to content

Commit

Permalink
fixed scrolling, removed description text area and turned it into a t…
Browse files Browse the repository at this point in the history 
…ooltip. close #2186
  • Loading branch information
@j-dimension
j-dimension committed Nov 7, 2023
1 parent b985fb1 commit 9c965c0
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 36 deletions.
21 changes: 1 addition & 20 deletions ...yer-client/src/com/jdimension/jlawyer/client/editors/files/TimesheetDialogEntryPanel.form
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,13 @@
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" attributes="0">
<Component id="chkLimited" min="-2" max="-2" attributes="0"/>
<EmptySpace min="0" pref="0" max="32767" attributes="0"/>
<EmptySpace min="0" pref="143" max="32767" attributes="0"/>
</Group>
<Group type="102" alignment="1" attributes="0">
<Component id="cmdAddLog" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="lblName" max="32767" attributes="0"/>
</Group>
<Component id="jScrollPane1" alignment="1" pref="272" max="32767" attributes="0"/>
<Component id="lblCase" max="32767" attributes="0"/>
</Group>
<EmptySpace max="-2" attributes="0"/>
Expand All @@ -46,8 +45,6 @@
<Component id="cmdAddLog" max="32767" attributes="0"/>
</Group>
<EmptySpace max="-2" attributes="0"/>
<Component id="jScrollPane1" min="-2" pref="47" max="-2" attributes="0"/>
<EmptySpace type="unrelated" max="-2" attributes="0"/>
<Component id="chkLimited" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
</Group>
Expand Down Expand Up @@ -87,22 +84,6 @@
<Property name="text" type="java.lang.String" value="jLabel2"/>
</Properties>
</Component>
<Container class="javax.swing.JScrollPane" name="jScrollPane1">
<AuxValues>
<AuxValue name="autoScrollPane" type="java.lang.Boolean" value="true"/>
</AuxValues>

<Layout class="org.netbeans.modules.form.compat2.layouts.support.JScrollPaneSupportLayout"/>
<SubComponents>
<Component class="javax.swing.JTextArea" name="taDescription">
<Properties>
<Property name="editable" type="boolean" value="false"/>
<Property name="columns" type="int" value="20"/>
<Property name="rows" type="int" value="5"/>
</Properties>
</Component>
</SubComponents>
</Container>
<Component class="javax.swing.JCheckBox" name="chkLimited">
<Properties>
<Property name="text" type="java.lang.String" value="jCheckBox1"/>
Expand Down
20 changes: 4 additions & 16 deletions ...yer-client/src/com/jdimension/jlawyer/client/editors/files/TimesheetDialogEntryPanel.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand All @@ -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());
}

/**
Expand All @@ -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));
Expand All @@ -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);

Expand All @@ -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())
);
Expand All @@ -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())
);
Expand All @@ -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
}

0 comments on commit 9c965c0

Please sign in to comment.