Switch left/right

Normand Briere

2019-08-01 7d02eaffc02895a01d95d8fd7e089044449e1d6d

 GroupEditor.java
..
..
@@ -932,7 +932,7 @@
932
932
 		restoreCameraButton.addActionListener(this);
933
933
                 
934
934
 		copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
935
-                saveButton.setToolTipText("New version");
935
+                saveButton.setToolTipText("Duplicate current version");
936
936
 		saveButton.addActionListener(this);
937
937
                                                 
938
938
 		copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..
..
@@ -942,12 +942,12 @@
942
942
                 
943
943
                 cGridBag updown = new cGridBag().setVertical(true);
944
944
 		updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
945
-                restoreButton.setToolTipText("Restore current");
945
+                restoreButton.setToolTipText("Restore current version (undo latest change)");
946
946
 		restoreButton.addActionListener(this);
947
947
                 restoreButton.setEnabled(false);
948
948
                 
949
949
 		updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
950
-                replaceButton.setToolTipText("Replace current");
950
+                replaceButton.setToolTipText("Replace current version (save latest change)");
951
951
 		replaceButton.addActionListener(this);
952
952
                 replaceButton.setEnabled(false);
953
953
                 
..
..
@@ -1183,7 +1183,7 @@
1183
1183
 		dgr.addDragGestureListener(this);
1184
1184
 		}catch(Exception e) {}
1185
1185
 		*/
1186
-        radio.layout = sixButton; // sevenButton;
1186
+        radio.layout = threeButton; // sixButton;
1187
1187
         oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
1188
1188
 	}
1189
1189
         
..
..
@@ -1234,9 +1234,12 @@
1234
1234
                 smoothCB.setToolTipText("Snapping delay");
1235
1235
                                 smoothCB.addItemListener(this);
1236
1236
 
1237
-                panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
1238
-                slowCB.setToolTipText("Smooth interpolation");
1239
-                                slowCB.addItemListener(this);
1237
+//                panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
1238
+//                slowCB.setToolTipText("Smooth interpolation");
1239
+//                                slowCB.addItemListener(this);
1240
+                panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
1241
+                minshaderCB.setToolTipText("Minimal fast shader");
1242
+                                minshaderCB.addItemListener(this);
1240
1243
                                 
1241
1244
 //        	constraints.gridy += 1;
1242
1245
 //                panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
..
..
@@ -1325,7 +1328,7 @@
1325
1328
             }
1326
1329
             
1327
1330
             radioButton.SetObject(obj);
1328
-            radioButton.layout = sixButton; // sevenButton;
1331
+            radioButton.layout = threeButton; // sixButton;
1329
1332
             radioButton.SetCamera(cameraView.renderCamera, false);
1330
1333
             radioButton.addActionListener(this);
1331
1334
             radioPanel.add(radioButton);
..
..
@@ -1350,6 +1353,8 @@
1350
1353
         cCheckBox localCB;
1351
1354
         cCheckBox crowdCB;
1352
1355
         cCheckBox smoothCB;
1356
+        cCheckBox minshaderCB;
1357
+        
1353
1358
         cToggleButton fastCB;
1354
1359
         cCheckBox slowCB;
1355
1360
         cCheckBox boxCB;
..
..
@@ -1420,6 +1425,12 @@
1420
1425
             {
1421
1426
                 cameraView.ToggleInertia();
1422
1427
         cameraView.repaint();
1428
+            }
1429
+            else if(e.getSource() == minshaderCB)
1430
+            {
1431
+                Globals.MINSHADER ^= true;
1432
+                cameraView.programInitialized = false;
1433
+                cameraView.repaint();
1423
1434
             }
1424
1435
             else if(e.getSource() == localCB)
1425
1436
             {
..
..
@@ -3933,11 +3944,13 @@
3933
3944
                 } else if (event.getSource() == editCameraItem)
3934
3945
                 {
3935
3946
                     cameraView.ProtectCamera();
3947
+                    cameraView.requestFocusInWindow();
3936
3948
                     cameraView.repaint();
3937
3949
                     return;
3938
3950
                 } else if (event.getSource() == restoreCameraItem || event.getSource() == restoreCameraButton)
3939
3951
                 {
3940
3952
                     cameraView.RevertCamera();
3953
+                    cameraView.requestFocusInWindow();
3941
3954
                     cameraView.repaint();
3942
3955
                     return;
3943
3956
         //        } else if (event.getSource() == textureButton)