From 59de607850161a26863f92961d53caae7a2dabc8 Mon Sep 17 00:00:00 2001
From: Normand Briere <nbriere@noware.ca>
Date: Tue, 06 Aug 2019 21:37:03 -0400
Subject: [PATCH] Pin button.
---
GroupEditor.java | 85 ++++++++++++++++++++++++++----------------
1 files changed, 53 insertions(+), 32 deletions(-)
diff --git a/GroupEditor.java b/GroupEditor.java
index 0efe0b9..00a0f61 100644
--- a/GroupEditor.java
+++ b/GroupEditor.java
@@ -16,6 +16,7 @@
//import buoy.widget.BFileChooser;
class GroupEditor extends ObjEditor implements //iParse, //iCallBack,
+ Grafreed.iResourceCallBack,
ObjectUI,
Runnable,
ActionListener,
@@ -311,12 +312,24 @@
}
}
- public void ChangeSkybox(String name)
+ public void CallBack(String[] path)
+ {
+ for (int i = 0; i < path.length; i++)
+ {
+ System.out.print(path[i] + "/");
+ }
+
+ System.out.println();
+ }
+
+ public void ChangeSkybox(String skybox)
{
//cameraView.envyoff = false;
- group.skyboxname = name;
+ group.skyboxname = skybox;
group.skyboxext = "jpg";
cameraView.repaint();
+
+ Grafreed.ParseResources("textures", this);
}
//ObjEditor objEditor;
@@ -931,32 +944,36 @@
restoreCameraButton.setToolTipText("Restore viewpoint");
restoreCameraButton.addActionListener(this);
- copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
- saveButton.setToolTipText("Duplicate current version");
- saveButton.addActionListener(this);
+ copyOptionsPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
+ saveVersionButton.setToolTipText("Duplicate current version");
+ saveVersionButton.addActionListener(this);
- copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
- undoButton.setToolTipText("Previous version");
- undoButton.addActionListener(this);
- undoButton.setEnabled(false);
+ copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
+ deleteVersionButton.setToolTipText("Delete current version");
+ deleteVersionButton.addActionListener(this);
+
+ copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
+ previousVersionButton.setToolTipText("Previous version");
+ previousVersionButton.addActionListener(this);
+ previousVersionButton.setEnabled(false);
cGridBag updown = new cGridBag().setVertical(true);
updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
restoreButton.setToolTipText("Undo (restore current version)");
restoreButton.addActionListener(this);
- restoreButton.setEnabled(false);
+ //restoreButton.setEnabled(false);
updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
replaceButton.setToolTipText("Save (replace current version)");
replaceButton.addActionListener(this);
- replaceButton.setEnabled(false);
+ //replaceButton.setEnabled(false);
copyOptionsPanel.add(updown);
- copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
- redoButton.setToolTipText("Next version");
- redoButton.addActionListener(this);
- redoButton.setEnabled(false);
+ copyOptionsPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
+ nextVersionButton.setToolTipText("Next version");
+ nextVersionButton.addActionListener(this);
+ nextVersionButton.setEnabled(false);
oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
liveCB.setToolTipText("Enable animation");
@@ -1094,7 +1111,7 @@
cGridBag skyboxpane = new cGridBag();
skyboxpane.preferredHeight = 100;
- oe.toolboxPanel.add(skyboxpane);
+ oe.skyboxPanel.add(skyboxpane);
JTabbedPane skyboxpanel = new JTabbedPane();
skyboxpane.add(skyboxpanel);
@@ -1121,9 +1138,9 @@
clearPanelButton.setToolTipText("Clear edit panel");
clearPanelButton.addActionListener(this);
- editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
- unselectButton.setToolTipText("Unselect");
- unselectButton.addActionListener(this);
+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
+ //unselectButton.setToolTipText("Unselect");
+ //unselectButton.addActionListener(this);
editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
flashSelectionButton.setToolTipText("Highlight selection");
@@ -2571,7 +2588,7 @@
if (source == invariantsItem)
{
System.out.println("Invariants:");
- Grafreed.grafreeD.universe.invariants();
+ Grafreed.grafreed.universe.invariants();
} else
if (source == memoryItem)
{
@@ -2602,35 +2619,40 @@
{
ToggleFullScreen();
} else
- if (source == undoButton)
+ if (source == previousVersionButton)
{
// Go to previous version
//if (!Undo())
//java.awt.Toolkit.getDefaultToolkit().beep();
- Undo();
+ PreviousVersion();
} else
if (source == restoreButton)
{
// Restore current version
Restore();
- restoreButton.setEnabled(false);
+ //restoreButton.setEnabled(false);
} else
if (source == replaceButton)
{
// Overwrite current version
Replace();
- replaceButton.setEnabled(false);
+ //replaceButton.setEnabled(false);
} else
- if (source == redoButton)
+ if (source == nextVersionButton)
{
// Go to next version
- Redo();
+ NextVersion();
} else
- if (source == saveButton)
+ if (source == saveVersionButton)
{
// Save a new version
if (!Save(true))
java.awt.Toolkit.getDefaultToolkit().beep();
+ } else
+ if (source == deleteVersionButton)
+ {
+ // Delete a new version
+ DeleteVersion();
} else
if (source == oneStepButton)
{
@@ -2685,11 +2707,11 @@
} else
if (source == undoItem)
{
- Undo();
+ PreviousVersion();
} else
if (source == redoItem)
{
- Redo();
+ NextVersion();
} else
if (source == duplicateItem)
{
@@ -5160,7 +5182,7 @@
{
editButton.setEnabled(enabled);
uneditButton.setEnabled(enabled);
- unselectButton.setEnabled(enabled);
+ //unselectButton.setEnabled(enabled);
flashSelectionButton.setEnabled(enabled);
clearPanelButton.setEnabled(!listUI.isEmpty());
@@ -5168,7 +5190,7 @@
void refreshContents(boolean cp)
{
- if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
{
objEditor.ClearInfo(); // .GetMaterial());
@@ -6004,7 +6026,6 @@
cButton restoreCameraButton;
- cButton saveButton;
cButton oneStepButton;
cButton groupButton;
--
Gitblit v1.6.2