diff --git a/java/org/artisanlogiciel/games/maze/gui/Display.java b/java/org/artisanlogiciel/games/maze/gui/Display.java index 80d8cc0..e070636 100644 --- a/java/org/artisanlogiciel/games/maze/gui/Display.java +++ b/java/org/artisanlogiciel/games/maze/gui/Display.java @@ -80,8 +80,6 @@ implements StatusListener con.add(scrollableMaze, BorderLayout.CENTER); controler = new MazeControler(Display.this, params); con.add(controler.getMoveControl(), BorderLayout.NORTH); - con.add(controler.getGenerationControl(), BorderLayout.SOUTH); - /* scrollableMaze.addComponentListener(new ComponentAdapter() { @Override diff --git a/java/org/artisanlogiciel/games/maze/gui/MazeControler.java b/java/org/artisanlogiciel/games/maze/gui/MazeControler.java index 7bbb0fe..6a3e6e7 100644 --- a/java/org/artisanlogiciel/games/maze/gui/MazeControler.java +++ b/java/org/artisanlogiciel/games/maze/gui/MazeControler.java @@ -28,6 +28,31 @@ public class MazeControler extends JPanel { p.setName(pName); } + private JMenu createCreateMenu() { + JMenu createMenu = new JMenu(MazeDefault.labels.getString("create")); + + JButton buttonCreate = new JButton(MazeDefault.labels.getString("create")); + buttonCreate.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent evt) { + display.recreateModel(); + } + }); + + createMenu.add(buttonCreate); + + createMenu.add(getGenerationControl()); + + JButton buttonReset = new JButton("reset");//labels.getString("reset")); + buttonReset.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent evt) { + display.resetModel(); + } + }); + createMenu.add(buttonReset); + + return createMenu; + } + private JMenu createLoadingMenu() { JMenu loadMenu = new JMenu(MazeDefault.labels.getString("load")); @@ -237,14 +262,6 @@ public class MazeControler extends JPanel { private JPanel createResolveQuitBar() { JPanel resolveQuitBar = new JPanel(new FlowLayout()); - JButton buttonCreate = new JButton(MazeDefault.labels.getString("create")); - buttonCreate.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent evt) { - display.recreateModel(); - } - }); - resolveQuitBar.add(buttonCreate); - JButton resolveButton = new JButton(MazeDefault.labels.getString("resolve")); resolveButton.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent evt) { @@ -280,14 +297,6 @@ public class MazeControler extends JPanel { resolveQuitBar.add(quitButton); - JButton buttonReset = new JButton("reset");//labels.getString("reset")); - buttonReset.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent evt) { - display.resetModel(); - } - }); - resolveQuitBar.add(buttonReset); - return resolveQuitBar; } @@ -299,7 +308,10 @@ public class MazeControler extends JPanel { BoxLayout layout = new BoxLayout(this, BoxLayout.Y_AXIS); setLayout(layout); + settings = new MazeSettings(params); + JMenuBar menuBar = new JMenuBar(); + menuBar.add(createCreateMenu()); menuBar.add(createSavingMenu()); menuBar.add(createLoadingMenu()); add(menuBar); @@ -307,7 +319,7 @@ public class MazeControler extends JPanel { add(createResolveQuitBar()); JPanel controlMovesPanel = new JPanel(new BorderLayout()); - settings = new MazeSettings(params); + @SuppressWarnings("serial") Action goNorth = new AbstractAction() { public void actionPerformed(ActionEvent evt) { @@ -369,7 +381,9 @@ public class MazeControler extends JPanel { add(buildResizeControl()); // layers control add(buildLayerControl()); - add(settings); + + // NOPE ! it overrides menu belonging + // add(settings); } diff --git a/java/org/artisanlogiciel/games/maze/gui/MazeSettings.java b/java/org/artisanlogiciel/games/maze/gui/MazeSettings.java index d103bf2..015bfd4 100644 --- a/java/org/artisanlogiciel/games/maze/gui/MazeSettings.java +++ b/java/org/artisanlogiciel/games/maze/gui/MazeSettings.java @@ -47,6 +47,7 @@ public class MazeSettings extends Panel { }); add(slider); + fieldWidth = new IntegerField("width",params.getWidth()); addField(fieldWidth); @@ -56,7 +57,6 @@ public class MazeSettings extends Panel { fieldDepth = new IntegerField("depth",params.getMaxDepth()); addField(fieldDepth); - JLabel seedLabel = new JLabel(); fieldSeed = new IntegerField("seed", params.getSeed()); addField(fieldSeed);