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
         {
..
..
@@ -220,7 +237,7 @@
220
237
 //        toggleSwitchItem.addItemListener(this);
221
238
 //        toggleSwitchItem.setState(CameraPane.SWITCH);
222
239
         
223
-        cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
240
+        cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
224
241
         toggleHandleItem.addItemListener(this);
225
242
         toggleHandleItem.setState(CameraPane.HANDLES);
226
243
         
..
..
@@ -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
..
..
@@ -582,7 +601,7 @@
582
601
          */
583
602
                 cGridBag copyOptionsPanel = new cGridBag();
584
603
                                         
585
-                copyOptionsPanel.preferredHeight = 2;
604
+                copyOptionsPanel.preferredHeight = 1;
586
605
                 
587
606
                 //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
588
607
                 
..
..
@@ -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);
..
..
@@ -726,7 +762,7 @@
726
762
                                compositeButton.addActionListener(this);
727
763
 
728
764
                 oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
729
-                switchButton.setToolTipText("Create switch");
765
+                switchButton.setToolTipText("Create item switcher");
730
766
                                switchButton.addActionListener(this);
731
767
 
732
768
                 oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..
..
@@ -758,16 +794,16 @@
758
794
                 }
759
795
                 
760
796
                 // EDIT panel
761
-		editCommandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
762
-                editButton.setToolTipText("Edit selection");
797
+		editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
798
+                editButton.setToolTipText("Pin selection controls");
763
799
 		editButton.addActionListener(this);
764
800
 
765
-		editCommandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
766
-                uneditButton.setToolTipText("Unedit selection");
801
+		editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
802
+                uneditButton.setToolTipText("Remove selection controls");
767
803
 		uneditButton.addActionListener(this);
768
804
 
769
805
 		editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
770
-                allParamsButton.setToolTipText("Edit all params");
806
+                allParamsButton.setToolTipText("Show all controle");
771
807
 		allParamsButton.addActionListener(this);
772
808
 
773
809
 		editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..
..
@@ -784,6 +820,7 @@
784
820
                 
785
821
                 editCommandsPanel.preferredHeight = 1;
786
822
                 
823
+                SetPinStates(false);
787
824
 //                oe.treePanel.add(commandsPanel);
788
825
 //                oe.treePanel.Return();
789
826
                 
..
..
@@ -810,6 +847,9 @@
810
847
 
811
848
                 oe.treePanel.add(copyOptionsPanel);
812
849
                 oe.treePanel.Return();
850
+        cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
851
+            versionSlider = (cNumberSlider)sliderPane.getComponent(1);
852
+            sliderPane.preferredHeight = 1;
813
853
                 
814
854
 //        mainPanel.setDividerLocation(0.5); //1.0);
815
855
 //        mainPanel.setResizeWeight(0.5);
..
..
@@ -832,7 +872,7 @@
832
872
 		dgr.addDragGestureListener(this);
833
873
 		}catch(Exception e) {}
834
874
 		*/
835
-        radio.layout = sevenButton;
875
+        radio.layout = sixButton; // sevenButton;
836
876
         oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
837
877
 	}
838
878
         
..
..
@@ -857,14 +897,18 @@
857
897
                                 boxCB.addItemListener(this);
858
898
                                 
859
899
                 panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
860
-                zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
900
+                zoomBoxCB.setToolTipText("Display only for wheel");
861
901
                                 zoomBoxCB.addItemListener(this);
862
902
 
863
903
         if (true) // Globals.ADVANCED)
