From c9954e4bdba84422d4e40343bd74e875e7ec0ffd Mon Sep 17 00:00:00 2001
From: Robert Colton <robertbcolton@gmail.com>
Date: Thu, 23 May 2019 17:00:58 -0400
Subject: [PATCH] Settings Includes Fix (#435)

Readd messages for GM >530 <600 settings include tab. Change settings include tab layout to vertical. Use singular, rather than plural, labels on the instantiable include frame.
---
 org/lateralgm/main/LGM.java                   |  2 +-
 org/lateralgm/messages/messages.properties    | 17 ++++++++++++++--
 org/lateralgm/subframes/GameSettingFrame.java | 20 +++++++++----------
 3 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/org/lateralgm/main/LGM.java b/org/lateralgm/main/LGM.java
index 8e8c141e7..ab0042703 100644
--- a/org/lateralgm/main/LGM.java
+++ b/org/lateralgm/main/LGM.java
@@ -135,7 +135,7 @@
 
 public final class LGM
 	{
-	public static final String version = "1.8.73"; //$NON-NLS-1$
+	public static final String version = "1.8.74"; //$NON-NLS-1$
 
 	// TODO: This list holds the class loader for any loaded plugins which should be
 	// cleaned up and closed when the application closes.
diff --git a/org/lateralgm/messages/messages.properties b/org/lateralgm/messages/messages.properties
index e008cca2b..040075800 100644
--- a/org/lateralgm/messages/messages.properties
+++ b/org/lateralgm/messages/messages.properties
@@ -647,8 +647,8 @@ IncludeFrame.SIZE=Size: {0} bytes
 IncludeFrame.ORIGINAL_FILE=Original File: {0}
 IncludeFrame.COPIES_TO=Copies to:
 IncludeFrame.PLATFORMS=
-IncludeFrame.OVERWRITE_EXISTING=Overwrite existing files
-IncludeFrame.REMOVE_FILES_AT_END=Remove files at end of game
+IncludeFrame.OVERWRITE_EXISTING=Overwrite existing file
+IncludeFrame.REMOVE_FILES_AT_END=Remove file at end of game
 IncludeFrame.STORE_EDITABLE=Store in the project editable
 IncludeFrame.FREE_MEMORY=Free memory after export
 
@@ -871,6 +871,19 @@ GameSettingFrame.PRODUCT=Product:
 GameSettingFrame.COPYRIGHT=Copyright:
 GameSettingFrame.DESCRIPTION=Description:
 
+#Include tab
+GameSettingFrame.TAB_INCLUDE=Include
+GameSettingFrame.HINT_INCLUDE=Configure Includes
+GameSettingFrame.FILES_TO_INCLUDE=Files to include in the Executable
+GameSettingFrame.ADD_INCLUDE=Add
+GameSettingFrame.DELETE_INCLUDE=Delete
+GameSettingFrame.CLEAR_INCLUDES=Clear
+GameSettingFrame.EXPORT_TO=Folder to export to
+GameSettingFrame.SAME_FOLDER=Same folder as executable
+GameSettingFrame.TEMP_DIRECTORY=Temporary directory
+GameSettingFrame.OVERWRITE_EXISTING=Overwrite existing files
+GameSettingFrame.REMOVE_FILES_AT_END=Remove files at end of game
+
 #Errors tab
 GameSettingFrame.TAB_ERRORS=Errors
 GameSettingFrame.HINT_ERRORS=Configure Error handling
diff --git a/org/lateralgm/subframes/GameSettingFrame.java b/org/lateralgm/subframes/GameSettingFrame.java
index bf8554d56..9bae8f5ff 100644
--- a/org/lateralgm/subframes/GameSettingFrame.java
+++ b/org/lateralgm/subframes/GameSettingFrame.java
@@ -50,13 +50,13 @@
 import javax.swing.JTextField;
 import javax.swing.JTree;
 import javax.swing.LayoutStyle.ComponentPlacement;
+import javax.swing.SwingConstants;
 import javax.swing.event.TreeSelectionEvent;
 import javax.swing.event.TreeSelectionListener;
 import javax.swing.tree.DefaultMutableTreeNode;
 import javax.swing.tree.DefaultTreeCellRenderer;
 import javax.swing.tree.DefaultTreeModel;
 import javax.swing.tree.TreeSelectionModel;
-import javax.swing.SwingConstants;
 
 import org.lateralgm.components.ColorSelect;
 import org.lateralgm.components.CustomFileChooser;
@@ -500,17 +500,15 @@ private JPanel makeIncludePane()
 		includesFc.setMultiSelectionEnabled(true);
 
 		layout.setHorizontalGroup(layout.createParallelGroup()
-		/**/.addGroup(layout.createSequentialGroup()
-		/*		*/.addComponent(folderPanel).addGap(4,8,MAX_VALUE)
-		/*		*/.addGroup(layout.createParallelGroup()
-		/*				*/.addComponent(overwriteExisting)
-		/*				*/.addComponent(removeAtGameEnd))));
+		/*	*/.addComponent(folderPanel).addGap(4,8,MAX_VALUE)
+		/*	*/.addGroup(layout.createParallelGroup()
+		/*			*/.addComponent(overwriteExisting)
+		/*			*/.addComponent(removeAtGameEnd)));
 		layout.setVerticalGroup(layout.createSequentialGroup()
-		/**/.addGroup(layout.createParallelGroup()
-		/*		*/.addComponent(folderPanel)
-		/*		*/.addGroup(layout.createSequentialGroup()
-		/*				*/.addComponent(overwriteExisting)
-		/*				*/.addComponent(removeAtGameEnd))));
+		/*	*/.addComponent(folderPanel)
+		/*	*/.addGroup(layout.createSequentialGroup()
+		/*			*/.addComponent(overwriteExisting)
+		/*			*/.addComponent(removeAtGameEnd)));
 		return panel;
 		}