17.94

GUI waitingroom size tunning
tonikelope · May 11, 2024 · 26bc54f · 26bc54f
1 parent 2607150
commit 26bc54f
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 17 deletions.
diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.tonikelope</groupId>
     <artifactId>CoronaPoker</artifactId>
-    <version>17.93</version>
+    <version>17.94</version>
     <packaging>jar</packaging>
     <build>
         <plugins>

diff --git a/src/main/java/com/tonikelope/coronapoker/AboutDialog.java b/src/main/java/com/tonikelope/coronapoker/AboutDialog.java
@@ -64,7 +64,7 @@
  */
 public class AboutDialog extends javax.swing.JDialog {
 
-    public static final String VERSION = "17.93";
+    public static final String VERSION = "17.94";
     public static final String UPDATE_URL = "https://github.com/tonikelope/coronapoker/releases/latest";
     public static final String TITLE = "¿De dónde ha salido esto?";
     public static final int MAX_MOD_LOGO_HEIGHT = 75;

diff --git a/src/main/java/com/tonikelope/coronapoker/Init.java b/src/main/java/com/tonikelope/coronapoker/Init.java
@@ -1111,9 +1111,15 @@ private static void UPDATE() {
 
                                 Helpers.cleanCacheDIR();
 
-                                String[] cmdArr = {Helpers.getJavaBinPath(), "-jar", updater_jar, NEW_VERSION, current_jar_path, new_jar_path, "¡Santiago y cierra, España!"};
+                                if (GameFrame.LANGUAGE.equals("es")) {
+                                    String[] cmdArr = {Helpers.getJavaBinPath(), "-jar", updater_jar, NEW_VERSION, current_jar_path, new_jar_path, "¡Santiago y cierra, España!"};
 
-                                Runtime.getRuntime().exec(cmdArr);
+                                    Runtime.getRuntime().exec(cmdArr);
+                                } else {
+                                    String[] cmdArr = {Helpers.getJavaBinPath(), "-jar", updater_jar, NEW_VERSION, current_jar_path, new_jar_path};
+
+                                    Runtime.getRuntime().exec(cmdArr);
+                                }
 
                                 if (Helpers.OSValidator.isWindows()) {
                                     Helpers.restoreWindowsGlobalZoom();

diff --git a/src/main/java/com/tonikelope/coronapoker/WaitingRoomFrame.form b/src/main/java/com/tonikelope/coronapoker/WaitingRoomFrame.form
@@ -41,7 +41,10 @@
     </DimensionLayout>
     <DimensionLayout dim="1">
       <Group type="103" groupAlignment="0" attributes="0">
-          <Component id="main_scroll_panel" alignment="1" max="32767" attributes="0"/>
+          <Group type="102" alignment="0" attributes="0">
+              <Component id="main_scroll_panel" pref="784" max="32767" attributes="0"/>
+              <EmptySpace max="-2" attributes="0"/>
+          </Group>
       </Group>
     </DimensionLayout>
   </Layout>
@@ -52,6 +55,9 @@
           <Border info="null"/>
         </Property>
         <Property name="doubleBuffered" type="boolean" value="true"/>
+        <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+          <Dimension value="[700, 750]"/>
+        </Property>
       </Properties>
 
       <Layout class="org.netbeans.modules.form.compat2.layouts.support.JScrollPaneSupportLayout"/>
@@ -65,9 +71,9 @@
                       <EmptySpace max="-2" attributes="0"/>
                       <Group type="103" groupAlignment="0" attributes="0">
                           <Component id="danger_server" alignment="0" max="32767" attributes="0"/>
-                          <Component id="panel_arriba" alignment="0" max="32767" attributes="0"/>
+                          <Component id="panel_arriba" alignment="0" pref="688" max="32767" attributes="0"/>
                           <Component id="chat_notifications" alignment="0" max="32767" attributes="0"/>
-                          <Component id="chat_scroll" alignment="0" pref="679" max="32767" attributes="0"/>
+                          <Component id="chat_scroll" alignment="0" pref="0" max="32767" attributes="0"/>
                           <Component id="jPanel1" alignment="0" max="32767" attributes="0"/>
                       </Group>
                       <EmptySpace max="-2" attributes="0"/>
@@ -84,16 +90,21 @@
                       <EmptySpace max="-2" attributes="0"/>
                       <Component id="chat_notifications" min="-2" max="-2" attributes="0"/>
                       <EmptySpace max="-2" attributes="0"/>
-                      <Component id="chat_scroll" pref="88" max="32767" attributes="0"/>
+                      <Component id="chat_scroll" pref="28" max="32767" attributes="0"/>
                       <EmptySpace max="-2" attributes="0"/>
                       <Component id="jPanel1" min="-2" max="-2" attributes="0"/>
-                      <EmptySpace max="-2" attributes="0"/>
+                      <EmptySpace min="0" pref="0" max="-2" attributes="0"/>
                   </Group>
               </Group>
             </DimensionLayout>
           </Layout>
           <SubComponents>
             <Container class="javax.swing.JPanel" name="panel_arriba">
+              <Properties>
+                <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+                  <Dimension value="[700, 487]"/>
+                </Property>
+              </Properties>
 
               <Layout>
                 <DimensionLayout dim="0">
@@ -177,7 +188,7 @@
                               <EmptySpace min="0" pref="0" max="-2" attributes="0"/>
                               <Group type="103" groupAlignment="0" attributes="0">
                                   <Component id="kick_user" max="32767" attributes="0"/>
-                                  <Component id="panel_conectados" pref="739" max="32767" attributes="0"/>
+                                  <Component id="panel_conectados" pref="376" max="32767" attributes="0"/>
                               </Group>
                           </Group>
                       </Group>

diff --git a/src/main/java/com/tonikelope/coronapoker/WaitingRoomFrame.java b/src/main/java/com/tonikelope/coronapoker/WaitingRoomFrame.java
@@ -2603,6 +2603,9 @@ public void windowOpened(java.awt.event.WindowEvent evt) {
 
         main_scroll_panel.setBorder(null);
         main_scroll_panel.setDoubleBuffered(true);
+        main_scroll_panel.setPreferredSize(new java.awt.Dimension(700, 750));
+
+        panel_arriba.setPreferredSize(new java.awt.Dimension(700, 487));
 
         status.setFont(new java.awt.Font("Dialog", 1, 20)); // NOI18N
         status.setForeground(new java.awt.Color(51, 153, 0));
@@ -2657,7 +2660,7 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
                 .addGap(0, 0, 0)
                 .addGroup(panel_conLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
                     .addComponent(kick_user, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-                    .addComponent(panel_conectados, javax.swing.GroupLayout.DEFAULT_SIZE, 739, Short.MAX_VALUE)))
+                    .addComponent(panel_conectados, javax.swing.GroupLayout.DEFAULT_SIZE, 376, Short.MAX_VALUE)))
         );
         panel_conLayout.setVerticalGroup(
             panel_conLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
@@ -3052,9 +3055,9 @@ public void mouseClicked(java.awt.event.MouseEvent evt) {
                 .addContainerGap()
                 .addGroup(main_panelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
                     .addComponent(danger_server, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-                    .addComponent(panel_arriba, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                    .addComponent(panel_arriba, javax.swing.GroupLayout.DEFAULT_SIZE, 688, Short.MAX_VALUE)
                     .addComponent(chat_notifications, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-                    .addComponent(chat_scroll, javax.swing.GroupLayout.DEFAULT_SIZE, 679, Short.MAX_VALUE)
+                    .addComponent(chat_scroll, javax.swing.GroupLayout.PREFERRED_SIZE, 0, Short.MAX_VALUE)
                     .addComponent(jPanel1, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
                 .addContainerGap())
         );
@@ -3068,10 +3071,10 @@ public void mouseClicked(java.awt.event.MouseEvent evt) {
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                 .addComponent(chat_notifications)
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                .addComponent(chat_scroll, javax.swing.GroupLayout.DEFAULT_SIZE, 88, Short.MAX_VALUE)
+                .addComponent(chat_scroll, javax.swing.GroupLayout.DEFAULT_SIZE, 28, Short.MAX_VALUE)
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                 .addComponent(jPanel1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                .addContainerGap())
+                .addGap(0, 0, 0))
         );
 
         main_scroll_panel.setViewportView(main_panel);
@@ -3080,11 +3083,13 @@ public void mouseClicked(java.awt.event.MouseEvent evt) {
         getContentPane().setLayout(layout);
         layout.setHorizontalGroup(
             layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-            .addComponent(main_scroll_panel, javax.swing.GroupLayout.Alignment.TRAILING)
+            .addComponent(main_scroll_panel, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
         );
         layout.setVerticalGroup(
             layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-            .addComponent(main_scroll_panel, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, 850, Short.MAX_VALUE)
+            .addGroup(layout.createSequentialGroup()
+                .addComponent(main_scroll_panel, javax.swing.GroupLayout.DEFAULT_SIZE, 784, Short.MAX_VALUE)
+                .addContainerGap())
         );
 
         pack();