Merge branch 'feature/removeFontAwesome2' into feature/#92_word_notes_dialog

ddamke · ddamke · commit a6b1926921eb · 2022-10-14T14:07:55.000+02:00
diff --git a/src/main/java/de/doubleslash/keeptime/common/SvgNodeProvider.java b/src/main/java/de/doubleslash/keeptime/common/SvgNodeProvider.java
@@ -1,6 +1,5 @@
 package de.doubleslash.keeptime.common;
 
-import javafx.geometry.Bounds;
 import javafx.scene.Node;
 import javafx.scene.shape.SVGPath;
 import org.w3c.dom.Document;
@@ -14,41 +13,40 @@
 import java.io.InputStream;
 
 /**
- * class loads SvgPath from a SvgFile because Java can not load the original svg file as it is. <p>
+ * class loads SvgPath from a SvgFile because Java can not load the original svg file as it is.
+ * <p>
  * To load the svg the class extracts the path as string and creates a new SvgPath and returns it.
  */
 
 public class SvgNodeProvider {
 
-    private static String getSvgPathWithXMl(Resources.RESOURCE resource) {
-        String svgPath;
-        Document document;
-        DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
-        DocumentBuilder db;
-
-        try {
-            db = dbf.newDocumentBuilder();
-        } catch (ParserConfigurationException e) {
-            throw new RuntimeException(e + "Tried to build new document");
-        }
-
-        try (InputStream inputStream = Resources.getResource(resource).openStream()) {
-            document = db.parse(inputStream);
-            NodeList nodeList = document.getElementsByTagName("path");
-            svgPath = nodeList.item(0).getAttributes().getNamedItem("d").getNodeValue();
-        } catch (IOException | SAXException e) {
-            throw new RuntimeException(e + " ");
-        }
-        return svgPath;
-    }
-
-    public static Node getSvgNode(Resources.RESOURCE resource){
-        SVGPath IconSvg = new SVGPath();
-        IconSvg.setContent(getSvgPathWithXMl(resource));
-        Bounds bounds = IconSvg.getBoundsInParent();
-        double scale = Math.min(15 / bounds.getWidth(), 15 / bounds.getHeight());
-        IconSvg.setScaleX(scale);
-        IconSvg.setScaleY(scale);
-        return IconSvg;
-    }
+   public static String getSvgPathWithXMl(Resources.RESOURCE resource) {
+      String svgPath;
+      Document document;
+      DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+      DocumentBuilder db;
+
+      try {
+         db = dbf.newDocumentBuilder();
+      } catch (ParserConfigurationException e) {
+         throw new RuntimeException("Tried to build new document", e);
+      }
+
+      try (InputStream inputStream = Resources.getResource(resource).openStream()) {
+         document = db.parse(inputStream);
+         NodeList nodeList = document.getElementsByTagName("path");
+         svgPath = nodeList.item(0).getAttributes().getNamedItem("d").getNodeValue();
+      } catch (IOException | SAXException e) {
+         throw new RuntimeException("Could not extract SvgPath from resource " + resource, e);
+      }
+      return svgPath;
+   }
+
+   public static Node getSvgNodeWithScale(Resources.RESOURCE resource, Double scaleX , Double scaleY) {
+      SVGPath iconSvg = new SVGPath();
+      iconSvg.setContent(getSvgPathWithXMl(resource));
+      iconSvg.setScaleX(scaleX);
+      iconSvg.setScaleY(scaleY);
+      return iconSvg;
+   }
 }
