From 66aca73cce89e4b4d7521862760edf4b0888bc38 Mon Sep 17 00:00:00 2001
From: Normand Briere <nbriere@noware.ca>
Date: Sat, 17 Aug 2019 20:45:38 -0400
Subject: [PATCH] Tree icons, tabbed pane + credits.
---
Grafreed.java | 70 ++++++++++++++++++++++++++++++----
1 files changed, 61 insertions(+), 9 deletions(-)
diff --git a/Grafreed.java b/Grafreed.java
index 39862ba..2c1cfc9 100644
--- a/Grafreed.java
+++ b/Grafreed.java
@@ -15,9 +15,7 @@
//import com.jamonapi.*;
public class Grafreed extends Applet implements ActionListener
-{
- static boolean NIMBUSLAF = false; // true;
-
+{
static int RENDERME = 0;
static boolean epsequal = false;
@@ -885,15 +883,15 @@
/**/
- if (NIMBUSLAF)
+ if (Globals.NIMBUSLAF)
{
try
{
- Object o = UIManager.getInstalledLookAndFeels();
+ //Object o = UIManager.getInstalledLookAndFeels();
javax.swing.plaf.metal.MetalLookAndFeel.setCurrentTheme(new javax.swing.plaf.metal.DefaultMetalTheme());
//MetalLookAndFeel.setCurrentTheme(new Theme(Constants.beigeTheme));
- UIManager.setLookAndFeel(new javax.swing.plaf.metal.MetalLookAndFeel());
+ //UIManager.setLookAndFeel(new javax.swing.plaf.metal.MetalLookAndFeel());
UIManager.setLookAndFeel("com.sun.java.swing.plaf.nimbus.NimbusLookAndFeel");
//UIManager.setLookAndFeel("com.apple.laf.AquaLookAndFeel");
@@ -901,6 +899,9 @@
//UIManager.put("nimbusBase", new Color(0,0,0));
javax.swing.UIDefaults ui = UIManager.getDefaults();
+
+ ui.put("TabbedPane.tabInsets", new javax.swing.plaf.InsetsUIResource(0,8,0,0));
+
for (java.util.Enumeration e = ui.keys(); e.hasMoreElements();)
{
Object key = e.nextElement();
@@ -920,13 +921,19 @@
MetalLookAndFeel.setCurrentTheme(new javax.swing.plaf.metal.DefaultMetalTheme());
//MetalLookAndFeel.setCurrentTheme(new Theme(Constants.yellowTheme));
//UIManager.put("ScrollBar.background", new javax.swing.plaf.ColorUIResource(100,0,0));
+ UIManager.setLookAndFeel("com.sun.java.swing.plaf.nimbus.NimbusLookAndFeel");
+
+ javax.swing.UIDefaults ui = UIManager.getDefaults();
+
+ Object x = ui.get("TabbedPane.background");
+
UIManager.setLookAndFeel(new MetalLookAndFeel());
- //UIManager.setLookAndFeel("com.sun.java.swing.plaf.nimbus.NimbusLookAndFeel");
//UIManager.setLookAndFeel("com.apple.laf.AquaLookAndFeel");
//UIManager.setLookAndFeel("javax.swing.plaf.nimbus.NimbusLookAndFeel");
//UIManager.setLookAndFeel("javax.swing.plaf.metal.MetalLookAndFeel");
- javax.swing.UIDefaults ui = UIManager.getDefaults();
+ ui = UIManager.getDefaults();
+
ArrayList gradient = new java.util.ArrayList(5);
gradient.add(1.0);
gradient.add(0.0);
@@ -935,10 +942,50 @@
gradient.add(new javax.swing.plaf.ColorUIResource(0,0,0));
ui.put("Button.gradient", gradient);
- ui.put("TabbedPane.tabInsets", new javax.swing.plaf.InsetsUIResource(0,8,0,0));
+
+ //ui.put("RadioButton.icon", ObjEditor.GetIcon("icons/white-sphere-icon.png"));
+ //ui.put("RadioButtonMenuItem.checkIcon", ObjEditor.GetIcon("icons/fit.png"));
+ //ui.put("RadioButtonMenuItem.arrowIcon", ObjEditor.GetIcon("icons/fit.png"));
+
ui.put("Slider.foreground", new javax.swing.plaf.ColorUIResource(0,0,0));
ui.put("Slider.horizontalThumbIcon", ObjEditor.GetIcon("icons/white-sphere-icon.png"));
+ /*
+TabbedPane.unselectedBackground Color
+TabbedPane.unselectedTabBackground Color
+TabbedPane.unselectedTabForeground Color
+TabbedPane.unselectedTabHighlight Color
+TabbedPane.unselectedTabShadow
+ */
+// ui.put("TabbedPane.contentAreaColor", new javax.swing.plaf.ColorUIResource(0,100,0));
+ //ui.put("TabbedPane.selected", new javax.swing.plaf.ColorUIResource(200,0,200));
+
+ ui.put("TabbedPane.background", new javax.swing.plaf.ColorUIResource(150,150,150));
+ ui.put("TabbedPane.foreground", new javax.swing.plaf.ColorUIResource(50,50,50));
+ ui.put("TabbedPane.light", new javax.swing.plaf.ColorUIResource(255,255,255));
+ ui.put("TabbedPane.selectedForeground", new javax.swing.plaf.ColorUIResource(0,0,0));
+ ui.put("TabbedPane.selectHighlight", new javax.swing.plaf.ColorUIResource(255,255,255));
+ ui.put("TabbedPane.darkShadow", new javax.swing.plaf.ColorUIResource(0,0,0));
+
+// ui.put("TabbedPane.shadow", new javax.swing.plaf.ColorUIResource(200,0,0));
+// ui.put("TabbedPane.tabAreaBackground", new javax.swing.plaf.ColorUIResource(0,200,0));
+// ui.put("TabbedPane.unselectedBackground", new javax.swing.plaf.ColorUIResource(200,200,0));
+// ui.put("TabbedPane.unselectedTabBackground", new javax.swing.plaf.ColorUIResource(0,0,200));
+// ui.put("TabbedPane.unselectedTabForeground", new javax.swing.plaf.ColorUIResource(200,0,200));
+// ui.put("TabbedPane.unselectedTabHighlight", new javax.swing.plaf.ColorUIResource(0,200,200));
+// ui.put("TabbedPane.unselectedTabShadow", new javax.swing.plaf.ColorUIResource(200,200,200));
+
+ ui.put("TabbedPane.textIconGap", 0);
+ ui.put("TabbedPane.contentBorderInsets", new javax.swing.plaf.InsetsUIResource(0,0,0,0));
+ ui.put("TabbedPane.tabAreaInsets", new javax.swing.plaf.InsetsUIResource(1,1,0,0));
+ ui.put("TabbedPane.tabInsets", new javax.swing.plaf.InsetsUIResource(0,8,0,0));
+
+ Object openIcon2 = ui.get("Tree.openIcon");
+
+ ui.put("Tree.openIcon", ObjEditor.GetIcon("icons/folderopen.png"));
+ ui.put("Tree.closedIcon", ObjEditor.GetIcon("icons/folderclose.png"));
+ ui.put("Tree.leafIcon", ObjEditor.GetIcon("icons/file.png"));
+
//javax.swing.plaf.metal.MetalIconFactory.getHorizontalSliderThumbIcon().
Object o = ui.get("Slider.horizontalThumbIcon");
@@ -1150,6 +1197,11 @@
static public Object clone(Object o)
{
+ if (o instanceof Object3D)
+ {
+ assert(((Object3D)o).parent == null);
+ }
+
if (o == null)
return null;
--
Gitblit v1.6.2