From 9079880942d022ee32fd3a543843e132e52deb1a Mon Sep 17 00:00:00 2001
From: Normand Briere <nbriere@noware.ca>
Date: Sun, 30 Jun 2019 23:52:19 -0400
Subject: [PATCH] Tree icons.
---
ObjEditor.java | 59 +++++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 39 insertions(+), 20 deletions(-)
diff --git a/ObjEditor.java b/ObjEditor.java
index b7cf47d..1779397 100644
--- a/ObjEditor.java
+++ b/ObjEditor.java
@@ -309,7 +309,7 @@
//localCopy.parent = null;
frame = new JFrame();
- frame.setUndecorated(true);
+ frame.setUndecorated(false);
objEditor = this;
this.callee = callee;
@@ -350,7 +350,7 @@
frame.setMenuBar(menuBar = new MenuBar());
menuBar.add(fileMenu = new Menu("File"));
fileMenu.add(newItem = new MenuItem("New"));
- fileMenu.add(loadItem = new MenuItem("Open..."));
+ fileMenu.add(openItem = new MenuItem("Open..."));
//oe.menuBar.add(menu = new Menu("Include"));
Menu menu = new Menu("Import");
@@ -382,7 +382,7 @@
}
newItem.addActionListener(this);
- loadItem.addActionListener(this);
+ openItem.addActionListener(this);
saveItem.addActionListener(this);
saveAsItem.addActionListener(this);
exportAsItem.addActionListener(this);
@@ -699,8 +699,8 @@
}
}
-static GraphicsDevice device = GraphicsEnvironment
- .getLocalGraphicsEnvironment().getScreenDevices()[0];
+//static GraphicsDevice device = GraphicsEnvironment
+// .getLocalGraphicsEnvironment().getScreenDevices()[0];
Rectangle keeprect;
cRadio radio;
@@ -741,10 +741,11 @@
else
{
keeprect = frame.getBounds();
- Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
- Dimension rect2 = frame.getToolkit().getScreenSize();
- frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
+// Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
+// Dimension rect2 = frame.getToolkit().getScreenSize();
+// frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
// frame.setState(Frame.MAXIMIZED_BOTH);
+ frame.setBounds(frame.getGraphicsConfiguration().getBounds());
}
maximized ^= true;
@@ -758,12 +759,17 @@
void ToggleFullScreen()
{
+GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
+
cameraView.ToggleFullScreen();
if (!CameraPane.FULLSCREEN)
{
device.setFullScreenWindow(null);
+ frame.dispose();
+ frame.setUndecorated(false);
frame.validate();
+ frame.setVisible(true);
//frame.setVisible(false);
// frame.removeNotify();
@@ -774,7 +780,7 @@
// X frame.getContentPane().remove(/*"Center",*/bigThree);
// X framePanel.add(bigThree);
// X frame.getContentPane().add(/*"Center",*/framePanel);
- framePanel.setDividerLocation(1);
+ framePanel.setDividerLocation(46);
//frame.setVisible(true);
radio.layout = keepButton;
@@ -789,8 +795,12 @@
// frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
// frame.getToolkit().getScreenSize().height);
//frame.setVisible(false);
+
+ frame.dispose();
+ frame.setUndecorated(true);
device.setFullScreenWindow(frame);
frame.validate();
+ frame.setVisible(true);
// frame.removeNotify();
// frame.setUndecorated(true);
// frame.addNotify();
@@ -1483,7 +1493,10 @@
// north.add(ctrlPanel, BorderLayout.NORTH);
// objectPanel.add(north);
objectPanel.add(editPanel);
- objectPanel.add(infoPanel);
+
+ if (Globals.ADVANCED)
+ objectPanel.add(infoPanel);
+
objectPanel.add(toolboxPanel);
/*
@@ -1592,9 +1605,9 @@
// aConstraints.gridheight = 1;
framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
- framePanel.setContinuousLayout(true);
- framePanel.setOneTouchExpandable(true);
- framePanel.setDividerLocation(0.8);
+ framePanel.setContinuousLayout(false);
+ framePanel.setOneTouchExpandable(false);
+ //.setDividerLocation(0.8);
//framePanel.setDividerSize(15);
//framePanel.setResizeWeight(0.15);
framePanel.setName("Frame");
@@ -1613,12 +1626,13 @@
frame.setSize(1280, 860);
- frame.validate();
- frame.setVisible(true);
-
cameraView.requestFocusInWindow();
gridPanel.setDividerLocation(1.0);
+
+ frame.validate();
+
+ frame.setVisible(true);
frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
frame.addWindowListener(new WindowAdapter()
@@ -3187,6 +3201,10 @@
{
ToggleAnimation();
return;
+ } else if (event.getSource() == archiveItem)
+ {
+ cTools.Archive(frame);
+ return;
} else if (event.getSource() == flipVCB)
{
copy.flipV ^= true;
@@ -3380,9 +3398,9 @@
{
Close();
//return true;
- } else if (source == loadItem)
+ } else if (source == openItem)
{
- load();
+ Open();
//return true;
} else if (source == newItem)
{
@@ -4709,7 +4727,7 @@
}
}
- void load() // throws ClassNotFoundException
+ void Open() // throws ClassNotFoundException
{
if (Grafreed.standAlone)
{
@@ -4994,7 +5012,7 @@
MenuBar menuBar;
Menu fileMenu;
MenuItem newItem;
- MenuItem loadItem;
+ MenuItem openItem;
MenuItem saveItem;
MenuItem saveAsItem;
MenuItem exportAsItem;
@@ -5017,6 +5035,7 @@
CheckboxMenuItem toggleSwitchItem;
CheckboxMenuItem toggleRootItem;
CheckboxMenuItem animationItem;
+ CheckboxMenuItem archiveItem;
CheckboxMenuItem toggleHandleItem;
CheckboxMenuItem togglePaintItem;
JSplitPane mainPanel;
--
Gitblit v1.6.2