17.92

Timba terminada fecha_hora + duración
tonikelope · May 10, 2024 · c795a22 · c795a22
1 parent b5e577e
commit c795a22
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 4 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.91</version>
+    <version>17.92</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.91";
+    public static final String VERSION = "17.92";
     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/BalanceDialog.form b/src/main/java/com/tonikelope/coronapoker/BalanceDialog.form
@@ -38,14 +38,17 @@
           </Group>
           <Component id="stats_button" alignment="0" max="32767" attributes="0"/>
           <Component id="log_button" alignment="0" max="32767" attributes="0"/>
+          <Component id="date" max="32767" attributes="0"/>
       </Group>
     </DimensionLayout>
     <DimensionLayout dim="1">
       <Group type="103" groupAlignment="0" attributes="0">
           <Group type="102" alignment="0" attributes="0">
               <Component id="title" min="-2" max="-2" attributes="0"/>
               <EmptySpace min="0" pref="0" max="-2" attributes="0"/>
-              <Component id="scroll_panel" pref="22" max="32767" attributes="0"/>
+              <Component id="date" min="-2" max="-2" attributes="0"/>
+              <EmptySpace min="0" pref="0" max="-2" attributes="0"/>
+              <Component id="scroll_panel" pref="274" max="32767" attributes="0"/>
               <EmptySpace max="-2" attributes="0"/>
               <Component id="log_button" min="-2" max="-2" attributes="0"/>
               <EmptySpace max="-2" attributes="0"/>
@@ -83,6 +86,28 @@
         <Property name="opaque" type="boolean" value="true"/>
       </Properties>
     </Component>
+    <Component class="javax.swing.JLabel" name="date">
+      <Properties>
+        <Property name="background" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
+          <Color blue="66" green="66" red="66" type="rgb"/>
+        </Property>
+        <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
+          <Font name="Dialog" size="28" style="1"/>
+        </Property>
+        <Property name="foreground" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
+          <Color blue="ff" green="ff" red="ff" type="rgb"/>
+        </Property>
+        <Property name="horizontalAlignment" type="int" value="0"/>
+        <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
+          <Border info="org.netbeans.modules.form.compat2.border.EmptyBorderInfo">
+            <EmptyBorder bottom="10" left="10" right="10" top="10"/>
+          </Border>
+        </Property>
+        <Property name="doubleBuffered" type="boolean" value="true"/>
+        <Property name="focusable" type="boolean" value="false"/>
+        <Property name="opaque" type="boolean" value="true"/>
+      </Properties>
+    </Component>
     <Container class="javax.swing.JScrollPane" name="scroll_panel">
       <Properties>
         <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">

diff --git a/src/main/java/com/tonikelope/coronapoker/BalanceDialog.java b/src/main/java/com/tonikelope/coronapoker/BalanceDialog.java
@@ -56,6 +56,8 @@ public BalanceDialog(java.awt.Frame parent, boolean modal) {
         super(parent, modal);
 
         initComponents();
+
+        date.setText(Helpers.getFechaHoraActual() + " ("+Helpers.seconds2FullTime(GameFrame.getInstance().getConta_tiempo_juego())+")");
 
         exit_button.requestFocus();
 
@@ -164,6 +166,7 @@ public int compare(Object[] t, Object[] t1) {
     private void initComponents() {
 
         title = new javax.swing.JLabel();
+        date = new javax.swing.JLabel();
         scroll_panel = new javax.swing.JScrollPane();
         jugadores = new javax.swing.JPanel();
         exit_button = new javax.swing.JButton();
@@ -193,6 +196,15 @@ public void windowDeactivated(java.awt.event.WindowEvent evt) {
         title.setFocusable(false);
         title.setOpaque(true);
 
+        date.setBackground(new java.awt.Color(102, 102, 102));
+        date.setFont(new java.awt.Font("Dialog", 1, 28)); // NOI18N
+        date.setForeground(new java.awt.Color(255, 255, 255));
+        date.setHorizontalAlignment(javax.swing.SwingConstants.CENTER);
+        date.setBorder(javax.swing.BorderFactory.createEmptyBorder(10, 10, 10, 10));
+        date.setDoubleBuffered(true);
+        date.setFocusable(false);
+        date.setOpaque(true);
+
         scroll_panel.setBorder(null);
         scroll_panel.setDoubleBuffered(true);
         scroll_panel.setFocusable(false);
@@ -265,13 +277,16 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
                 .addComponent(exit_button, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
             .addComponent(stats_button, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
             .addComponent(log_button, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+            .addComponent(date, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
         );
         layout.setVerticalGroup(
             layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
             .addGroup(layout.createSequentialGroup()
                 .addComponent(title)
                 .addGap(0, 0, 0)
-                .addComponent(scroll_panel, javax.swing.GroupLayout.DEFAULT_SIZE, 22, Short.MAX_VALUE)
+                .addComponent(date)
+                .addGap(0, 0, 0)
+                .addComponent(scroll_panel, javax.swing.GroupLayout.DEFAULT_SIZE, 274, Short.MAX_VALUE)
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                 .addComponent(log_button)
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
@@ -339,6 +354,7 @@ private void formWindowActivated(java.awt.event.WindowEvent evt) {//GEN-FIRST:ev
     }//GEN-LAST:event_formWindowActivated
 
     // Variables declaration - do not modify//GEN-BEGIN:variables
+    private javax.swing.JLabel date;
     private javax.swing.JButton exit_button;
     private javax.swing.JPanel jugadores;
     private javax.swing.JButton log_button;