Changeset 729 for trunk/src/org/expeditee/settings/UserSettings.java

Timestamp:

01/21/14 11:59:05 (10 years ago)

Author:

jts21

Message:

Move ColorWheels to UserSettings, store them as new ArraySetting type that handles default values (so now ColorWheels have defaults if you unlink their setting)

File:

• trunk/src/org/expeditee/settings/UserSettings.java (modified) (3 diffs)

trunk/src/org/expeditee/settings/UserSettings.java

@@ -6 +6 @@
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.LinkedList;
 import java.util.List;
@@ -22 +23 @@
 import org.expeditee.items.ItemUtils;
 import org.expeditee.items.Text;
+import org.expeditee.setting.ArraySetting;
 import org.expeditee.setting.BooleanSetting;
 import org.expeditee.setting.FloatSetting;
@@ -289 +291 @@
          * Colorwheels
          */
-        public static final FrameSetting ColorWheel = new FrameSetting("The colours of items in the child frame are used to populate the colour wheel") {
-                @Override
-                protected void run(Frame frame) {
-                        Item.COLOR_WHEEL = FrameUtils.getColorWheel(frame);
-                }
-        };
-        
-        public static final FrameSetting FillColorWheel = new FrameSetting("The colours of items in the child frame are used to populate the colour wheel") {
-                @Override
-                protected void run(Frame frame) {
-                        Item.FILL_COLOR_WHEEL = FrameUtils.getColorWheel(frame);
-                }
-        };
-        
-        public static final FrameSetting BackgroundColorWheel = new FrameSetting("The colours of items in the child frame are used to populate the colour wheel") {
-                @Override
-                protected void run(Frame frame) {
-                        Frame.COLOR_WHEEL = FrameUtils.getColorWheel(frame);
+        public static final ArraySetting<Color> ColorWheel = new ArraySetting<Color>("The colours of items in the child frame are used to populate the colour wheel",
+                        new Color[] { Color.BLACK, Color.RED, Color.BLUE, Item.GREEN, Color.MAGENTA, Color.YELLOW.darker(), Color.WHITE }) {
+                @Override
+                public boolean setSetting(Text text) {
+                        Frame child = text.getChild();
+                if (child == null) {
+                        return false;
+                }
+                _value = FrameUtils.getColorWheel(child);
+                return true;
+                }
+        };
+        
+        public static final ArraySetting<Color> FillColorWheel = new ArraySetting<Color>("The colours of items in the child frame are used to populate the colour wheel",
+                        new Color[] { new Color(255, 150, 150), new Color(150, 150, 255), new Color(150, 255, 150),
+                        new Color(255, 150, 255), new Color(255, 255, 100), Color.WHITE, Color.BLACK }) {
+                @Override
+                public boolean setSetting(Text text) {
+                        Frame child = text.getChild();
+                if (child == null) {
+                        return false;
+                }
+                _value = FrameUtils.getColorWheel(child);
+                return true;
+                }
+        };
+        
+        public static final ArraySetting<Color> BackgroundColorWheel = new ArraySetting<Color>("The colours of items in the child frame are used to populate the colour wheel",
+                        new Color[] { new Color(235, 235, 235), new Color(225, 225, 255), new Color(195, 255, 255),
+                        new Color(225, 255, 225), new Color(255, 255, 195), new Color(255, 225, 225),
+                        new Color(255, 195, 255), Color.WHITE, Color.GRAY, Color.DARK_GRAY, Color.BLACK, null }) {
+                @Override
+                public boolean setSetting(Text text) {
+                        Frame child = text.getChild();
+                if (child == null) {
+                        return false;
+                }
+                _value = FrameUtils.getColorWheel(child);
+                return true;
                 }
         };