From 38aa14d4f9d168d9a0064dcb4d7d060485184847 Mon Sep 17 00:00:00 2001
From: Andreas Erhard <developer@andaris.at>
Date: Sun, 26 Feb 2017 15:35:23 +0100
Subject: [PATCH] minor layout fix

---
 launch4j.xml                               |  4 ++--
 src/at/andaris/keyutil/CalculatorForm.form | 26 +++++++++++++---------
 src/at/andaris/keyutil/CalculatorForm.java | 26 ++++++++++++----------
 3 files changed, 31 insertions(+), 25 deletions(-)

diff --git a/launch4j.xml b/launch4j.xml
index 87d6d05..9ca01b5 100644
--- a/launch4j.xml
+++ b/launch4j.xml
@@ -24,11 +24,11 @@
     <runtimeBits>64/32</runtimeBits>
   </jre>
   <versionInfo>
-    <fileVersion>0.1.1.0</fileVersion>
+    <fileVersion>0.1.2.0</fileVersion>
     <txtFileVersion>0</txtFileVersion>
     <fileDescription>AES-256 Key Generator &amp; Checksum Calculator</fileDescription>
     <copyright>Andreas Erhard</copyright>
-    <productVersion>0.1.1.0</productVersion>
+    <productVersion>0.1.2.0</productVersion>
     <txtProductVersion>0</txtProductVersion>
     <productName>AES-256 Key Generator &amp;amp; Checksum Calculator</productName>
     <companyName>Andreas Erhard</companyName>
diff --git a/src/at/andaris/keyutil/CalculatorForm.form b/src/at/andaris/keyutil/CalculatorForm.form
index 3b83355..13312ff 100644
--- a/src/at/andaris/keyutil/CalculatorForm.form
+++ b/src/at/andaris/keyutil/CalculatorForm.form
@@ -37,26 +37,29 @@
               <Group type="103" groupAlignment="0" max="-2" attributes="0">
                   <Component id="lblHeading" max="32767" attributes="0"/>
                   <Component id="jSeparator1" alignment="0" max="32767" attributes="0"/>
-                  <Group type="102" alignment="0" attributes="0">
-                      <Component id="lblBytes" min="-2" max="-2" attributes="0"/>
-                      <EmptySpace type="separate" max="-2" attributes="0"/>
-                      <Component id="txtBytes" min="-2" pref="54" max="-2" attributes="0"/>
-                  </Group>
                   <Group type="102" alignment="0" attributes="0">
                       <Group type="103" groupAlignment="0" attributes="0">
                           <Component id="lblKey" alignment="0" min="-2" max="-2" attributes="0"/>
                           <Component id="lblResult" alignment="1" min="-2" max="-2" attributes="0"/>
                       </Group>
-                      <EmptySpace min="-2" pref="36" max="-2" attributes="0"/>
+                      <EmptySpace min="36" pref="36" max="-2" attributes="0"/>
                       <Group type="103" groupAlignment="0" attributes="0">
-                          <Group type="102" attributes="0">
+                          <Group type="102" alignment="0" attributes="0">
                               <Component id="txtResult" min="-2" pref="54" max="-2" attributes="0"/>
                               <EmptySpace min="-2" pref="174" max="-2" attributes="0"/>
                               <Component id="lblInfo" min="-2" pref="234" max="-2" attributes="0"/>
                           </Group>
                           <Group type="102" alignment="0" attributes="0">
-                              <Component id="txtKey" min="-2" pref="348" max="-2" attributes="0"/>
-                              <EmptySpace type="unrelated" max="-2" attributes="0"/>
+                              <Group type="103" groupAlignment="0" max="-2" attributes="0">
+                                  <Group type="102" attributes="0">
+                                      <Component id="txtBytes" min="-2" pref="54" max="-2" attributes="0"/>
+                                      <EmptySpace min="-2" pref="300" max="-2" attributes="0"/>
+                                  </Group>
+                                  <Group type="102" attributes="0">
+                                      <Component id="txtKey" max="32767" attributes="0"/>
+                                      <EmptySpace type="unrelated" max="-2" attributes="0"/>
+                                  </Group>
+                              </Group>
                               <Group type="103" groupAlignment="0" max="-2" attributes="0">
                                   <Component id="btnCalculate" max="32767" attributes="0"/>
                                   <Component id="btnGenerate" min="-2" pref="104" max="-2" attributes="0"/>
