Merge origin/master

jlawyerorg · Aug 14, 2024 · 595bd48 · 595bd48
2 parents 2c9b00e + 378bba0
commit 595bd48
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 24 deletions.
diff --git a/j-lawyer-client/src/com/jdimension/jlawyer/client/desktop/DesktopPanel.form b/j-lawyer-client/src/com/jdimension/jlawyer/client/desktop/DesktopPanel.form
@@ -456,7 +456,7 @@
                               </Group>
                           </Group>
                           <EmptySpace max="-2" attributes="0"/>
-                          <Component id="tabPaneTagged" pref="172" max="32767" attributes="0"/>
+                          <Component id="tabPaneTagged" pref="78" max="32767" attributes="0"/>
                           <EmptySpace max="-2" attributes="0"/>
                       </Group>
                   </Group>
@@ -651,18 +651,26 @@
         </DimensionLayout>
         <DimensionLayout dim="1">
           <Group type="103" groupAlignment="0" attributes="0">
-              <Group type="103" groupAlignment="3" attributes="0">
-                  <Component id="lblUnreadMail" alignment="3" min="-2" max="-2" attributes="0"/>
-                  <Component id="lblScans" alignment="3" min="-2" max="-2" attributes="0"/>
-                  <Component id="lblMailingStatus" alignment="3" min="-2" max="-2" attributes="0"/>
-                  <Component id="lblUnreadDrebis" alignment="3" min="-2" max="-2" attributes="0"/>
-                  <Component id="lblUnreadBea" alignment="3" min="-2" max="-2" attributes="0"/>
+              <Group type="102" alignment="1" attributes="0">
+                  <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
+                  <Group type="103" groupAlignment="3" attributes="0">
+                      <Component id="lblUnreadInstantMessages" alignment="3" min="-2" pref="40" max="-2" attributes="0"/>
+                      <Component id="lblUpdateStatus" alignment="3" min="-2" pref="40" max="-2" attributes="0"/>
+                      <Component id="lblNewsStatus" alignment="3" min="-2" pref="40" max="-2" attributes="0"/>
+                  </Group>
               </Group>
-              <Group type="103" alignment="1" groupAlignment="3" attributes="0">
-                  <Component id="lblUnreadInstantMessages" alignment="3" min="-2" pref="40" max="-2" attributes="0"/>
-                  <Component id="lblUpdateStatus" alignment="3" min="-2" pref="40" max="-2" attributes="0"/>
-                  <Component id="lblNewsStatus" alignment="3" min="-2" pref="40" max="-2" attributes="0"/>
-                  <Component id="lblUpdateStatusFormPlugins" alignment="3" min="-2" max="-2" attributes="0"/>
+              <Group type="102" attributes="0">
+                  <Group type="103" groupAlignment="0" attributes="0">
+                      <Group type="103" groupAlignment="3" attributes="0">
+                          <Component id="lblUnreadMail" alignment="3" min="-2" max="-2" attributes="0"/>
+                          <Component id="lblScans" alignment="3" min="-2" max="-2" attributes="0"/>
+                          <Component id="lblMailingStatus" alignment="3" min="-2" max="-2" attributes="0"/>
+                          <Component id="lblUnreadDrebis" alignment="3" min="-2" max="-2" attributes="0"/>
+                          <Component id="lblUnreadBea" alignment="3" min="-2" max="-2" attributes="0"/>
+                      </Group>
+                      <Component id="lblUpdateStatusFormPlugins" alignment="0" min="-2" pref="40" max="-2" attributes="0"/>
+                  </Group>
+                  <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
               </Group>
           </Group>
         </DimensionLayout>

diff --git a/j-lawyer-client/src/com/jdimension/jlawyer/client/desktop/DesktopPanel.java b/j-lawyer-client/src/com/jdimension/jlawyer/client/desktop/DesktopPanel.java
@@ -1328,7 +1328,7 @@ public void mousePressed(java.awt.event.MouseEvent evt) {
                         .add(org.jdesktop.layout.GroupLayout.LEADING, cmdDocumentTagFilter, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
                         .add(org.jdesktop.layout.GroupLayout.LEADING, cmdTagFilter, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)))
                 .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                .add(tabPaneTagged, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 172, Short.MAX_VALUE)
+                .add(tabPaneTagged, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 78, Short.MAX_VALUE)
                 .addContainerGap())
         );
 
@@ -1420,17 +1420,22 @@ public void mousePressed(java.awt.event.MouseEvent evt) {
         );
         messagesWidgetLayout.setVerticalGroup(
             messagesWidgetLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-            .add(messagesWidgetLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
-                .add(lblUnreadMail)
-                .add(lblScans)
-                .add(lblMailingStatus)
-                .add(lblUnreadDrebis)
-                .add(lblUnreadBea))
-            .add(org.jdesktop.layout.GroupLayout.TRAILING, messagesWidgetLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
-                .add(lblUnreadInstantMessages, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 40, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
-                .add(lblUpdateStatus, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 40, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
-                .add(lblNewsStatus, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 40, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
-                .add(lblUpdateStatusFormPlugins))
+            .add(org.jdesktop.layout.GroupLayout.TRAILING, messagesWidgetLayout.createSequentialGroup()
+                .add(0, 0, Short.MAX_VALUE)
+                .add(messagesWidgetLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
+                    .add(lblUnreadInstantMessages, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 40, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
+                    .add(lblUpdateStatus, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 40, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
+                    .add(lblNewsStatus, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 40, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)))
+            .add(messagesWidgetLayout.createSequentialGroup()
+                .add(messagesWidgetLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+                    .add(messagesWidgetLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
+                        .add(lblUnreadMail)
+                        .add(lblScans)
+                        .add(lblMailingStatus)
+                        .add(lblUnreadDrebis)
+                        .add(lblUnreadBea))
+                    .add(lblUpdateStatusFormPlugins, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 40, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
+                .add(0, 0, Short.MAX_VALUE))
         );
 
         lblArchiveFileCount.setFont(lblArchiveFileCount.getFont().deriveFont(lblArchiveFileCount.getFont().getStyle() | java.awt.Font.BOLD));