From f7f147a1234235df6cb7ec58bede6cc12dd6e03f Mon Sep 17 00:00:00 2001
From: j-dimension <info@j-lawyer.org>
Date: Thu, 28 Nov 2024 13:12:32 +0100
Subject: [PATCH] layout changes for user administration. issue #2689

---
 .../configuration/UserAdministrationDialog.form | 15 +++++----------
 .../configuration/UserAdministrationDialog.java | 17 +++++++----------
 2 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/j-lawyer-client/src/com/jdimension/jlawyer/client/configuration/UserAdministrationDialog.form b/j-lawyer-client/src/com/jdimension/jlawyer/client/configuration/UserAdministrationDialog.form
index 26bcd39ff..401a0e6ad 100755
--- a/j-lawyer-client/src/com/jdimension/jlawyer/client/configuration/UserAdministrationDialog.form
+++ b/j-lawyer-client/src/com/jdimension/jlawyer/client/configuration/UserAdministrationDialog.form
@@ -76,15 +76,10 @@
                               <EmptySpace max="-2" attributes="0"/>
                               <Component id="txtUser" min="-2" pref="216" max="-2" attributes="0"/>
                           </Group>
+                          <Component id="chkShowExternalUsers" min="-2" max="-2" attributes="0"/>
                       </Group>
                       <EmptySpace type="separate" max="-2" attributes="0"/>
-                      <Group type="103" groupAlignment="0" attributes="0">
-                          <Group type="102" attributes="0">
-                              <Component id="chkShowExternalUsers" min="-2" max="-2" attributes="0"/>
-                              <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
-                          </Group>
-                          <Component id="jScrollPane1" max="32767" attributes="0"/>
-                      </Group>
+                      <Component id="jScrollPane1" max="32767" attributes="0"/>
                   </Group>
               </Group>
               <EmptySpace max="-2" attributes="0"/>
@@ -95,7 +90,7 @@
       <Group type="103" groupAlignment="0" attributes="0">
           <Group type="102" alignment="1" attributes="0">
               <EmptySpace max="-2" attributes="0"/>
-              <Group type="103" groupAlignment="0" attributes="0">
+              <Group type="103" groupAlignment="0" max="-2" attributes="0">
                   <Group type="102" attributes="0">
                       <Group type="103" groupAlignment="3" attributes="0">
                           <Component id="txtUser" alignment="3" min="-2" max="-2" attributes="0"/>
@@ -103,11 +98,11 @@
                       </Group>
                       <EmptySpace max="-2" attributes="0"/>
                       <Component id="cmdAdd" min="-2" max="-2" attributes="0"/>
+                      <EmptySpace max="32767" attributes="0"/>
+                      <Component id="chkShowExternalUsers" min="-2" max="-2" attributes="0"/>
                   </Group>
                   <Component id="jScrollPane1" min="-2" pref="137" max="-2" attributes="0"/>
               </Group>
-              <EmptySpace max="-2" attributes="0"/>
-              <Component id="chkShowExternalUsers" min="-2" max="-2" attributes="0"/>
               <EmptySpace type="unrelated" max="-2" attributes="0"/>
               <Component id="jTabbedPane1" min="-2" max="-2" attributes="0"/>
               <EmptySpace max="32767" attributes="0"/>
diff --git a/j-lawyer-client/src/com/jdimension/jlawyer/client/configuration/UserAdministrationDialog.java b/j-lawyer-client/src/com/jdimension/jlawyer/client/configuration/UserAdministrationDialog.java
index 0c40ae90a..be02fe1ae 100755
--- a/j-lawyer-client/src/com/jdimension/jlawyer/client/configuration/UserAdministrationDialog.java
+++ b/j-lawyer-client/src/com/jdimension/jlawyer/client/configuration/UserAdministrationDialog.java
@@ -2024,29 +2024,26 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
                             .add(layout.createSequentialGroup()
                                 .add(jLabel1)
                                 .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                                .add(txtUser, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 216, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)))
+                                .add(txtUser, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 216, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
+                            .add(chkShowExternalUsers))
                         .add(18, 18, 18)
-                        .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-                            .add(layout.createSequentialGroup()
-                                .add(chkShowExternalUsers)
-                                .add(0, 0, Short.MAX_VALUE))
-                            .add(jScrollPane1))))
+                        .add(jScrollPane1)))
                 .addContainerGap())
         );
         layout.setVerticalGroup(
             layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
             .add(org.jdesktop.layout.GroupLayout.TRAILING, layout.createSequentialGroup()
                 .addContainerGap()
-                .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+                .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING, false)
                     .add(layout.createSequentialGroup()
                         .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
                             .add(txtUser, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
                             .add(jLabel1))
                         .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                        .add(cmdAdd))
+                        .add(cmdAdd)
+                        .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                        .add(chkShowExternalUsers))
                     .add(jScrollPane1, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 137, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
-                .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                .add(chkShowExternalUsers)
                 .addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED)
                 .add(jTabbedPane1, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
                 .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)