From a24144bb1842666b1225d27c8e3aaad38ff7cb2d Mon Sep 17 00:00:00 2001 From: Kristian Knarvik Date: Sat, 27 Jan 2018 12:35:29 +0100 Subject: [PATCH] Removed bin --- .gitignore | 4 +++- .../Minecraft_Server_Launcher_jar/run.bat | 2 -- .../META-INF/MANIFEST.MF | 3 --- .../serverlauncher/userinterface/GUI.java | 17 +++++++++-------- 4 files changed, 12 insertions(+), 14 deletions(-) delete mode 100644 bin/artifacts/Minecraft_Server_Launcher_jar/run.bat delete mode 100644 bin/production/Minecraft-Server-Launcher/META-INF/MANIFEST.MF diff --git a/.gitignore b/.gitignore index 06d018b..e55848e 100644 --- a/.gitignore +++ b/.gitignore @@ -25,4 +25,6 @@ hs_err_pid* *.xml -*.iml \ No newline at end of file +*.iml + +bin/ \ No newline at end of file diff --git a/bin/artifacts/Minecraft_Server_Launcher_jar/run.bat b/bin/artifacts/Minecraft_Server_Launcher_jar/run.bat deleted file mode 100644 index 247cf4b..0000000 --- a/bin/artifacts/Minecraft_Server_Launcher_jar/run.bat +++ /dev/null @@ -1,2 +0,0 @@ -java -jar Minecraft-Server-Launcher.jar -pause \ No newline at end of file diff --git a/bin/production/Minecraft-Server-Launcher/META-INF/MANIFEST.MF b/bin/production/Minecraft-Server-Launcher/META-INF/MANIFEST.MF deleted file mode 100644 index 5ee19cb..0000000 --- a/bin/production/Minecraft-Server-Launcher/META-INF/MANIFEST.MF +++ /dev/null @@ -1,3 +0,0 @@ -Manifest-Version: 1.0 -Main-Class: Main - diff --git a/src/net/knarcraft/serverlauncher/userinterface/GUI.java b/src/net/knarcraft/serverlauncher/userinterface/GUI.java index 4be11f4..491f4a1 100644 --- a/src/net/knarcraft/serverlauncher/userinterface/GUI.java +++ b/src/net/knarcraft/serverlauncher/userinterface/GUI.java @@ -82,6 +82,7 @@ public class GUI { JPanel controlPanel = new JPanel(); controlPanel.setBorder(new EmptyBorder(5, 5, 5, 5)); GroupLayout controlLayout = new GroupLayout(controlPanel); + GroupLayout controlLayout2 = new GroupLayout(controlPanel); controlPanel.setLayout(controlLayout); JLabel basicControls = customLabel("Basic controls"); JButton sendStart = customButton("Start servers"); @@ -89,6 +90,9 @@ public class GUI { JButton backup = customButton("Backup"); JButton viewConsole = customButton("View server consoles"); JLabel profile = customLabel("Profile"); + JButton addProfile = customButton("+"); + JButton delProfile = customButton("-"); + JComboBox profiles = new JComboBox<>(new String[]{"Default"}); controlLayout.setVerticalGroup( controlLayout.createSequentialGroup() @@ -98,22 +102,19 @@ public class GUI { .addComponent(sendStart) .addComponent(sendStop) .addComponent(backup) - .addComponent(viewConsole)) - .addGroup(controlLayout.createParallelGroup(GroupLayout.Alignment.BASELINE) - .addComponent(profile))); + .addComponent(viewConsole))); controlLayout.setHorizontalGroup( controlLayout.createSequentialGroup() .addGroup(controlLayout.createParallelGroup(GroupLayout.Alignment.LEADING) .addComponent(basicControls) - .addComponent(profile) - .addComponent(sendStart)) + .addComponent(sendStart)) .addGroup(controlLayout.createParallelGroup(GroupLayout.Alignment.LEADING) - .addComponent(sendStop)) + .addComponent(sendStop)) .addGroup(controlLayout.createParallelGroup(GroupLayout.Alignment.LEADING) - .addComponent(backup)) + .addComponent(backup)) .addGroup(controlLayout.createParallelGroup(GroupLayout.Alignment.LEADING) - .addComponent(viewConsole))); + .addComponent(viewConsole))); tabs.addTab("Control panel", null, controlPanel, "Basic server controls");