Fix skin default.

Normand Briere

2019-05-01 a742f6cebf1d471217d836e07934e5c02c22b6db

 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"));
..
..
@@ -440,6 +440,10 @@
440
440
                 liveCB.setToolTipText("Enabled animation");
441
441
                                 liveCB.addItemListener(this);
442
442
 
443
+                oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
444
+                fastCB.setToolTipText("Fast mode");
445
+                                fastCB.addItemListener(this);
446
+                                
443
447
                 oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
444
448
                 trackCB.setToolTipText("Enable tracking");
445
449
                                 trackCB.addItemListener(this);
..
..
@@ -450,17 +454,14 @@
450
454
 
451
455
 //		oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
452
456
 //		screenfitpointButton.addActionListener(this);
453
-//			oe.aConstraints.gridx += 1;
454
-		oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
455
-		snapobjectButton.addActionListener(this);
456
-                snapobjectButton.setToolTipText("Snap Object");
457
-			oe.aConstraints.gridx += 1;
458
457
 
459
-                //aConstraints.gridx = 0;
460
-                //aConstraints.gridy += 1;
461
-		oe.aConstraints.weighty = 0;
462
-		oe.aConstraints.gridwidth = 1;
463
-		
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
+
464
465
 		oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
465
466
                 flashSelectionButton.setToolTipText("Show selection");
466
467
 		flashSelectionButton.addActionListener(this);
..
..
@@ -587,39 +588,29 @@
587
588
         
588
589
         void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
589
590
         {
590
-        	//constraints.gridx = 0;
591
-        	//constraints.gridy = 0;
592
-                panel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
593
-                fastCB.setToolTipText("Fast mode");
594
-                                fastCB.addItemListener(this);
595
-        	//constraints.gridy += 1;
596
591
                 panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
597
592
                 supportCB.setToolTipText("Enabled rigging");
598
593
                                 supportCB.addItemListener(this);
599
594
 
600
-        //	constraints.gridy += 1;
601
595
         //        panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
602
596
         //                        localCB.addItemListener(this);
603
597
 
604
-        	//constraints.gridy += 1;
605
598
                 panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
606
599
                 crowdCB.setToolTipText("Used for crowds");
607
600
                                 crowdCB.addItemListener(this);
608
601
 
609
-        	//constraints.gridy += 1;
610
602
                 panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
611
603
                 smoothCB.setToolTipText("Snapping delay");
612
604
                                 smoothCB.addItemListener(this);
613
605
 
614
-        	//constraints.gridy += 1;
615
606
                 panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
616
607
                 slowCB.setToolTipText("Smooth interpolation");
617
608
                                 slowCB.addItemListener(this);
618
-        	//constraints.gridy += 1;
609
+                                
619
610
                 panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
620
611
                 boxCB.setToolTipText("Display bounding boxes");
621
612
                                 boxCB.addItemListener(this);
622
-        	//constraints.gridy += 1;
613
+                                
623
614
                 panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
624
615
                 zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
625
616
                                 zoomBoxCB.addItemListener(this);
..
..
@@ -648,11 +639,9 @@
648
639
 //panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
649
640
 //                debugCB.addItemListener(this);
650
641
 
651
-        	//constraints.gridy += 1;
652
642
                 panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
653
643
                                 oeilCB.addItemListener(this);
654
644
 
655
-        	//constraints.gridy += 1;
656
645
                 panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
657
646
                 lookAtCB.setToolTipText("Look-at target");
658
647
                                 lookAtCB.addItemListener(this);
..
..
@@ -1110,7 +1099,7 @@
1110
1099
 	{
1111
1100
 		menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1112
1101
 		animationItem.addItemListener(this);
1113
-                animationItem.setState(CameraPane.ANIMATION);
1102
+                animationItem.setState(Globals.ANIMATION);
1114
1103
                 
1115
1104
 		menu.add("-");
1116
1105
 		parseverticesItem = menu.add(new MenuItem("Multiplicity"));
..
..
@@ -2246,7 +2235,7 @@
2246
2235
                         RandomNode random = new RandomNode();
2247
2236
 			group(random);
2248
2237
                         if (random.size() > 0)
2249
-                            random.name = random.get(0).name + "Rnd";
2238
+                            random.name = random.get(0).name + "Switch";
2250
2239
 		} else
2251
2240
 		if (source == physicsItem)
2252
2241
                 {