Changeset 1102 for trunk/src/org/expeditee/settings/templates/TemplateSettings.java

Timestamp:

05/10/18 16:04:51 (6 years ago)

Author:

davidb

Message:

Reworking of the code-base to separate logic from graphics. This version of Expeditee now supports a JFX graphics as an alternative to SWING

File:

• trunk/src/org/expeditee/settings/templates/TemplateSettings.java (modified) (9 diffs)

trunk/src/org/expeditee/settings/templates/TemplateSettings.java

@@ -19 +19 @@
 package org.expeditee.settings.templates;
 
-import java.awt.Color;
-
-import org.expeditee.gui.DisplayIO;
+import org.expeditee.core.Colour;
+import org.expeditee.gui.DisplayController;
 import org.expeditee.gui.Frame;
 import org.expeditee.gui.FrameUtils;
@@ -50 +49 @@
                                 i.setParent(null);
                         }
-                        DisplayIO.setCursor(Item.HIDDEN_CURSOR);
-                        DisplayIO.setCursor(Item.DEFAULT_CURSOR);
+                        DisplayController.setCursor(Item.HIDDEN_CURSOR);
+                        DisplayController.setCursor(Item.DEFAULT_CURSOR);
                 }
         };
         
-        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 }) {
+        public static final ArraySetting<Colour> ColorWheel = new ArraySetting<Colour>("The colours of items in the child frame are used to populate the colour wheel",
+                        new Colour[] { Colour.BLACK, Colour.RED, Colour.BLUE, Item.GREEN, Colour.MAGENTA, Colour.YELLOW.darker(), Colour.WHITE }) {
                 @Override
                 public boolean setSetting(Text text) {
@@ -68 +67 @@
         };
         
-        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 }) {
+        public static final ArraySetting<Colour> FillColorWheel = new ArraySetting<Colour>("The colours of items in the child frame are used to populate the colour wheel",
+                        new Colour[] { Colour.FromRGB255(255, 150, 150), Colour.FromRGB255(150, 150, 255), Colour.FromRGB255(150, 255, 150),
+                        Colour.FromRGB255(255, 150, 255), Colour.FromRGB255(255, 255, 100), Colour.WHITE, Colour.BLACK }) {
                 @Override
                 public boolean setSetting(Text text) {
@@ -82 +81 @@
         };
         
-        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 }) {
+        public static final ArraySetting<Colour> BackgroundColorWheel = new ArraySetting<Colour>("The colours of items in the child frame are used to populate the colour wheel",
+                        new Colour[] { Colour.FromRGB255(235, 235, 235), Colour.FromRGB255(225, 225, 255), Colour.FromRGB255(195, 255, 255),
+                                        Colour.FromRGB255(225, 255, 225), Colour.FromRGB255(255, 255, 195), Colour.FromRGB255(255, 225, 225),
+                                        Colour.FromRGB255(255, 195, 255), Colour.WHITE, Colour.GREY, Colour.DARK_GREY, Colour.BLACK, null }) {
                 @Override
                 public boolean setSetting(Text text) {
@@ -107 +106 @@
                 public Text generateText() {
                         Text t = new Text("AnnotationTemplate");
-                t.setColor(Color.gray);
+                t.setColor(Colour.GREY);
                 return t;
                 }
@@ -116 +115 @@
                 public Text generateText() {
                         Text t = new Text("CommentTemplate");
-                t.setColor(Color.green.darker());
+                t.setColor(Colour.GREEN.darker());
                 return t;
                 }
@@ -125 +124 @@
                 public Text generateText() {
                         Text t = new Text("StatsTemplate");
-                t.setColor(Color.BLACK);
-                t.setBackgroundColor(new Color(0.9F, 0.9F, 0.9F));
+                t.setColor(Colour.BLACK);
+                t.setBackgroundColor(new Colour(0.9F, 0.9F, 0.9F));
                 t.setFamily(Text.MONOSPACED_FONT);
                 t.setSize(14);
@@ -140 +139 @@
                 t.setFontStyle("Bold");
                 t.setFamily("SansSerif");
-                t.setColor(Color.BLUE);
+                t.setColor(Colour.BLUE);
                 t.setPosition(25, 50);
                 return t;
@@ -157 +156 @@
                 public Text generateText() {
                         Text t = new Text("TooltipTemplate");
-                t.setColor(Color.BLACK);
-                t.setBackgroundColor(new Color(0.7F, 0.7F, 0.9F));
+                t.setColor(Colour.BLACK);
+                t.setBackgroundColor(new Colour(0.7F, 0.7F, 0.9F));
                 // t.setFamily(Text.MONOSPACED_FONT);
                 t.setSize(14);