From 631719825b865aaf9fa1cb124d9fc5bd9dd78bd4 Mon Sep 17 00:00:00 2001
From: Normand Briere <nbriere@noware.ca>
Date: Sun, 05 May 2019 10:27:02 -0400
Subject: [PATCH] Disabled timer for instant selection.
---
GrafreeD.java | 56 +++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 45 insertions(+), 11 deletions(-)
diff --git a/GrafreeD.java b/GrafreeD.java
index 1527f55..6485281 100644
--- a/GrafreeD.java
+++ b/GrafreeD.java
@@ -15,6 +15,8 @@
//import com.jamonapi.*;
public class GrafreeD extends Applet implements ActionListener
{
+ static boolean NIMBUSLAF = true;
+
static int RENDERME = 0;
static boolean epsequal = false;
@@ -595,6 +597,9 @@
public static void main(String argv[])
{
+ String osArch = System.getProperty("os.arch");
+ System.out.println("os.arch = " + osArch);
+
if (argv.length == 0)
{
String javaPath = System.getProperty("java.home") + File.separator + "bin" + File.separator + "java";
@@ -607,7 +612,7 @@
System.out.println("jarfile0 = " + jarfile);
- String jarpath = u.toString().split("file:")[1].split("GrafreeD.jar")[0];
+ String jarpath = u.toString().split("file:")[1].split("Grafreed.jar")[0];
System.out.println("jarpath0 = " + jarpath);
@@ -626,7 +631,11 @@
System.out.println("jarfile = " + jarfile);
jarpath = jarpath.substring(1, jarpath.length());
System.out.println("jarpath = " + jarpath);
- command += "native" + File.separator + "windows_amd64";
+ command += "native" + File.separator;
+ if (osArch.equals("amd64"))
+ command += "windows_amd64";
+ else
+ command += "windows_i586";
}
else
command += "native" + File.separator + "macosx";
@@ -794,24 +803,49 @@
// PlayAudio("/Users/nbriere/Downloads/Footsteps-6.wav", 4, 1);
-
- try
+/**/
+ if (NIMBUSLAF)
{
- MetalLookAndFeel.setCurrentTheme(new DefaultMetalTheme());
- MetalLookAndFeel.setCurrentTheme(new Theme(Constants.yellowTheme));
- UIManager.setLookAndFeel(new MetalLookAndFeel());
- //UIManager.setLookAndFeel("com.sun.java.swing.plaf.nimbus.NimbusLookAndFeel");
+ try
+ {
+ 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("com.sun.java.swing.plaf.nimbus.NimbusLookAndFeel");
//UIManager.setLookAndFeel("com.apple.laf.AquaLookAndFeel");
//UIManager.setLookAndFeel("javax.swing.plaf.metal.MetalLookAndFeel");
- } catch (Exception e)
- {
+ //UIManager.put("nimbusBase", new Color(0,0,0));
+ }
+ catch (Exception e)
+ {
+ }
}
+ else
+ {
+ try
+ {
+ MetalLookAndFeel.setCurrentTheme(new DefaultMetalTheme());
+ MetalLookAndFeel.setCurrentTheme(new Theme(Constants.yellowTheme));
+ UIManager.setLookAndFeel(new MetalLookAndFeel());
+ //UIManager.setLookAndFeel("com.sun.java.swing.plaf.nimbus.NimbusLookAndFeel");
+ //UIManager.setLookAndFeel("com.apple.laf.AquaLookAndFeel");
+ //UIManager.setLookAndFeel("javax.swing.plaf.metal.MetalLookAndFeel");
+ } catch (Exception e)
+ {
+ }
+ }
+/**/
+// javax.swing.ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
+
//Monitor mon=MonitorFactory.start("myFirstMonitor");
standAlone = true;
grafreeD = new GrafreeD();
grafreeD.universe = new Composite();
- grafreeD.universe.name = "Scene";
+ grafreeD.universe.name = "Grafreed";
grafreeD.universe.material = new cMaterial();
// theApplet3D.universe.textures = CameraPane.DEFAULT_TEXTURE;
--
Gitblit v1.6.2