From a7277e6c6381e55761f7fa87276260fac1c94d5e Mon Sep 17 00:00:00 2001
From: Normand Briere <nbriere@noware.ca>
Date: Wed, 01 May 2019 22:31:45 -0400
Subject: [PATCH] Bigger default size.
---
ObjEditor.java | 32 ++++++++++++++++----------------
GroupEditor.java | 21 ++++++++++++++-------
2 files changed, 30 insertions(+), 23 deletions(-)
diff --git a/GroupEditor.java b/GroupEditor.java
index 56e3aff..e205d0c 100644
--- a/GroupEditor.java
+++ b/GroupEditor.java
@@ -171,6 +171,14 @@
//editItem.addActionListener(this);
duplicateItem = menu.add(new MenuItem("Duplicate"));
duplicateItem.addActionListener(this);
+ cloneItem = menu.add(new MenuItem("Clone"));
+ cloneItem.addActionListener(this);
+ if (Globals.ADVANCED)
+ {
+ cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
+ cloneSupportItem.addActionListener(this);
+ }
+ menu.add("-");
cutItem = menu.add(new MenuItem("Cut"));
cutItem.addActionListener(this);
copyItem = menu.add(new MenuItem("Copy"));
@@ -178,10 +186,7 @@
pasteItem = menu.add(new MenuItem("Paste"));
pasteItem.addActionListener(this);
menu.add("-");
- cloneItem = menu.add(new MenuItem("Clone"));
- cloneItem.addActionListener(this);
- cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
- cloneSupportItem.addActionListener(this);
+
menu.add("-");
pasteIntoItem = menu.add(new MenuItem("Paste into"));
pasteIntoItem.addActionListener(this);
@@ -272,6 +277,7 @@
if (Globals.ADVANCED)
{
+ menu.add("-");
physicsItem = menu.add(new MenuItem("Physics"));
physicsItem.addActionListener(this);
frameselectorItem = menu.add(new MenuItem("Frame Selector"));
@@ -297,6 +303,7 @@
shadowZItem.addActionListener(this);
if (Globals.ADVANCED)
{
+ menu.add("-");
linkerItem = menu.add(new MenuItem("Linker"));
linkerItem.addActionListener(this);
attributeItem = menu.add(new MenuItem("Attribute"));
@@ -305,8 +312,8 @@
templateItem.addActionListener(this);
pointflowItem = menu.add(new MenuItem("Point Flow"));
pointflowItem.addActionListener(this);
- menu.add("-");
}
+ menu.add("-");
resetTransformItem = menu.add(new MenuItem("Reset Transform"));
resetTransformItem.addActionListener(this);
resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
@@ -1164,13 +1171,13 @@
parseverticesItem.addActionListener(this);
textureFieldItem = menu.add(new MenuItem("Texture Field"));
textureFieldItem.addActionListener(this);
- alignItem = menu.add(new MenuItem("Align Object"));
+ alignItem = menu.add(new MenuItem("Align Objects"));
alignItem.addActionListener(this);
reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
reduceMorphItem.addActionListener(this);
reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
reduce34MorphItem.addActionListener(this);
-
+ menu.add("-");
menu.add(computeAOItem = new MenuItem("Compute AO"));
computeAOItem.addActionListener(this);
diff --git a/ObjEditor.java b/ObjEditor.java
index afb7487..2f289ea 100644
--- a/ObjEditor.java
+++ b/ObjEditor.java
@@ -319,8 +319,21 @@
toggleTextureItem.addItemListener(this);
toggleTextureItem.setState(CameraPane.textureon);
+ cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
+ toggleSwitchItem.addItemListener(this);
+ toggleSwitchItem.setState(CameraPane.SWITCH);
+
+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
+ toggleHandleItem.addItemListener(this);
+ toggleHandleItem.setState(CameraPane.HANDLES);
+
+ cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
+ togglePaintItem.addItemListener(this);
+ togglePaintItem.setState(CameraPane.PAINTMODE);
+
if (Globals.ADVANCED)
{
+ cameraMenu.add("-");
cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
toggleLiveItem.addItemListener(this);
toggleLiveItem.setState(Globals.isLIVE());
@@ -350,18 +363,6 @@
cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
toggleTimelineItem.addItemListener(this);
}
-
- cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
- toggleSwitchItem.addItemListener(this);
- toggleSwitchItem.setState(CameraPane.SWITCH);
-
- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
- toggleHandleItem.addItemListener(this);
- toggleHandleItem.setState(CameraPane.HANDLES);
-
- cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
- togglePaintItem.addItemListener(this);
- togglePaintItem.setState(CameraPane.PAINTMODE);
// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
// toggleRootItem.addItemListener(this);
@@ -1329,7 +1330,7 @@
scrollpane.addMouseWheelListener(this); // Default not fast enough
/*JTabbedPane*/ scenePanel = new cGridBag();
- scenePanel.preferredWidth = 7;
+ scenePanel.preferredWidth = 6;
JTabbedPane tabbedPane = new JTabbedPane();
tabbedPane.add(scrollpane);
@@ -1435,8 +1436,8 @@
// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
- frame.setSize(1024, 768);
- frame.show();
+ frame.setSize(1280, 860);
+ frame.setVisible(true);
gridPanel.setDividerLocation(1.0);
@@ -3276,7 +3277,6 @@
callee.refreshContents();
} else
{
- new Exception().printStackTrace();
System.exit(0);
}
}
--
Gitblit v1.6.2