From 25cef97465f0bfa8959663754e9243006324c81c Mon Sep 17 00:00:00 2001
From: Normand Briere <nbriere@noware.ca>
Date: Wed, 01 May 2019 10:09:53 -0400
Subject: [PATCH] Nimbus L&F
---
GroupEditor.java | 109 ++++++++++++++++++++++++------------------------------
1 files changed, 49 insertions(+), 60 deletions(-)
diff --git a/GroupEditor.java b/GroupEditor.java
index a2fec77..60a98fd 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);
liveCB.setToolTipText("Enabled animation");
liveCB.addItemListener(this);
- oe.aConstraints.gridx += 1;
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,39 +461,34 @@
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);
+ oe.toolbarPanel.add(rootButton = new cButton("o o o", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
rootButton.setToolTipText("Edit object 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);
@@ -604,15 +593,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 +609,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 +639,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,12 +656,12 @@
//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);
@@ -2720,7 +2709,7 @@
// centralPanel.setVisible(true);
// XYZPanel.setVisible(false);
bigThree.ClearUI();
- bigThree.addComponent(centralPanel);
+ bigThree.add(centralPanel);
bigThree.FlushUI();
} else
if (source == threeButton)
@@ -2755,8 +2744,8 @@
// centralPanel.setVisible(true);
// XYZPanel.setVisible(true);
bigThree.ClearUI();
- bigThree.addComponent(centralPanel);
- bigThree.addComponent(XYZPanel);
+ bigThree.add(centralPanel);
+ bigThree.add(XYZPanel);
bigThree.FlushUI();
} else
if (source == fourButton)
@@ -2791,7 +2780,7 @@
// centralPanel.setVisible(false);
// XYZPanel.setVisible(false);
bigThree.ClearUI();
- bigThree.addComponent(scenePanel);
+ bigThree.add(scenePanel);
bigThree.FlushUI();
} else
if (source == sixButton)
@@ -2826,8 +2815,8 @@
// centralPanel.setVisible(true);
// XYZPanel.setVisible(false);
bigThree.ClearUI();
- bigThree.addComponent(scenePanel);
- bigThree.addComponent(centralPanel);
+ bigThree.add(scenePanel);
+ bigThree.add(centralPanel);
bigThree.FlushUI();
} else
if (source == sevenButton)
@@ -2862,9 +2851,9 @@
// centralPanel.setVisible(true);
// XYZPanel.setVisible(true);
bigThree.ClearUI();
- bigThree.addComponent(scenePanel);
- bigThree.addComponent(centralPanel);
- bigThree.addComponent(XYZPanel);
+ bigThree.add(scenePanel);
+ bigThree.add(centralPanel);
+ bigThree.add(XYZPanel);
bigThree.FlushUI();
} else
if (source == rootButton)
@@ -2916,7 +2905,7 @@
child.editWindow = null; // ???????????
}
- objEditor.ctrlPanel.revalidate();
+ objEditor.ctrlPanel.validate();
//objEditor.jTree.clearSelection();
//objEditor.ResetSliders();
refreshContents(true);
--
Gitblit v1.6.2