From c23a2a128cbd5eb94b1a11e3b3a34676cf681135 Mon Sep 17 00:00:00 2001
From: Normand Briere <nbriere@noware.ca>
Date: Mon, 02 Sep 2019 10:46:28 -0400
Subject: [PATCH] isWindows flag.
---
ObjEditor.java | 47 +++++++++++++++++++++++++++++++++--------------
1 files changed, 33 insertions(+), 14 deletions(-)
diff --git a/ObjEditor.java b/ObjEditor.java
index b849ed2..eab8b93 100644
--- a/ObjEditor.java
+++ b/ObjEditor.java
@@ -136,19 +136,19 @@
{
BufferedImage image;
-// if (name.endsWith("jpg"))
-// {
-// try
-// {
-// // Much faster!
-// image = new sun.awt.image.codec.JPEGImageDecoderImpl(ObjEditor.class.getClassLoader().getResourceAsStream(name)).decodeAsBufferedImage();
-// }
-// catch (Exception e)
-// {
-// image = javax.imageio.ImageIO.read(ObjEditor.class.getClassLoader().getResourceAsStream(name));
-// }
-// }
-// else
+ if (!Grafreed.isWindows && name.endsWith("jpg"))
+ {
+ try
+ {
+ // Much faster!
+ image = new sun.awt.image.codec.JPEGImageDecoderImpl(ObjEditor.class.getClassLoader().getResourceAsStream(name)).decodeAsBufferedImage();
+ }
+ catch (Exception e)
+ {
+ image = javax.imageio.ImageIO.read(ObjEditor.class.getClassLoader().getResourceAsStream(name));
+ }
+ }
+ else
image = javax.imageio.ImageIO.read(ObjEditor.class.getClassLoader().getResourceAsStream(name));
// if (image.getWidth() > 48 && image.getHeight() > 48)
@@ -1341,6 +1341,11 @@
obj = o;
}
}
+
+ String GetSupportText()
+ {
+ return "Support";
+ }
void SetupUI2(ObjEditor oe)
{
@@ -1392,7 +1397,7 @@
randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
- link2masterCB = AddCheckBox(setupPanel2, "Support", copy.link2master);
+ link2masterCB = AddCheckBox(setupPanel2, GetSupportText(), copy.link2master);
link2masterCB.setToolTipText("Attach to support");
if (Globals.ADVANCED)
@@ -4094,6 +4099,20 @@
if (event.getSource() == randomCB)
{
copy.random ^= true;
+ if (this instanceof RandomEditor)
+ {
+ cGridBag itemPanel = ((RandomEditor)this).itemPanel;
+ itemPanel.getComponent(0).setEnabled(!copy.random);
+
+ // Tooltip?
+ if (copy.random)
+ {
+ }
+ else
+ {
+ }
+ }
+
objEditor.refreshContents();
return;
}
--
Gitblit v1.6.2