Minor UI Changes

SMGCommunity · Mar 30, 2024 · 2f31138 · 2f31138
1 parent f127426
commit 2f31138
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 25 deletions.
diff --git a/src/whitehole/AboutForm.form b/src/whitehole/AboutForm.form
@@ -50,7 +50,7 @@
   <SubComponents>
     <Component class="javax.swing.JLabel" name="label">
       <Properties>
-        <Property name="text" type="java.lang.String" value="&lt;html&gt; &lt;h2&gt;Whitehole&lt;/h2&gt; A level editor for Super Mario Galaxy and Super Mario Galaxy 2.&lt;br&gt; Whitehole is free software and shouldn&apos;t be provided as a part&lt;br&gt; of a paid software package.  &lt;h2&gt;Credits&lt;/h2&gt; Arisotura, TheSunCat, Aurum, JuPaHe64, PhantomWings, Treeki,&lt;br&gt; Super Hackio, shibbo, NWPlayer123, Bussun, IonicPixels, thakis,&lt;br&gt; yaz0r, Lord-Giganticus, groepaz, Dirbaio, Rob Camick, and AwesomeTMC.&lt;br&gt; &lt;/html&gt;"/>
+        <Property name="text" type="java.lang.String" value="&lt;html&gt;&#xa;  &lt;h2&gt;Whitehole&lt;/h2&gt; A level editor for Super Mario Galaxy and Super Mario Galaxy 2. &lt;br&gt; Whitehole is free software and shouldn&apos;t be provided as a part &lt;br&gt; of a paid software package. &lt;h2&gt;Credits&lt;/h2&gt; Arisotura, Aurum, AwesomeTMC, Bussun, Dirbaio, &lt;br/&gt;groepaz, IonicPixels, JuPaHe64, Lord-Giganticus, NWPlayer123, &lt;br/&gt;PhantomWings, Rob Camick, shibboleet, Super Hackio, thakis, &lt;br/&gt;TheSunCat, Treeki, and yaz0r. &lt;h4&gt;Current Version:&lt;br/&gt;Whitehole Neo (Beta 5)&lt;/h4&gt;&lt;/html&gt;"/>
       </Properties>
     </Component>
   </SubComponents>

diff --git a/src/whitehole/AboutForm.java b/src/whitehole/AboutForm.java
@@ -35,7 +35,7 @@ private void initComponents() {
         setIconImage(Whitehole.ICON);
         setResizable(false);
 
-        label.setText("<html> <h2>Whitehole</h2> A level editor for Super Mario Galaxy and Super Mario Galaxy 2.<br> Whitehole is free software and shouldn't be provided as a part<br> of a paid software package.  <h2>Credits</h2> Arisotura, TheSunCat, Aurum, JuPaHe64, PhantomWings, Treeki,<br> Super Hackio, shibbo, NWPlayer123, Bussun, IonicPixels, thakis,<br> yaz0r, Lord-Giganticus, groepaz, Dirbaio, Rob Camick, and AwesomeTMC.<br> </html>");
+        label.setText("<html>\n  <h2>Whitehole</h2> A level editor for Super Mario Galaxy and Super Mario Galaxy 2. <br> Whitehole is free software and shouldn't be provided as a part <br> of a paid software package. <h2>Credits</h2> Arisotura, Aurum, AwesomeTMC, Bussun, Dirbaio, <br/>groepaz, IonicPixels, JuPaHe64, Lord-Giganticus, NWPlayer123, <br/>PhantomWings, Rob Camick, shibboleet, Super Hackio, thakis, <br/>TheSunCat, Treeki, and yaz0r. <h4>Current Version:<br/>Whitehole Neo (Beta 5)</h4></html>");
 
         javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane());
         getContentPane().setLayout(layout);

diff --git a/src/whitehole/MainFrame.form b/src/whitehole/MainFrame.form
@@ -91,31 +91,31 @@
         </Component>
         <Component class="javax.swing.JToolBar$Separator" name="jSeparator2">
         </Component>
-        <Component class="javax.swing.JButton" name="btnCreateGalaxy">
+        <Component class="javax.swing.JButton" name="btnBcsvEditor">
           <Properties>
