blame | history | patch | commit | commitdiff
Normand Briere
2018-07-08 c8024a8777faf76727fbb6975ddf4fecb567b426 
 GroupEditor.java
....@@ -520,6 +520,9 @@
520520 		
521521 		oe.toolbarPanel.add(flashSelectionButton = new cButton(" ? ")); //, oe.aConstraints);
522522 		flashSelectionButton.addActionListener(this);
523
+                
524
+		oe.toolbarPanel.add(new cButton("     ", false));
525
+                
523526 		oe.aConstraints.gridx += 1;
524527 		oe.aConstraints.weighty = 0;
525528 		oe.aConstraints.gridwidth = 1;
....@@ -646,14 +649,14 @@
646649 	
647650         void EditObject(Object3D obj)
648651         {
649
-            cRadio dummyButton = new cRadio(obj.name);
650
-            dummyButton.SetObject(obj);
651
-            dummyButton.layout = sevenButton;
652
-            dummyButton.SetCamera(cameraView.renderCamera, false);
653
-            dummyButton.addActionListener(this);
654
-            radioPanel.add(dummyButton);
655
-            buttonGroup.add(dummyButton);
656
-            dummyButton.doClick();
652
+            cRadio radioButton = new cRadio(obj.name);
653
+            radioButton.SetObject(obj);
654
+            radioButton.layout = sevenButton;
655
+            radioButton.SetCamera(cameraView.renderCamera, false);
656
+            radioButton.addActionListener(this);
657
+            radioPanel.add(radioButton);
658
+            buttonGroup.add(radioButton);
659
+            radioButton.doClick();
657660         }
658661         void SetupViews(ObjEditor oe)
659662         {
....@@ -715,8 +718,7 @@
715718                     dropAttributes |= Object3D.TEXTURE;
716719                 else
717720                     dropAttributes &= ~Object3D.TEXTURE;
718
-            }
719
-            else if(e.getSource() == liveCB)
721
+            } else if(e.getSource() == liveCB)
720722             {
721723                 cameraView.ToggleLive();
722724             }
....@@ -2639,7 +2641,7 @@
26392641                     //gridPanel.setDividerLocation(1.0);
26402642                     //bigPanel.setDividerLocation(0.0);
26412643                     bigThree.remove(scenePanel);
2642
-                    bigThree.remove(cameraPanel);
2644
+                    bigThree.remove(centralPanel);
26432645                     bigThree.remove(XYZPanel);
26442646                     aWindowConstraints.gridx = 0;
26452647                     aWindowConstraints.gridy = 0;
....@@ -2654,7 +2656,7 @@
26542656             //        aConstraints.gridheight = 3;
26552657                     aWindowConstraints.gridx = 1;
26562658                     aWindowConstraints.fill = GridBagConstraints.BOTH;
2657
-                    bigThree.add(cameraPanel, aWindowConstraints);
2659
+                    bigThree.add(centralPanel, aWindowConstraints);
26582660                     aWindowConstraints.weightx = 0;
26592661                     aWindowConstraints.gridx = 4;
26602662                     aWindowConstraints.gridwidth = 1;
....@@ -2667,7 +2669,7 @@
26672669 		{
26682670                     radio.layout = threeButton;
26692671                     bigThree.remove(scenePanel);
2670
-                    bigThree.remove(cameraPanel);
2672
+                    bigThree.remove(centralPanel);
26712673                     bigThree.remove(XYZPanel);
26722674                     aWindowConstraints.gridx = 0;
26732675                     aWindowConstraints.gridy = 0;
....@@ -2682,7 +2684,7 @@
26822684             //        aConstraints.gridheight = 3;
26832685                     aWindowConstraints.gridx = 1;
26842686                     aWindowConstraints.fill = GridBagConstraints.BOTH;
2685
-                    bigThree.add(cameraPanel, aWindowConstraints);
2687
+                    bigThree.add(centralPanel, aWindowConstraints);
26862688                     aWindowConstraints.weightx = 0;
26872689                     aWindowConstraints.gridx = 4;
26882690                     aWindowConstraints.gridwidth = 1;
....@@ -2695,7 +2697,7 @@
26952697 		{
26962698                     radio.layout = fourButton;
26972699                     bigThree.remove(scenePanel);
2698
-                    bigThree.remove(cameraPanel);
2700
+                    bigThree.remove(centralPanel);
26992701                     bigThree.remove(XYZPanel);
27002702                     aWindowConstraints.gridx = 0;
27012703                     aWindowConstraints.gridy = 0;
....@@ -2723,7 +2725,7 @@
27232725 		{
27242726                     radio.layout = sixButton;
27252727                     bigThree.remove(scenePanel);
2726
-                    bigThree.remove(cameraPanel);
2728
+                    bigThree.remove(centralPanel);
27272729                     bigThree.remove(XYZPanel);
27282730                     aWindowConstraints.gridx = 0;
27292731                     aWindowConstraints.gridy = 0;
....@@ -2738,7 +2740,7 @@
27382740               //      aWindowConstraints.gridheight = 3;
27392741                     aWindowConstraints.gridx = 1;
27402742                     aWindowConstraints.fill = GridBagConstraints.BOTH;
2741
-                    bigThree.add(cameraPanel, aWindowConstraints);
2743
+                    bigThree.add(centralPanel, aWindowConstraints);
27422744                     aWindowConstraints.weightx = 0;
27432745                     aWindowConstraints.gridx = 4;
27442746                     aWindowConstraints.gridwidth = 1;
....@@ -2751,7 +2753,7 @@
27512753 		{
27522754                     radio.layout = sevenButton;
27532755                     bigThree.remove(scenePanel);
2754
-                    bigThree.remove(cameraPanel);
2756
+                    bigThree.remove(centralPanel);
27552757                     bigThree.remove(XYZPanel);
27562758                     aWindowConstraints.gridx = 0;
27572759                     aWindowConstraints.gridy = 0;
....@@ -2766,7 +2768,7 @@
27662768                //     aWindowConstraints.gridheight = 3;
27672769                     aWindowConstraints.gridx = 1;
27682770                     aWindowConstraints.fill = GridBagConstraints.BOTH;
2769
-                    bigThree.add(cameraPanel, aWindowConstraints);
2771
+                    bigThree.add(centralPanel, aWindowConstraints);
27702772                     aWindowConstraints.weightx = 0;
27712773                     aWindowConstraints.gridx = 4;
27722774                     aWindowConstraints.gridwidth = 1;