blame | history | patch | commit | commitdiff
Normand Briere
2019-06-27 f78dd18c66d607b693c0bf5937fc59181bf5a26b 
 ObjEditor.java
....@@ -15,6 +15,9 @@
1515 //import javax.swing.plaf.ColorUIResource;
1616 //import javax.swing.plaf.metal.DefaultMetalTheme;
1717 
18
+import javax.swing.plaf.basic.BasicSplitPaneDivider;
19
+import javax.swing.plaf.basic.BasicSplitPaneUI;
20
+
1821 //import javax.media.opengl.GLCanvas;
1922 
2023 import //weka.core.
....@@ -207,7 +210,7 @@
207210         
208211         objEditor.ctrlPanel.remove(namePanel);
209212         
210
-        if (!GroupEditor.allparams)
213
+        if (!allparams)
211214             return;
212215         
213216 //        objEditor.ctrlPanel.remove(liveCB);
....@@ -337,6 +340,11 @@
337340         return frame.action(event, obj);
338341     }
339342 
343
+    // Cannot work without static
344
+    static boolean allparams = true;
345
+
346
+    static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
347
+
340348     void SetupMenu()
341349     {
342350         frame.setMenuBar(menuBar = new MenuBar());
....@@ -398,6 +406,11 @@
398406 //                    
399407 //                    materialFlushed = true;
400408 //                }
409
+//                if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Edit"))
410
+//                {
411
+//                    if (listUI.size() == 0)
412
+//                        EditSelection(false);
413
+//                }
401414 
402415                 refreshContents(false); // To refresh Info tab
403416             }
....@@ -448,7 +461,13 @@
448461         mainPanel.setDividerSize(9);
449462         mainPanel.setDividerLocation(0.5); //1.0);
450463         mainPanel.setResizeWeight(0.5);
451
-
464
+        
465
+//mainPanel.setDividerSize((int) (mainPanel.getDividerSize() * 1.5));
466
+//    BasicSplitPaneDivider divider = ( (BasicSplitPaneUI) mainPanel.getUI()).getDivider();
467
+//    divider.setDividerSize(15);
468
+//    divider.setBorder(BorderFactory.createTitledBorder(divider.getBorder(), "Custom border title -- gets rid of the one-touch arrows!"));    
469
+    
470
+    
452471         //ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
453472         //mainPanel.setLayout(new GridBagLayout());
454473         toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
....@@ -1102,7 +1121,7 @@
11021121         
11031122         oe.ctrlPanel.Return();
11041123         
1105
-        if (!GroupEditor.allparams)
1124
+        if (!allparams)
11061125             return;
11071126 
11081127             setupPanel = new cGridBag().setVertical(false);
....@@ -1115,7 +1134,7 @@
11151134         hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
11161135                 hideCB.setToolTipText("Hide object");
11171136         markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1118
-        markCB.setToolTipText("Set the animation target transform");
1137
+        markCB.setToolTipText("As animation target transform");
11191138         
11201139             setupPanel2 = new cGridBag().setVertical(false);
11211140             
....@@ -1123,7 +1142,7 @@
11231142         rewindCB.setToolTipText("Rewind animation");
11241143         
11251144         randomCB = AddCheckBox(setupPanel2, "Rand", copy.random);
1126
-        randomCB.setToolTipText("Randomly Rewind or Go back and forth");
1145
+        randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
11271146 
11281147         if (Globals.ADVANCED)
11291148         {
....@@ -1439,13 +1458,13 @@
14391458         //JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
14401459         //tmp.setName("Edit");
14411460         objectPanel.add(materialPanel);
1442
-        objectPanel.add(toolboxPanel);
14431461 //        JPanel north = new JPanel(new BorderLayout());
14441462 //        north.setName("Edit");
14451463 //        north.add(ctrlPanel, BorderLayout.NORTH);
14461464 //        objectPanel.add(north);
14471465         objectPanel.add(editPanel);
14481466         objectPanel.add(infoPanel);
1467
+        objectPanel.add(toolboxPanel);
14491468 
14501469         /*
14511470         aConstraints.gridx = 0;
....@@ -1454,7 +1473,7 @@
14541473         aConstraints.gridy += 1;
14551474         aConstraints.gridwidth = 1;
14561475         mainPanel.add(objectPanel, aConstraints);
1457
-         */
1476
+        */
14581477 
14591478         scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
14601479                 VERTICAL_SCROLLBAR_AS_NEEDED,
....@@ -3007,12 +3026,17 @@
30073026 //                }
30083027 
30093028         /**/
3010
-        if (deselect)
3029
+        if (deselect || child == null)
30113030         {
30123031             //group.deselectAll();
30133032             //freeze = true;
30143033             GetTree().clearSelection();
30153034             //freeze = false;
3035
+            
3036
+            if (child == null)
3037
+            {
3038
+                return;
3039
+            }
30163040         }
30173041 
30183042         //group.addSelectee(child);
....@@ -3527,6 +3551,8 @@
35273551             tab.graphs[i] = null;
35283552         }
35293553 
3554
+        SetUndoStates();
3555
+        
35303556         // test save
35313557         if (false)
35323558         {
....@@ -3549,6 +3575,8 @@
35493575 
35503576     void CopyChanged(Object3D obj)
35513577     {
3578
+        SetUndoStates();
3579
+        
35523580         boolean temp = CameraPane.SWITCH;
35533581         CameraPane.SWITCH = false;
35543582         
....@@ -3586,6 +3614,17 @@
35863614         }
35873615         
35883616         refreshContents();
3617
+    }
3618
+    
3619
+    cButton undoButton;
3620
+    cButton redoButton;
3621
+        
3622
+    void SetUndoStates()
3623
+    {
3624
+        cRadio tab = GetCurrentTab();
3625
+        
3626
+        undoButton.setEnabled(tab.undoindex > 0);
3627
+        redoButton.setEnabled(tab.graphs[tab.undoindex + 1] != null);
35893628     }
35903629     
35913630     public void Undo()
....@@ -4765,6 +4804,8 @@
47654804             String filename = browser.getFile();
47664805             if (filename != null && filename.length() > 0)
47674806             {
4807
+                if (!filename.endsWith(".gfd"))
4808
+                    filename += ".gfd";
47684809                 lastname = browser.getDirectory() + filename;
47694810                 save();
47704811             }