From d1e1417edc8a6ccf195b6da3270f22234dda61e4 Mon Sep 17 00:00:00 2001
From: Normand Briere <nbriere@noware.ca>
Date: Wed, 01 May 2019 16:02:52 -0400
Subject: [PATCH] Fix random/switch node.

---
 GroupEditor.java |   29 +++++++++++++----------------
 1 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/GroupEditor.java b/GroupEditor.java
index 9679b9d..397b6c7 100644
--- a/GroupEditor.java
+++ b/GroupEditor.java
@@ -239,16 +239,16 @@
 		ungroupItem = menu.add(new MenuItem("Ungroup"));
 		ungroupItem.addActionListener(this);
 		menu.add("-");
-		randomItem = menu.add(new MenuItem("Random"));
+		randomItem = menu.add(new MenuItem("Switch node"));
 		randomItem.addActionListener(this);
-		physicsItem = menu.add(new MenuItem("Physics"));
-		physicsItem.addActionListener(this);
-		frameselectorItem = menu.add(new MenuItem("Frame Selector"));
-		frameselectorItem.addActionListener(this);
 		switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
 		switchGeoItem.addActionListener(this);
 		switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
 		switchTransfoItem.addActionListener(this);
+		physicsItem = menu.add(new MenuItem("Physics"));
+		physicsItem.addActionListener(this);
+		frameselectorItem = menu.add(new MenuItem("Frame Selector"));
+		frameselectorItem.addActionListener(this);
 		morphItem = menu.add(new MenuItem("Morph"));
 		morphItem.addActionListener(this);
 		scriptNodeItem = menu.add(new MenuItem("Script Node"));
@@ -454,17 +454,14 @@
 
 //		oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
 //		screenfitpointButton.addActionListener(this);
-//			oe.aConstraints.gridx += 1;
-		oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
-		snapobjectButton.addActionListener(this);
-                snapobjectButton.setToolTipText("Snap Object");
-			oe.aConstraints.gridx += 1;
 
-                //aConstraints.gridx = 0;
-                //aConstraints.gridy += 1;
-		oe.aConstraints.weighty = 0;
-		oe.aConstraints.gridwidth = 1;
-		
+                if (Globals.ADVANCED)
+                {
+                        oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
+                        snapobjectButton.addActionListener(this);
+                        snapobjectButton.setToolTipText("Snap Object");
+                }
+
 		oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
                 flashSelectionButton.setToolTipText("Show selection");
 		flashSelectionButton.addActionListener(this);
@@ -2238,7 +2235,7 @@
                         RandomNode random = new RandomNode();
 			group(random);
                         if (random.size() > 0)
-                            random.name = random.get(0).name + "Rnd";
+                            random.name = random.get(0).name + "Switch";
 		} else
 		if (source == physicsItem)
                 {

--
Gitblit v1.6.2