Minor tuning

Normand Briere

2019-08-22 6a145f6c81dfcbe0653eda27d042efb48daa7512

 GroupEditor.java
..
..
@@ -29,7 +29,7 @@
29
29
     {
30
30
         cButton skyboxButton;
31
31
         final String path = "cubemaps/" + f + "-skyboxes/" + s;
32
-        row.add(skyboxButton = GetButton(path + "/preview.jpg", !Grafreed.NIMBUSLAF));
32
+        row.add(skyboxButton = GetButton(path + "/preview.jpg", !Globals.NIMBUSLAF));
33
33
         //row.add(skyboxButton = GetButton(path + "/negx.jpg", !Grafreed.NIMBUSLAF));
34
34
         skyboxButton.setToolTipText(s.equals("") ? "No background" : s);
35
35
         skyboxButton.addActionListener(new ActionListener()
..
..
@@ -46,7 +46,7 @@
46
46
     {
47
47
         cButton textureButton;
48
48
         final String path = "textures/" + f + "/" + c + "/"; // + t;
49
-        row.add(textureButton = GetButton(path + "icons/" + t, !Grafreed.NIMBUSLAF));
49
+        row.add(textureButton = GetButton(path + "icons/" + t, !Globals.NIMBUSLAF));
50
50
         textureButton.setToolTipText(c + count);
51
51
         textureButton.addActionListener(new ActionListener()
52
52
         {
..
..
@@ -347,7 +347,7 @@
347
347
 
348
348
     public void CreateSkyboxPanel(cGridBag skyboxPanel)
349
349
     {
350
-        JTabbedPane skyboxpane = new JTabbedPane();
350
+        JTabbedPane skyboxpane = new JTabbedPane(JTabbedPane.LEFT);
351
351
         
352
352
         AddSkyboxTab0(skyboxpane);
353
353
         AddSkyboxTab1(skyboxpane);
..
..
@@ -415,12 +415,14 @@
415
415
 		this.copy = this.group = group;
416
416
 		//selectees = this.group.selectees;
417
417
 		
418
+                assert(false);
419
+                
418
420
         if (copy.versionlist == null)
419
421
         {
420
422
             copy.versionlist = new Object3D[100];
421
423
             copy.versionindex = -1;
422
424
             
423
-            Save(true);
425
+            //Save(true);
424
426
         }
425
427
         
426
428
 		if(ui)
..
..
@@ -449,7 +451,7 @@
449
451
             copy.versionlist = new Object3D[100];
450
452
             copy.versionindex = -1;
451
453
             
452
-            Save(true);
454
+            //Save(true);
453
455
         }
454
456
 	}
455
457
 
..
..
@@ -855,9 +857,9 @@
855
857
 		hideleavesItem.addActionListener(this);
856
858
 		showleavesItem = menu.add(new MenuItem("Show Leaves"));
857
859
 		showleavesItem.addActionListener(this);
858
-		markleavesItem = menu.add(new MenuItem("Mark Leaves"));
860
+		markleavesItem = menu.add(new MenuItem("Anim Leaves"));
859
861
 		markleavesItem.addActionListener(this);
860
-		unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
862
+		unmarkleavesItem = menu.add(new MenuItem("Unanim Leaves"));
861
863
 		unmarkleavesItem.addActionListener(this);
862
864
 		rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
863
865
 		rewindleavesItem.addActionListener(this);
..
..
@@ -934,6 +936,8 @@
934
936
         cGridBag currenttab;
935
937
         //boolean added; // patch for jar
936
938
                 
939
+        int totalcount = 0;
940
+        
937
941
         int tabcount = 0;
938
942
         int colcount = 0;
939
943
         int rowcount = 0;
..
..
@@ -962,7 +966,7 @@
962
966
             texturecount = 0;
963
967
         }
964
968
         
965
-        if (path.length > 2 && path[2].toLowerCase().endsWith(".jpg"))
969
+        if (path.length > 2 && (path[2].toLowerCase().endsWith(".jpg") || path[2].toLowerCase().endsWith(".png")))
966
970
         {
967
971
             //if (!added)
968
972
             {
..
..
@@ -971,7 +975,8 @@
971
975
                 currenttab = (cGridBag)resourcecontainer.getComponentAt(resourcecontainer.indexOfTab(tabname));
972
976
             }
973
977
             
974
-            AddTextureButton(path[0], path[1], path[2], texturecount++, currenttab);
978
+            AddTextureButton(path[0], path[1], path[2], ++texturecount, currenttab);
979
+            totalcount++;
975
980
             
976
981
             if (++colcount >= columns)
977
982
             {
..
..
@@ -997,6 +1002,8 @@
997
1002
             container.add(resourcecontainer);
998
1003
             
999
1004
             Grafreed.ParseResources("textures", this);
1005
+            
1006
+            // 935. System.out.println("Total = " + totalcount);
1000
1007
         }
1001
1008
         
1002
1009
 	void SetupUI2(ObjEditor oe)
..
..
@@ -1036,9 +1043,9 @@
1036
1043
         oe.radioPanel.add(dummyButton);
1037
1044
         oe.buttonGroup.add(dummyButton);
1038
1045
          */
1039
-                cGridBag copyOptionsPanel = new cGridBag();
1046
+                cGridBag versionManagerPanel = new cGridBag();
1040
1047
                                         
1041
-                copyOptionsPanel.preferredHeight = 2;
1048
+                versionManagerPanel.preferredHeight = 4;
1042
1049
                 
1043
1050
                 //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
1044
1051
                 
..
..
@@ -1065,25 +1072,25 @@
1065
1072
 //                        }
1066
1073
 //                });
1067
1074
                 
1068
-		oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1075
+		oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1069
1076
                 collapseButton.setToolTipText("Collapse toolbar");
1070
1077
 		collapseButton.addActionListener(this);
1071
1078
                 
1072
-		oe.toolbarPanel.add(maximize3DButton = GetButton("icons/empty.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1079
+		oe.toolbarPanel.add(maximize3DButton = GetButton("icons/square.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1073
1080
                 maximize3DButton.setToolTipText("Maximize 3D view");
1074
1081
 		maximize3DButton.addActionListener(this);
1075
1082
                 
1076
-		oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1083
+		oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1077
1084
                 twoButton.setToolTipText("Show 3D view only");
1078
1085
 		twoButton.addActionListener(this);
1079
1086
                 this.fullscreenLayout = twoButton;
1080
1087
                 
1081
-		oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1088
+		oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1082
1089
                 threeButton.setToolTipText("Show controls and 3D view");
1083
1090
 		threeButton.addActionListener(this);
1084
1091
                 if (Globals.ADVANCED)
1085
1092
                 {
1086
-		oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1093
+		oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1087
1094
                 sixButton.setToolTipText("Show 3D view and controls");
1088
1095
 		sixButton.addActionListener(this);
1089
1096
                 }
..
..
@@ -1092,50 +1099,51 @@
1092
1099
 //		sevenButton.addActionListener(this);
1093
1100
                 //
1094
1101
                 
1095
-		oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1102
+		oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1096
1103
                 fullButton.setToolTipText("Full-screen window");
1097
1104
 		fullButton.addActionListener(this);
1098
1105
                 
1099
-		oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1106
+		oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1100
1107
                 screenfitButton.setToolTipText("Screen fit");
1101
1108
 		screenfitButton.addActionListener(this);
1102
1109
 
1103
-		oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1110
+		oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1104
1111
                 restoreCameraButton.setToolTipText("Restore viewpoint");
1105
1112
 		restoreCameraButton.addActionListener(this);
1106
1113
                 
1107
-		copyOptionsPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1114
+		versionManagerPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1108
1115
                 saveVersionButton.setToolTipText("Duplicate current version");
1109
1116
 		saveVersionButton.addActionListener(this);
1110
1117
                                                 
1111
-		copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1118
+		versionManagerPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1112
1119
                 deleteVersionButton.setToolTipText("Delete current version");
1113
1120
 		deleteVersionButton.addActionListener(this);
1121
+                deleteVersionButton.setEnabled(false);
1114
1122
                                                 
1115
-		copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1123
+		versionManagerPanel.add(previousVersionButton = GetButton("icons/undo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1116
1124
                 previousVersionButton.setToolTipText("Previous version");
1117
1125
 		previousVersionButton.addActionListener(this);
1118
1126
                 previousVersionButton.setEnabled(false);
1119
1127
                 
1120
1128
                 cGridBag updown = new cGridBag().setVertical(true);
1121
-		updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1129
+		updown.add(restoreButton = GetButton("icons/restore.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1122
1130
                 restoreButton.setToolTipText("Undo (restore current version)");
1123
1131
 		restoreButton.addActionListener(this);
1124
-                //restoreButton.setEnabled(false);
1132
+                restoreButton.setEnabled(false);
1125
1133
                 
1126
-		updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1134
+		updown.add(replaceButton = GetButton("icons/replace.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1127
1135
                 replaceButton.setToolTipText("Save (replace current version)");
1128
1136
 		replaceButton.addActionListener(this);
1129
-                //replaceButton.setEnabled(false);
1137
+                replaceButton.setEnabled(false);
1130
1138
                 
1131
-                copyOptionsPanel.add(updown);
1139
+                versionManagerPanel.add(updown);
1132
1140
                 
1133
-		copyOptionsPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1141
+		versionManagerPanel.add(nextVersionButton = GetButton("icons/redo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1134
1142
                 nextVersionButton.setToolTipText("Next version");
1135
1143
 		nextVersionButton.addActionListener(this);
1136
1144
                 nextVersionButton.setEnabled(false);
1137
1145
                 
1138
-		oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1146
+		oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1139
1147
                 oneStepButton.setToolTipText("Animate one step forward");
1140
1148
 		oneStepButton.addActionListener(this);
1141
1149
                 
..
..
@@ -1158,11 +1166,11 @@
1158
1166
 
1159
1167
                 if (Globals.ADVANCED)
1160
1168
                 {
1161
-                        oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1169
+                        oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1162
1170
                         snapobjectButton.addActionListener(this);
1163
1171
                         snapobjectButton.setToolTipText("Snap Object");
1164
1172
                         
1165
-		oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1173
+		oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1166
1174
 		fourButton.addActionListener(this);
1167
1175
                 fourButton.setToolTipText("Show control panel only");
1168
1176
                 }
..
..
@@ -1170,11 +1178,11 @@
1170
1178
 		//oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
1171
1179
                 
1172
1180
 
1173
-		oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1181
+		oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1174
1182
                 rootButton.setToolTipText("Open selection in new tab");
1175
1183
 		rootButton.addActionListener(this);
1176
1184
 
1177
-                oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1185
+                oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1178
1186
                 closeButton.setToolTipText("Close tab");
1179
1187
 		closeButton.addActionListener(this);
1180
1188
 		//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
..
..
@@ -1183,38 +1191,38 @@
1183
1191
                 cGridBag row1 = new cGridBag();
1184
1192
                 
1185
1193
                 // INSERT
1186
-                row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1194
+                row1.add(gridButton = GetButton("icons/grid.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1187
1195
                 gridButton.setToolTipText("Create ground");
1188
1196
                                 gridButton.addActionListener(this);
1189
1197
 
1190
-                row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1198
+                row1.add(boxButton = GetButton("icons/box.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1191
1199
                 boxButton.setToolTipText("Create box");
1192
1200
                                 boxButton.addActionListener(this);
1193
1201
 
1194
-                row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1202
+                row1.add(superButton = GetButton("icons/super.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1195
1203
                 superButton.setToolTipText("Create superellipsoid");
1196
1204
                                 superButton.addActionListener(this);
1197
1205
 
1198
-                row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1206
+                row1.add(sphereButton = GetButton("icons/sphere.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1199
1207
                 sphereButton.setToolTipText("Create sphere");
1200
1208
                                 sphereButton.addActionListener(this);
1201
1209
 
1202
-                row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1210
+                row1.add(coneButton = GetButton("icons/cone.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1203
1211
                 coneButton.setToolTipText("Create cone");
1204
1212
                                 coneButton.addActionListener(this);
1205
1213
 
1206
-                row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1214
+                row1.add(torusButton = GetButton("icons/torus.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1207
1215
                 torusButton.setToolTipText("Create torus");
1208
1216
                                 torusButton.addActionListener(this);
1209
1217
 
1210
1218
                 if (Globals.ADVANCED)
1211
1219
                 {
1212
-                    oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1220
+                    oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1213
1221
                     kleinButton.setToolTipText("Create Klein bottle");
1214
1222
                                     kleinButton.addActionListener(this);
1215
1223
                 }
1216
1224
                 
1217
-                row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1225
+                row1.add(particlesButton = GetButton("icons/particles.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1218
1226
                 particlesButton.setToolTipText("Create particle system");
1219
1227
                                particlesButton.addActionListener(this);
1220
1228
 
..
..
@@ -1222,31 +1230,31 @@
1222
1230
                 
1223
1231
                 cGridBag row2 = new cGridBag();
1224
1232
                 
1225
-                row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1233
+                row2.add(groupButton = GetButton("icons/group.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1226
1234
                 groupButton.setToolTipText("Create group");
1227
1235
                                groupButton.addActionListener(this);
1228
1236
 
1229
-                row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1237
+                row2.add(compositeButton = GetButton("icons/composite.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1230
1238
                 compositeButton.setToolTipText("Create composite");
1231
1239
                                compositeButton.addActionListener(this);
1232
1240
 
1233
-                row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1241
+                row2.add(switchButton = GetButton("icons/switch.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1234
1242
                 switchButton.setToolTipText("Create item switcher");
1235
1243
                                switchButton.addActionListener(this);
1236
1244
 
1237
-                row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1245
+                row2.add(loopButton = GetButton("icons/loop.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1238
1246
                 loopButton.setToolTipText("Create loop");
1239
1247
                                loopButton.addActionListener(this);
1240
1248
 
1241
-                row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1249
+                row2.add(textureButton = GetButton("icons/texture.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1242
1250
                 textureButton.setToolTipText("Create texture");
1243
1251
                                textureButton.addActionListener(this);
1244
1252
 
1245
-                row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1253
+                row2.add(overlayButton = GetButton("icons/overlay.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1246
1254
                 overlayButton.setToolTipText("Create overlay");
1247
1255
                                overlayButton.addActionListener(this);
1248
1256
 
1249
-                row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1257
+                row2.add(lightButton = GetButton("icons/light-bulb.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1250
1258
                 lightButton.setToolTipText("Create light");
1251
1259
                                lightButton.addActionListener(this);
1252
1260
 
..
..
@@ -1256,6 +1264,11 @@
1256
1264
                 
1257
1265
                 CreateTexturePanel(textures);
1258
1266
                 
1267
+                int tabCount = resourcecontainer.getTabCount();
1268
+                
1269
+                if (tabCount > 0)
1270
+                    resourcecontainer.setSelectedIndex((int)(Math.random() * tabCount));
1271
+                
1259
1272
                 oe.toolboxPanel.add(textures);
1260
1273
                 
1261
1274
                 textures.preferredHeight = 100;
..
..
@@ -1263,11 +1276,11 @@
1263
1276
                 CreateSkyboxPanel(oe.skyboxPanel);
1264
1277
                 
1265
1278
                 // EDIT panel
1266
-		editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1279
+		editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1267
1280
                 editButton.setToolTipText("Pin selection controls");
1268
1281
 		editButton.addActionListener(this);
1269
1282
 
1270
-		editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1283
+		editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1271
1284
                 uneditButton.setToolTipText("Unpin and remove selection controls");
1272
1285
 		uneditButton.addActionListener(this);
1273
1286
 
..
..
@@ -1275,7 +1288,7 @@
1275
1288
                 allParamsButton.setToolTipText("Show all controls");
1276
1289
 		allParamsButton.addActionListener(this);
1277
1290
 
1278
-		editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1291
+		editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1279
1292
                 clearPanelButton.setToolTipText("Clear all controls");
1280
1293
 		clearPanelButton.addActionListener(this);
1281
1294
 
..
..
@@ -1283,7 +1296,7 @@
1283
1296
                 //unselectButton.setToolTipText("Unselect");
1284
1297
 		//unselectButton.addActionListener(this);
1285
1298
 
1286
-		editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1299
+		editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1287
1300
                 flashSelectionButton.setToolTipText("Highlight selection");
1288
1301
 		flashSelectionButton.addActionListener(this);
1289
1302
                 
..
..
@@ -1306,6 +1319,8 @@
1306
1319
                 
1307
1320
                 cGridBag jSPPanel = new cGridBag();
1308
1321
 
1322
+            jSPPanel.preferredHeight = 20;
1323
+            
1309
1324
                 JScrollPane jSP;
1310
1325
 		//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
1311
1326
 		jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
..
..
@@ -1314,11 +1329,11 @@
1314
1329
                 oe.treePanel.add(jSPPanel);
1315
1330
                 oe.treePanel.Return();
1316
1331
 
1317
-                oe.treePanel.add(copyOptionsPanel);
1332
+                oe.treePanel.add(versionManagerPanel);
1318
1333
                 oe.treePanel.Return();
1319
-        cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
1320
-            versionSlider = (cNumberSlider)sliderPane.getComponent(1);
1321
-            sliderPane.preferredHeight = 1;
1334
+        versionSliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
1335
+            versionSlider = (cNumberSlider)versionSliderPane.getComponent(1);
1336
+            versionSliderPane.preferredHeight = 3;
1322
1337
                 
1323
1338
 //        mainPanel.setDividerLocation(0.1); //1.0);
1324
1339
         mainPanel.setResizeWeight(0.4);
..
..
@@ -3963,6 +3978,8 @@
3963
3978
 		if (source == closeButton)
3964
3979
 		{
3965
3980
 //System.out.println("CLOSE: " + buttonGroup.getSelection());
3981
+                    Replace();
3982
+                    
3966
3983
                     cRadio ab;
3967
3984
                     for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3968
3985
                     {
..
..
@@ -4061,6 +4078,8 @@
4061
4078
 		} else
4062
4079
                 if(source instanceof cRadio)
4063
4080
 		{
4081
+                    Replace();
4082
+                    
4064
4083
                     group.parent = keepparent;
4065
4084
                         group.attributes = 0;
4066
4085
                     //group.editWindow = null;
..
..
@@ -4116,13 +4135,21 @@
4116
4135
                     
4117
4136
         if (copy.versionlist == null)
4118
4137
         {
4119
-            copy.versionlist = new Object3D[100];
4120
4138
             copy.versionindex = -1;
4121
4139
             
4122
4140
             // Cannot work with loops
4123
-            // To fix this issue, first mark all nodes above the root,
4141
+            // To fix this issue, we first mark all nodes above the root,
4124
4142
             // and check if any of these nodes are reachable below the root.
4125
-            //Save(true);
4143
+            Grafreed.grafreed.universe.TagObjects(copy, true);
4144
+            
4145
+            if (!copy.HasTags())
4146
+            {
4147
+                copy.versionlist = new Object3D[100];
4148
+                
4149
+                Save(true);
4150
+            }
4151
+            
4152
+            Grafreed.grafreed.universe.TagObjects(copy, false);
4126
4153
         }
4127
4154
         
4128
4155
                     SetVersionStates();
..
..
@@ -4270,7 +4297,7 @@
4270
4297
                         TouchTransform(obj);
4271
4298
                         continue;
4272
4299
                     }
4273
-                    if ((mask&2) != 0) // Scale
4300
+                    if ((mask&2) != 0) // Scale/rotation
4274
4301
                     {
4275
4302
                         obj.toParent[0][0] = obj.toParent[1][1] = obj.toParent[2][2] = 1;
4276
4303
                         obj.toParent[0][1] = obj.toParent[1][0] = obj.toParent[2][0] = 0;
..
..
@@ -4278,10 +4305,6 @@
4278
4305
                         obj.fromParent[0][0] = obj.fromParent[1][1] = obj.fromParent[2][2] = 1;
4279
4306
                         obj.fromParent[0][1] = obj.fromParent[1][0] = obj.fromParent[2][0] = 0;
4280
4307
                         obj.fromParent[0][2] = obj.fromParent[1][2] = obj.fromParent[2][1] = 0;
4281
-                    }
4282
-                    if ((mask&4) != 0) // Rotation
4283
-                    {
4284
-                        // ?
4285
4308
                     }
4286
4309
                     if ((mask&1) != 0) // Translation
4287
4310
                     {
..
..
@@ -5380,6 +5403,7 @@
5380
5403
 
5381
5404
         void refreshContents(boolean cp)
5382
5405
         {
5406
+            if (Globals.ADVANCED)
5383
5407
             //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
5384
5408
             if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
5385
5409
             {