Move XYZ panel + icons.

Normand Briere

2019-07-19 e79247ef52a0bbb3864d46bb1e2c716005b3ecf3

 GroupEditor.java
..
..
@@ -60,6 +60,12 @@
60
60
 		this.copy = this.group = group;
61
61
 		//selectees = this.group.selectees;
62
62
 		
63
+        if (copy.versions == null)
64
+        {
65
+            copy.versions = new byte[100][];
66
+            copy.versionindex = -1;
67
+        }
68
+        
63
69
 		if(ui)
64
70
                     SetupUI(objEditor);
65
71
 	}
..
..
@@ -74,6 +80,12 @@
74
80
 		this.copy = this.group = copy;
75
81
 		//selectees = this.group.selectees;
76
82
 		
83
+        if (copy.versions == null)
84
+        {
85
+            copy.versions = new byte[100][];
86
+            copy.versionindex = -1;
87
+        }
88
+        
77
89
 		SetupMenu2(this); //objEditor);
78
90
 		SetupUI2(objEditor);
79
91
 		objEditor.SetupUI(true);
..
..
@@ -84,6 +96,10 @@
84
96
 
85
97
     void CloneSelection(boolean supports)
86
98
     {
99
+        if (Globals.REPLACEONMAKE)
100
+            Save();
101
+        boolean keep = Globals.REPLACEONMAKE;
102
+        Globals.REPLACEONMAKE = false;
87
103
         //   Object3D keep = GrafreeD.clipboard;
88
104
            //Object3D obj;
89
105
            for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
..
..
@@ -94,6 +110,7 @@
94
110
                
95
111
                makeSomething(clone, i==group.selection.size()-1);
96
112
            }
113
+        Globals.REPLACEONMAKE = keep;
97
114
     }
98
115
 
99
116
     void CloneClipboard(boolean supports)
..
..
@@ -189,8 +206,8 @@
189
206
 //		pasteExpandItem = menu.add(new MenuItem("Paste expand"));
190
207
 //		pasteExpandItem.addActionListener(this);
191
208
 		menu.add("-");
192
-		clearItem = menu.add(new MenuItem("Clear"));
193
-		clearItem.addActionListener(this);
209
+		deleteItem = menu.add(new MenuItem("Delete"));
210
+		deleteItem.addActionListener(this);
194
211
                 
195
212
         if (Globals.ADVANCED)
