From 47cd0f0a3870d843cb758535316060d30f15c811 Mon Sep 17 00:00:00 2001
From: Normand Briere <nbriere@noware.ca>
Date: Mon, 24 Jun 2019 19:10:13 -0400
Subject: [PATCH] Toolbox + DnD

---
 ObjEditor.java |  101 +++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 95 insertions(+), 6 deletions(-)

diff --git a/ObjEditor.java b/ObjEditor.java
index 9fcd4b1..fdd2815 100644
--- a/ObjEditor.java
+++ b/ObjEditor.java
@@ -4,6 +4,7 @@
 
 import java.awt.*;
 import java.awt.event.*;
+import java.awt.image.BufferedImage;
 import javax.swing.*;
 import javax.swing.event.*;
 import javax.swing.text.*;
@@ -37,6 +38,65 @@
     JFrame frame;
     
     static ObjEditor theFrame;
+    
+    cButton GetButton(String name, boolean border)
+    {
+        try
+        {
+            ImageIcon icon = GetIcon(name);
+            return new cButton(icon, border);
+        }
+        catch (Exception e)
+        {
+            return new cButton(name, border);
+        }
+    }
+
+    cToggleButton GetToggleButton(String name, boolean border)
+    {
+        try
+        {
+            ImageIcon icon = GetIcon(name);
+            return new cToggleButton(icon, border);
+        }
+        catch (Exception e)
+        {
+            return new cToggleButton(name, border);
+        }
+    }
+
+    cCheckBox GetCheckBox(String name, boolean border)
+    {
+        try
+        {
+            ImageIcon icon = GetIcon(name);
+            return new cCheckBox(icon, border);
+        }
+        catch (Exception e)
+        {
+            return new cCheckBox(name, border);
+        }
+    }
+
+    private ImageIcon GetIcon(String name) throws IOException
+    {
+        BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
+        
+        if (image.getWidth() != 24 && image.getHeight() != 24)
+        {
+            BufferedImage resized = new BufferedImage(24, 24, image.getType());
+            Graphics2D g = resized.createGraphics();
+            g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
+            //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
+            g.drawImage(image, 0, 0, 24, 24, 0, 0, image.getWidth(), image.getHeight(), null);
+            g.dispose();
+            
+            image = resized;
+        }
+        
+        javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
+        return icon;
+    }
     
     // SCRIPT
     
@@ -337,9 +397,12 @@
         editPanel.add(editCommandsPanel);
         editPanel.add(ctrlPanel);
                 
-        materialPanel = new cGridBag().setVertical(true);
+        toolboxPanel = new cGridBag().setVertical(false);
+        toolboxPanel.setName("Toolbox");
         
+        materialPanel = new cGridBag().setVertical(true);
         materialPanel.setName("Material");
+        
         /*JTextPane*/
         infoarea = createTextPane();
         doc = infoarea.getStyledDocument();
@@ -612,6 +675,8 @@
         
         boolean maximized;
     
+        cButton fullscreenLayout;
+
         void Minimize()
         {
             frame.setState(Frame.ICONIFIED);
@@ -673,7 +738,7 @@
 // X                   frame.getContentPane().add(/*"Center",*/bigThree);
                     framePanel.setDividerLocation(0);
 
-                    radio.layout = twoButton;
+                    radio.layout = fullscreenLayout;
                     radio.layout.doClick();
                     //frame.setVisible(true);
                 }
@@ -1347,6 +1412,7 @@
 
         //JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
         //tmp.setName("Edit");
+        objectPanel.add(toolboxPanel);
         objectPanel.add(materialPanel);
 //        JPanel north = new JPanel(new BorderLayout());
 //        north.setName("Edit");
@@ -3408,6 +3474,8 @@
     
     public void Save()
     {
+        System.err.println("Save");
+        
         cRadio tab = GetCurrentTab();
         
         boolean temp = CameraPane.SWITCH;
@@ -3492,6 +3560,8 @@
     
     public void Undo()
     {
+        System.err.println("Undo");
+        
         cRadio tab = GetCurrentTab();
         
         if (tab.undoindex == 0)
@@ -3675,7 +3745,7 @@
         assert false;
     }
 
-    void EditSelection()
+    void EditSelection(boolean newWindow)
     {
     }
 
@@ -4170,7 +4240,8 @@
 
     void makeSomething(Object3D thing, boolean resetmodel) // deselect)
     {
-        Save();
+        if (Globals.SAVEONMAKE) // && resetmodel)
+            Save();
         //Tween.set(thing, 0).target(1).start(tweenManager);
         //Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
 //            if (thing instanceof GenericJointDemo)
@@ -4257,6 +4328,12 @@
         {
             ResetModel();
             Select(thing.GetTreePath(), true, false); // unselect... false);
+            
+        if (thing.Size() == 0)
+        {
+            //EditSelection(false);
+        }
+        
             refreshContents();
         }
 
@@ -4479,6 +4556,7 @@
         
         if (readobj != null)
         {
+        if (Globals.SAVEONMAKE)
             Save();
             try
             {
@@ -4850,18 +4928,29 @@
     CheckboxMenuItem togglePaintItem;
     JSplitPane mainPanel;
     JScrollPane scrollpane;
+    
     JPanel toolbarPanel;
+    
     cGridBag treePanel;
+    
     JPanel radioPanel;
     ButtonGroup buttonGroup;
-    cGridBag ctrlPanel;
+    
+    cGridBag toolboxPanel;
     cGridBag materialPanel;
+    cGridBag ctrlPanel;
+    
     JScrollPane infoPanel;
+    
     cGridBag optionsPanel;
+    
     JTabbedPane objectPanel;
+    
     cGridBag XYZPanel;
+    
     JSplitPane gridPanel;
     JSplitPane bigPanel;
+    
     cGridBag bigThree;
     cGridBag scenePanel;
     cGridBag centralPanel;
@@ -4976,7 +5065,7 @@
     cNumberSlider fogField;
     JLabel opacityPowerLabel;
     cNumberSlider opacityPowerField;
-    JTree jTree;
+    cTree jTree;
     //ObjectUI parent;
     
     cNumberSlider normalpushField;

--
Gitblit v1.6.2