diff --git a/src/main/java/de/doubleslash/keeptime/view/ReportController.java b/src/main/java/de/doubleslash/keeptime/view/ReportController.java
@@ -270,11 +270,10 @@ public void updateItem(final LocalDate item, final boolean empty) {
 
    private Button createDeleteWorkButton(final Work w) {
       final Button deleteButton;
-      deleteButton = new Button("", SvgNodeProvider.getSvgNode(RESOURCE.SVG_TRASH_ICON));
+      deleteButton = new Button("", SvgNodeProvider.getSvgNodeWithScale(RESOURCE.SVG_TRASH_ICON,0.03,0.03));
       deleteButton.setMaxSize(20, 18);
       deleteButton.setMinSize(20, 18);
       deleteButton.setContentDisplay(ContentDisplay.GRAPHIC_ONLY);
-
       deleteButton.setOnAction(e -> {
          LOG.info("Delete work clicked.");
          final Alert alert = new Alert(AlertType.CONFIRMATION);
@@ -296,7 +295,7 @@ private Button createDeleteWorkButton(final Work w) {
    }
 
    private Button createEditWorkButton(final Work work) {
-      final Button editButton = new Button("",SvgNodeProvider.getSvgNode(RESOURCE.SVG_PENCIL_ICON));
+      final Button editButton = new Button("",SvgNodeProvider.getSvgNodeWithScale(RESOURCE.SVG_PENCIL_ICON, 0.03 ,0.03));
       editButton.setMaxSize(20, 18);
       editButton.setMinSize(20, 18);
       editButton.setContentDisplay(ContentDisplay.GRAPHIC_ONLY);
@@ -356,7 +355,7 @@ private GridPane setUpEditWorkGridPane(final Work work, final Dialog<Work> dialo
    }
 
    private Button createCopyProjectButton(final List<Work> projectWork) {
-      final Button copyButton = new Button("", SvgNodeProvider.getSvgNode(RESOURCE.SVG_FLOPPY_DISK_ICON));
+      final Button copyButton = new Button("", SvgNodeProvider.getSvgNodeWithScale(RESOURCE.SVG_FLOPPY_DISK_ICON, 0.03 ,0.03));
       copyButton.setMaxSize(20, 18);
       copyButton.setMinSize(20, 18);
       copyButton.setContentDisplay(ContentDisplay.GRAPHIC_ONLY);
@@ -379,7 +378,7 @@ private Button createCopyProjectButton(final List<Work> projectWork) {
    }
 
    private Node createCopyWorkButton(final Work w) {
-      final Button copyButton = new Button("", SvgNodeProvider.getSvgNode(RESOURCE.SVG_FLOPPY_DISK_ICON));
+      final Button copyButton = new Button("", SvgNodeProvider.getSvgNodeWithScale(RESOURCE.SVG_FLOPPY_DISK_ICON, 0.03 ,0.03));
       copyButton.setMaxSize(20, 18);
       copyButton.setMinSize(20, 18);
       copyButton.setContentDisplay(ContentDisplay.GRAPHIC_ONLY);
diff --git a/src/main/java/de/doubleslash/keeptime/view/ViewController.java b/src/main/java/de/doubleslash/keeptime/view/ViewController.java
@@ -113,6 +113,18 @@ public class ViewController {
    @FXML
    private Button calendarButton;
 
+   @FXML
+   private SVGPath calendarIcon;
+
+   @FXML
+   private SVGPath settingsIcon;
+
+   @FXML
+   private SVGPath minimizeIcon;
+
+   @FXML
+   private SVGPath closeIcon;
+
    @FXML
    private TextArea textArea;
 
@@ -185,28 +197,16 @@ private void initialize() {
       calendarButton.setOnAction(ae -> calendarClicked());
 
       calendarButton.textFillProperty().bind(fontColorProperty);
-      calendarButton.setMaxSize(30, 30);
-      calendarButton.setMinSize(30, 30);
-      calendarButton.setContentDisplay(ContentDisplay.GRAPHIC_ONLY);
-      calendarButton.setGraphic(SvgNodeProvider.getSvgNode(RESOURCE.SVG_CALENDAR_DAYS_ICON));
+      calendarButton.setGraphic(SvgNodeProvider.getSvgNodeWithScale(RESOURCE.SVG_CALENDAR_DAYS_ICON, 0.03 ,0.03));
 
       closeButton.textFillProperty().bind(fontColorProperty);
-      closeButton.setMaxSize(30, 30);
-      closeButton.setMinSize(30, 30);
-      closeButton.setContentDisplay(ContentDisplay.GRAPHIC_ONLY);
-      closeButton.setGraphic(SvgNodeProvider.getSvgNode(RESOURCE.SVG_CLOSE_ICON));
+      closeButton.setGraphic(SvgNodeProvider.getSvgNodeWithScale(RESOURCE.SVG_CLOSE_ICON, 0.03 ,0.03));
 
       settingsButton.textFillProperty().bind(fontColorProperty);
-      settingsButton.setMaxSize(30, 30);
-      settingsButton.setMinSize(30, 30);
-      settingsButton.setContentDisplay(ContentDisplay.GRAPHIC_ONLY);
-      settingsButton.setGraphic(SvgNodeProvider.getSvgNode(RESOURCE.SVG_SETTINGS_ICON));
+      settingsButton.setGraphic(SvgNodeProvider.getSvgNodeWithScale(RESOURCE.SVG_SETTINGS_ICON, 0.03 ,0.03));
 
       minimizeButton.textFillProperty().bind(fontColorProperty);
-      minimizeButton.setMaxSize(30, 30);
-      minimizeButton.setMinSize(30, 30);
-      minimizeButton.setContentDisplay(ContentDisplay.GRAPHIC_ONLY);
-      minimizeButton.setGraphic(SvgNodeProvider.getSvgNode(RESOURCE.SVG_MINUS_ICON));
+      minimizeButton.setGraphic(SvgNodeProvider.getSvgNodeWithScale(RESOURCE.SVG_MINUS_ICON , 0.03 ,0.03));
 
       final Runnable updateMainBackgroundColor = this::runUpdateMainBackgroundColor;
 
diff --git a/src/main/resources/layouts/ViewLayout.fxml b/src/main/resources/layouts/ViewLayout.fxml
@@ -30,7 +30,7 @@
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.text.Font?>
 
-<Pane fx:id="pane" prefHeight="175.0" style="-fx-background-color: rgba(54,143,179,0.01); -fx-background-radius: 10 10 10 10; -fx-border-radius: 10 10 10 10; -fx-border-color: rgba(54,143,179,.0.01);" xmlns="http://javafx.com/javafx/8.0.202-ea" xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.doubleslash.keeptime.view.ViewController">
+<Pane fx:id="pane" prefHeight="175.0" style="-fx-background-color: rgba(54,143,179,0.01); -fx-background-radius: 10 10 10 10; -fx-border-radius: 10 10 10 10; -fx-border-color: rgba(54,143,179,.0.01);" xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.doubleslash.keeptime.view.ViewController">
    <children>
       <BorderPane fx:id="borderPane" layoutX="5.0" layoutY="-15.0">
          <center>
@@ -50,10 +50,8 @@
                      <center>
                         <HBox alignment="CENTER" prefHeight="36.0">
                            <children>
-                              <Button fx:id="calendarButton" mnemonicParsing="false" prefHeight="25.0" prefWidth="22.0" stylesheets="@../css/application.css">
-                              </Button>
-                              <Button fx:id="settingsButton" mnemonicParsing="false" prefHeight="25.0" prefWidth="22.0" stylesheets="@../css/application.css">
-                              </Button>
+                              <Button fx:id="calendarButton" contentDisplay="GRAPHIC_ONLY" maxHeight="30.0" maxWidth="30.0" minHeight="30" minWidth="30" mnemonicParsing="false" prefHeight="25.0" prefWidth="22.0" stylesheets="@../css/application.css" />
+                              <Button fx:id="settingsButton" contentDisplay="GRAPHIC_ONLY" maxHeight="30.0" maxWidth="30.0" minHeight="30.0" minWidth="30.0" mnemonicParsing="false" prefHeight="25.0" prefWidth="22.0" stylesheets="@../css/application.css" />
                            </children>
                         </HBox>
                      </center>
@@ -78,12 +76,12 @@
                         <Font name="Open Sans Regular" size="14.0" />
                      </font>
                   </TextArea>
-                  <Button fx:id="minimizeButton" layoutX="243.0" layoutY="8.0" mnemonicParsing="false" stylesheets="@../css/application.css">
+                  <Button fx:id="minimizeButton" layoutX="239.0" layoutY="9.0" maxHeight="30.0" maxWidth="30.0" minHeight="20.0" minWidth="20.0" mnemonicParsing="false" prefHeight="30.0" prefWidth="30.0" stylesheets="@../css/application.css">
                      <font>
                         <Font name="Open Sans Regular" size="12.0" />
                      </font>
                      </Button>
-                  <Button fx:id="closeButton" layoutX="266.0" layoutY="8.0" mnemonicParsing="false" stylesheets="@../css/application.css">
+                  <Button fx:id="closeButton" layoutX="262.0" layoutY="9.0" maxHeight="30.0" maxWidth="30.0" minHeight="20.0" minWidth="20.0" mnemonicParsing="false" prefHeight="30.0" prefWidth="30.0" stylesheets="@../css/application.css">
                      <font>
                         <Font name="Open Sans Regular" size="12.0" />
                      </font>
