blame | history | patch | commit | commitdiff
Normand Briere
2019-07-01 6600d22461ccc1cb602f238a9ffa83cf07dd830e 
 ObjEditor.java
....@@ -309,7 +309,7 @@
309309         //localCopy.parent = null;
310310 
311311         frame = new JFrame();
312
-                frame.setUndecorated(true);
312
+                frame.setUndecorated(false);
313313         objEditor = this;
314314         this.callee = callee;
315315 
....@@ -350,7 +350,7 @@
350350         frame.setMenuBar(menuBar = new MenuBar());
351351         menuBar.add(fileMenu = new Menu("File"));
352352         fileMenu.add(newItem = new MenuItem("New"));
353
-        fileMenu.add(loadItem = new MenuItem("Open..."));
353
+        fileMenu.add(openItem = new MenuItem("Open..."));
354354         
355355                 //oe.menuBar.add(menu = new Menu("Include"));
356356         Menu menu = new Menu("Import");
....@@ -382,7 +382,7 @@
382382         }
383383 
384384         newItem.addActionListener(this);
385
-        loadItem.addActionListener(this);
385
+        openItem.addActionListener(this);
386386         saveItem.addActionListener(this);
387387         saveAsItem.addActionListener(this);
388388         exportAsItem.addActionListener(this);
....@@ -449,7 +449,7 @@
449449 // TEXTAREA           infoarea.setLineWrap(true);
450450 // TEXTAREA           infoarea.setWrapStyleWord(true);
451451         infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
452
-        //infoPanel.setPreferredSize(new Dimension(50, 200));
452
+        infoPanel.setPreferredSize(new Dimension(1, 1));
453453         infoPanel.setName("Info");
454454         //infoPanel.setLayout(new BorderLayout());
455455         //infoPanel.add(createTextPane());
....@@ -699,8 +699,8 @@
699699         }
700700     }
701701 
702
-static GraphicsDevice device = GraphicsEnvironment
703
-        .getLocalGraphicsEnvironment().getScreenDevices()[0];
702
+//static GraphicsDevice device = GraphicsEnvironment
703
+//        .getLocalGraphicsEnvironment().getScreenDevices()[0];
704704 
705705     Rectangle keeprect;
706706         cRadio radio;
....@@ -741,10 +741,11 @@
741741             else
742742             {
743743                 keeprect = frame.getBounds();
744
-                Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
745
-                Dimension rect2 = frame.getToolkit().getScreenSize();
746
-                frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
744
+//                Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
745
+//                Dimension rect2 = frame.getToolkit().getScreenSize();
746
+//                frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
747747 //                frame.setState(Frame.MAXIMIZED_BOTH);
748
+                frame.setBounds(frame.getGraphicsConfiguration().getBounds());
748749             }
749750             
750751             maximized ^= true;
....@@ -758,12 +759,17 @@
758759         
759760         void ToggleFullScreen()
760761         {
762
+GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
763
+
761764                 cameraView.ToggleFullScreen();
762765                 
763766                 if (!CameraPane.FULLSCREEN)
764767                 {
765768                     device.setFullScreenWindow(null);
769
+                    frame.dispose();
770
+                frame.setUndecorated(false);
766771             frame.validate();
772
+                    frame.setVisible(true);
767773                     
768774                     //frame.setVisible(false);
769775 //                frame.removeNotify();
....@@ -774,7 +780,7 @@
774780 // X                   frame.getContentPane().remove(/*"Center",*/bigThree);
775781 // X                   framePanel.add(bigThree);
776782 // X                   frame.getContentPane().add(/*"Center",*/framePanel);
777
-                    framePanel.setDividerLocation(1);
783
+                    framePanel.setDividerLocation(46);
778784                     
779785                     //frame.setVisible(true);
780786                     radio.layout = keepButton;
....@@ -789,8 +795,12 @@
789795 //                frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
790796 //                        frame.getToolkit().getScreenSize().height);
791797                     //frame.setVisible(false);
798
+                    
799
+            frame.dispose();
800
+                frame.setUndecorated(true);
792801                     device.setFullScreenWindow(frame);
793802             frame.validate();
803
+                    frame.setVisible(true);
794804 //                frame.removeNotify();
795805 //                frame.setUndecorated(true);
796806 //                frame.addNotify();
....@@ -1483,7 +1493,10 @@
14831493 //        north.add(ctrlPanel, BorderLayout.NORTH);
14841494 //        objectPanel.add(north);
14851495         objectPanel.add(editPanel);
1486
-        objectPanel.add(infoPanel);
1496
+        
1497
+        //if (Globals.ADVANCED)
1498
+            objectPanel.add(infoPanel);
1499
+        
14871500         objectPanel.add(toolboxPanel);
14881501 
14891502         /*
....@@ -1592,9 +1605,9 @@
15921605 //		aConstraints.gridheight = 1;
15931606 
15941607         framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1595
-        framePanel.setContinuousLayout(true);
1596
-        framePanel.setOneTouchExpandable(true);
1597
-        framePanel.setDividerLocation(0.8);
1608
+        framePanel.setContinuousLayout(false);
1609
+        framePanel.setOneTouchExpandable(false);
1610
+        //.setDividerLocation(0.8);
15981611         //framePanel.setDividerSize(15);
15991612         //framePanel.setResizeWeight(0.15);
16001613         framePanel.setName("Frame");
....@@ -1613,12 +1626,13 @@
16131626 
16141627         frame.setSize(1280, 860);
16151628         
1616
-        frame.validate();
1617
-        frame.setVisible(true);
1618
-
16191629                     cameraView.requestFocusInWindow();
16201630                     
16211631         gridPanel.setDividerLocation(1.0);
1632
+        
1633
+        frame.validate();
1634
+
1635
+        frame.setVisible(true);
16221636 
16231637         frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
16241638         frame.addWindowListener(new WindowAdapter()
....@@ -3380,9 +3394,9 @@
33803394         {
33813395             Close();
33823396             //return true;
3383
-        } else if (source == loadItem)
3397
+        } else if (source == openItem)
33843398         {
3385
-            load();
3399
+            Open();
33863400             //return true;
33873401         } else if (source == newItem)
33883402         {
....@@ -3407,6 +3421,10 @@
34073421         {
34083422             generatePOV();
34093423             //return true;
3424
+        } else if (event.getSource() == archiveItem)
3425
+        {
3426
+            cTools.Archive(frame);
3427
+            return;
34103428         } else if (source == zBufferItem)
34113429         {
34123430             try
....@@ -4709,7 +4727,7 @@
47094727         }
47104728     }
47114729 
4712
-    void load() // throws ClassNotFoundException
4730
+    void Open() // throws ClassNotFoundException
47134731     {
47144732         if (Grafreed.standAlone)
47154733         {
....@@ -4994,7 +5012,7 @@
49945012     MenuBar menuBar;
49955013     Menu fileMenu;
49965014     MenuItem newItem;
4997
-    MenuItem loadItem;
5015
+    MenuItem openItem;
49985016     MenuItem saveItem;
49995017     MenuItem saveAsItem;
50005018     MenuItem exportAsItem;
....@@ -5017,6 +5035,7 @@
50175035     CheckboxMenuItem toggleSwitchItem;
50185036     CheckboxMenuItem toggleRootItem;
50195037     CheckboxMenuItem animationItem;
5038
+    MenuItem archiveItem;
50205039     CheckboxMenuItem toggleHandleItem;
50215040     CheckboxMenuItem togglePaintItem;
50225041     JSplitPane mainPanel;