864
904
         {
865
-                panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
866
-                supportCB.setToolTipText("Enable rigging");
867
-                                supportCB.addItemListener(this);
905
+//                panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
906
+//                supportCB.setToolTipText("Enable rigging");
907
+//                                supportCB.addItemListener(this);
908
+
909
+                panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
910
+                freezeCB.setToolTipText("Fast moving camera");
911
+                                freezeCB.addItemListener(this);
868
912
 
869
913
         //        panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
870
914
         //                        localCB.addItemListener(this);
..
..
@@ -919,7 +963,7 @@
919
963
                                 oeilCB.addItemListener(this);
920
964
 
921
965
                 panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
922
-                shadowCB.setToolTipText("Compute shadows when live");
966
+                shadowCB.setToolTipText("When live compute shadows");
923
967
                                 shadowCB.addItemListener(this);
924
968
 
925
969
                 panel.Return();
..
..
@@ -928,12 +972,12 @@
928
972
                                 toggleTextureCB.addItemListener(this);
929
973
                                 
930
974
                 panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
931
-                toggleSwitchCB.setToolTipText("Use switch");
975
+                toggleSwitchCB.setToolTipText("Choose a single item");
932
976
                                 toggleSwitchCB.addItemListener(this);
933
977
                                 
934
-                panel.add(autosaveCB = new cCheckBox("Auto-save", Globals.SAVEONMAKE)); //, constraints);
935
-                autosaveCB.setToolTipText("Auto-save on structure change");
936
-                                autosaveCB.addItemListener(this);
978
+                panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
979
+                autokeepCB.setToolTipText("On structure change");
980
+                                autokeepCB.addItemListener(this);
937
981
 
938
982
                 panel.Return();
939
983
             if (Globals.ADVANCED)
..
..
@@ -962,7 +1006,7 @@
962
1006
         {
963
1007
             cRadio radioButton = new cRadio(obj.name);
964
1008
             
965
-            // Patch to avoid bug with transparency.
1009
+            // June 2019. Patch to avoid bug with transparency.
966
1010
             radioButton.hadMaterial = obj.material != null;
967
1011
             if (!radioButton.hadMaterial)
968
1012
             {
..
..
@@ -970,7 +1014,7 @@
970
1014
             }
971
1015
             
972
1016
             radioButton.SetObject(obj);
973
-            radioButton.layout = sevenButton;
1017
+            radioButton.layout = sixButton; // sevenButton;
974
1018
             radioButton.SetCamera(cameraView.renderCamera, false);
975
1019
             radioButton.addActionListener(this);
976
1020
             radioPanel.add(radioButton);
..
..
@@ -999,6 +1043,7 @@
999
1043
         cCheckBox slowCB;
1000
1044
         cCheckBox boxCB;
1001
1045
         cCheckBox zoomBoxCB;
1046
+        cCheckBox freezeCB;
1002
1047
         //cToggleButton trackCB;
1003
1048
         cCheckBox trackCB;
1004
1049
         cCheckBox smoothfocusCB;
..
..
@@ -1009,7 +1054,7 @@
1009
1054
         
1010
1055
         cCheckBox oeilCB;
1011
1056
         cCheckBox shadowCB;
1012
-        cCheckBox autosaveCB;
1057
+        cCheckBox autokeepCB;
1013
1058
         cCheckBox lookAtCB;
1014
1059
         
1015
1060
 //        static int COLOR = 1;
..
..
@@ -1117,9 +1162,13 @@
1117
1162
             {
1118
1163
                 Globals.COMPUTESHADOWWHENLIVE ^= true;
1119
1164
             }
1120
-            else if(e.getSource() == autosaveCB)
1165
+            else if(e.getSource() == freezeCB)
1121
1166
             {
1122
-                Globals.SAVEONMAKE ^= true;
1167
+                Globals.FREEZEONMOVE ^= true;
1168
+            }
1169
+            else if(e.getSource() == autokeepCB)
1170
+            {
1171
+                Globals.REPLACEONMAKE ^= true;
1123
1172
             }
1124
1173
             else if(e.getSource() == lookAtCB)
1125
1174
             {
..
..
@@ -1201,8 +1250,6 @@
1201
1250
                         }
1202
1251
                     }
1203
1252
                     
1204
-                    String string = (String) object;
1205
-                    
1206
1253
                     System.out.println("Transfer = " + object + "; drop : " + target);
1207
1254
 //                    if( object instanceof java.io.File[])
1208
1255
 //                    {
..
..
@@ -1210,6 +1257,8 @@
1210
1257
 //                        objEditor.DropFile((java.io.File[]) object, true);
1211
1258
 //                        return;
1212
1259
 //                    }
1260
+                    
1261
+                    String string = object.toString();
1213
1262
                     
1214
1263
                     // File path for Mac and Windows
1215
1264
                     if (string.charAt(0) == '/' || string.charAt(1) == ':')
..
..
@@ -1459,6 +1508,9 @@
1459
1508
 		animationItem.addItemListener(this);
1460
1509
                 animationItem.setState(Globals.ANIMATION);
1461
1510
                 
1511
+		menu.add(archiveItem = new MenuItem("Archive3D..."));
1512
+		archiveItem.addActionListener(this);
1513
+                
1462
1514
 		menu.add("-");
1463
1515
 		parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1464
1516
 		parseverticesItem.addActionListener(this);
..
..
@@ -1471,6 +1523,8 @@
1471
1523
 		reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1472
1524
 		reduce34MorphItem.addActionListener(this);
1473
1525
 		menu.add("-");
1526
+		menu.add(memoryItem = new MenuItem("Memory Usage"));
1527
+		memoryItem.addActionListener(this);
1474
1528
 		menu.add(computeAOItem = new MenuItem("Compute AO"));
1475
1529
 		computeAOItem.addActionListener(this);
1476
1530
                 
..
..
@@ -1479,8 +1533,6 @@
1479
1533
 		mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1480
1534
 		mirrorItem.addActionListener(this);
1481
1535
 		menu.add("-");
1482
-		menu.add(memoryItem = new MenuItem("Memory Usage"));
1483
-		memoryItem.addActionListener(this);
1484
1536
 		menu.add(analyzeItem = new MenuItem("Analyze"));
1485
1537
 		analyzeItem.addActionListener(this);
1486
1538
 		menu.add(dumpItem = new MenuItem("Print"));
..
..
@@ -1628,6 +1680,30 @@
1628
1680
             
1629
1681
             makeSomething(shadow);
1630
1682
         }