@@ -64,6 +67,7 @@
                           </Group>
                       </Group>
                   </Group>
+                  <Component id="lblBytes" alignment="0" min="-2" max="-2" attributes="0"/>
               </Group>
               <EmptySpace pref="24" max="32767" attributes="0"/>
           </Group>
@@ -77,14 +81,14 @@
               <EmptySpace min="-2" pref="29" max="-2" attributes="0"/>
               <Group type="103" groupAlignment="3" attributes="0">
                   <Component id="lblKey" alignment="3" min="-2" pref="20" max="-2" attributes="0"/>
-                  <Component id="txtKey" alignment="3" min="-2" max="-2" attributes="0"/>
                   <Component id="btnGenerate" alignment="3" min="-2" max="-2" attributes="0"/>
+                  <Component id="txtKey" alignment="3" min="-2" max="-2" attributes="0"/>
               </Group>
               <EmptySpace type="unrelated" max="-2" attributes="0"/>
               <Group type="103" groupAlignment="3" attributes="0">
                   <Component id="lblBytes" alignment="3" min="-2" max="-2" attributes="0"/>
-                  <Component id="txtBytes" alignment="3" min="-2" max="-2" attributes="0"/>
                   <Component id="btnCalculate" alignment="3" min="-2" max="-2" attributes="0"/>
+                  <Component id="txtBytes" alignment="3" min="-2" max="-2" attributes="0"/>
               </Group>
               <EmptySpace type="unrelated" max="-2" attributes="0"/>
               <Component id="jSeparator1" min="-2" pref="10" max="-2" attributes="0"/>
diff --git a/src/at/andaris/keyutil/CalculatorForm.java b/src/at/andaris/keyutil/CalculatorForm.java
index a4459dd..60e4394 100644
--- a/src/at/andaris/keyutil/CalculatorForm.java
+++ b/src/at/andaris/keyutil/CalculatorForm.java
@@ -43,7 +43,7 @@
  */
 public class CalculatorForm extends javax.swing.JFrame {
 
-    public static final String VERSION = "0.1.1";
+    public static final String VERSION = "0.1.2";
 
     /**
      * Creates new form ContactEditor
@@ -123,10 +123,6 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
                 .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING, false)
                     .add(lblHeading, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
                     .add(jSeparator1)
-                    .add(layout.createSequentialGroup()
-                        .add(lblBytes)
-                        .add(18, 18, 18)
-                        .add(txtBytes, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 54, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
                     .add(layout.createSequentialGroup()
                         .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
                             .add(lblKey)
@@ -138,11 +134,17 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
                                 .add(174, 174, 174)
                                 .add(lblInfo, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 234, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
                             .add(layout.createSequentialGroup()
-                                .add(txtKey, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 348, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
-                                .addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED)
+                                .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING, false)
+                                    .add(layout.createSequentialGroup()
+                                        .add(txtBytes, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 54, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
+                                        .add(300, 300, 300))
+                                    .add(layout.createSequentialGroup()
+                                        .add(txtKey)
+                                        .addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED)))
                                 .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING, false)
                                     .add(btnCalculate, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-                                    .add(btnGenerate, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 104, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))))))
+                                    .add(btnGenerate, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 104, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)))))
+                    .add(lblBytes))
                 .addContainerGap(24, Short.MAX_VALUE))
         );
         layout.setVerticalGroup(
@@ -153,13 +155,13 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
                 .add(29, 29, 29)
                 .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
                     .add(lblKey, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 20, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
-                    .add(txtKey, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
-                    .add(btnGenerate))
+                    .add(btnGenerate)
+                    .add(txtKey, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
                 .addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED)
                 .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
                     .add(lblBytes)
-                    .add(txtBytes, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
-                    .add(btnCalculate))
+                    .add(btnCalculate)
+                    .add(txtBytes, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
                 .addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED)
                 .add(jSeparator1, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 10, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
                 .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)