From c260044cb4ac0f6181b69dc672d8abb692aa1f26 Mon Sep 17 00:00:00 2001
From: Robert Vokac <robertvokac@nanoboot.org>
Date: Sat, 3 Feb 2024 03:07:37 +0000
Subject: [PATCH] Added new improvements

---
 .../utils/timecalc/gui/common/TimeCalcWindow.java         | 6 ++++++
 .../org/nanoboot/utils/timecalc/main/TimeCalcManager.java | 8 +-------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/main/java/org/nanoboot/utils/timecalc/gui/common/TimeCalcWindow.java b/src/main/java/org/nanoboot/utils/timecalc/gui/common/TimeCalcWindow.java
index 9cb87a2..9eb280f 100644
--- a/src/main/java/org/nanoboot/utils/timecalc/gui/common/TimeCalcWindow.java
+++ b/src/main/java/org/nanoboot/utils/timecalc/gui/common/TimeCalcWindow.java
@@ -11,6 +11,12 @@ import java.awt.HeadlessException;
 public class TimeCalcWindow extends JFrame {
     public TimeCalcWindow() throws HeadlessException {
         setFocusable(true);
+        addWindowListener(new java.awt.event.WindowAdapter() {
+            @Override
+            public void windowClosing(java.awt.event.WindowEvent e) {
+                System.exit(0);
+            }
+        });
     }
 
     public Component[] addAll(Component... comp) {
diff --git a/src/main/java/org/nanoboot/utils/timecalc/main/TimeCalcManager.java b/src/main/java/org/nanoboot/utils/timecalc/main/TimeCalcManager.java
index 3ce657f..010e364 100644
--- a/src/main/java/org/nanoboot/utils/timecalc/main/TimeCalcManager.java
+++ b/src/main/java/org/nanoboot/utils/timecalc/main/TimeCalcManager.java
@@ -135,7 +135,7 @@ public class TimeCalcManager {
             }
         });
         JTextPane text = new JTextPane();
-        text.setBounds(10, 10 + 210 + 10, 500, 250);
+        text.setBounds(MARGIN, MARGIN + 210 + MARGIN, 500, 250);
         text.setFont(new Font(Font.MONOSPACED, Font.PLAIN, 12));
         text.setForeground(Color.GRAY);
         text.setBackground(new Color(238, 238, 238));
@@ -192,12 +192,6 @@ public class TimeCalcManager {
         window.setTitle(windowTitle);
         window.setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE);
 
-        window.addWindowListener(new java.awt.event.WindowAdapter() {
-            @Override
-            public void windowClosing(java.awt.event.WindowEvent e) {
-                System.exit(0);
-            }
-        });
         weatherButton
                 .addActionListener(e -> new WeatherWindow().setVisible(true));
         commandButton