-            <Property name="text" type="java.lang.String" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
-              <Connection code="(tabLists.getSelectedIndex() == 0) ? &quot;Create Galaxy&quot; : &quot;Create Zone&quot;" type="code"/>
-            </Property>
+            <Property name="text" type="java.lang.String" value="BCSV Editor"/>
+            <Property name="enabled" type="boolean" value="false"/>
             <Property name="focusable" type="boolean" value="false"/>
             <Property name="horizontalTextPosition" type="int" value="0"/>
             <Property name="verticalTextPosition" type="int" value="3"/>
           </Properties>
           <Events>
-            <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="btnCreateGalaxyActionPerformed"/>
+            <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="btnBcsvEditorActionPerformed"/>
           </Events>
         </Component>
         <Component class="javax.swing.JToolBar$Separator" name="jSeparator4">
         </Component>
-        <Component class="javax.swing.JButton" name="btnBcsvEditor">
+        <Component class="javax.swing.JButton" name="btnCreateGalaxy">
           <Properties>
-            <Property name="text" type="java.lang.String" value="BCSV Editor"/>
-            <Property name="enabled" type="boolean" value="false"/>
+            <Property name="text" type="java.lang.String" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
+              <Connection code="(tabLists.getSelectedIndex() == 0) ? &quot;Create Galaxy&quot; : &quot;Create Zone&quot;" type="code"/>
+            </Property>
             <Property name="focusable" type="boolean" value="false"/>
             <Property name="horizontalTextPosition" type="int" value="0"/>
             <Property name="verticalTextPosition" type="int" value="3"/>
           </Properties>
           <Events>
-            <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="btnBcsvEditorActionPerformed"/>
+            <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="btnCreateGalaxyActionPerformed"/>
           </Events>
         </Component>
         <Component class="javax.swing.JToolBar$Separator" name="jSeparator3">

diff --git a/src/whitehole/MainFrame.java b/src/whitehole/MainFrame.java
@@ -305,9 +305,9 @@ private void initComponents() {
         jSeparator1 = new javax.swing.JToolBar.Separator();
         btnOpenGalaxy = new javax.swing.JButton();
         jSeparator2 = new javax.swing.JToolBar.Separator();
-        btnCreateGalaxy = new javax.swing.JButton();
-        jSeparator4 = new javax.swing.JToolBar.Separator();
         btnBcsvEditor = new javax.swing.JButton();
+        jSeparator4 = new javax.swing.JToolBar.Separator();
+        btnCreateGalaxy = new javax.swing.JButton();
         jSeparator3 = new javax.swing.JToolBar.Separator();
         btnSettings = new javax.swing.JButton();
         jSeparator6 = new javax.swing.JToolBar.Separator();
@@ -360,18 +360,6 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
         toolbar.add(btnOpenGalaxy);
         toolbar.add(jSeparator2);
 
-        btnCreateGalaxy.setText((tabLists.getSelectedIndex() == 0) ? "Create Galaxy" : "Create Zone");
-        btnCreateGalaxy.setFocusable(false);
-        btnCreateGalaxy.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
-        btnCreateGalaxy.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
-        btnCreateGalaxy.addActionListener(new java.awt.event.ActionListener() {
-            public void actionPerformed(java.awt.event.ActionEvent evt) {
-                btnCreateGalaxyActionPerformed(evt);
-            }
-        });
-        toolbar.add(btnCreateGalaxy);
-        toolbar.add(jSeparator4);
-
         btnBcsvEditor.setText("BCSV Editor");
         btnBcsvEditor.setEnabled(false);
         btnBcsvEditor.setFocusable(false);
@@ -383,6 +371,18 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
             }
         });
         toolbar.add(btnBcsvEditor);
+        toolbar.add(jSeparator4);
+
+        btnCreateGalaxy.setText((tabLists.getSelectedIndex() == 0) ? "Create Galaxy" : "Create Zone");
+        btnCreateGalaxy.setFocusable(false);
+        btnCreateGalaxy.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
+        btnCreateGalaxy.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
+        btnCreateGalaxy.addActionListener(new java.awt.event.ActionListener() {
+            public void actionPerformed(java.awt.event.ActionEvent evt) {
+                btnCreateGalaxyActionPerformed(evt);
+            }
+        });
+        toolbar.add(btnCreateGalaxy);
         toolbar.add(jSeparator3);
 
         btnSettings.setText("Settings");