Merge pull request #483 from ThomasJClark/icon-thing

Fix the "X" button on sources and steps

Author: ThomasJClark

ui/src/main/resources/edu/wpi/grip/ui/GRIP.css

@@ -108,8 +108,6 @@ Button.add-source {
 
 Button.delete, Button.move-left, Button.move-right, .start-stoppable-button, .exception-witness-responder-button {
     -fx-padding: 0.2em 0.8em;
-    -fx-font-weight: bold;
-    -fx-text-fill: -fx-dark-color;
     -fx-pref-height: 2em;
     -fx-pref-width: 2em;
 }

ui/src/main/resources/edu/wpi/grip/ui/icons/delete.png

@@ -1,15 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<?import edu.wpi.grip.ui.util.DPIUtility?>
 <?import javafx.scene.control.*?>
+<?import javafx.scene.image.Image?>
 <?import javafx.scene.image.ImageView?>
 <?import javafx.scene.layout.*?>
-<?import edu.wpi.grip.ui.util.DPIUtility ?>
-
 <VBox fx:controller="edu.wpi.grip.ui.pipeline.StepController" fx:id="root" xmlns:fx="http://javafx.com/fxml/1"
       styleClass="step">
     <HBox>
-        <Button fx:id="deleteButton" onMouseClicked="#deleteStep" styleClass="delete" text="✕"
-                HBox.hgrow="NEVER">
+        <Button fx:id="deleteButton" onMouseClicked="#deleteStep" styleClass="delete" HBox.hgrow="NEVER">
+            <graphic>
+                <ImageView>
+                    <Image url="/edu/wpi/grip/ui/icons/delete.png"/>
+                    <fitWidth>
+                        <DPIUtility fx:constant="SMALL_ICON_SIZE"/>
+                    </fitWidth>
+                    <fitHeight>
+                        <DPIUtility fx:constant="SMALL_ICON_SIZE"/>
+                    </fitHeight>
+                </ImageView>
+            </graphic>
             <tooltip>
                 <Tooltip text="Delete Step"/>
             </tooltip>

ui/src/main/resources/edu/wpi/grip/ui/pipeline/Step.fxml

@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<?import edu.wpi.grip.ui.util.DPIUtility?>
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.Label?>
 <?import javafx.scene.control.Separator?>
+<?import javafx.scene.image.Image?>
+<?import javafx.scene.image.ImageView?>
 <?import javafx.scene.layout.*?>
 <VBox styleClass="source"
       fx:controller="edu.wpi.grip.ui.pipeline.source.SourceController"
@@ -12,7 +15,24 @@
             <top>
                 <HBox fx:id="controls" alignment="CENTER" spacing="2.0" styleClass="source-header-box"
                       BorderPane.alignment="CENTER">
-                    <Button onMouseClicked="#delete" styleClass="delete" text="✕"/>
+                    <Button onMouseClicked="#delete" styleClass="delete">
+                        <graphic>
+                            <ImageView>
+                                <Image url="/edu/wpi/grip/ui/icons/delete.png"/>
+                                <fitWidth>
+                                    <DPIUtility fx:constant="SMALL_ICON_SIZE"/>
+                                </fitWidth>
+                                <fitHeight>
+                                    <DPIUtility fx:constant="SMALL_ICON_SIZE"/>
+                                </fitHeight>
+                            </ImageView>
+                        </graphic>
+                    </Button>
+                    <Separator orientation="VERTICAL" visible="false">
+                        <prefWidth>
+                            <DPIUtility fx:constant="MINI_ICON_SIZE"/>
+                        </prefWidth>
+                    </Separator>
                     <Label fx:id="name" styleClass="source-name"/>
                     <Pane HBox.hgrow="ALWAYS"/>
                 </HBox>