From b0f86f1f758007c0ea749185b971ad24df63011a Mon Sep 17 00:00:00 2001 From: "DozorovaA.A" Date: Wed, 30 Nov 2022 10:18:42 +0400 Subject: [PATCH] add all form --- .vs/VSWorkspaceState.json | 9 + .vs/slnx.sqlite | Bin 102400 -> 114688 bytes .../src/FormArmoredVehicleConfig.form | 439 +++++++++++++++++- .../src/FormArmoredVehicleConfig.java | 323 ++++++++++++- 4 files changed, 738 insertions(+), 33 deletions(-) create mode 100644 .vs/VSWorkspaceState.json diff --git a/.vs/VSWorkspaceState.json b/.vs/VSWorkspaceState.json new file mode 100644 index 0000000..0907065 --- /dev/null +++ b/.vs/VSWorkspaceState.json @@ -0,0 +1,9 @@ +{ + "ExpandedNodes": [ + "", + "\\ArmoredVehicle", + "\\ArmoredVehicle\\src" + ], + "SelectedNode": "\\ArmoredVehicle\\src\\PolimorphClass.java", + "PreviewInSolutionExplorer": false +} \ No newline at end of file diff --git a/.vs/slnx.sqlite b/.vs/slnx.sqlite index ab0c3bfbdbdf5791d7b8c9d9c2dcfeead13aa496..5592d4285ab07c76020047d9e2c6993b91836c27 100644 GIT binary patch delta 15439 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 Kmn&d?pY?x;0bb|; delta 5879 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 ItiVS94=bP9&;S4c diff --git a/ArmoredVehicle/src/FormArmoredVehicleConfig.form b/ArmoredVehicle/src/FormArmoredVehicleConfig.form index 144e564..106c6d6 100644 --- a/ArmoredVehicle/src/FormArmoredVehicleConfig.form +++ b/ArmoredVehicle/src/FormArmoredVehicleConfig.form @@ -29,8 +29,21 @@ - - + + + + + + + + + + + + + + + @@ -38,8 +51,18 @@ - - + + + + + + + + + + + + @@ -53,9 +76,7 @@ - - @@ -67,10 +88,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + - - - @@ -92,13 +135,35 @@ - + + + + + + + + + + + + + + + + + - + + + + + + + @@ -139,10 +204,36 @@ - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -150,7 +241,23 @@ - + + + + + + + + + + + + + + + + + @@ -161,9 +268,309 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ArmoredVehicle/src/FormArmoredVehicleConfig.java b/ArmoredVehicle/src/FormArmoredVehicleConfig.java index 30817ac..5524039 100644 --- a/ArmoredVehicle/src/FormArmoredVehicleConfig.java +++ b/ArmoredVehicle/src/FormArmoredVehicleConfig.java @@ -36,6 +36,24 @@ public class FormArmoredVehicleConfig extends javax.swing.JFrame { SpinnerWeight = new javax.swing.JSpinner(); panelColors = new java.awt.Panel(); labelColors = new java.awt.Label(); + PanelRed = new javax.swing.JPanel(); + PanelGray = new javax.swing.JPanel(); + PanelBlack = new javax.swing.JPanel(); + PanelOrange = new javax.swing.JPanel(); + PanelPink = new javax.swing.JPanel(); + PanelGreen = new javax.swing.JPanel(); + PanelBlue = new javax.swing.JPanel(); + PanelYellow = new javax.swing.JPanel(); + LabelCountRollers = new javax.swing.JLabel(); + ComboBoxCountRollers = new javax.swing.JComboBox<>(); + LabelModify = new javax.swing.JLabel(); + LabelSimple = new javax.swing.JLabel(); + panelObject = new java.awt.Panel(); + LabelDopColor = new javax.swing.JLabel(); + LabelColor = new javax.swing.JLabel(); + panelDraw = new java.awt.Panel(); + buttonAdd = new java.awt.Button(); + buttonCancel = new java.awt.Button(); setDefaultCloseOperation(javax.swing.WindowConstants.EXIT_ON_CLOSE); @@ -52,22 +70,172 @@ public class FormArmoredVehicleConfig extends javax.swing.JFrame { labelColors.setText("Цвета"); + PanelRed.setBackground(java.awt.Color.red); + + javax.swing.GroupLayout PanelRedLayout = new javax.swing.GroupLayout(PanelRed); + PanelRed.setLayout(PanelRedLayout); + PanelRedLayout.setHorizontalGroup( + PanelRedLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGap(0, 45, Short.MAX_VALUE) + ); + PanelRedLayout.setVerticalGroup( + PanelRedLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGap(0, 37, Short.MAX_VALUE) + ); + + PanelGray.setBackground(java.awt.Color.gray); + + javax.swing.GroupLayout PanelGrayLayout = new javax.swing.GroupLayout(PanelGray); + PanelGray.setLayout(PanelGrayLayout); + PanelGrayLayout.setHorizontalGroup( + PanelGrayLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGap(0, 39, Short.MAX_VALUE) + ); + PanelGrayLayout.setVerticalGroup( + PanelGrayLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGap(0, 37, Short.MAX_VALUE) + ); + + PanelBlack.setBackground(java.awt.Color.black); + + javax.swing.GroupLayout PanelBlackLayout = new javax.swing.GroupLayout(PanelBlack); + PanelBlack.setLayout(PanelBlackLayout); + PanelBlackLayout.setHorizontalGroup( + PanelBlackLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGap(0, 0, Short.MAX_VALUE) + ); + PanelBlackLayout.setVerticalGroup( + PanelBlackLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGap(0, 0, Short.MAX_VALUE) + ); + + PanelOrange.setBackground(java.awt.Color.orange); + + javax.swing.GroupLayout PanelOrangeLayout = new javax.swing.GroupLayout(PanelOrange); + PanelOrange.setLayout(PanelOrangeLayout); + PanelOrangeLayout.setHorizontalGroup( + PanelOrangeLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGap(0, 39, Short.MAX_VALUE) + ); + PanelOrangeLayout.setVerticalGroup( + PanelOrangeLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGap(0, 39, Short.MAX_VALUE) + ); + + PanelPink.setBackground(java.awt.Color.pink); + + javax.swing.GroupLayout PanelPinkLayout = new javax.swing.GroupLayout(PanelPink); + PanelPink.setLayout(PanelPinkLayout); + PanelPinkLayout.setHorizontalGroup( + PanelPinkLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGap(0, 39, Short.MAX_VALUE) + ); + PanelPinkLayout.setVerticalGroup( + PanelPinkLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGap(0, 0, Short.MAX_VALUE) + ); + + PanelGreen.setBackground(java.awt.Color.green); + + javax.swing.GroupLayout PanelGreenLayout = new javax.swing.GroupLayout(PanelGreen); + PanelGreen.setLayout(PanelGreenLayout); + PanelGreenLayout.setHorizontalGroup( + PanelGreenLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGap(0, 39, Short.MAX_VALUE) + ); + PanelGreenLayout.setVerticalGroup( + PanelGreenLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGap(0, 0, Short.MAX_VALUE) + ); + + PanelBlue.setBackground(java.awt.Color.blue); + + javax.swing.GroupLayout PanelBlueLayout = new javax.swing.GroupLayout(PanelBlue); + PanelBlue.setLayout(PanelBlueLayout); + PanelBlueLayout.setHorizontalGroup( + PanelBlueLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGap(0, 39, Short.MAX_VALUE) + ); + PanelBlueLayout.setVerticalGroup( + PanelBlueLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGap(0, 0, Short.MAX_VALUE) + ); + + PanelYellow.setBackground(java.awt.Color.yellow); + + javax.swing.GroupLayout PanelYellowLayout = new javax.swing.GroupLayout(PanelYellow); + PanelYellow.setLayout(PanelYellowLayout); + PanelYellowLayout.setHorizontalGroup( + PanelYellowLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGap(0, 39, Short.MAX_VALUE) + ); + PanelYellowLayout.setVerticalGroup( + PanelYellowLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGap(0, 0, Short.MAX_VALUE) + ); + + label2.setText("label2"); + javax.swing.GroupLayout panelColorsLayout = new javax.swing.GroupLayout(panelColors); panelColors.setLayout(panelColorsLayout); panelColorsLayout.setHorizontalGroup( panelColorsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(panelColorsLayout.createSequentialGroup() - .addGap(22, 22, 22) - .addComponent(labelColors, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addContainerGap(166, Short.MAX_VALUE)) + .addContainerGap() + .addGroup(panelColorsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(panelColorsLayout.createSequentialGroup() + .addGroup(panelColorsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false) + .addComponent(PanelOrange, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addComponent(PanelBlack, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) + .addGap(18, 18, 18) + .addGroup(panelColorsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING, false) + .addGroup(panelColorsLayout.createSequentialGroup() + .addComponent(PanelGray, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(PanelRed, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addGroup(panelColorsLayout.createSequentialGroup() + .addComponent(PanelYellow, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addComponent(PanelGreen, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) + .addGroup(panelColorsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addComponent(PanelPink, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(PanelBlue, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))) + .addComponent(labelColors, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addContainerGap(28, Short.MAX_VALUE)) ); panelColorsLayout.setVerticalGroup( panelColorsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(panelColorsLayout.createSequentialGroup() .addComponent(labelColors, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addGap(0, 130, Short.MAX_VALUE)) + .addGap(20, 20, 20) + .addGroup(panelColorsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(panelColorsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false) + .addComponent(PanelRed, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addComponent(PanelBlack, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addComponent(PanelPink, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) + .addComponent(PanelGray, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addGroup(panelColorsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false) + .addComponent(PanelOrange, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addComponent(PanelGreen, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addComponent(PanelBlue, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addComponent(PanelYellow, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) + .addGap(0, 62, Short.MAX_VALUE)) ); + label1.setText("label1"); + + LabelCountRollers.setText("Количество катков"); + + ComboBoxCountRollers.setModel(new javax.swing.DefaultComboBoxModel<>(new String[] { "4", "5", "6" })); + + LabelModify.setText("Продвинутый"); + LabelModify.setBorder(javax.swing.BorderFactory.createLineBorder(new java.awt.Color(0, 0, 0))); + + LabelSimple.setText("Простой"); + LabelSimple.setBorder(javax.swing.BorderFactory.createLineBorder(new java.awt.Color(0, 0, 0))); + javax.swing.GroupLayout panelParamsLayout = new javax.swing.GroupLayout(panelParams); panelParams.setLayout(panelParamsLayout); panelParamsLayout.setHorizontalGroup( @@ -75,9 +243,7 @@ public class FormArmoredVehicleConfig extends javax.swing.JFrame { .addGroup(panelParamsLayout.createSequentialGroup() .addContainerGap() .addGroup(panelParamsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(checkboxGun, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) .addComponent(labelParams, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(checkboxTower, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) .addGroup(panelParamsLayout.createSequentialGroup() .addGroup(panelParamsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addComponent(labelSpeed, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) @@ -85,10 +251,26 @@ public class FormArmoredVehicleConfig extends javax.swing.JFrame { .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addGroup(panelParamsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addComponent(SpinnerWeight, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(SpinnerSpeed, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)))) - .addGap(21, 21, 21) - .addComponent(panelColors, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addContainerGap(145, Short.MAX_VALUE)) + .addComponent(SpinnerSpeed, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))) + .addGroup(panelParamsLayout.createSequentialGroup() + .addComponent(LabelCountRollers) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) + .addComponent(ComboBoxCountRollers, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addComponent(checkboxTower, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(checkboxGun, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addGroup(panelParamsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(panelParamsLayout.createSequentialGroup() + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(panelColors, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addGroup(panelParamsLayout.createSequentialGroup() + .addGap(115, 115, 115) + .addComponent(LabelModify, javax.swing.GroupLayout.PREFERRED_SIZE, 87, javax.swing.GroupLayout.PREFERRED_SIZE))) + .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) + .addGroup(panelParamsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(panelParamsLayout.createSequentialGroup() + .addGap(227, 227, 227) + .addComponent(LabelSimple, javax.swing.GroupLayout.PREFERRED_SIZE, 67, javax.swing.GroupLayout.PREFERRED_SIZE) + .addContainerGap(159, Short.MAX_VALUE))) ); panelParamsLayout.setVerticalGroup( panelParamsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) @@ -106,28 +288,115 @@ public class FormArmoredVehicleConfig extends javax.swing.JFrame { .addGroup(panelParamsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addComponent(labelWeight, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) .addComponent(SpinnerWeight, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addGap(20, 20, 20) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addGroup(panelParamsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addComponent(LabelCountRollers) + .addComponent(ComboBoxCountRollers, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addGap(40, 40, 40))) + .addGroup(panelParamsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(panelParamsLayout.createSequentialGroup() + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .addComponent(checkboxTower, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(checkboxGun, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))) - .addContainerGap(116, Short.MAX_VALUE)) + .addComponent(checkboxGun, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addGap(59, 59, 59)) + .addGroup(panelParamsLayout.createSequentialGroup() + .addGap(20, 20, 20) + .addComponent(LabelModify, javax.swing.GroupLayout.PREFERRED_SIZE, 29, javax.swing.GroupLayout.PREFERRED_SIZE) + .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)))) + .addGroup(panelParamsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, panelParamsLayout.createSequentialGroup() + .addContainerGap(216, Short.MAX_VALUE) + .addComponent(LabelSimple, javax.swing.GroupLayout.PREFERRED_SIZE, 29, javax.swing.GroupLayout.PREFERRED_SIZE) + .addGap(68, 68, 68))) ); + LabelDopColor.setText("Доп. цвет"); + LabelDopColor.setBorder(javax.swing.BorderFactory.createLineBorder(new java.awt.Color(0, 0, 0))); + + LabelColor.setText("Цвет"); + LabelColor.setBorder(javax.swing.BorderFactory.createLineBorder(new java.awt.Color(0, 0, 0))); + + javax.swing.GroupLayout panelDrawLayout = new javax.swing.GroupLayout(panelDraw); + panelDraw.setLayout(panelDrawLayout); + panelDrawLayout.setHorizontalGroup( + panelDrawLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGap(0, 0, Short.MAX_VALUE) + ); + panelDrawLayout.setVerticalGroup( + panelDrawLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGap(0, 177, Short.MAX_VALUE) + ); + + javax.swing.GroupLayout panelObjectLayout = new javax.swing.GroupLayout(panelObject); + panelObject.setLayout(panelObjectLayout); + panelObjectLayout.setHorizontalGroup( + panelObjectLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, panelObjectLayout.createSequentialGroup() + .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addComponent(LabelDopColor, javax.swing.GroupLayout.PREFERRED_SIZE, 67, javax.swing.GroupLayout.PREFERRED_SIZE) + .addGap(60, 60, 60)) + .addGroup(panelObjectLayout.createSequentialGroup() + .addGap(20, 20, 20) + .addComponent(panelDraw, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addContainerGap()) + .addGroup(panelObjectLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(panelObjectLayout.createSequentialGroup() + .addGap(42, 42, 42) + .addComponent(LabelColor, javax.swing.GroupLayout.PREFERRED_SIZE, 67, javax.swing.GroupLayout.PREFERRED_SIZE) + .addContainerGap(157, Short.MAX_VALUE))) + ); + panelObjectLayout.setVerticalGroup( + panelObjectLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(panelObjectLayout.createSequentialGroup() + .addGap(15, 15, 15) + .addComponent(LabelDopColor, javax.swing.GroupLayout.PREFERRED_SIZE, 29, javax.swing.GroupLayout.PREFERRED_SIZE) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(panelDraw, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addContainerGap()) + .addGroup(panelObjectLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(panelObjectLayout.createSequentialGroup() + .addGap(16, 16, 16) + .addComponent(LabelColor, javax.swing.GroupLayout.PREFERRED_SIZE, 29, javax.swing.GroupLayout.PREFERRED_SIZE) + .addContainerGap(196, Short.MAX_VALUE))) + ); + + buttonAdd.setLabel("Добавить"); + + buttonCancel.setLabel("Отмена"); + javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane()); getContentPane().setLayout(layout); layout.setHorizontalGroup( layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(layout.createSequentialGroup() .addContainerGap() - .addComponent(panelParams, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addContainerGap(139, Short.MAX_VALUE)) + .addComponent(panelParams, javax.swing.GroupLayout.PREFERRED_SIZE, 420, javax.swing.GroupLayout.PREFERRED_SIZE) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(layout.createSequentialGroup() + .addComponent(panelObject, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addContainerGap()) + .addGroup(layout.createSequentialGroup() + .addGap(10, 10, 10) + .addComponent(buttonAdd, javax.swing.GroupLayout.PREFERRED_SIZE, 69, javax.swing.GroupLayout.PREFERRED_SIZE) + .addGap(42, 42, 42) + .addComponent(buttonCancel, javax.swing.GroupLayout.PREFERRED_SIZE, 70, javax.swing.GroupLayout.PREFERRED_SIZE) + .addContainerGap(85, Short.MAX_VALUE)))) ); layout.setVerticalGroup( layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(layout.createSequentialGroup() .addContainerGap() - .addComponent(panelParams, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addContainerGap()) + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(layout.createSequentialGroup() + .addComponent(panelObject, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) + .addComponent(buttonAdd, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(buttonCancel, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))) + .addComponent(panelParams, javax.swing.GroupLayout.PREFERRED_SIZE, 268, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) ); pack(); @@ -169,16 +438,36 @@ public class FormArmoredVehicleConfig extends javax.swing.JFrame { } // Variables declaration - do not modify//GEN-BEGIN:variables + private javax.swing.JComboBox ComboBoxCountRollers; + private javax.swing.JLabel LabelColor; + private javax.swing.JLabel LabelCountRollers; + private javax.swing.JLabel LabelDopColor; + private javax.swing.JLabel LabelModify; + private javax.swing.JLabel LabelSimple; + private javax.swing.JPanel PanelBlack; + private javax.swing.JPanel PanelBlue; + private javax.swing.JPanel PanelGray; + private javax.swing.JPanel PanelGreen; + private javax.swing.JPanel PanelOrange; + private javax.swing.JPanel PanelPink; + private javax.swing.JPanel PanelRed; + private javax.swing.JPanel PanelYellow; private javax.swing.JSpinner SpinnerSpeed; private javax.swing.JSpinner SpinnerWeight; + private java.awt.Button buttonAdd; + private java.awt.Button buttonCancel; private java.awt.Checkbox checkboxGun; private java.awt.Checkbox checkboxTower; private java.awt.Choice choice1; + private java.awt.Label label1; + private java.awt.Label label2; private java.awt.Label labelColors; private java.awt.Label labelParams; private java.awt.Label labelSpeed; private java.awt.Label labelWeight; private java.awt.Panel panelColors; + private java.awt.Panel panelDraw; + private java.awt.Panel panelObject; private java.awt.Panel panelParams; // End of variables declaration//GEN-END:variables }