1683
+
1684
+    private void ClearUnpinned()
1685
+    {
1686
+        //for (Object3D obj : listUI)
1687
+        for (int i=listUI.size(); --i>=0;)
1688
+        {
1689
+            Object3D obj = listUI.elementAt(i);
1690
+            if (!obj.pinned)
1691
+            {
1692
+                obj.CloseUI();
1693
+                listUI.remove(i);
1694
+            }
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
1706
+    }
1631
1707
         
1632
1708
     /**
1633
1709
      * applyExample
..
..
@@ -2107,25 +2183,25 @@
2107
2183
                         Composite csg = new GroupLeaf();
2108
2184
                         csg.count = 5;
2109
2185
 			group(csg);
2110
-                        Composite child = new cGroup();
2186
+                        Composite child = new cGroup("Branch");
2111
2187
                         csg.addChild(child);
2112
2188
                         child.addChild(csg);
2113
2189
 		} else
2114
2190
 		if (source == doubleItem)
2115
2191
 		{
2116
-                        Composite csg = new GroupLeaf();
2192
+                        Composite csg = new GroupLeaf("Fork");
2117
2193
                         csg.count = 5;
2118
2194
 			group(csg);
2119
-                        Composite child = new cGroup();
2195
+                        Composite child = new cGroup("Branch A");
2120
2196
                         csg.addChild(child);
2121
2197
                         child.addChild(csg);
2122
-                        child = new cGroup();
2198
+                        child = new cGroup("Branch B");
2123
2199
                         csg.addChild(child);
2124
2200
                         child.addChild(csg);
2125
2201
 		} else
2126
2202
 		if (source == tripleItem)
2127
2203
 		{
2128
-                        Composite csg = new GroupLeaf();
2204
+                        Composite csg = new GroupLeaf("Trident");
2129
2205
                         csg.count = 4;
2130
2206
 			group(csg);
2131
2207
                         Composite child = new cGroup();
..
..
@@ -2189,15 +2265,31 @@
2189
2265
 		} else
2190
2266
 		if (source == undoButton)
2191
2267
 		{
2268
+                        // Go to previous version
2269
+			//if (!Undo())
2270
+                            //java.awt.Toolkit.getDefaultToolkit().beep();
2192
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();
2193
2282
 		} else
2194
2283
 		if (source == redoButton)
2195
2284
 		{
2285
+                        // Go to next version
2196
2286
 			Redo();
2197
2287
 		} else
2198
2288
 		if (source == saveButton)
2199
2289
 		{
2200
-			Save();
2290
+                        // Save a new version
2291
+			if (!Save(true))
2292
+                            java.awt.Toolkit.getDefaultToolkit().beep();
2201
2293
 		} else
2202
2294
 		if (source == oneStepButton)
2203
2295
 		{
..
..
@@ -2206,17 +2298,14 @@
2206
2298
 		} else
2207
2299
 		if (source == screenfitButton)
2208
2300
 		{
2209
-			//Reload(lastConverter, lastFilename, true);
2210
2301
                     ScreenFit();
2211
2302
 		} else
2212
2303
 		if (source == screenfitpointButton)
2213
2304
 		{
2214
-			//Reload(lastConverter, lastFilename, true);
2215
2305
                     ScreenFitPoint();
2216
2306
 		} else
2217
2307
 		if (source == snapobjectButton)
2218
2308
 		{
2219
-			//Reload(lastConverter, lastFilename, true);
2220
2309
                     SnapObject();
2221
2310
 		} else
2222
2311
 //		if (event.getSource() == recompileButton)
..
..
@@ -2580,7 +2669,7 @@
2580
2669
 		{
2581
2670
 			StepAll();
2582
2671
 		} else
2583
-		if (source == clearItem) // || event.getSource() == clearButton)
2672
+		if (source == deleteItem) // || event.getSource() == clearButton)
2584
2673
 		{
2585
2674
 			//int indices[] = jList.getSelectedIndices();
2586
2675
 			//for (int i = indices.length - 1; i >= 0; i--)
..
..
@@ -2740,15 +2829,28 @@
2740
2829
 		} else
2741
2830
 		if (source == ungroupItem || source == ungroupButton)
2742
2831
 		{
2743
-			//ungroup();
2832
+                    boolean hasRoot = false;
2833
+                    
2744
2834
                     for (int i=0; i<group.selection.size(); i++)
2745
2835
                     {
2746
-                        Ungroup(group.selection.get(i));
2836
+                        if (group.selection.get(i) == group)
2837
+                        {
2838
+                            hasRoot = true;
2839
+                            break;
2840
+                        }
2747
2841
                     }
2748
2842
 
2749
-                    ClearSelection(false);
2750
-                    
2751
-                    refreshContents();
2843
+                    if (!hasRoot)
2844
+                    {
2845
+                        for (int i=0; i<group.selection.size(); i++)
2846
+                        {
2847
+                            Ungroup(group.selection.get(i));
2848
+                        }
2849
+
2850
+                        ClearSelection(false);
2851
+
2852
+                        refreshContents();
2853
+                    }
2752
2854
 		} else
2753
2855
 		if (source == genUVItem)
2754
2856
                 {
..
..
@@ -3372,7 +3474,7 @@
3372
3474
                     //copy.ClearUI();
3373
3475
                     for (Object3D obj : listUI)
3374
3476
                     {
3375
-                        obj.pinned = true;
3477
+                        obj.pinned = false;
3376
3478
                         obj.CloseUI();
3377
3479
                     }
3378
3480
                     listUI.clear();
..
..
@@ -3431,6 +3533,9 @@
3431
3533
                     }
3432
3534
                     
3433
3535
                     copy = group;
3536
+                    
3537
+                    SetUndoStates();
3538
+
3434
3539
                     //Globals.theRenderer.object = group;
3435
3540
                     if(!useclient)
3436
3541
                     {
..
..
@@ -3457,6 +3562,13 @@
3457
3562
                         currentLayout = sevenButton;
3458
3563
                      */
3459
3564
                     radio.layout.doClick();
3565
+                    
3566
+                    ClearUnpinned();
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)
3571
+                        EditSelection(false);
3460
3572
                     keepparent = group.parent;
