diff --git a/app/src/main/java/com/annimon/hotarufx/ui/FontAwesome.java b/app/src/main/java/com/annimon/hotarufx/ui/FontAwesome.java index e5feb4b..207cb71 100644 --- a/app/src/main/java/com/annimon/hotarufx/ui/FontAwesome.java +++ b/app/src/main/java/com/annimon/hotarufx/ui/FontAwesome.java @@ -8,6 +8,7 @@ import java.util.Map; import java.util.stream.Collectors; import javafx.scene.text.Font; import javafx.util.Pair; +import lombok.Getter; public enum FontAwesome { @@ -25,6 +26,7 @@ public enum FontAwesome { SCISSORS("\uf0c4", "scissors", "cut"), UNDO("\uf0e2", "undo"); + @Getter private final String symbol; private final List names; diff --git a/app/src/main/java/com/annimon/hotarufx/ui/FontAwesomeIcon.java b/app/src/main/java/com/annimon/hotarufx/ui/FontAwesomeIcon.java index cd8dbd1..cbcd0f2 100644 --- a/app/src/main/java/com/annimon/hotarufx/ui/FontAwesomeIcon.java +++ b/app/src/main/java/com/annimon/hotarufx/ui/FontAwesomeIcon.java @@ -12,6 +12,10 @@ public class FontAwesomeIcon extends Text { init(); } + public FontAwesomeIcon(FontAwesome icon) { + this(icon.getSymbol()); + } + public FontAwesomeIcon(String text) { super(text); init(); diff --git a/app/src/main/java/com/annimon/hotarufx/ui/control/ColorPickerBox.java b/app/src/main/java/com/annimon/hotarufx/ui/control/ColorPickerBox.java index 0cdcd6e..dad32ce 100644 --- a/app/src/main/java/com/annimon/hotarufx/ui/control/ColorPickerBox.java +++ b/app/src/main/java/com/annimon/hotarufx/ui/control/ColorPickerBox.java @@ -1,5 +1,6 @@ package com.annimon.hotarufx.ui.control; +import com.annimon.hotarufx.ui.FontAwesome; import com.annimon.hotarufx.ui.FontAwesomeIcon; import java.util.regex.Pattern; import javafx.beans.binding.Bindings; @@ -155,7 +156,7 @@ public class ColorPickerBox extends VBox { } }); final Button copyButton = new Button("Copy"); - copyButton.setGraphic(new FontAwesomeIcon("copy")); + copyButton.setGraphic(new FontAwesomeIcon(FontAwesome.COPY)); copyButton.setOnAction(e -> { final Clipboard clipboard = Clipboard.getSystemClipboard(); final ClipboardContent content = new ClipboardContent(); diff --git a/app/src/main/java/com/annimon/hotarufx/ui/controller/EditorController.java b/app/src/main/java/com/annimon/hotarufx/ui/controller/EditorController.java index 0aaddbb..e756016 100644 --- a/app/src/main/java/com/annimon/hotarufx/ui/controller/EditorController.java +++ b/app/src/main/java/com/annimon/hotarufx/ui/controller/EditorController.java @@ -8,6 +8,7 @@ import com.annimon.hotarufx.io.DocumentManager; import com.annimon.hotarufx.io.FileManager; import com.annimon.hotarufx.io.IOStream; import com.annimon.hotarufx.lib.Context; +import com.annimon.hotarufx.ui.FontAwesome; import com.annimon.hotarufx.ui.FontAwesomeIcon; import com.annimon.hotarufx.ui.RenderPreparer; import com.annimon.hotarufx.ui.SyntaxHighlighter; @@ -119,7 +120,7 @@ public class EditorController implements Initializable, DocumentListener { alert.initOwner(primaryStage); alert.initModality(Modality.APPLICATION_MODAL); alert.getDialogPane().setContent(new Group()); - val icon = new FontAwesomeIcon("question-circle"); + val icon = new FontAwesomeIcon(FontAwesome.QUESTION_CIRCLE); alert.getDialogPane().setGraphic(icon); return alert.showAndWait() .filter(b -> b == ButtonType.OK)