KnarCraft/Minecraft-Server-Launcher
KnarCraft/Minecraft-Server-Launcher
1
0
Fork 0
Code Issues 3 Pull Requests Releases 12 Wiki Activity

Moves the show consoles button to the main control panel
All checks were successful
KnarCraft/Minecraft-Server-Launcher/pipeline/head This commit looks good
Details

Browse Source 
Also makes the control servers tab hidden if the servers are not running
This commit is contained in:
Kristian Knarvik 2021-10-01 13:56:16 +02:00
parent 8f25fa2796
commit 166d63f1b2
3 changed files with 22 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/main/java/net/knarcraft/minecraftserverlauncher/userinterface/ControlPanelTab.java
View File

@ -18,6 +18,7 @@ public class ControlPanelTab implements ActionListener {
private JButton stopServerButton; private JButton stopServerButton;
private JButton backupButton; private JButton backupButton;
private JButton addProfileButton; private JButton addProfileButton;
private JButton showConsolesButton;
private JButton deleteProfileButton; private JButton deleteProfileButton;
private JComboBox<String> profiles; private JComboBox<String> profiles;
private final JPanel controlPanelPanel; private final JPanel controlPanelPanel;
@ -147,13 +148,25 @@ public class ControlPanelTab implements ActionListener {
controlPanelPanel.add(stopServerButton); controlPanelPanel.add(stopServerButton);
stopServerButton.addActionListener(this); stopServerButton.addActionListener(this);
JLabel lblProfile = new JLabel("Profile"); showConsolesButton = new JButton("View server consoles");
springLayout.putConstraint(SpringLayout.NORTH, lblProfile, 6, SpringLayout.SOUTH, startServerButton); springLayout.putConstraint(SpringLayout.NORTH, showConsolesButton, 0, SpringLayout.NORTH, stopServerButton);
springLayout.putConstraint(SpringLayout.WEST, lblProfile, 10, SpringLayout.WEST, controlPanelPanel); springLayout.putConstraint(SpringLayout.WEST, showConsolesButton, 6, SpringLayout.EAST, stopServerButton);
controlPanelPanel.add(lblProfile); controlPanelPanel.add(showConsolesButton);
showConsolesButton.addActionListener(this);
backupButton = new JButton("Backup");
springLayout.putConstraint(SpringLayout.NORTH, backupButton, 0, SpringLayout.NORTH, showConsolesButton);
springLayout.putConstraint(SpringLayout.WEST, backupButton, 6, SpringLayout.EAST, showConsolesButton);
controlPanelPanel.add(backupButton);
backupButton.addActionListener(this);
JLabel profileLabel = new JLabel("Profile");
springLayout.putConstraint(SpringLayout.NORTH, profileLabel, 6, SpringLayout.SOUTH, startServerButton);
springLayout.putConstraint(SpringLayout.WEST, profileLabel, 10, SpringLayout.WEST, controlPanelPanel);
controlPanelPanel.add(profileLabel);
addProfileButton = new JButton("+"); addProfileButton = new JButton("+");
springLayout.putConstraint(SpringLayout.NORTH, addProfileButton, 6, SpringLayout.SOUTH, lblProfile); springLayout.putConstraint(SpringLayout.NORTH, addProfileButton, 6, SpringLayout.SOUTH, profileLabel);
springLayout.putConstraint(SpringLayout.WEST, addProfileButton, 10, SpringLayout.WEST, controlPanelPanel); springLayout.putConstraint(SpringLayout.WEST, addProfileButton, 10, SpringLayout.WEST, controlPanelPanel);
controlPanelPanel.add(addProfileButton); controlPanelPanel.add(addProfileButton);
addProfileButton.addActionListener(this); addProfileButton.addActionListener(this);
@ -177,12 +190,6 @@ public class ControlPanelTab implements ActionListener {
springLayout.putConstraint(SpringLayout.EAST, statusLabel, -10, SpringLayout.EAST, controlPanelPanel); springLayout.putConstraint(SpringLayout.EAST, statusLabel, -10, SpringLayout.EAST, controlPanelPanel);
statusLabel.setFont(new Font("", Font.BOLD, 12)); statusLabel.setFont(new Font("", Font.BOLD, 12));
controlPanelPanel.add(statusLabel); controlPanelPanel.add(statusLabel);
backupButton = new JButton("Backup");
springLayout.putConstraint(SpringLayout.NORTH, backupButton, 0, SpringLayout.NORTH, startServerButton);
springLayout.putConstraint(SpringLayout.WEST, backupButton, 6, SpringLayout.EAST, stopServerButton);
controlPanelPanel.add(backupButton);
backupButton.addActionListener(this);
} }
@Override @Override
@ -203,6 +210,8 @@ public class ControlPanelTab implements ActionListener {
deleteProfile(); deleteProfile();
} else if (actionSource == profiles) { } else if (actionSource == profiles) {
changeProfile(); changeProfile();
} else if (actionSource == showConsolesButton) {
ServerConsoles.setAsVisible();
} }
} }
} }

