Pin button.

Normand Briere

2019-08-07 59de607850161a26863f92961d53caae7a2dabc8

 GroupEditor.java
..
..
@@ -16,6 +16,7 @@
16
16
 //import buoy.widget.BFileChooser;
17
17
 
18
18
 class GroupEditor extends ObjEditor implements //iParse, //iCallBack,
19
+    Grafreed.iResourceCallBack,
19
20
         ObjectUI,
20
21
         Runnable,
21
22
         ActionListener,
..
..
@@ -28,8 +29,8 @@
28
29
     {
29
30
         cButton skyboxButton;
30
31
         final String path = "cubemaps/" + f + "-skyboxes/" + s;
31
-        //row.add(skyboxButton = GetButton(path + "/" + s + ".jpg", !Grafreed.NIMBUSLAF));
32
-        row.add(skyboxButton = GetButton(path + "/negx.jpg", !Grafreed.NIMBUSLAF));
32
+        row.add(skyboxButton = GetButton(path + "/preview.jpg", !Grafreed.NIMBUSLAF));
33
+        //row.add(skyboxButton = GetButton(path + "/negx.jpg", !Grafreed.NIMBUSLAF));
33
34
         skyboxButton.setToolTipText(s);
34
35
         skyboxButton.addActionListener(new ActionListener()
35
36
         {
..
..
@@ -57,11 +58,12 @@
57
58
         cGridBag row6 = new cGridBag();
58
59
         
59
60
         AddSkyboxButton("default", "rgb", row0);
60
-        AddSkyboxButton("default", "cornell", row0);
61
-        AddSkyboxButton("default", "uffizi", row0);
62
-        AddSkyboxButton("default", "CloudyHills", row0);
63
-        
64
-        AddSkyboxButton("default", "skycube", row1);
61
+        //AddSkyboxButton("default", "cornell", row0);
62
+        AddSkyboxButton("penguins", "dust", row0);
63
+        AddSkyboxButton("penguins", "tropic", row0);
64
+        AddSkyboxButton("penguins", "yonder", row0);
65
+
66
+        AddSkyboxButton("default", "uffizi", row1);
65
67
         AddSkyboxButton("bridge", "Bridge", row1);
66
68
         AddSkyboxButton("bridge", "Bridge2", row1);
67
69
         AddSkyboxButton("urban", "GamlaStan2", row1);
..
..
@@ -73,23 +75,23 @@
73
75
         
74
76
         AddSkyboxButton("urban", "SaintLazarusChurch3", row3);
75
77
         AddSkyboxButton("urban", "UnionSquare", row3);
78
+        AddSkyboxButton("urban", "Medborgarplatsen", row3);
76
79
         AddSkyboxButton("park", "BerzeliiPark", row3);
77
-        AddSkyboxButton("park", "Buddha", row3);
78
80
         
81
+        AddSkyboxButton("park", "Buddha", row4);
79
82
         AddSkyboxButton("park", "CNTower2", row4);
80
83
         AddSkyboxButton("park", "NiagaraFalls1", row4);
81
84
         AddSkyboxButton("park", "NiagaraFalls3", row4);
82
-        AddSkyboxButton("park", "Park", row4);
83
85
         
86
+        AddSkyboxButton("park", "Park", row5);
84
87
         AddSkyboxButton("park", "Pond", row5);
85
88
         AddSkyboxButton("park", "Skansen", row5);
86
89
         AddSkyboxButton("park", "Skansen2", row5);
87
-        AddSkyboxButton("park", "Skansen3", row5);
88
90
         
91
+        AddSkyboxButton("park", "Skansen3", row6);
89
92
         AddSkyboxButton("park", "Skansen4", row6);
90
93
         AddSkyboxButton("park", "Skansen5", row6);
91
-        AddSkyboxButton("park", "Stairs", row6);
92
-        AddSkyboxButton("park", "Tantolunden4", row6);
94
+        AddSkyboxButton("persson", "VancouverConventionCentre", row6);
93
95
         
94
96
         tab0.add(row0);
95
97
         tab0.add(row1);
..
..
@@ -140,24 +142,29 @@
140
142
         AddSkyboxButton("forest", "Langholmen2", row3);
141
143
         AddSkyboxButton("forest", "Plants", row3);
142
144
         AddSkyboxButton("mountain", "Maskonaive", row3);
145
+        
143
146
         AddSkyboxButton("mountain", "Maskonaive2", row4);
144
-        
145
147
         AddSkyboxButton("mountain", "Maskonaive3", row4);
146
-        AddSkyboxButton("mountain", "Ryfjallet", row4);
147
-        AddSkyboxButton("mountain", "Teide", row4);        
148
+        AddSkyboxButton("mountain", "Teide", row4);
149
+        AddSkyboxButton("park", "Tantolunden4", row4);
148
150
         
151
+        AddSkyboxButton("park", "Stairs", row5);
152
+        AddSkyboxButton("default", "skycube", row6);
149
153
         AddSkyboxButton("rocky", "Langholmen", row5);
150
-        AddSkyboxButton("rocky", "Riddarfjarden", row5);
151
154
         AddSkyboxButton("rocky", "Skinnarviksberget", row5);
155
+        
152
156
         AddSkyboxButton("rocky", "Tantolunden6", row5);
157
+        AddSkyboxButton("default", "CloudyHills", row6);
158
+        AddSkyboxButton("daz", "Autumn", row6);
159
+        AddSkyboxButton("daz", "MountainTrail", row6);
153
160
         /*
154
-Kastellholmen
155
-Langholmen
156
-Riddarfjarden
157
-Skinnarviksberget
158
-Tanto
159
-Tantolunden2
160
-Tantolunden6
161
+Autumn
162
+Greenlands
163
+MountainTrail
164
+Oasis
165
+TheRock
166
+TopOfTheWorld
167
+Winter
161
168
          */
162
169
         
163
170
         tab0.add(row0);
..
..
@@ -197,39 +204,33 @@
197
204
         
198
205
         AddSkyboxButton("urban", "CNTower", row1);
199
206
         AddSkyboxButton("bridge", "ArstaBridge", row1);
200
-        AddSkyboxButton("indoors", "DallasW", row1);
201
-        AddSkyboxButton("indoors", "MarriottMadisonWest", row1);
207
+        AddSkyboxButton("rocky", "Riddarfjarden", row1);
208
+        AddSkyboxButton("penguins", "sleepyhollow", row1);
202
209
         
210
+        AddSkyboxButton("penguins", "kenon_star", row2);
211
+        AddSkyboxButton("persson", "corona", row2);
212
+        AddSkyboxButton("persson", "spaceskybox", row2);
203
213
         AddSkyboxButton("indoors", "Vasa", row2);
204
-        AddSkyboxButton("winter", "Backyard", row2);
205
-        AddSkyboxButton("winter", "Creek", row2);
206
-        AddSkyboxButton("winter", "FootballField3", row2);
207
214
         
215
+        AddSkyboxButton("winter", "Backyard", row3);
216
+        AddSkyboxButton("winter", "Creek", row3);
217
+        AddSkyboxButton("winter", "FootballField3", row3);
208
218
         AddSkyboxButton("winter", "Forest", row3);
209
-        AddSkyboxButton("winter", "HornstullsStrand2", row3);
210
-        AddSkyboxButton("winter", "House", row3);
211
-        AddSkyboxButton("winter", "IceLake", row3);
212
219
         
220
+        AddSkyboxButton("winter", "HornstullsStrand2", row4);
221
+        AddSkyboxButton("winter", "House", row4);
222
+        AddSkyboxButton("winter", "IceLake", row4);
213
223
         AddSkyboxButton("winter", "IceRiver", row4);
214
-        AddSkyboxButton("winter", "Park3", row4);
215
-        AddSkyboxButton("winter", "PondWinter", row4);
216
224
         
225
+        AddSkyboxButton("winter", "Park3", row5);
226
+        AddSkyboxButton("winter", "PondWinter", row5);
217
227
         AddSkyboxButton("winter", "Tantolunden5", row5);
218
228
         AddSkyboxButton("winter", "Vindelalven", row5);
219
-        /*
220
-Backyard
221
-Creek
222
-FootballField3
223
-Forest
224
-HornstullsStrand2
225
-House
226
-IceLake
227
-IceRiver
228
-Park3
229
-PondWinter
230
-Tantolunden5
231
-Vindelalven         * 
232
-         */
229
+        
230
+        AddSkyboxButton("daz", "TheRock", row6);
231
+        AddSkyboxButton("daz", "TopOfTheWorld", row6);
232
+        AddSkyboxButton("daz", "Winter", row6);
233
+        AddSkyboxButton("mountain", "Ryfjallet", row6);
233
234
         
234
235
         tab0.add(row0);
235
236
         tab0.add(row1);
..
..
@@ -245,13 +246,90 @@
245
246
             //tab0.add(new cGridBag());
246
247
         }
247
248
     }
248
-    
249
-    public void ChangeSkybox(String name)
249
+
250
+    public void AddSkyboxTab3(JTabbedPane skyboxpanel)
250
251
     {
251
-        cameraView.envyoff = false;
252
-        cameraView.skyboxname = name;
253
-        cameraView.skyboxext = "jpg";
252
+        cGridBag tab0 = new cGridBag().setVertical(true);
253
+        
254
+        tab0.setName("Others");
255
+        skyboxpanel.add(tab0);
256
+
257
+        cGridBag row0 = new cGridBag();
258
+        cGridBag row1 = new cGridBag();
259
+        cGridBag row2 = new cGridBag();
260
+        cGridBag row3 = new cGridBag();
261
+        cGridBag row4 = new cGridBag();
262
+        cGridBag row5 = new cGridBag();
263
+        cGridBag row6 = new cGridBag();
264
+        
265
+        AddSkyboxButton("mayhem", "afterrain", row0);
266
+        AddSkyboxButton("mayhem", "aqua4", row0);
267
+        AddSkyboxButton("mayhem", "aqua9", row0);
268
+        AddSkyboxButton("mayhem", "flame", row0);
269
+        
270
+        AddSkyboxButton("mayhem", "h2s", row1);
271
+        AddSkyboxButton("mayhem", "prehistoric", row1);
272
+        AddSkyboxButton("mayhem", "scorched", row1);
273
+        AddSkyboxButton("penguins", "desertdawn", row1);
274
+        
275
+        AddSkyboxButton("persson", "Citadella", row2);
276
+        AddSkyboxButton("persson", "Citadella2", row2);
277
+        AddSkyboxButton("persson", "clouds1", row2);
278
+        AddSkyboxButton("penguins", "wrath", row2);
279
+        
280
+        AddSkyboxButton("persson", "FishermansBastion", row3);
281
+        AddSkyboxButton("persson", "HeroesSquare", row3);
282
+        AddSkyboxButton("indoors", "DallasW", row3);
283
+        AddSkyboxButton("indoors", "MarriottMadisonWest", row3);
284
+        
285
+        AddSkyboxButton("persson", "LancellottiChapel", row4);
286
+        AddSkyboxButton("persson", "PereaBeach1", row4);
287
+        AddSkyboxButton("persson", "PereaBeach2", row4);
288
+        AddSkyboxButton("persson", "redeclipse", row4);
289
+        
290
+        AddSkyboxButton("daz", "Greenlands", row5);
291
+        AddSkyboxButton("daz", "Oasis", row5);
292
+        AddSkyboxButton("elyvisions", "arch3", row5);
293
+        AddSkyboxButton("elyvisions", "calm_sea", row5);
294
+        
295
+        AddSkyboxButton("elyvisions", "rainbow", row6);
296
+        AddSkyboxButton("elyvisions", "distant_sunset", row6);
297
+        AddSkyboxButton("elyvisions", "heaven", row6);
298
+        AddSkyboxButton("elyvisions", "hot", row6);
299
+        
300
+        tab0.add(row0);
301
+        tab0.add(row1);
302
+        tab0.add(row2);
303
+        tab0.add(row3);
304
+        tab0.add(row4);
305
+        tab0.add(row5);
306
+        tab0.add(row6);
307
+        
308
+        for (int i=5; --i>=0;)
309
+        {
310
+            //oe.toolboxPanel.Return();
311
+            //tab0.add(new cGridBag());
312
+        }
313
+    }
314
+        
315
+    public void CallBack(String[] path)
316
+    {
317
+        for (int i = 0; i < path.length; i++)
318
+        {
319
+            System.out.print(path[i] + "/");
320
+        }
321
+        
322
+        System.out.println();
323
+    }
324
+    
325
+    public void ChangeSkybox(String skybox)
326
+    {
327
+        //cameraView.envyoff = false;
328
+        group.skyboxname = skybox;
329
+        group.skyboxext = "jpg";
254
330
         cameraView.repaint();
331
+
332
+        Grafreed.ParseResources("textures", this);
255
333
     }
256
334
     
257
335
     //ObjEditor objEditor;
..
..
@@ -291,9 +369,9 @@
291
369
 		this.copy = this.group = group;
292
370
 		//selectees = this.group.selectees;
293
371
 		
294
-        if (copy.versions == null)
372
+        if (copy.versionlist == null)
295
373
         {
296
-            copy.versions = new byte[100][];
374
+            copy.versionlist = new Object3D[100];
297
375
             copy.versionindex = -1;
298
376
         }
299
377
         
..
..
@@ -318,9 +396,9 @@
318
396
                 
319
397
                 ((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
320
398
                 
321
-        if (copy.versions == null)
399
+        if (copy.versionlist == null)
322
400
         {
323
-            copy.versions = new byte[100][];
401
+            copy.versionlist = new Object3D[100];
324
402
             copy.versionindex = -1;
325
403
             
326
404
             Save(true);
..
..
@@ -866,32 +944,36 @@
866
944
                 restoreCameraButton.setToolTipText("Restore viewpoint");
867
945
 		restoreCameraButton.addActionListener(this);
868
946
                 
869
-		copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
870
-                saveButton.setToolTipText("New version");
871
-		saveButton.addActionListener(this);
947
+		copyOptionsPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
948
+                saveVersionButton.setToolTipText("Duplicate current version");
949
+		saveVersionButton.addActionListener(this);
872
950
                                                 
873
-		copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
874
-                undoButton.setToolTipText("Previous version");
875
-		undoButton.addActionListener(this);
876
-                undoButton.setEnabled(false);
951
+		copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
952
+                deleteVersionButton.setToolTipText("Delete current version");
953
+		deleteVersionButton.addActionListener(this);
954
+                                                
955
+		copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
956
+                previousVersionButton.setToolTipText("Previous version");
957
+		previousVersionButton.addActionListener(this);
958
+                previousVersionButton.setEnabled(false);
877
959
                 
878
960
                 cGridBag updown = new cGridBag().setVertical(true);
879
961
 		updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
880
-                restoreButton.setToolTipText("Restore current");
962
+                restoreButton.setToolTipText("Undo (restore current version)");
881
963
 		restoreButton.addActionListener(this);
882
-                restoreButton.setEnabled(false);
964
+                //restoreButton.setEnabled(false);
883
965
                 
884
966
 		updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
885
-                replaceButton.setToolTipText("Replace current");
967
+                replaceButton.setToolTipText("Save (replace current version)");
886
968
 		replaceButton.addActionListener(this);
887
-                replaceButton.setEnabled(false);
969
+                //replaceButton.setEnabled(false);
888
970
                 
889
971
                 copyOptionsPanel.add(updown);
890
972
                 
891
-		copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
892
-                redoButton.setToolTipText("Next version");
893
-		redoButton.addActionListener(this);
894
-                redoButton.setEnabled(false);
973
+		copyOptionsPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
974
+                nextVersionButton.setToolTipText("Next version");
975
+		nextVersionButton.addActionListener(this);
976
+                nextVersionButton.setEnabled(false);
895
977
                 
896
978
                 oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
897
979
                 liveCB.setToolTipText("Enable animation");
..
..
@@ -1029,7 +1111,7 @@
1029
1111
                 cGridBag skyboxpane = new cGridBag();
1030
1112
                 skyboxpane.preferredHeight = 100;
1031
1113
                 
1032
-                oe.toolboxPanel.add(skyboxpane);
1114
+                oe.skyboxPanel.add(skyboxpane);
1033
1115
                 
1034
1116
                 JTabbedPane skyboxpanel = new JTabbedPane();
1035
1117
                 skyboxpane.add(skyboxpanel);
..
..
@@ -1037,6 +1119,7 @@
1037
1119
                 AddSkyboxTab0(skyboxpanel);
1038
1120
                 AddSkyboxTab1(skyboxpanel);
1039
1121
                 AddSkyboxTab2(skyboxpanel);
1122
+                AddSkyboxTab3(skyboxpanel);
1040
1123
                 
1041
1124
                 // EDIT panel
1042
1125
 		editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..
..
@@ -1044,20 +1127,20 @@
1044
1127
 		editButton.addActionListener(this);
1045
1128
 
1046
1129
 		editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1047
-                uneditButton.setToolTipText("Remove selection controls");
1130
+                uneditButton.setToolTipText("Unpin and remove selection controls");
1048
1131
 		uneditButton.addActionListener(this);
1049
1132
 
1050
1133
 		editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
1051
1134
                 allParamsButton.setToolTipText("Show all controle");
1052
1135
 		allParamsButton.addActionListener(this);
1053
1136
 
1054
-		editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1137
+		editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1055
1138
                 clearPanelButton.setToolTipText("Clear edit panel");
1056
1139
 		clearPanelButton.addActionListener(this);
1057
1140
 
1058
-		editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1059
-                unselectButton.setToolTipText("Unselect");
1060
-		unselectButton.addActionListener(this);
1141
+		//editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1142
+                //unselectButton.setToolTipText("Unselect");
1143
+		//unselectButton.addActionListener(this);
1061
1144
 
1062
1145
 		editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1063
1146
                 flashSelectionButton.setToolTipText("Highlight selection");
..
..
@@ -1117,7 +1200,7 @@
1117
1200
 		dgr.addDragGestureListener(this);
1118
1201
 		}catch(Exception e) {}
1119
1202
 		*/
1120
-        radio.layout = sixButton; // sevenButton;
1203
+        radio.layout = threeButton; // sixButton;
1121
1204
         oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
1122
1205
 	}
1123
1206
         
..
..
@@ -1168,9 +1251,12 @@
1168
1251
                 smoothCB.setToolTipText("Snapping delay");
1169
1252
                                 smoothCB.addItemListener(this);
1170
1253
 
1171
-                panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
1172
-                slowCB.setToolTipText("Smooth interpolation");
1173
-                                slowCB.addItemListener(this);
1254
+//                panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
1255
+//                slowCB.setToolTipText("Smooth interpolation");
1256
+//                                slowCB.addItemListener(this);
1257
+                panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
1258
+                minshaderCB.setToolTipText("Minimal fast shader");
1259
+                                minshaderCB.addItemListener(this);
1174
1260
                                 
1175
1261
 //        	constraints.gridy += 1;
1176
1262
 //                panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
..
..
@@ -1259,7 +1345,7 @@
1259
1345
             }
1260
1346
             
1261
1347
             radioButton.SetObject(obj);
1262
-            radioButton.layout = sixButton; // sevenButton;
1348
+            radioButton.layout = threeButton; // sixButton;
1263
1349
             radioButton.SetCamera(cameraView.renderCamera, false);
1264
1350
             radioButton.addActionListener(this);
1265
1351
             radioPanel.add(radioButton);
..
..
@@ -1284,6 +1370,8 @@
1284
1370
         cCheckBox localCB;
1285
1371
         cCheckBox crowdCB;
1286
1372
         cCheckBox smoothCB;
1373
+        cCheckBox minshaderCB;
1374
+        
1287
1375
         cToggleButton fastCB;
1288
1376
         cCheckBox slowCB;
1289
1377
         cCheckBox boxCB;
..
..
@@ -1354,6 +1442,12 @@
1354
1442
             {
1355
1443
                 cameraView.ToggleInertia();
1356
1444
         cameraView.repaint();
1445
+            }
1446
+            else if(e.getSource() == minshaderCB)
1447
+            {
1448
+                Globals.MINSHADER ^= true;
1449
+                cameraView.programInitialized = false;
1450
+                cameraView.repaint();
1357
1451
             }
1358
1452
             else if(e.getSource() == localCB)
1359
1453
             {
..
..
@@ -2494,7 +2588,7 @@
2494
2588
 		if (source == invariantsItem)
2495
2589
 		{
2496
2590
                     System.out.println("Invariants:");
2497
-                    Grafreed.grafreeD.universe.invariants();
2591
+                    Grafreed.grafreed.universe.invariants();
2498
2592
 		} else
2499
2593
 		if (source == memoryItem)
2500
2594
 		{
..
..
@@ -2525,33 +2619,40 @@
2525
2619
 		{
2526
2620
 			ToggleFullScreen();
2527
2621
 		} else
2528
-		if (source == undoButton)
2622
+		if (source == previousVersionButton)
2529
2623
 		{
2530
2624
                         // Go to previous version
2531
2625
 			//if (!Undo())
2532
2626
                             //java.awt.Toolkit.getDefaultToolkit().beep();
2533
-			Undo();
2627
+			PreviousVersion();
2534
2628
 		} else
2535
2629
 		if (source == restoreButton)
2536
2630
 		{
2537
2631
                         // Restore current version
2538
2632
 			Restore();
2633
+        //restoreButton.setEnabled(false);
2539
2634
 		} else
2540
2635
 		if (source == replaceButton)
2541
2636
 		{
2542
2637
                         // Overwrite current version
2543
2638
 			Replace();
2639
+        //replaceButton.setEnabled(false);
2544
2640
 		} else
2545
-		if (source == redoButton)
2641
+		if (source == nextVersionButton)
2546
2642
 		{
2547
2643
                         // Go to next version
2548
-			Redo();
2644
+			NextVersion();
2549
2645
 		} else
2550
-		if (source == saveButton)
2646
+		if (source == saveVersionButton)
2551
2647
 		{
2552
2648
                         // Save a new version
2553
2649
 			if (!Save(true))
2554
2650
                             java.awt.Toolkit.getDefaultToolkit().beep();
2651
+		} else
2652
+		if (source == deleteVersionButton)
2653
+		{
2654
+                        // Delete a new version
2655
+                        DeleteVersion();
2555
2656
 		} else
2556
2657
 		if (source == oneStepButton)
2557
2658
 		{
..
..
@@ -2606,11 +2707,11 @@
2606
2707
 		} else
2607
2708
 		if (source == undoItem)
2608
2709
 		{
2609
-			Undo();
2710
+			PreviousVersion();
2610
2711
 		} else
2611
2712
 		if (source == redoItem)
2612
2713
 		{
2613
-			Redo();
2714
+			NextVersion();
2614
2715
 		} else
2615
2716
 		if (source == duplicateItem)
2616
2717
 		{
..
..
@@ -3743,10 +3844,10 @@
3743
3844
 			{
3744
3845
 				Object3D child = (Object3D)e.nextElement();
3745
3846
                                 if(child.editWindow != null)
3746
-                                    objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3747
3847
                                 child.pinned = false;
3748
3848
 				child.CloseUI();
3749
3849
                                 listUI.remove(child);
3850
+//                                    objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3750
3851
                                 
3751
3852
                                 //child.editWindow = null; // ???????????
3752
3853
 			}
..
..
@@ -3765,6 +3866,7 @@
3765
3866
                         obj.CloseUI();
3766
3867
                     }
3767
3868
                     listUI.clear();
3869
+                    SetPinStates(group.selection.size() > 0);
3768
3870
                     refreshContents(true);
3769
3871
 		} else
3770
3872
 		if (source == allParamsButton)
..
..
@@ -3851,6 +3953,7 @@
3851
3953
                     radio.layout.doClick();
3852
3954
                     
3853
3955
                     ClearUnpinned();
3956
+                    
3854
3957
                     //Grafreed.Assert(group != null);
3855
3958
                     //Grafreed.Assert(group.selection != null);
3856
3959
                     SetPinStates(group.selection == null || group.selection.size() > 0);
..
..
@@ -3867,11 +3970,13 @@
3867
3970
                 } else if (event.getSource() == editCameraItem)
3868
3971
                 {
3869
3972
                     cameraView.ProtectCamera();
3973
+                    cameraView.requestFocusInWindow();
3870
3974
                     cameraView.repaint();
3871
3975
                     return;
3872
3976
                 } else if (event.getSource() == restoreCameraItem || event.getSource() == restoreCameraButton)
3873
3977
                 {
3874
3978
                     cameraView.RevertCamera();
3979
+                    cameraView.requestFocusInWindow();
3875
3980
                     cameraView.repaint();
3876
3981
                     return;
3877
3982
         //        } else if (event.getSource() == textureButton)
..
..
@@ -5004,9 +5109,7 @@
5004
5109
 		
5005
5110
 		freezemodel = false;
5006
5111
 	}
5007
-	
5008
-        boolean flashIt = true;
5009
-        
5112
+	        
5010
5113
 	public void valueChanged(TreeSelectionEvent e)
5011
5114
 	//public boolean handleEvent(Event event)
5012
5115
 	{
..
..
@@ -5079,13 +5182,15 @@
5079
5182
         {
5080
5183
             editButton.setEnabled(enabled);
5081
5184
             uneditButton.setEnabled(enabled);
5082
-            unselectButton.setEnabled(enabled);
5185
+            //unselectButton.setEnabled(enabled);
5083
5186
             flashSelectionButton.setEnabled(enabled);
5187
+            
5188
+            clearPanelButton.setEnabled(!listUI.isEmpty());
5084
5189
         }
5085
5190
 
5086
5191
         void refreshContents(boolean cp)
5087
5192
         {
5088
-            if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
5193
+            //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
5089
5194
             if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
5090
5195
             {
5091
5196
                 objEditor.ClearInfo(); // .GetMaterial());
..
..
@@ -5921,7 +6026,6 @@
5921
6026
 	
5922
6027
 	cButton restoreCameraButton;
5923
6028
         
5924
-	cButton saveButton;
5925
6029
 	cButton oneStepButton;
5926
6030
         
5927
6031
         cButton groupButton;