Skip to content

Commit

Permalink
remove default user icon upon successful login
Browse files Browse the repository at this point in the history
  • Loading branch information
@j-dimension
j-dimension committed Feb 13, 2025
1 parent dbde85f commit 3d1e8c3
Show file tree
Hide file tree
Showing 2 changed files with 38 additions and 40 deletions.
36 changes: 17 additions & 19 deletions j-lawyer-client/src/com/jdimension/jlawyer/client/LoginDialog.form
View file
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,7 @@
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" attributes="0">
<EmptySpace max="-2" attributes="0"/>
<Component id="jLabel18" min="-2" max="-2" attributes="0"/>
<Component id="lblDefaultUserIcon" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="jPanel10" min="-2" max="-2" attributes="0"/>
<EmptySpace max="32767" attributes="0"/>
Expand All @@ -361,7 +361,7 @@
<Group type="102" alignment="0" attributes="0">
<EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" max="-2" attributes="0">
<Component id="jLabel18" max="32767" attributes="0"/>
<Component id="lblDefaultUserIcon" max="32767" attributes="0"/>
<Component id="jPanel10" max="32767" attributes="0"/>
</Group>
<EmptySpace max="-2" attributes="0"/>
Expand All @@ -370,7 +370,7 @@
</DimensionLayout>
</Layout>
<SubComponents>
<Component class="javax.swing.JLabel" name="jLabel18">
<Component class="javax.swing.JLabel" name="lblDefaultUserIcon">
<Properties>
<Property name="horizontalAlignment" type="int" value="0"/>
<Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
Expand Down Expand Up @@ -473,24 +473,22 @@
<EmptySpace min="-2" pref="19" max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" max="-2" attributes="0">
<Component id="cmdSaveProfile" max="32767" attributes="0"/>
<Group type="103" groupAlignment="1" max="-2" attributes="0">
<Component id="rdSecNone" alignment="0" max="32767" attributes="0"/>
<Component id="rdSecSsl" alignment="0" max="32767" attributes="0"/>
<Group type="102" alignment="0" attributes="0">
<Group type="103" groupAlignment="1" max="-2" attributes="0">
<Component id="txtPort" alignment="0" max="32767" attributes="0"/>
<Component id="txtServer" max="32767" attributes="0"/>
<Component id="cmbProfile" min="-2" pref="341" max="-2" attributes="0"/>
</Group>
<EmptySpace max="-2" attributes="0"/>
<Component id="cmdAddProfile" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="cmdImportProfile" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="cmdDeleteProfile" min="-2" max="-2" attributes="0"/>
<Component id="rdSecNone" alignment="0" max="32767" attributes="0"/>
<Component id="rdSecSsl" alignment="0" max="32767" attributes="0"/>
<Group type="102" alignment="0" attributes="0">
<Group type="103" groupAlignment="1" max="-2" attributes="0">
<Component id="txtPort" alignment="0" max="32767" attributes="0"/>
<Component id="txtServer" max="32767" attributes="0"/>
<Component id="cmbProfile" min="-2" pref="341" max="-2" attributes="0"/>
</Group>
<Component id="jPanel4" alignment="0" max="32767" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="cmdAddProfile" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="cmdImportProfile" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="cmdDeleteProfile" min="-2" max="-2" attributes="0"/>
</Group>
<Component id="jPanel4" alignment="0" max="32767" attributes="0"/>
</Group>
<EmptySpace max="32767" attributes="0"/>
</Group>
Expand Down
42 changes: 21 additions & 21 deletions j-lawyer-client/src/com/jdimension/jlawyer/client/LoginDialog.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1070,7 +1070,7 @@ protected void paintComponent(Graphics g) {
};
jPanel11 = new javax.swing.JPanel();
jPanel12 = new javax.swing.JPanel();
jLabel18 = new javax.swing.JLabel();
lblDefaultUserIcon = new javax.swing.JLabel();
jPanel10 = new javax.swing.JPanel();
lblUser = new javax.swing.JLabel();
lblCompany = new javax.swing.JLabel();
Expand Down Expand Up @@ -1259,8 +1259,8 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {

jPanel12.setOpaque(false);

jLabel18.setHorizontalAlignment(javax.swing.SwingConstants.CENTER);
jLabel18.setIcon(new javax.swing.ImageIcon(getClass().getResource("/com/jdimension/jlawyer/client/person_outline_96dp_FFFFFF.png"))); // NOI18N
lblDefaultUserIcon.setHorizontalAlignment(javax.swing.SwingConstants.CENTER);
lblDefaultUserIcon.setIcon(new javax.swing.ImageIcon(getClass().getResource("/com/jdimension/jlawyer/client/person_outline_96dp_FFFFFF.png"))); // NOI18N

jPanel10.setOpaque(false);
jPanel10.setLayout(new java.awt.GridLayout(3, 1));
Expand All @@ -1286,7 +1286,7 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
jPanel12Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
.add(jPanel12Layout.createSequentialGroup()
.addContainerGap()
.add(jLabel18)
.add(lblDefaultUserIcon)
.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
.add(jPanel10, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
.addContainerGap(org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
Expand All @@ -1296,7 +1296,7 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
.add(jPanel12Layout.createSequentialGroup()
.addContainerGap()
.add(jPanel12Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING, false)
.add(jLabel18, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.add(lblDefaultUserIcon, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.add(jPanel10, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
.addContainerGap())
);
Expand Down Expand Up @@ -1525,21 +1525,20 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
.add(19, 19, 19)
.add(jPanel6Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING, false)
.add(cmdSaveProfile, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.add(jPanel6Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING, false)
.add(org.jdesktop.layout.GroupLayout.LEADING, rdSecNone, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.add(org.jdesktop.layout.GroupLayout.LEADING, rdSecSsl, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.add(org.jdesktop.layout.GroupLayout.LEADING, jPanel6Layout.createSequentialGroup()
.add(jPanel6Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING, false)
.add(org.jdesktop.layout.GroupLayout.LEADING, txtPort)
.add(txtServer)
.add(cmbProfile, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 341, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
.add(cmdAddProfile)
.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
.add(cmdImportProfile)
.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
.add(cmdDeleteProfile))
.add(org.jdesktop.layout.GroupLayout.LEADING, jPanel4, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)))
.add(rdSecNone, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.add(rdSecSsl, 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.TRAILING, false)
.add(org.jdesktop.layout.GroupLayout.LEADING, txtPort)
.add(txtServer)
.add(cmbProfile, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 341, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
.add(cmdAddProfile)
.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
.add(cmdImportProfile)
.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
.add(cmdDeleteProfile))
.add(jPanel4, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
.addContainerGap(org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
);
jPanel6Layout.setVerticalGroup(
Expand Down Expand Up @@ -2185,6 +2184,7 @@ public void setUserInfo(ImageIcon icon, AppUserBean principal) {
}
this.lblUser.setText(name);
this.lblUser.setIcon(icon);
this.lblDefaultUserIcon.setIcon(null);
this.lblRole.setText(StringUtils.nonEmpty(principal.getRole()));
}

Expand Down Expand Up @@ -2355,7 +2355,6 @@ public static void main(String args[]) {
private javax.swing.JLabel jLabel15;
private javax.swing.JLabel jLabel16;
private javax.swing.JLabel jLabel17;
private javax.swing.JLabel jLabel18;
private javax.swing.JLabel jLabel19;
private javax.swing.JLabel jLabel2;
private javax.swing.JLabel jLabel3;
Expand All @@ -2381,6 +2380,7 @@ public static void main(String args[]) {
private javax.swing.JLabel lblAutoUpdate;
private javax.swing.JLabel lblBoxOutput;
private javax.swing.JLabel lblCompany;
private javax.swing.JLabel lblDefaultUserIcon;
private javax.swing.JLabel lblFullClientVersion;
private javax.swing.JLabel lblProfile;
private javax.swing.JLabel lblProgress;
Expand Down

0 comments on commit 3d1e8c3

Please sign in to comment.