Edit panel

Normand Briere

2019-06-23 f1382bc839a74ef1d1534c61ea94e53cf54716df

 ObjEditor.java
..
..
@@ -171,7 +171,7 @@
171
171
         
172
172
         objEditor.ctrlPanel.remove(setupPanel);
173
173
         objEditor.ctrlPanel.remove(setupPanel2);
174
-        objEditor.ctrlPanel.remove(commandsPanel);
174
+        objEditor.ctrlPanel.remove(objectCommandsPanel);
175
175
         objEditor.ctrlPanel.remove(pushPanel);
176
176
         //objEditor.ctrlPanel.remove(fillPanel);
177
177
         
..
..
@@ -327,9 +327,18 @@
327
327
         toolbarPanel.setName("Toolbar");
328
328
         treePanel = new cGridBag();
329
329
         treePanel.setName("Tree");
330
+        
331
+        editPanel = new cGridBag().setVertical(true);
332
+        editPanel.setName("Edit");
333
+        
330
334
         ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
331
-        ctrlPanel.setName("Edit");
335
+        
336
+        editCommandsPanel = new cGridBag();
337
+        editPanel.add(editCommandsPanel);
338
+        editPanel.add(ctrlPanel);
339
+                
332
340
         materialPanel = new cGridBag().setVertical(true);
341
+        
333
342
         materialPanel.setName("Material");
334
343
         /*JTextPane*/
335
344
         infoarea = createTextPane();
..
..
@@ -819,10 +828,13 @@
819
828
     JButton fasterButton;
820
829
     JButton remarkButton;
821
830
     
831
+    cGridBag editPanel;
832
+    cGridBag editCommandsPanel;
833
+    
822
834
     cGridBag namePanel;
823
835
     cGridBag setupPanel;
824
836
     cGridBag setupPanel2;
825
-    cGridBag commandsPanel;
837
+    cGridBag objectCommandsPanel;
826
838
     cGridBag pushPanel;
827
839
     cGridBag fillPanel;
828
840
 
..
..
@@ -1035,23 +1047,23 @@
1035
1047
         oe.ctrlPanel.add(setupPanel2);
1036
1048
         oe.ctrlPanel.Return();
1037
1049
         
1038
-            commandsPanel = new cGridBag().setVertical(false);
1050
+            objectCommandsPanel = new cGridBag().setVertical(false);
1039
1051
         
1040
-        resetButton = AddButton(commandsPanel, "Reset");
1052
+        resetButton = AddButton(objectCommandsPanel, "Reset");
1041
1053
         resetButton.setToolTipText("Jump to frame zero");
1042
-        stepButton = AddButton(commandsPanel, "Step");
1054
+        stepButton = AddButton(objectCommandsPanel, "Step");
1043
1055
         stepButton.setToolTipText("Step one frame");
1044
1056
 //            resetAllButton = AddButton(oe, "Reset All");
1045
1057
 //            stepAllButton = AddButton(oe, "Step All");
1046
1058
 //            Return();
1047
-        slowerButton = AddButton(commandsPanel, "Slow");
1059
+        slowerButton = AddButton(objectCommandsPanel, "Slow");
1048
1060
         slowerButton.setToolTipText("Decrease animation speed");
1049
-        fasterButton = AddButton(commandsPanel, "Fast");
1061
+        fasterButton = AddButton(objectCommandsPanel, "Fast");
1050
1062
         fasterButton.setToolTipText("Increase animation speed");
1051
-        remarkButton = AddButton(commandsPanel, "Remark");
1063
+        remarkButton = AddButton(objectCommandsPanel, "Remark");
1052
1064
         remarkButton.setToolTipText("Set the current transform as the target");
1053
1065
 
1054
-        oe.ctrlPanel.add(commandsPanel);
1066
+        oe.ctrlPanel.add(objectCommandsPanel);
1055
1067
         oe.ctrlPanel.Return();
1056
1068
 
1057
1069
     pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
..
..
@@ -1340,7 +1352,7 @@
1340
1352
 //        north.setName("Edit");
1341
1353
 //        north.add(ctrlPanel, BorderLayout.NORTH);
1342
1354
 //        objectPanel.add(north);
1343
-        objectPanel.add(ctrlPanel);
1355
+        objectPanel.add(editPanel);
1344
1356
         objectPanel.add(infoPanel);
1345
1357
 
1346
1358
         /*