3461
3573
                     // PARENT = NULL or not???
3462
3574
                     //group.parent = null; // ROOT
..
..
@@ -4526,6 +4638,12 @@
4526
4638
 	
4527
4639
 	void EditSelection(boolean newWindow)
4528
4640
 	{
4641
+                if (group.selection == null)
4642
+                {
4643
+                     EditElement(group, newWindow); // ? new
4644
+                     return;
4645
+                }
4646
+                
4529
4647
         //    aConstraints.gridy = 0;
4530
4648
 		for (int i=0; i<group.selection.size(); i++)
4531
4649
 		{
..
..
@@ -4536,12 +4654,7 @@
4536
4654
 			Object3D elem = (Object3D)group.selection.elementAt(i);
4537
4655
                         if(elem != group || !newWindow)
4538
4656
                         {
4539
-                        //    if (!(elem instanceof Composite))
4540
-                        //        newWindow = false;
4541
-                            listUI.add(elem);
4542
-                            elem.openEditWindow(this, newWindow); //, false);
4543
-                            System.out.println("edit : " + elem);
4544
-                            elem.editWindow.refreshContents(true); // ? new
4657
+                            EditElement(elem, newWindow); // ? new
4545
4658
                         }
4546
4659
 		}
4547
4660
 	}
..
..
@@ -4616,17 +4729,7 @@
4616
4729
 		//new Exception().printStackTrace();
4617
4730
 
4618
4731
 		freezemodel = true;
4619
-		
4620
-                //for (Object3D obj : listUI)
4621
-                for (int i=listUI.size(); --i>=0;)
4622
-                {
4623
-                    Object3D obj = listUI.elementAt(i);
4624
-                    if (!obj.pinned)
4625
-                    {
4626
-                        obj.CloseUI();
4627
-                        listUI.remove(i);
4628
-                    }
4629
-                }
4732
+        ClearUnpinned();
4630
4733
                     
