diff --git a/ProjectElectricLocomotive/FormLocomotiveCollections.java b/ProjectElectricLocomotive/FormLocomotiveCollections.java index 98cfd0e..531169d 100644 --- a/ProjectElectricLocomotive/FormLocomotiveCollections.java +++ b/ProjectElectricLocomotive/FormLocomotiveCollections.java @@ -34,6 +34,7 @@ public class FormLocomotiveCollections { public FormLocomotiveCollections() { formElectricLocomotive = new FormElectricLocomotive(); + formLocomotiveConfig = new FormLocomotiveConfig(); _storage = new LocomotivesGenericStorage(400,300); _stackRemoveObjects = new Stack<>(); listBoxStorage.addListSelectionListener(this::listBoxObjectsSelectedIndexChanged); @@ -73,10 +74,11 @@ public class FormLocomotiveCollections { FrameLocomotiveConfig frameLocomotiveConfig = new FrameLocomotiveConfig(); frameLocomotiveConfig.setVisible(true); frameLocomotiveConfig._formLocomotiveConfig.buttonOk.addActionListener(e2 ->{ + frameLocomotiveConfig.dispose(); //loco = frameLocomotiveConfig._formLocomotiveConfig. }); -// FrameElectricLocomotive frameElectricLocomotive = new FrameElectricLocomotive(); + // FrameElectricLocomotive frameElectricLocomotive = new FrameElectricLocomotive(); // frameElectricLocomotive.setVisible(true); // frameElectricLocomotive._formElectricLocomotive.ButtonSelectLocomotive.addActionListener(e2 -> { // loco = frameElectricLocomotive._formElectricLocomotive._drawingLocomotive; diff --git a/ProjectElectricLocomotive/FormLocomotiveConfig.form b/ProjectElectricLocomotive/FormLocomotiveConfig.form index a1b6b32..824b26f 100644 --- a/ProjectElectricLocomotive/FormLocomotiveConfig.form +++ b/ProjectElectricLocomotive/FormLocomotiveConfig.form @@ -6,9 +6,9 @@ - - - + + + diff --git a/ProjectElectricLocomotive/FormLocomotiveConfig.java b/ProjectElectricLocomotive/FormLocomotiveConfig.java index dc38350..ea78bfb 100644 --- a/ProjectElectricLocomotive/FormLocomotiveConfig.java +++ b/ProjectElectricLocomotive/FormLocomotiveConfig.java @@ -27,7 +27,7 @@ public class FormLocomotiveConfig { public FormLocomotiveConfig() { -// MainPanel.setPreferredSize(new Dimension(980, 500)); + MainPanel.setPreferredSize(new Dimension(900, 400)); pictureBoxObject.setPreferredSize(new Dimension(300, 300)); // почему только на это реагируем, а? // groupBoxObjectParameters.setPreferredSize(new Dimension(600,400)); // groupBoxColors.setPreferredSize(new Dimension(210,200));