Timeline menu UI.

Normand Briere

2018-07-08 c8024a8777faf76727fbb6975ddf4fecb567b426

Timeline menu UI.

 GroupEditor.java
..
..
@@ -649,14 +649,14 @@
649
649
 	
650
650
         void EditObject(Object3D obj)
651
651
         {
652
-            cRadio dummyButton = new cRadio(obj.name);
653
-            dummyButton.SetObject(obj);
654
-            dummyButton.layout = sevenButton;
655
-            dummyButton.SetCamera(cameraView.renderCamera, false);
656
-            dummyButton.addActionListener(this);
657
-            radioPanel.add(dummyButton);
658
-            buttonGroup.add(dummyButton);
659
-            dummyButton.doClick();
652
+            cRadio radioButton = new cRadio(obj.name);
653
+            radioButton.SetObject(obj);
654
+            radioButton.layout = sevenButton;
655
+            radioButton.SetCamera(cameraView.renderCamera, false);
656
+            radioButton.addActionListener(this);
657
+            radioPanel.add(radioButton);
658
+            buttonGroup.add(radioButton);
659
+            radioButton.doClick();
660
660
         }
661
661
         void SetupViews(ObjEditor oe)
662
662
         {
 ObjEditor.java
..
..
@@ -28,6 +28,8 @@
28
28
         iSendInfo
29
29
 //KeyListener
30
30
 {
31
+        boolean timeline;
32
+        boolean wasFullScreen;
31
33
 
32
34
     // SCRIPT
33
35
     
..
..
@@ -238,7 +240,7 @@
238
240
         //if (!isDisplayable())
239
241
         //setUndecorated(true);
240
242
 
241
-        System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
243
+        //System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
242
244
         client = inClient;
243
245
         copy = localCopy;
244
246
         copy.editWindow = this;
..
..
@@ -292,11 +294,11 @@
292
294
         //normalLensItem.addActionListener(this);
293
295
         cameraMenu.add(revertCameraItem = new MenuItem("Revert Camera"));
294
296
         revertCameraItem.addActionListener(this);
297
+        cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
298
+        toggleTimelineItem.addItemListener(this);
295
299
         cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
296
300
         toggleFullScreenItem.addItemListener(this);
297
301
         toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
298
-        cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
299
-        toggleTimelineItem.addItemListener(this);
300
302
         cameraMenu.add("-");
301
303
         cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
302
304
         toggleTextureItem.addItemListener(this);
..
..
@@ -595,6 +597,22 @@
595
597
             System.err.println("Couldn't insert initial text into text pane.");
596
598
         }
597
599
     }
600
+
601
+        void ToggleFullScreen()
602
+        {
603
+                if (CameraPane.FULLSCREEN)
604
+                {
605
+                    frame.getContentPane().remove(/*"Center",*/bigThree);
606
+                    framePanel.add(bigThree);
607
+                    frame.getContentPane().add(/*"Center",*/framePanel);
608
+                } else
609
+                {
610
+                    frame.getContentPane().remove(/*"Center",*/framePanel);
611
+                    framePanel.remove(bigThree);
612
+                    frame.getContentPane().add(/*"Center",*/bigThree);
613
+                }
614
+                cameraView.ToggleFullScreen();
615
+        }
598
616
 
599
617
     private JTextArea createTextPane()
600
618
     {
..
..
@@ -2966,37 +2984,34 @@
2966
2984
             return;
2967
2985
         } else if (event.getSource() == toggleTimelineItem)
2968
2986
         {
2969
-            copy.timeline ^= true;
2987
+            timeline ^= true;
2970
2988
 
2971
-            if (copy.timeline)
2989
+            if (timeline)
2972
2990
             {
2973
2991
                 centralPanel.remove(cameraView);
2974
2992
                 centralPanel.add(timelinePanel);
2975
2993
                 frame.setJMenuBar(timelineMenubar);
2994
+                wasFullScreen = CameraPane.FULLSCREEN;
2995
+                if (!CameraPane.FULLSCREEN)
2996
+                    ToggleFullScreen();
2997
+                toggleFullScreenItem.setEnabled(false);
2976
2998
             }
2977
2999
             else
2978
3000
             {
2979
3001
                 centralPanel.remove(timelinePanel);
2980
3002
                 centralPanel.add(cameraView);
2981
3003
                 frame.setJMenuBar(null);
3004
+                if (!wasFullScreen)
3005
+                    ToggleFullScreen();
3006
+                toggleFullScreenItem.setEnabled(true);
2982
3007
             }
2983
3008
 
2984
3009
             frame.validate();
2985
3010
             return;
2986
3011
         } else if (event.getSource() == toggleFullScreenItem)
2987
3012
         {
2988
-            if (CameraPane.FULLSCREEN)
2989
-            {
2990
-                frame.getContentPane().remove(/*"Center",*/bigThree);
2991
-                framePanel.add(bigThree);
2992
-                frame.getContentPane().add(/*"Center",*/framePanel);
2993
-            } else
2994
-            {
2995
-                frame.getContentPane().remove(/*"Center",*/framePanel);
2996
-                frame.getContentPane().add(/*"Center",*/bigThree);
2997
-            }
3013
+            ToggleFullScreen();
2998
3014
             frame.validate();
2999
-            cameraView.ToggleFullScreen();
3000
3015
 
3001
3016
             return;
3002
3017
         } else if (event.getSource() == toggleRandomItem)
..
..
@@ -3574,8 +3589,11 @@
3574
3589
 
3575
3590
         void SnapObject()
3576
3591
         {
3577
-            Object3D obj = (Object3D)copy.selection.elementAt(0);
3578
-            SnapObject(obj);
3592
+            if (copy.selection.size() > 0)
3593
+            {
3594
+                    Object3D obj = (Object3D)copy.selection.elementAt(0);
3595
+                    SnapObject(obj);
3596
+            }
3579
3597
         }
3580
3598
         
3581
3599
         void SnapObject(Object3D obj)
 Object3D.java
..
..
@@ -285,7 +285,6 @@
285
285
             return parent.GetName() + "#";
286
286
         }
287
287
         
288
-    boolean timeline = false;
289
288
     boolean live = false;
290
289
     boolean hide = false;
291
290
     boolean link2master = false; // performs reset support/master at each frame
 timeflow/app/AppState.java
..
..
@@ -16,7 +16,7 @@
16
16
         {
17
17
                 if (!new File(FILE).exists())
18
18
                 {
19
-                        System.err.println("No existing settings file found.");
19
+                        //System.err.println("No existing settings file found.");
20
20
                         return;
21
21
                 }
22
22
                 try