4631
4734
 		/**/
4632
4735
 		//switch (event.id)
..
..
@@ -4689,12 +4792,14 @@
4689
4792
         {
4690
4793
             editButton.setEnabled(enabled);
4691
4794
             uneditButton.setEnabled(enabled);
4795
+            unselectButton.setEnabled(enabled);
4796
+            flashSelectionButton.setEnabled(enabled);
4692
4797
         }
4693
4798
 
4694
4799
         void refreshContents(boolean cp)
4695
4800
         {
4696
4801
             if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
4697
-            if (!Globals.MOUSEDRAGGED) // && !Globals.TIMERRUNNING)
4802
+            if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
4698
4803
             {
4699
4804
                 objEditor.ClearInfo(); // .GetMaterial());
4700
4805
 
..
..
@@ -4793,8 +4898,8 @@
4793
4898
                 
4794
4899
 		if (cut)
4795
4900
 		{
4796
-        if (Globals.SAVEONMAKE)
4797
-                    Save();
4901
+//        if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
4902
+//                    Save();
4798
4903
 			//int indices[] = jList.getSelectedIndices();
4799
4904
 			//for (int i = indices.length - 1; i >= 0; i--)
4800
4905
 			//jList.remove(indices[i]);
..
..
@@ -4897,6 +5002,10 @@
4897
5002
 	
4898
5003
 	void paste(boolean expand)
4899
5004
 	{
5005
+        if (Globals.REPLACEONMAKE)
5006
+            Save();
5007
+        boolean keep = Globals.REPLACEONMAKE;
5008
+        Globals.REPLACEONMAKE = false;
4900
5009
 	//	if (GrafreeD.clipboard == null)
4901
5010
 	//		return;
4902
5011
 		boolean first = true;
..
..
@@ -4956,6 +5065,7 @@
4956
5065
                         Grafreed.clipboard.get(0).parent = keepparent;
4957
5066
 		}
4958
5067
 		
5068
+        Globals.REPLACEONMAKE = keep;
4959
5069
 		ResetModel();
4960
5070
 		refreshContents();
4961
5071
 	}
..
..
@@ -5091,6 +5201,10 @@
5091
5201
         
5092
5202
 	void group(Object3D csg, boolean grab)
5093
5203
 	{
5204
+        if (Globals.REPLACEONMAKE)
5205
+            Save();
5206
+        boolean keep = Globals.REPLACEONMAKE;
5207
+        Globals.REPLACEONMAKE = false;
5094
5208
 		if (//false) // why??
5095
5209
                     !group.selection.isEmpty())
5096
5210
                 {
..
..
@@ -5204,10 +5318,15 @@
5204
5318
                 //node.add(csg);
5205
5319
 		//makeSomething(node);
5206
5320
 		makeSomething(csg);
5321
+        Globals.REPLACEONMAKE = keep;
5207
5322
 	}
5208
5323
 	
5209
5324
         void Ungroup(Object3D g)
5210
5325
         {
5326
+        if (Globals.REPLACEONMAKE)
5327
+            Save();
5328
+        boolean keep = Globals.REPLACEONMAKE;
5329
+        Globals.REPLACEONMAKE = false;
5211
5330
             if (g instanceof HiddenObject)
5212
5331
             {
5213
5332
                 HiddenObject h = (HiddenObject) g;
..
..
@@ -5224,6 +5343,7 @@
5224
5343
                     objEditor.makeSomething(g.get(i), false);
5225
5344
                 }
5226
5345
             }
5346
+        Globals.REPLACEONMAKE = keep;
5227
5347
         }
5228
5348
         
5229
5349
 	void ungroup()
..
..
@@ -5514,9 +5634,6 @@
5514
5634
 	
5515
5635
 	cButton restoreCameraButton;
5516
5636
         
5517
-	cButton minButton;
5518
-	cButton maxButton;
5519
-	cButton fullButton;
5520
5637
 	cButton saveButton;
5521
5638
 	cButton oneStepButton;
5522
5639
         
..
..
@@ -5590,7 +5707,7 @@
5590
5707
 	private MenuItem pasteLinkItem;
5591
5708
 	private MenuItem pasteCloneItem;
5592
5709
 	private MenuItem pasteExpandItem;
5593
-	private MenuItem clearItem;
5710
+	private MenuItem deleteItem;
5594
5711
 	private MenuItem clearAllItem;
5595
5712
 	private MenuItem genUVItem;
5596
5713
 	private MenuItem genNormalsMESHItem;