GUI change Save Menu and Create Button

- Save is now a menu and Create/Resolve/Quit buttons
This commit is contained in:
philippe lhardy
2020-10-11 11:40:49 +02:00
parent 84f803d3a3
commit c26db0e3cb

View File

@@ -23,24 +23,11 @@ import java.io.FileOutputStream;
import java.io.IOException;
import java.util.LinkedList;
import java.util.Locale;
import java.util.Scanner;
import java.util.ResourceBundle;
import javax.imageio.ImageIO;
import javax.swing.AbstractAction;
import javax.swing.Action;
import javax.swing.BoxLayout;
import javax.swing.JButton;
import javax.swing.JComponent;
import javax.swing.JCheckBox;
import javax.swing.JFrame;
import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.JScrollPane;
import javax.swing.JSlider;
import javax.swing.JTextField;
import javax.swing.KeyStroke;
import javax.swing.*;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
@@ -119,8 +106,8 @@ public class Display extends JFrame
if (params != null)
{
params = controler.getSettings().getParams();
// keep current model...
// model = new LabyModel(params, new java.util.Random());
// DON'T keep current model...
model = new LabyModel(params, new java.util.Random());
maze.resetWallsProvider(model);
model.setMazeListener(maze);
@@ -381,16 +368,6 @@ public class Display extends JFrame
{
if ( params != null )
{
JButton buttonCreate = new JButton(labels.getString("create"));
buttonCreate.addActionListener(new ActionListener()
{
public void actionPerformed(ActionEvent evt)
{
recreateModel();
}
});
add(buttonCreate);
JButton buttonReset = new JButton("reset");//labels.getString("reset"));
buttonReset.addActionListener(new ActionListener()
{
@@ -448,7 +425,7 @@ public class Display extends JFrame
p.setName(pName);
}
private JPanel createSavingBar()
private JMenu createSavingMenu()
{
final JTextField saveName = new JTextField("newlaby ");
final JButton savePngButton = new JButton(labels.getString("save") +" png");
@@ -496,20 +473,31 @@ public class Display extends JFrame
};
saveImcButton.addActionListener(saveImcAction);
JPanel savePanel = new JPanel(new FlowLayout());
savePanel.add(saveName);
savePanel.add(saveSvgButton);
savePanel.add(savePngButton);
savePanel.add(saveButton);
savePanel.add(saveImcButton);
JMenu saveMenu = new JMenu("Save");
saveMenu.add(saveName);
saveMenu.add(saveSvgButton);
saveMenu.add(savePngButton);
saveMenu.add(saveButton);
saveMenu.add(saveImcButton);
return savePanel;
return saveMenu;
}
private JPanel createResolveQuitBar()
{
JPanel resolveQuitBar = new JPanel(new FlowLayout());
JButton buttonCreate = new JButton(labels.getString("create"));
buttonCreate.addActionListener(new ActionListener()
{
public void actionPerformed(ActionEvent evt)
{
recreateModel();
}
});
resolveQuitBar.add(buttonCreate);
JButton resolveButton = new JButton(labels.getString("resolve"));
resolveButton.addActionListener(new ActionListener()
{
@@ -547,7 +535,9 @@ public class Display extends JFrame
BoxLayout layout = new BoxLayout(this,BoxLayout.Y_AXIS);
setLayout(layout);
add(createSavingBar());
JMenuBar menuBar = new JMenuBar();
menuBar.add(createSavingMenu());
add(menuBar);
add(createResolveQuitBar());