Fix flush UI.

Normand Briere

2019-05-02 a76491b66a2e304d9ae27a162f407b98c70fbafa

Fix flush UI.

 GroupEditor.java
..
..
@@ -505,13 +505,13 @@
505
505
                 uneditButton.setToolTipText("Unedit selection");
506
506
 		uneditButton.addActionListener(this);
507
507
 
508
+		commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
509
+                allParamsButton.setToolTipText("Edit all params");
510
+		allParamsButton.addActionListener(this);
511
+
508
512
 		commandsPanel.add(clearPanelButton = new cButton("C", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
509
513
                 clearPanelButton.setToolTipText("Clear edit panel");
510
514
 		clearPanelButton.addActionListener(this);
511
-
512
-		commandsPanel.add(allParamsButton = new cButton("A", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
513
-                allParamsButton.setToolTipText("All params??");
514
-		allParamsButton.addActionListener(this);
515
515
 
516
516
 		commandsPanel.add(unselectButton = new cButton("U", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
517
517
                 unselectButton.setToolTipText("Unselect");
..
..
@@ -2892,7 +2892,7 @@
2892
2892
                                 
2893
2893
                                 child.editWindow = null; // ???????????
2894
2894
 			}
2895
-			objEditor.ctrlPanel.validate();
2895
+			objEditor.ctrlPanel.FlushUI();
2896
2896
 			//objEditor.jTree.clearSelection();
2897
2897
 			//objEditor.ResetSliders();
2898
2898
                     refreshContents(true);
..
..
@@ -4946,8 +4946,8 @@
4946
4946
 	cButton flashSelectionButton;
4947
4947
 	cButton editButton;
4948
4948
 	cButton uneditButton;
4949
+	JCheckBox allParamsButton;
4949
4950
 	cButton clearpanelButton;
4950
-	cButton allParamsButton;
4951
4951
 	cButton unselectButton;
4952
4952
 	
4953
4953
 	cButton screenfitButton;
 ObjEditor.java
..
..
@@ -143,6 +143,8 @@
143
143
         //nameField.removeActionListener(this);
144
144
 //        objEditor.ctrlPanel.remove(nameField);
145
145
         
146
+        objEditor.ctrlPanel.remove(namePanel);
147
+        
146
148
         if (!GroupEditor.allparams)
147
149
             return;
148
150
         
..
..
@@ -165,7 +167,6 @@
165
167
 //        objEditor.ctrlPanel.remove(fasterButton);
166
168
 //        objEditor.ctrlPanel.remove(remarkButton);
167
169
         
168
-        objEditor.ctrlPanel.remove(namePanel);
169
170
         objEditor.ctrlPanel.remove(setupPanel);
170
171
         objEditor.ctrlPanel.remove(commandsPanel);
171
172
         objEditor.ctrlPanel.remove(pushPanel);
..
..
@@ -967,28 +968,45 @@
967
968
             setupPanel = new cGridBag().setVertical(false);
968
969
             
969
970
         liveCB = AddCheckBox(setupPanel, "Live", copy.live);
970
-        if (Globals.ADVANCED)
971
-                link2masterCB = AddCheckBox(setupPanel, "Supp", copy.link2master);
971
+                liveCB.setToolTipText("Animate object");
972
972
         hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
973
+                hideCB.setToolTipText("Hide object");
973
974
 //            Return();
974
975
         markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
975
-        rewindCB = AddCheckBox(setupPanel, "Rew", copy.rewind);
976
-        randomCB = AddCheckBox(setupPanel, "Rand", copy.random);
976
+        markCB.setToolTipText("Set the animation target transform");
977
+        
978
+        rewindCB = AddCheckBox(setupPanel, "Rewind", copy.rewind);
979
+        rewindCB.setToolTipText("Rewind animation");
980
+        
981
+        randomCB = AddCheckBox(setupPanel, "Random", copy.random);
982
+        randomCB.setToolTipText("Option for switch node");
977
983
 
984
+        if (Globals.ADVANCED)
985
+        {
986
+                link2masterCB = AddCheckBox(setupPanel, "Support", copy.link2master);
987
+                link2masterCB.setToolTipText("Attach to support");
988
+                speedupCB = AddCheckBox(setupPanel, "Speed", copy.speedup);
989
+                speedupCB.setToolTipText("Option motion capture");
990
+        }
991
+        
978
992
         oe.ctrlPanel.add(setupPanel);
979
993
         oe.ctrlPanel.Return();
980
994
         
981
995
             commandsPanel = new cGridBag().setVertical(false);
982
996
         
983
997
         resetButton = AddButton(commandsPanel, "Reset");
998
+        resetButton.setToolTipText("Jump to frame zero");
984
999
         stepButton = AddButton(commandsPanel, "Step");
1000
+        stepButton.setToolTipText("Step one frame");
985
1001
 //            resetAllButton = AddButton(oe, "Reset All");
986
1002
 //            stepAllButton = AddButton(oe, "Step All");
987
-        speedupCB = AddCheckBox(commandsPanel, "Speed", copy.speedup);
988
1003
 //            Return();
989
1004
         slowerButton = AddButton(commandsPanel, "Slow");
1005
+        slowerButton.setToolTipText("Decrease animation speed");
990
1006
         fasterButton = AddButton(commandsPanel, "Fast");
1007
+        fasterButton.setToolTipText("Increase animation speed");
991
1008
         remarkButton = AddButton(commandsPanel, "Remark");
1009
+        remarkButton.setToolTipText("Set the current transform as the target");
992
1010
 
993
1011
         oe.ctrlPanel.add(commandsPanel);
994
1012
         oe.ctrlPanel.Return();
..
..
@@ -2979,6 +2997,7 @@
2979
2997
         if (event.getSource() == randomCB)
2980
2998
         {
2981
2999
             copy.random ^= true;
3000
+            objEditor.refreshContents();
2982
3001
             return;
2983
3002
         }
2984
3003
         if (event.getSource() == speedupCB)
 Object3D.java
..
..
@@ -7378,6 +7378,7 @@
7378
7378
             objectUI.closeUI();
7379
7379
             if (editWindow != null)
7380
7380
             {
7381
+                editWindow.ctrlPanel.FlushUI();
7381
7382
                 editWindow.refreshContents();
7382
7383
             } // ? new
7383
7384
             objectUI = null;