196
213
         {
..
..
@@ -380,13 +397,14 @@
380
397
 		shadowYItem.addActionListener(this);
381
398
                 shadowZItem = menu.add(new MenuItem("Shadow Blue"));
382
399
 		shadowZItem.addActionListener(this);
400
+		attributeItem = menu.add(new MenuItem("Attribute"));
401
+		attributeItem.addActionListener(this);
402
+                
383
403
         if (Globals.ADVANCED)
384
404
         {
385
405
 		menu.add("-");
386
406
 		linkerItem = menu.add(new MenuItem("Linker"));
387
407
 		linkerItem.addActionListener(this);
388
-		attributeItem = menu.add(new MenuItem("Attribute"));
389
-		attributeItem.addActionListener(this);
390
408
 		templateItem = menu.add(new MenuItem("Template"));
391
409
 		templateItem.addActionListener(this);
392
410
 		pointflowItem = menu.add(new MenuItem("Point Flow"));
..
..
@@ -415,7 +433,7 @@
415
433
 		genNormalsMESHItem.addActionListener(this);
416
434
         if (Globals.ADVANCED)
417
435
         {
418
-		genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
436
+		genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
419
437
 		genNormalsMINEItem.addActionListener(this);
420
438
         }
421
439
 		stripifyItem = menu.add(new MenuItem("Stripify"));
..
..
@@ -538,6 +556,7 @@
538
556
 		buildToolsMenu(menu);
539
557
 	}
540
558
 	
559
+        
541
560
 	void SetupUI2(ObjEditor oe)
542
561
 	{
543
562
             // June 2019
..
..
@@ -590,50 +609,66 @@
590
609
                 //minButton.setToolTipText("Minimize window");
591
610
 		//minButton.addActionListener(this);
592
611
                 
593
-		oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
594
-                maxButton.setToolTipText("Maximize window");
595
-		maxButton.addActionListener(this);
612
+                if (Globals.ADVANCED)
613
+                {
614
+                    oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
615
+                    maxButton.setToolTipText("Maximize window");
616
+                    maxButton.addActionListener(this);
617
+                }
596
618
                 
597
619
 		oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
598
620
                 fullButton.setToolTipText("Full-screen window");
599
621
 		fullButton.addActionListener(this);
600
622
                 
623
+		oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
624
+                screenfitButton.setToolTipText("Screen fit");
625
+		screenfitButton.addActionListener(this);
626
+
601
627
 		oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
602
628
                 restoreCameraButton.setToolTipText("Restore viewpoint");
603
629
 		restoreCameraButton.addActionListener(this);
604
630
                 
631
+		copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
632
+                saveButton.setToolTipText("New version");
633
+		saveButton.addActionListener(this);
634
+                                                
605
635
 		copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
606
-                undoButton.setToolTipText("Undo changes");
636
+                undoButton.setToolTipText("Previous version");
607
637
 		undoButton.addActionListener(this);
608
638
                 undoButton.setEnabled(false);
609
639
                 
640
+                cGridBag updown = new cGridBag().setVertical(true);
641
+		updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
642
+                restoreButton.setToolTipText("Restore current");
643
+		restoreButton.addActionListener(this);
644
+                restoreButton.setEnabled(false);
645
+                
646
+		updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
647
+                replaceButton.setToolTipText("Replace current");
648
+		replaceButton.addActionListener(this);
649
+                replaceButton.setEnabled(false);
650
+                
651
+                copyOptionsPanel.add(updown);
652
+                
610
653
 		copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
611
-                redoButton.setToolTipText("Redo changes");
654
+                redoButton.setToolTipText("Next version");
612
655
 		redoButton.addActionListener(this);
613
656
                 redoButton.setEnabled(false);
614
657
                 
615
-		copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
616
-                saveButton.setToolTipText("Save changes");
617
-		saveButton.addActionListener(this);
618
-                
619
-                copyOptionsPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
658
+                oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
620
659
                 liveCB.setToolTipText("Enable animation");
621
660
                                 liveCB.addItemListener(this);
622
661
 
623
-		copyOptionsPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
662
+		oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
624
663
                 oneStepButton.setToolTipText("Animate one step forward");
625
664
 		oneStepButton.addActionListener(this);
626
665
                 
627
-                copyOptionsPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
666
+                oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
628
667
                 fastCB.setToolTipText("Fast mode");
629
668
                                 fastCB.addItemListener(this);
630
669
                                 
631
670
                 //oe.toolboxPanel.Return();
632
671
                 
633
-		copyOptionsPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
634
-                screenfitButton.setToolTipText("Screen fit");
635
-		screenfitButton.addActionListener(this);
636
-
637
672
 //                copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
638
673
 //                trackCB.setToolTipText("Enable tracking");
639
674
 //                                trackCB.addItemListener(this);
..
..
@@ -650,27 +685,28 @@
650
685
 
651
686
 		//oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
652
687
                 
653
-		oe.toolbarPanel.add(twoButton = new cButton("|-|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
654
-                twoButton.setToolTipText("Show center view only");
655
-		twoButton.addActionListener(this);
656
-                this.fullscreenLayout = twoButton;
657
-                
658
688
 		oe.toolbarPanel.add(fourButton = new cButton("-||", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
659
689
 		fourButton.addActionListener(this);
660
690
                 fourButton.setToolTipText("Show left panel only");
691
+                
692
+		oe.toolbarPanel.add(twoButton = new cButton("|-|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
693
+                twoButton.setToolTipText("Show right view only");
694
+		twoButton.addActionListener(this);
695
+                this.fullscreenLayout = twoButton;
696
+                
661
697
 		oe.toolbarPanel.add(sixButton = new cButton("-|-|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
662
-                sixButton.setToolTipText("2-column layout left");
698
+                sixButton.setToolTipText("Show left and right");
663
699
 		sixButton.addActionListener(this);
664
-		oe.toolbarPanel.add(threeButton = new cButton("|-|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
665
-                threeButton.setToolTipText("2-column layout right");
666
-		threeButton.addActionListener(this);
667
-		oe.toolbarPanel.add(sevenButton = new cButton("-|-|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
668
-                sevenButton.setToolTipText("3-column layout");
669
-		sevenButton.addActionListener(this);
700
+//		oe.toolbarPanel.add(threeButton = new cButton("|-|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
701
+//                threeButton.setToolTipText("2-column layout right");
702
+//		threeButton.addActionListener(this);
703
+//		oe.toolbarPanel.add(sevenButton = new cButton("-|-|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
704
+//                sevenButton.setToolTipText("3-column layout");
705
+//		sevenButton.addActionListener(this);
670
706
                 //
671
707
 
672
-		oe.toolbarPanel.add(rootButton = GetButton("icons/write.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
673
-                rootButton.setToolTipText("Edit selection in new tab");
708
+		oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
709
+                rootButton.setToolTipText("Open selection in new tab");
674
710
 		rootButton.addActionListener(this);
675
711
 
676
712
                 oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..
..
@@ -811,6 +847,9 @@
811
847
 
812
848
                 oe.treePanel.add(copyOptionsPanel);
813
849
                 oe.treePanel.Return();
850
+        cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
851
+            versionSlider = (cNumberSlider)sliderPane.getComponent(1);
852
+            sliderPane.preferredHeight = 1;
814
853
                 
815
854
 //        mainPanel.setDividerLocation(0.5); //1.0);
816
855
 //        mainPanel.setResizeWeight(0.5);
..
..
@@ -833,7 +872,7 @@
833
872
 		dgr.addDragGestureListener(this);
834
873
 		}catch(Exception e) {}
835
874
 		*/
836
-        radio.layout = sevenButton;
875
+        radio.layout = sixButton; // sevenButton;
837
876
         oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
838
877
 	}
839
878
         
..
..
@@ -936,9 +975,9 @@
936
975
                 toggleSwitchCB.setToolTipText("Choose a single item");
937
976
                                 toggleSwitchCB.addItemListener(this);
938
977
                                 
939
-                panel.add(autosaveCB = new cCheckBox("Auto-save", Globals.SAVEONMAKE)); //, constraints);
940
-                autosaveCB.setToolTipText("On structure change");
941
-                                autosaveCB.addItemListener(this);
978
+                panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
979
+                autokeepCB.setToolTipText("On structure change");
980
+                                autokeepCB.addItemListener(this);
942
981
 
943
982
                 panel.Return();
944
983
             if (Globals.ADVANCED)
..
..
@@ -967,7 +1006,7 @@
967
1006
         {
968
1007
             cRadio radioButton = new cRadio(obj.name);
969
1008
             
970
-            // Patch to avoid bug with transparency.
1009
+            // June 2019. Patch to avoid bug with transparency.
971
1010
             radioButton.hadMaterial = obj.material != null;
972
1011
             if (!radioButton.hadMaterial)
973
1012
             {
..
..
@@ -975,7 +1014,7 @@
975
1014
             }
976
1015
             
977
1016
             radioButton.SetObject(obj);
978
-            radioButton.layout = sevenButton;
1017
+            radioButton.layout = sixButton; // sevenButton;
979
1018
             radioButton.SetCamera(cameraView.renderCamera, false);
980
1019
             radioButton.addActionListener(this);
981
1020
             radioPanel.add(radioButton);
..
..
@@ -1015,7 +1054,7 @@
1015
1054
         
1016
1055
         cCheckBox oeilCB;
1017
1056
         cCheckBox shadowCB;
1018
-        cCheckBox autosaveCB;
1057
+        cCheckBox autokeepCB;
1019
1058
         cCheckBox lookAtCB;
1020
1059
         
1021
1060
 //        static int COLOR = 1;
..
..
@@ -1127,9 +1166,9 @@
1127
1166
             {
1128
1167
                 Globals.FREEZEONMOVE ^= true;
1129
1168
             }
1130
-            else if(e.getSource() == autosaveCB)
1169
+            else if(e.getSource() == autokeepCB)
1131
1170
             {
1132
-                Globals.SAVEONMAKE ^= true;
1171
+                Globals.REPLACEONMAKE ^= true;
1133
1172
             }
1134
1173
             else if(e.getSource() == lookAtCB)
1135
1174
             {
..
..
@@ -1211,8 +1250,6 @@
1211
1250
                         }
1212
1251
                     }
1213
1252
                     
1214
-                    String string = (String) object;
1215
-                    
1216
1253
                     System.out.println("Transfer = " + object + "; drop : " + target);
1217
1254
 //                    if( object instanceof java.io.File[])
1218
1255
 //                    {
..
..
@@ -1220,6 +1257,8 @@
1220
1257
 //                        objEditor.DropFile((java.io.File[]) object, true);
1221
1258
 //                        return;
1222
1259
 //                    }
1260
+                    
1261
+                    String string = object.toString();
1223
1262
                     
1224
1263
                     // File path for Mac and Windows
1225
1264
                     if (string.charAt(0) == '/' || string.charAt(1) == ':')
..
..
@@ -1469,6 +1508,9 @@
1469
1508
 		animationItem.addItemListener(this);
1470
1509
                 animationItem.setState(Globals.ANIMATION);
1471
1510
                 
1511
+		menu.add(archiveItem = new MenuItem("Archive3D..."));
1512
+		archiveItem.addActionListener(this);
1513
+                
1472
1514
 		menu.add("-");
1473
1515
 		parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1474
1516
 		parseverticesItem.addActionListener(this);
..
..
@@ -1481,6 +1523,8 @@
1481
1523
 		reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1482
1524
 		reduce34MorphItem.addActionListener(this);
1483
1525
 		menu.add("-");
1526
+		menu.add(memoryItem = new MenuItem("Memory Usage"));
1527
+		memoryItem.addActionListener(this);
1484
1528
 		menu.add(computeAOItem = new MenuItem("Compute AO"));
1485
1529
 		computeAOItem.addActionListener(this);
1486
1530
                 
..
..
@@ -1489,8 +1533,6 @@
1489
1533
 		mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1490
1534
 		mirrorItem.addActionListener(this);
1491
1535
 		menu.add("-");
1492
-		menu.add(memoryItem = new MenuItem("Memory Usage"));
1493
-		memoryItem.addActionListener(this);
1494
1536
 		menu.add(analyzeItem = new MenuItem("Analyze"));
1495
1537
 		analyzeItem.addActionListener(this);
1496
1538
 		menu.add(dumpItem = new MenuItem("Print"));
..
..
@@ -1651,6 +1693,16 @@
1651
1693
                 listUI.remove(i);
1652
1694
             }
1653
1695
         }
1696
+    }
1697
+
1698
+    private void EditElement(Object3D elem, boolean newWindow)
1699
+    {
1700
+        //    if (!(elem instanceof Composite))
1701
+        //        newWindow = false;
1702
+            listUI.add(elem);
1703
+            elem.openEditWindow(this, newWindow); //, false);
1704
+            System.out.println("edit : " + elem);
1705
+            elem.editWindow.refreshContents(true); // ? new
1654
1706
     }
1655
1707
         
1656
1708
     /**
..
..
@@ -2213,15 +2265,31 @@
2213
2265
 		} else
2214
2266
 		if (source == undoButton)
2215
2267
 		{
2268
+                        // Go to previous version
2269
+			//if (!Undo())
2270
+                            //java.awt.Toolkit.getDefaultToolkit().beep();
2216
2271
 			Undo();
2272
+		} else
2273
+		if (source == restoreButton)
2274
+		{
2275
+                        // Restore current version
2276
+			Restore();
2277
+		} else
2278
+		if (source == replaceButton)
2279
+		{
2280
+                        // Overwrite current version
2281
+			Replace();
2217
2282
 		} else
2218
2283
 		if (source == redoButton)
2219
2284
 		{
2285
+                        // Go to next version
2220
2286
 			Redo();
2221
2287
 		} else
2222
2288
 		if (source == saveButton)
2223
2289
 		{
2224
-			Save();
2290
+                        // Save a new version
2291
+			if (!Save(true))
2292
+                            java.awt.Toolkit.getDefaultToolkit().beep();
2225
2293
 		} else
2226
2294
 		if (source == oneStepButton)
2227
2295
 		{
..
..
@@ -2230,17 +2298,14 @@
2230
2298
 		} else
2231
2299
 		if (source == screenfitButton)
2232
2300
 		{
2233
-			//Reload(lastConverter, lastFilename, true);
2234
2301
                     ScreenFit();
2235
2302
 		} else
2236
2303
 		if (source == screenfitpointButton)
2237
2304
 		{
2238
-			//Reload(lastConverter, lastFilename, true);
2239
2305
                     ScreenFitPoint();
2240
2306
 		} else
2241
2307
 		if (source == snapobjectButton)
2242
2308
 		{
2243
-			//Reload(lastConverter, lastFilename, true);
2244
2309
                     SnapObject();
2245
2310
 		} else
2246
2311
 //		if (event.getSource() == recompileButton)
..
..
@@ -2604,7 +2669,7 @@
2604
2669
 		{
2605
2670
 			StepAll();
2606
2671
 		} else
2607
-		if (source == clearItem) // || event.getSource() == clearButton)
2672
+		if (source == deleteItem) // || event.getSource() == clearButton)
2608
2673
 		{
2609
2674
 			//int indices[] = jList.getSelectedIndices();
2610
2675
 			//for (int i = indices.length - 1; i >= 0; i--)
..
..
@@ -3468,6 +3533,9 @@
3468
3533
                     }
3469
3534
                     
3470
3535
                     copy = group;
3536
+                    
3537
+                    SetUndoStates();
3538
+
3471
3539
                     //Globals.theRenderer.object = group;
3472
3540
                     if(!useclient)
3473
3541
                     {
..
..
@@ -3496,8 +3564,10 @@
3496
3564
                     radio.layout.doClick();
3497
3565
                     
3498
3566
                     ClearUnpinned();
3499
-                    SetPinStates(group.selection.size() > 0);
3500
-                    if (group.selection.size() == 1)
3567
+                    //Grafreed.Assert(group != null);
3568
+                    //Grafreed.Assert(group.selection != null);
3569
+                    SetPinStates(group.selection == null || group.selection.size() > 0);
3570
+                    if (group.selection == null || group.selection.size() == 1)
3501
3571
                         EditSelection(false);
3502
3572
                     keepparent = group.parent;
3503
3573
                     // PARENT = NULL or not???
..
..
@@ -4568,6 +4638,12 @@
4568
4638
 	
4569
4639
 	void EditSelection(boolean newWindow)
4570
4640
 	{
4641
+                if (group.selection == null)
4642
+                {
4643
+                     EditElement(group, newWindow); // ? new
4644
+                     return;
4645
+                }
4646
+                
4571
4647
         //    aConstraints.gridy = 0;
4572
4648
 		for (int i=0; i<group.selection.size(); i++)
4573
4649
 		{
..
..
@@ -4578,12 +4654,7 @@
4578
4654
 			Object3D elem = (Object3D)group.selection.elementAt(i);
4579
4655
                         if(elem != group || !newWindow)
4580
4656
                         {
4581
-                        //    if (!(elem instanceof Composite))
4582
-                        //        newWindow = false;
4583
-                            listUI.add(elem);
4584
-                            elem.openEditWindow(this, newWindow); //, false);
4585
-                            System.out.println("edit : " + elem);
4586
-                            elem.editWindow.refreshContents(true); // ? new
4657
+                            EditElement(elem, newWindow); // ? new
4587
4658
                         }
4588
4659
 		}
4589
4660
 	}
..
..
@@ -4728,7 +4799,7 @@
4728
4799
         void refreshContents(boolean cp)
4729
4800
         {
4730
4801
             if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
4731
-            if (!Globals.MOUSEDRAGGED) // && !Globals.TIMERRUNNING)
4802
+            if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
4732
4803
             {
4733
4804
                 objEditor.ClearInfo(); // .GetMaterial());
4734
4805
 
..
..
@@ -4827,8 +4898,8 @@
4827
4898
                 
4828
4899
 		if (cut)
4829
4900
 		{
4830
-        if (Globals.SAVEONMAKE)
4831
-                    Save();
4901
+//        if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
4902
+//                    Save();
4832
4903
 			//int indices[] = jList.getSelectedIndices();
4833
4904
 			//for (int i = indices.length - 1; i >= 0; i--)
4834
4905
 			//jList.remove(indices[i]);
..
..
@@ -4931,6 +5002,10 @@
4931
5002
 	
4932
5003
 	void paste(boolean expand)
4933
5004
 	{
5005
+        if (Globals.REPLACEONMAKE)
5006
+            Save();
5007
+        boolean keep = Globals.REPLACEONMAKE;
5008
+        Globals.REPLACEONMAKE = false;
4934
5009
 	//	if (GrafreeD.clipboard == null)
4935
5010
 	//		return;
4936
5011
 		boolean first = true;
..
..
@@ -4990,6 +5065,7 @@
4990
5065
                         Grafreed.clipboard.get(0).parent = keepparent;
4991
5066
 		}
4992
5067
 		
5068
+        Globals.REPLACEONMAKE = keep;
4993
5069
 		ResetModel();
4994
5070
 		refreshContents();
4995
5071
 	}
..
..
@@ -5125,6 +5201,10 @@
5125
5201
         
5126
5202
 	void group(Object3D csg, boolean grab)
5127
5203
 	{
5204
+        if (Globals.REPLACEONMAKE)
5205
+            Save();
5206
+        boolean keep = Globals.REPLACEONMAKE;
5207
+        Globals.REPLACEONMAKE = false;
5128
5208
 		if (//false) // why??
5129
5209
                     !group.selection.isEmpty())
5130
5210
                 {
..
..
@@ -5238,10 +5318,15 @@
5238
5318
                 //node.add(csg);
5239
5319
 		//makeSomething(node);
5240
5320
 		makeSomething(csg);
5321
+        Globals.REPLACEONMAKE = keep;
5241
5322
 	}
5242
5323
 	
5243
5324
         void Ungroup(Object3D g)
5244
5325
         {
5326
+        if (Globals.REPLACEONMAKE)
5327
+            Save();
5328
+        boolean keep = Globals.REPLACEONMAKE;
5329
+        Globals.REPLACEONMAKE = false;
5245
5330
             if (g instanceof HiddenObject)
5246
5331
             {
5247
5332
                 HiddenObject h = (HiddenObject) g;
..
..
@@ -5258,6 +5343,7 @@
5258
5343
                     objEditor.makeSomething(g.get(i), false);
5259
5344
                 }
5260
5345
             }
5346
+        Globals.REPLACEONMAKE = keep;
5261
5347
         }
5262
5348
         
5263
5349
 	void ungroup()
..
..
@@ -5621,7 +5707,7 @@
5621
5707
 	private MenuItem pasteLinkItem;
5622
5708
 	private MenuItem pasteCloneItem;
5623
5709
 	private MenuItem pasteExpandItem;
5624
-	private MenuItem clearItem;
5710
+	private MenuItem deleteItem;
5625
5711
 	private MenuItem clearAllItem;
5626
5712
 	private MenuItem genUVItem;
5627
5713
 	private MenuItem genNormalsMESHItem;