From 46dbce888e7c3eff8969f1ddbe22e144410b67f4 Mon Sep 17 00:00:00 2001 From: Normand Briere <nbriere@noware.ca> Date: Sun, 07 Jul 2019 10:20:06 -0400 Subject: [PATCH] Put back serial IDs for cone and torus. --- GroupEditor.java | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/GroupEditor.java b/GroupEditor.java index dab62a9..84ed69e 100644 --- a/GroupEditor.java +++ b/GroupEditor.java @@ -380,6 +380,7 @@ shadowYItem.addActionListener(this); shadowZItem = menu.add(new MenuItem("Shadow Blue")); shadowZItem.addActionListener(this); + if (Globals.ADVANCED) { menu.add("-"); @@ -601,6 +602,10 @@ fullButton.setToolTipText("Full-screen window"); fullButton.addActionListener(this); + oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints); + screenfitButton.setToolTipText("Screen fit"); + screenfitButton.addActionListener(this); + oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints); restoreCameraButton.setToolTipText("Restore viewpoint"); restoreCameraButton.addActionListener(this); @@ -633,10 +638,6 @@ //oe.toolboxPanel.Return(); - copyOptionsPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints); - screenfitButton.setToolTipText("Screen fit"); - screenfitButton.addActionListener(this); - // copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints); // trackCB.setToolTipText("Enable tracking"); // trackCB.addItemListener(this); @@ -1214,8 +1215,6 @@ } } - String string = (String) object; - System.out.println("Transfer = " + object + "; drop : " + target); // if( object instanceof java.io.File[]) // { @@ -1223,6 +1222,8 @@ // objEditor.DropFile((java.io.File[]) object, true); // return; // } + + String string = (String) object; // File path for Mac and Windows if (string.charAt(0) == '/' || string.charAt(1) == ':') @@ -2219,7 +2220,8 @@ } else if (source == undoButton) { - Undo(); + if (!Undo()) + java.awt.Toolkit.getDefaultToolkit().beep(); } else if (source == redoButton) { @@ -2227,7 +2229,8 @@ } else if (source == saveButton) { - Save(); + if (!Save(true)) + java.awt.Toolkit.getDefaultToolkit().beep(); } else if (source == oneStepButton) { @@ -2236,17 +2239,14 @@ } else if (source == screenfitButton) { - //Reload(lastConverter, lastFilename, true); ScreenFit(); } else if (source == screenfitpointButton) { - //Reload(lastConverter, lastFilename, true); ScreenFitPoint(); } else if (source == snapobjectButton) { - //Reload(lastConverter, lastFilename, true); SnapObject(); } else // if (event.getSource() == recompileButton) -- Gitblit v1.6.2