Fix flush UI.

Normand Briere

2019-05-02 a76491b66a2e304d9ae27a162f407b98c70fbafa

 GroupEditor.java
..
..
@@ -239,16 +239,16 @@
239
239
 		ungroupItem = menu.add(new MenuItem("Ungroup"));
240
240
 		ungroupItem.addActionListener(this);
241
241
 		menu.add("-");
242
-		randomItem = menu.add(new MenuItem("Random"));
242
+		randomItem = menu.add(new MenuItem("Switch node"));
243
243
 		randomItem.addActionListener(this);
244
-		physicsItem = menu.add(new MenuItem("Physics"));
245
-		physicsItem.addActionListener(this);
246
-		frameselectorItem = menu.add(new MenuItem("Frame Selector"));
247
-		frameselectorItem.addActionListener(this);
248
244
 		switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
249
245
 		switchGeoItem.addActionListener(this);
250
246
 		switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
251
247
 		switchTransfoItem.addActionListener(this);
248
+		physicsItem = menu.add(new MenuItem("Physics"));
249
+		physicsItem.addActionListener(this);
250
+		frameselectorItem = menu.add(new MenuItem("Frame Selector"));
251
+		frameselectorItem.addActionListener(this);
252
252
 		morphItem = menu.add(new MenuItem("Morph"));
253
253
 		morphItem.addActionListener(this);
254
254
 		scriptNodeItem = menu.add(new MenuItem("Script Node"));
..
..
@@ -454,17 +454,14 @@
454
454
 
455
455
 //		oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
456
456
 //		screenfitpointButton.addActionListener(this);
457
-//			oe.aConstraints.gridx += 1;
458
-		oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
459
-		snapobjectButton.addActionListener(this);
460
-                snapobjectButton.setToolTipText("Snap Object");
461
-			oe.aConstraints.gridx += 1;
462
457
 
463
-                //aConstraints.gridx = 0;
464
-                //aConstraints.gridy += 1;
465
-		oe.aConstraints.weighty = 0;
466
-		oe.aConstraints.gridwidth = 1;
467
-		
458
+                if (Globals.ADVANCED)
459
+                {
460
+                        oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
461
+                        snapobjectButton.addActionListener(this);
462
+                        snapobjectButton.setToolTipText("Snap Object");
463
+                }
464
+
468
465
 		oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
469
466
                 flashSelectionButton.setToolTipText("Show selection");
470
467
 		flashSelectionButton.addActionListener(this);
..
..
@@ -508,13 +505,13 @@
508
505
                 uneditButton.setToolTipText("Unedit selection");
509
506
 		uneditButton.addActionListener(this);
510
507
 
508
+		commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
509
+                allParamsButton.setToolTipText("Edit all params");
510
+		allParamsButton.addActionListener(this);
511
+
511
512
 		commandsPanel.add(clearPanelButton = new cButton("C", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
512
513
                 clearPanelButton.setToolTipText("Clear edit panel");
513
514
 		clearPanelButton.addActionListener(this);
514
-
515
-		commandsPanel.add(allParamsButton = new cButton("A", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
516
-                allParamsButton.setToolTipText("All params??");
517
-		allParamsButton.addActionListener(this);
518
515
 
519
516
 		commandsPanel.add(unselectButton = new cButton("U", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
520
517
                 unselectButton.setToolTipText("Unselect");
..
..
@@ -2238,7 +2235,7 @@
2238
2235
                         RandomNode random = new RandomNode();
2239
2236
 			group(random);
2240
2237
                         if (random.size() > 0)
2241
-                            random.name = random.get(0).name + "Rnd";
2238
+                            random.name = random.get(0).name + "Switch";
2242
2239
 		} else
2243
2240
 		if (source == physicsItem)
2244
2241
                 {
..
..
@@ -2895,7 +2892,7 @@
2895
2892
                                 
2896
2893
                                 child.editWindow = null; // ???????????
2897
2894
 			}
2898
-			objEditor.ctrlPanel.validate();
2895
+			objEditor.ctrlPanel.FlushUI();
2899
2896
 			//objEditor.jTree.clearSelection();
2900
2897
 			//objEditor.ResetSliders();
2901
2898
                     refreshContents(true);
..
..
@@ -4949,8 +4946,8 @@
4949
4946
 	cButton flashSelectionButton;
4950
4947
 	cButton editButton;
4951
4948
 	cButton uneditButton;
4949
+	JCheckBox allParamsButton;
4952
4950
 	cButton clearpanelButton;
4953
-	cButton allParamsButton;
4954
4951
 	cButton unselectButton;
4955
4952
 	
4956
4953
 	cButton screenfitButton;