12
src/main/java/net/knarcraft/minecraftserverlauncher/userinterface/ServerControlTab.java
View File

@ -22,7 +22,6 @@ public class ServerControlTab implements ActionListener {
private JButton customCommandButton; private JButton customCommandButton;
private JButton saveServerButton; private JButton saveServerButton;
private JButton reloadButton; private JButton reloadButton;
private JButton showConsolesButton;
private JTextField customCommandTextField; private JTextField customCommandTextField;
private final ServerLauncherController controller = ServerLauncherController.getInstance(); private final ServerLauncherController controller = ServerLauncherController.getInstance();
@ -134,13 +133,6 @@ public class ServerControlTab implements ActionListener {
springLayout.putConstraint(SpringLayout.EAST, reloadButton, 0, SpringLayout.EAST, opButton); springLayout.putConstraint(SpringLayout.EAST, reloadButton, 0, SpringLayout.EAST, opButton);
controlServers.add(reloadButton); controlServers.add(reloadButton);
reloadButton.addActionListener(this); reloadButton.addActionListener(this);
showConsolesButton = new JButton("View server consoles");
springLayout.putConstraint(SpringLayout.NORTH, showConsolesButton, 0, SpringLayout.NORTH, saveServerButton);
springLayout.putConstraint(SpringLayout.WEST, showConsolesButton, 0, SpringLayout.WEST, lblTargetServer);
springLayout.putConstraint(SpringLayout.EAST, showConsolesButton, 0, SpringLayout.EAST, targetServerCombo);
controlServers.add(showConsolesButton);
showConsolesButton.addActionListener(this);
} }
/** /**
@ -181,9 +173,7 @@ public class ServerControlTab implements ActionListener {
//Registers actions on all commands executed on a specific server //Registers actions on all commands executed on a specific server
handleServerCommands(actionSource, selectedServerValue); handleServerCommands(actionSource, selectedServerValue);
if (actionSource == showConsolesButton) { if (actionSource == targetServerCombo) {
ServerConsoles.setAsVisible();
} else if (actionSource == targetServerCombo) {
updatePlayers(); updatePlayers();
} }
} }

2
src/main/java/net/knarcraft/minecraftserverlauncher/userinterface/ServerLauncherGUI.java
View File

@ -336,7 +336,7 @@ public class ServerLauncherGUI extends MessageHandler implements ActionListener,
*/ */
public void updateGUIElementsWhenServersStartOrStop(boolean running) { public void updateGUIElementsWhenServersStartOrStop(boolean running) {
boolean stopped = !running; //Most gui is only enabled when the server is stopped rather than running. boolean stopped = !running; //Most gui is only enabled when the server is stopped rather than running.
//mainTabbedPane.setEnabledAt(1, !stopped); mainTabbedPane.setEnabledAt(1, !stopped);
mainTabbedPane.setEnabledAt(2, stopped); mainTabbedPane.setEnabledAt(2, stopped);
controlPanelTab.updateGUIElementsWhenServersStartOrStop(running); controlPanelTab.updateGUIElementsWhenServersStartOrStop(running);
} }