Minor tuning

Normand Briere

2019-08-22 6a145f6c81dfcbe0653eda27d042efb48daa7512

 Grafreed.java
..
..
@@ -881,7 +881,6 @@
881
881
 //        try{Thread.sleep(5000);}catch(Exception e){}
882
882
 //        PlayAudio("/Users/nbriere/Downloads/Footsteps-6.wav", 4, 1);
883
883
         
884
-        
885
884
 /**/
886
885
         if (Globals.NIMBUSLAF)
887
886
         {
..
..
@@ -934,6 +933,8 @@
934
933
                     
935
934
                     ui = UIManager.getDefaults();
936
935
                     
936
+                    x = ui.get("RadioButton.icon");
937
+                    
937
938
                     ArrayList gradient = new java.util.ArrayList(5);
938
939
                     gradient.add(1.0);
939
940
                     gradient.add(0.0);
..
..
@@ -943,9 +944,9 @@
943
944
                     
944
945
                     ui.put("Button.gradient", gradient);
945
946
                     
946
-                    //ui.put("RadioButton.icon", ObjEditor.GetIcon("icons/white-sphere-icon.png"));
947
-                    //ui.put("RadioButtonMenuItem.checkIcon", ObjEditor.GetIcon("icons/fit.png"));
948
-                    //ui.put("RadioButtonMenuItem.arrowIcon", ObjEditor.GetIcon("icons/fit.png"));
947
+                    //ui.put("RadioButton.icon", new CheckBox()); //ObjEditor.GetIcon("icons/white-sphere-icon.png")));
948
+                    ui.put("CheckBox.icon", new CheckBox()); //ObjEditor.GetIcon("icons/white-sphere-icon.png")));
949
+                    //ui.put("CheckBoxMenuItem.checkIcon", ObjEditor.GetIcon("icons/white-sphere-icon.png"));
949
950
                     
950
951
                     ui.put("Slider.foreground", new javax.swing.plaf.ColorUIResource(0,0,0));
951
952
                     ui.put("Slider.horizontalThumbIcon", ObjEditor.GetIcon("icons/white-sphere-icon.png"));
..
..
@@ -1015,7 +1016,9 @@
1015
1016
         
1016
1017
         //Monitor mon=MonitorFactory.start("myFirstMonitor");
1017
1018
         standAlone = true;
1018
-        grafreed = new Grafreed();
1019
+        
1020
+        grafreed = new Grafreed();   
1021
+        
1019
1022
         grafreed.materials = ReadGFD(grafreed.getClass().getClassLoader().getResourceAsStream("gfd/materials.gfd"));
1020
1023
         
1021
1024
         grafreed.universe = new cGroup();
..
..
@@ -1035,6 +1038,33 @@
1035
1038
         javax.swing.ToolTipManager.sharedInstance().setEnabled(Globals.TOOLTIPS);
1036
1039
     }
1037
1040
 
1041
+    static class CheckBox extends javax.swing.plaf.metal.MetalCheckBoxIcon
1042
+    {
1043
+        java.awt.image.BufferedImage image;
1044
+        
1045
+        CheckBox()
1046
+        {
1047
+            try
1048
+            {
1049
+                image = javax.imageio.ImageIO.read(ObjEditor.class.getClassLoader().getResourceAsStream("icons/checkbox.png"));
1050
+            }
1051
+            catch (Exception e)
1052
+            {
1053
+            }
1054
+        }
1055
+        
1056
+        protected void drawCheck(Component c, Graphics g, int x, int y)
1057
+        {
1058
+            super.drawCheck(c, g, x, y);
1059
+        }
1060
+        
1061
+        public void paintIcon(Component c, Graphics g, int x, int y)
1062
+        {
1063
+            g.drawImage(image, x-1, y-1, 19, 19, null);
1064
+            super.paintIcon(c, g, x+2, y+2);
1065
+        }
1066
+    }
1067
+    
1038
1068
     static Object3D materials;
1039
1069
     
1040
1070
     static Object3D ReadGFD(java.io.InputStream istream)