From 6600d22461ccc1cb602f238a9ffa83cf07dd830e Mon Sep 17 00:00:00 2001
From: Normand Briere <nbriere@noware.ca>
Date: Mon, 01 Jul 2019 18:04:02 -0400
Subject: [PATCH] Get icons 256x256
---
ObjEditor.java | 32 ++++++++++++++++++++------------
1 files changed, 20 insertions(+), 12 deletions(-)
diff --git a/ObjEditor.java b/ObjEditor.java
index b938e7a..93548e1 100644
--- a/ObjEditor.java
+++ b/ObjEditor.java
@@ -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);
@@ -449,7 +449,7 @@
// TEXTAREA infoarea.setLineWrap(true);
// TEXTAREA infoarea.setWrapStyleWord(true);
infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
- //infoPanel.setPreferredSize(new Dimension(50, 200));
+ infoPanel.setPreferredSize(new Dimension(1, 1));
infoPanel.setName("Info");
//infoPanel.setLayout(new BorderLayout());
//infoPanel.add(createTextPane());
@@ -780,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;
@@ -1493,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);
/*
@@ -1602,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");
@@ -3391,9 +3394,9 @@
{
Close();
//return true;
- } else if (source == loadItem)
+ } else if (source == openItem)
{
- load();
+ Open();
//return true;
} else if (source == newItem)
{
@@ -3418,6 +3421,10 @@
{
generatePOV();
//return true;
+ } else if (event.getSource() == archiveItem)
+ {
+ cTools.Archive(frame);
+ return;
} else if (source == zBufferItem)
{
try
@@ -4720,7 +4727,7 @@
}
}
- void load() // throws ClassNotFoundException
+ void Open() // throws ClassNotFoundException
{
if (Grafreed.standAlone)
{
@@ -5005,7 +5012,7 @@
MenuBar menuBar;
Menu fileMenu;
MenuItem newItem;
- MenuItem loadItem;
+ MenuItem openItem;
MenuItem saveItem;
MenuItem saveAsItem;
MenuItem exportAsItem;
@@ -5028,6 +5035,7 @@
CheckboxMenuItem toggleSwitchItem;
CheckboxMenuItem toggleRootItem;
CheckboxMenuItem animationItem;
+ MenuItem archiveItem;
CheckboxMenuItem toggleHandleItem;
CheckboxMenuItem togglePaintItem;
JSplitPane mainPanel;
--
Gitblit v1.6.2