Normand Briere
2019-07-01 6600d22461ccc1cb602f238a9ffa83cf07dd830e
ObjEditor.java
....@@ -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());
....@@ -780,7 +780,7 @@
780780 // X frame.getContentPane().remove(/*"Center",*/bigThree);
781781 // X framePanel.add(bigThree);
782782 // X frame.getContentPane().add(/*"Center",*/framePanel);
783
- framePanel.setDividerLocation(1);
783
+ framePanel.setDividerLocation(46);
784784
785785 //frame.setVisible(true);
786786 radio.layout = keepButton;
....@@ -1493,7 +1493,10 @@
14931493 // north.add(ctrlPanel, BorderLayout.NORTH);
14941494 // objectPanel.add(north);
14951495 objectPanel.add(editPanel);
1496
- objectPanel.add(infoPanel);
1496
+
1497
+ //if (Globals.ADVANCED)
1498
+ objectPanel.add(infoPanel);
1499
+
14971500 objectPanel.add(toolboxPanel);
14981501
14991502 /*
....@@ -1602,9 +1605,9 @@
16021605 // aConstraints.gridheight = 1;
16031606
16041607 framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1605
- framePanel.setContinuousLayout(true);
1606
- framePanel.setOneTouchExpandable(true);
1607
- framePanel.setDividerLocation(0.8);
1608
+ framePanel.setContinuousLayout(false);
1609
+ framePanel.setOneTouchExpandable(false);
1610
+ //.setDividerLocation(0.8);
16081611 //framePanel.setDividerSize(15);
16091612 //framePanel.setResizeWeight(0.15);
16101613 framePanel.setName("Frame");
....@@ -3391,9 +3394,9 @@
33913394 {
33923395 Close();
33933396 //return true;
3394
- } else if (source == loadItem)
3397
+ } else if (source == openItem)
33953398 {
3396
- load();
3399
+ Open();
33973400 //return true;
33983401 } else if (source == newItem)
33993402 {
....@@ -3418,6 +3421,10 @@
34183421 {
34193422 generatePOV();
34203423 //return true;
3424
+ } else if (event.getSource() == archiveItem)
3425
+ {
3426
+ cTools.Archive(frame);
3427
+ return;
34213428 } else if (source == zBufferItem)
34223429 {
34233430 try
....@@ -4720,7 +4727,7 @@
47204727 }
47214728 }
47224729
4723
- void load() // throws ClassNotFoundException
4730
+ void Open() // throws ClassNotFoundException
47244731 {
47254732 if (Grafreed.standAlone)
47264733 {
....@@ -5005,7 +5012,7 @@
50055012 MenuBar menuBar;
50065013 Menu fileMenu;
50075014 MenuItem newItem;
5008
- MenuItem loadItem;
5015
+ MenuItem openItem;
50095016 MenuItem saveItem;
50105017 MenuItem saveAsItem;
50115018 MenuItem exportAsItem;
....@@ -5028,6 +5035,7 @@
50285035 CheckboxMenuItem toggleSwitchItem;
50295036 CheckboxMenuItem toggleRootItem;
50305037 CheckboxMenuItem animationItem;
5038
+ MenuItem archiveItem;
50315039 CheckboxMenuItem toggleHandleItem;
50325040 CheckboxMenuItem togglePaintItem;
50335041 JSplitPane mainPanel;