From e79247ef52a0bbb3864d46bb1e2c716005b3ecf3 Mon Sep 17 00:00:00 2001
From: Normand Briere <nbriere@noware.ca>
Date: Thu, 18 Jul 2019 22:19:40 -0400
Subject: [PATCH] Move XYZ panel + icons.
---
ObjEditor.java | 90 +++++++++++++++++++++-----------------------
1 files changed, 43 insertions(+), 47 deletions(-)
diff --git a/ObjEditor.java b/ObjEditor.java
index 6e1560f..30d64e6 100644
--- a/ObjEditor.java
+++ b/ObjEditor.java
@@ -44,61 +44,47 @@
cButton GetButton(String name, boolean border)
{
- try
- {
- ImageIcon icon = GetIcon(name);
- return new cButton(icon, border);
- }
- catch (Exception e)
- {
- return new cButton(name, border);
- }
+ ImageIcon icon = GetIcon(name);
+ return new cButton(icon, 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);
- }
+ ImageIcon icon = GetIcon(name);
+ return new cToggleButton(icon, border);
}
cCheckBox GetCheckBox(String name, boolean border)
{
+ ImageIcon icon = GetIcon(name);
+ return new cCheckBox(icon, border);
+ }
+
+ private ImageIcon GetIcon(String name)
+ {
try
{
- ImageIcon icon = GetIcon(name);
- return new cCheckBox(icon, border);
+ 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;
}
catch (Exception e)
{
- return new cCheckBox(name, border);
+ return null;
}
- }
-
- 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
@@ -437,11 +423,12 @@
toolbarPanel = new JPanel();
toolbarPanel.setName("Toolbar");
+
treePanel = new cGridBag();
treePanel.setName("Tree");
editPanel = new cGridBag().setVertical(true);
- editPanel.setName("Edit");
+ //editPanel.setName("Edit");
ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
@@ -450,10 +437,10 @@
editPanel.add(ctrlPanel);
toolboxPanel = new cGridBag().setVertical(false);
- toolboxPanel.setName("Toolbox");
+ //toolboxPanel.setName("Toolbox");
materialPanel = new cGridBag().setVertical(true);
- materialPanel.setName("Material");
+ //materialPanel.setName("Material");
/*JTextPane*/
infoarea = createTextPane();
@@ -461,6 +448,7 @@
infoarea.setEditable(true);
SetText();
+
// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
// infoarea.setOpaque(false);
// //infoarea.setForeground(textcolor);
@@ -468,7 +456,7 @@
// TEXTAREA infoarea.setWrapStyleWord(true);
infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
infoPanel.setPreferredSize(new Dimension(1, 1));
- infoPanel.setName("Info");
+ //infoPanel.setName("Info");
//infoPanel.setLayout(new BorderLayout());
//infoPanel.add(createTextPane());
@@ -1492,6 +1480,7 @@
XYZPanel.addComponent(/*BorderLayout.SOUTH,*/sideView); // Scroll);
XYZPanel.addComponent(/*BorderLayout.CENTER,*/frontView); // Scroll);
XYZPanel.addComponent(/*BorderLayout.NORTH,*/topView); // Scroll);
+ //XYZPanel.setName("XYZ");
/*
gridPanel = new JPanel(); //new BorderLayout());
@@ -1529,16 +1518,23 @@
//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
//tmp.setName("Edit");
objectPanel.add(materialPanel);
+ objectPanel.setIconAt(0, GetIcon("icons/material.png"));
// JPanel north = new JPanel(new BorderLayout());
// north.setName("Edit");
// north.add(ctrlPanel, BorderLayout.NORTH);
// objectPanel.add(north);
objectPanel.add(editPanel);
+ objectPanel.setIconAt(1, GetIcon("icons/write.png"));
//if (Globals.ADVANCED)
objectPanel.add(infoPanel);
+ objectPanel.setIconAt(2, GetIcon("icons/info.png"));
+
+ objectPanel.add(XYZPanel);
+ objectPanel.setIconAt(3, GetIcon("icons/XYZ.png"));
objectPanel.add(toolboxPanel);
+ objectPanel.setIconAt(4, GetIcon("icons/primitives.png"));
/*
aConstraints.gridx = 0;
@@ -1559,7 +1555,7 @@
scrollpane.addMouseWheelListener(this); // Default not fast enough
/*JTabbedPane*/ scenePanel = new cGridBag();
- scenePanel.preferredWidth = 6;
+ scenePanel.preferredWidth = 5;
JTabbedPane tabbedPane = new JTabbedPane();
tabbedPane.add(scrollpane);
@@ -1637,7 +1633,7 @@
bigThree = new cGridBag();
bigThree.addComponent(scenePanel);
bigThree.addComponent(centralPanel);
- bigThree.addComponent(XYZPanel);
+ //bigThree.addComponent(XYZPanel);
// // SIDE EFFECT!!!
// aConstraints.gridx = 0;
--
Gitblit v1.6.2