From b1585b5b2b60c4165be400636c787fae24428c6a Mon Sep 17 00:00:00 2001
From: Normand Briere <nbriere@noware.ca>
Date: Wed, 01 May 2019 14:26:22 -0400
Subject: [PATCH] Fix info panel
---
GroupEditor.java | 205 ++++++++++++++++++++++++---------------------------
1 files changed, 96 insertions(+), 109 deletions(-)
diff --git a/GroupEditor.java b/GroupEditor.java
index 22fce0e..93258aa 100644
--- a/GroupEditor.java
+++ b/GroupEditor.java
@@ -12,6 +12,7 @@
import com.jme.math.Vector3f;
import com.jme.renderer.ColorRGBA;
+import grafeme.ui.*;
//import buoy.widget.BFileChooser;
class GroupEditor extends ObjEditor implements //iParse, //iCallBack,
@@ -433,31 +434,24 @@
oe.radioPanel.add(dummyButton);
oe.buttonGroup.add(dummyButton);
*/
- aConstraints.gridy += 1;
-
//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
- oe.aConstraints.gridwidth = 1;
- oe.aConstraints.gridx = 0;
-
- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE()), oe.aConstraints);
+ oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
liveCB.setToolTipText("Enabled animation");
liveCB.addItemListener(this);
- oe.aConstraints.gridx += 1;
- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK), oe.aConstraints);
+ oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
trackCB.setToolTipText("Enable tracking");
trackCB.addItemListener(this);
- oe.aConstraints.gridx += 1;
- oe.toolbarPanel.add(screenfitButton = new cButton("@ ")); //, oe.aConstraints);
+ oe.toolbarPanel.add(screenfitButton = new cButton("@", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
screenfitButton.setToolTipText("Screen fit");
screenfitButton.addActionListener(this);
- oe.aConstraints.gridx += 1;
+
// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
// screenfitpointButton.addActionListener(this);
// oe.aConstraints.gridx += 1;
- oe.toolbarPanel.add(snapobjectButton = new cButton(" O+ ")); //, oe.aConstraints);
+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
snapobjectButton.addActionListener(this);
snapobjectButton.setToolTipText("Snap Object");
oe.aConstraints.gridx += 1;
@@ -467,76 +461,66 @@
oe.aConstraints.weighty = 0;
oe.aConstraints.gridwidth = 1;
- oe.toolbarPanel.add(flashSelectionButton = new cButton(" ? ")); //, oe.aConstraints);
+ oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
flashSelectionButton.setToolTipText("Show selection");
flashSelectionButton.addActionListener(this);
- oe.toolbarPanel.add(new cButton(" ", false));
+ oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
- oe.aConstraints.gridx += 1;
- oe.aConstraints.weighty = 0;
- oe.aConstraints.gridwidth = 1;
-
- //
- oe.toolbarPanel.add(twoButton = new cButton(" |+| ")); //, oe.aConstraints);
+ oe.toolbarPanel.add(twoButton = new cButton("|+|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
twoButton.setToolTipText("Show center view only");
twoButton.addActionListener(this);
- oe.toolbarPanel.add(fourButton = new cButton("+|| ")); //, oe.aConstraints);
+ oe.toolbarPanel.add(fourButton = new cButton("+||", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
fourButton.addActionListener(this);
fourButton.setToolTipText("Show left panel only");
- oe.toolbarPanel.add(sixButton = new cButton("+|+| ")); //, oe.aConstraints);
+ oe.toolbarPanel.add(sixButton = new cButton("+|+|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
sixButton.setToolTipText("2-column layout left");
sixButton.addActionListener(this);
- oe.toolbarPanel.add(threeButton = new cButton(" |+|+")); //, oe.aConstraints);
+ oe.toolbarPanel.add(threeButton = new cButton("|+|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
threeButton.setToolTipText("2-column layout right");
threeButton.addActionListener(this);
- oe.toolbarPanel.add(sevenButton = new cButton("+|+|+")); //, oe.aConstraints);
+ oe.toolbarPanel.add(sevenButton = new cButton("+|+|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
sevenButton.setToolTipText("3-column layout");
sevenButton.addActionListener(this);
//
- oe.toolbarPanel.add(rootButton = new cButton(" o o o ")); //, oe.aConstraints);
- rootButton.setToolTipText("Edit object in new tab");
+ oe.toolbarPanel.add(rootButton = new cButton("o o o", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
+ rootButton.setToolTipText("Edit selection in new tab");
rootButton.addActionListener(this);
- oe.aConstraints.gridx += 1;
- oe.toolbarPanel.add(closeButton = new cButton(" X ")); //, oe.aConstraints);
+
+ oe.toolbarPanel.add(closeButton = new cButton("X", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
closeButton.setToolTipText("Close tab");
closeButton.addActionListener(this);
//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
//clearButton.addActionListener(this);
- oe.aConstraints.gridx += 1;
- oe.aConstraints.gridx = 1; //
- oe.treePanel.add(editButton = new cButton("+"), oe.aConstraints);
+ cGridBag commandsPanel = new cGridBag();
+
+ commandsPanel.add(editButton = new cButton("+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
+ editButton.setToolTipText("Edit selection");
editButton.addActionListener(this);
- oe.aConstraints.gridx += 1;
- oe.aConstraints.weighty = 0;
- oe.aConstraints.gridwidth = 1;
- oe.treePanel.add(uneditButton = new cButton("-"), oe.aConstraints);
+ commandsPanel.add(uneditButton = new cButton("-", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
+ uneditButton.setToolTipText("Unedit selection");
uneditButton.addActionListener(this);
- oe.aConstraints.gridx += 1;
- oe.aConstraints.weighty = 0;
- oe.aConstraints.gridwidth = 1;
-
- oe.treePanel.add(clearPanelButton = new cButton("C"), oe.aConstraints);
+ commandsPanel.add(clearPanelButton = new cButton("C", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
+ clearPanelButton.setToolTipText("Clear edit panel");
clearPanelButton.addActionListener(this);
- oe.aConstraints.gridx += 1;
- oe.aConstraints.weighty = 0;
- oe.aConstraints.gridwidth = 1;
-
- oe.treePanel.add(allParamsButton = new cButton("A"), oe.aConstraints);
+ commandsPanel.add(allParamsButton = new cButton("A", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
+ allParamsButton.setToolTipText("All params??");
allParamsButton.addActionListener(this);
- oe.aConstraints.gridx += 1;
- oe.aConstraints.weighty = 0;
- oe.aConstraints.gridwidth = 1;
-
- oe.treePanel.add(unselectButton = new cButton("U"), oe.aConstraints);
+ commandsPanel.add(unselectButton = new cButton("U", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
+ unselectButton.setToolTipText("Unselect");
unselectButton.addActionListener(this);
+ commandsPanel.preferredHeight = 1;
+
+ oe.treePanel.add(commandsPanel);
+ oe.treePanel.Return();
+
// oe.aConstraints.gridx += 1;
// oe.aConstraints.weighty = 0;
// oe.aConstraints.gridwidth = 1;
@@ -548,40 +532,37 @@
// oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
// gcButton.addActionListener(this);
- oe.aConstraints.gridx = 0;
- oe.aConstraints.gridy += 1;
-
- //ctrlPanel.add(objList = new List(5, true));
- oe.aConstraints.gridwidth = 100;
- // oe.aConstraints.gridheight = 100;
- oe.aConstraints.fill = GridBagConstraints.BOTH; // HORIZONTAL;
- oe.aConstraints.gridheight = 1;
- oe.aConstraints.weighty = 0.5;
- oe.aConstraints.gridx = 0;
- JScrollPane jSP;
+ cGridBag jSPPanel = new cGridBag();
+
+ JScrollPane jSP;
//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
- oe.treePanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null)), oe.aConstraints);
+ jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
ResetModel();
- oe.aConstraints.weighty = 0.5;
- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
- oe.aConstraints.gridy += 1;
- oe.aConstraints.gridwidth = 1;
+
+ oe.treePanel.add(jSPPanel);
+ oe.treePanel.Return();
- oe.aConstraints.weighty = 0;
- oe.aConstraints.gridwidth = 2;
-
- oe.treePanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0), oe.aConstraints);
+ cGridBag copyOptionsPanel = new cGridBag();
+
+ copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
+ colorCB.setToolTipText("Copy color when dropped");
colorCB.addItemListener(this);
- oe.aConstraints.gridx += 2;
- oe.treePanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0), oe.aConstraints);
+
+ copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
+ materialCB.setToolTipText("Copy material when dropped");
materialCB.addItemListener(this);
- oe.aConstraints.gridx += 2;
- oe.treePanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0), oe.aConstraints);
+
+ copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
+ textureCB.setToolTipText("Copy texture when dropped");
textureCB.addItemListener(this);
- oe.aConstraints.gridx = 0;
- oe.aConstraints.gridy += 1;
+ copyOptionsPanel.preferredHeight = 1;
+ oe.treePanel.add(copyOptionsPanel);
+ oe.treePanel.Return();
+// mainPanel.setDividerLocation(0.5); //1.0);
+// mainPanel.setResizeWeight(0.5);
+
//jList.addListSelectionListener(this);
oe.jTree.addTreeSelectionListener(this);
//jTree.setRootVisible(false);
@@ -604,15 +585,15 @@
oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
}
- void AddOptions(JPanel panel, GridBagConstraints constraints)
+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
{
- constraints.gridx = 0;
- constraints.gridy = 0;
- panel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST), constraints);
+ //constraints.gridx = 0;
+ //constraints.gridy = 0;
+ panel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
fastCB.setToolTipText("Fast mode");
fastCB.addItemListener(this);
- constraints.gridy += 1;
- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT), constraints);
+ //constraints.gridy += 1;
+ panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
supportCB.setToolTipText("Enabled rigging");
supportCB.addItemListener(this);
@@ -620,26 +601,26 @@
// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
// localCB.addItemListener(this);
- constraints.gridy += 1;
- panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD), constraints);
+ //constraints.gridy += 1;
+ panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
crowdCB.setToolTipText("Used for crowds");
crowdCB.addItemListener(this);
- constraints.gridy += 1;
- panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA), constraints);
+ //constraints.gridy += 1;
+ panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
smoothCB.setToolTipText("Snapping delay");
smoothCB.addItemListener(this);
- constraints.gridy += 1;
- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE), constraints);
+ //constraints.gridy += 1;
+ panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
slowCB.setToolTipText("Smooth interpolation");
slowCB.addItemListener(this);
- constraints.gridy += 1;
- panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE), constraints);
+ //constraints.gridy += 1;
+ panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
boxCB.setToolTipText("Display bounding boxes");
boxCB.addItemListener(this);
- constraints.gridy += 1;
- panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE), constraints);
+ //constraints.gridy += 1;
+ panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
zoomBoxCB.addItemListener(this);
@@ -650,16 +631,16 @@
if (false)
{
// handled in scripts
- constraints.gridy += 1;
- panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA), constraints);
+ //constraints.gridy += 1;
+ panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA)); //, constraints);
speakerCameraCB.addItemListener(this);
- constraints.gridy += 1;
- panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS), constraints);
+ //constraints.gridy += 1;
+ panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS)); //, constraints);
speakerFocusCB.addItemListener(this);
- constraints.gridy += 1;
- panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS), constraints);
+ //constraints.gridy += 1;
+ panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
smoothfocusCB.addItemListener(this);
}
@@ -667,14 +648,20 @@
//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
// debugCB.addItemListener(this);
- constraints.gridy += 1;
- panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL), constraints);
+ //constraints.gridy += 1;
+ panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
oeilCB.addItemListener(this);
- constraints.gridy += 1;
- panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT), constraints);
+ //constraints.gridy += 1;
+ panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
lookAtCB.setToolTipText("Look-at target");
lookAtCB.addItemListener(this);
+
+ cGridBag fill = new cGridBag();
+
+ fill.preferredHeight = 200;
+
+ panel.add(fill);
}
@@ -2916,7 +2903,7 @@
child.editWindow = null; // ???????????
}
- objEditor.ctrlPanel.revalidate();
+ objEditor.ctrlPanel.validate();
//objEditor.jTree.clearSelection();
//objEditor.ResetSliders();
refreshContents(true);
@@ -4124,12 +4111,12 @@
System.err.println("info : " + child.GetPath());
}
}
- else
- {
- objEditor.SetMaterial(group); // .GetMaterial());
- objEditor.AddInfo(group, this, true); // .GetMaterial());
- System.err.println("info : " + group.GetPath());
- }
+// else
+// {
+// objEditor.SetMaterial(group); // .GetMaterial());
+// objEditor.AddInfo(group, this, true); // .GetMaterial());
+// System.err.println("info : " + group.GetPath());
+// }
objEditor.SetText(); // jan 2014
--
Gitblit v1.6.2