Avoid erroneous MaterialDesignIconFactory

.gitignore

@@ -350,4 +350,4 @@ lib/ojdbc.jar
 !/buildSrc/src/main/groovy/org/jabref/build
 
 # do not ignore JabRef icons (they are ignored by the macos setting above)
-!gui/icon/**/*
+!src/main/java/org/jabref/gui/icon

src/main/java/org/jabref/gui/copyfiles/CopyFilesDialogView.java

@@ -7,13 +7,13 @@
 import javafx.scene.paint.Color;
 import javafx.scene.text.Text;
 
+import org.jabref.gui.icon.JabRefMaterialDesignIconFactory;
 import org.jabref.gui.util.BaseDialog;
 import org.jabref.gui.util.ValueTableCellFactory;
 import org.jabref.logic.l10n.Localization;
 
 import com.airhacks.afterburner.views.ViewLoader;
 import de.jensd.fx.glyphs.materialdesignicons.MaterialDesignIcon;
-import de.jensd.fx.glyphs.materialdesignicons.utils.MaterialDesignIconFactory;
 
 public class CopyFilesDialogView extends BaseDialog<Void> {
 
@@ -48,7 +48,7 @@ private void setupTable() {
         colFile.setCellFactory(new ValueTableCellFactory<CopyFilesResultItemViewModel, String>().withText(item -> item).withTooltip(item -> item));
         colStatus.setCellFactory(new ValueTableCellFactory<CopyFilesResultItemViewModel, MaterialDesignIcon>().withGraphic(item -> {
 
-            Text icon = MaterialDesignIconFactory.get().createIcon(item);
+            Text icon = JabRefMaterialDesignIconFactory.get().createIcon(item);
             if (item == MaterialDesignIcon.CHECK) {
                 icon.setFill(Color.GREEN);
             }

src/main/java/org/jabref/gui/fieldeditors/LinkedFilesEditor.java

@@ -30,6 +30,7 @@
 import org.jabref.gui.DragAndDropDataFormats;
 import org.jabref.gui.autocompleter.AutoCompleteSuggestionProvider;
 import org.jabref.gui.copyfiles.CopySingleFileAction;
+import org.jabref.gui.icon.JabRefMaterialDesignIconFactory;
 import org.jabref.gui.keyboard.KeyBinding;
 import org.jabref.gui.util.TaskExecutor;
 import org.jabref.gui.util.ViewModelListCellFactory;
@@ -43,7 +44,6 @@
 
 import com.airhacks.afterburner.views.ViewLoader;
 import de.jensd.fx.glyphs.materialdesignicons.MaterialDesignIcon;
-import de.jensd.fx.glyphs.materialdesignicons.utils.MaterialDesignIconFactory;
 
 public class LinkedFilesEditor extends HBox implements FieldEditorFX {
 
@@ -142,13 +142,13 @@ private static Node createFileDisplay(LinkedFileViewModel linkedFile) {
         info.setStyle("-fx-padding: 0.5em 0 0.5em 0;"); // To align with buttons below which also have 0.5em padding
         info.getChildren().setAll(icon, link, desc, progressIndicator);
 
-        Button acceptAutoLinkedFile = MaterialDesignIconFactory.get().createIconButton(MaterialDesignIcon.BRIEFCASE_CHECK);
+        Button acceptAutoLinkedFile = JabRefMaterialDesignIconFactory.get().createIconButton(MaterialDesignIcon.BRIEFCASE_CHECK);
         acceptAutoLinkedFile.setTooltip(new Tooltip(Localization.lang("This file was found automatically. Do you want to link it to this entry?")));
         acceptAutoLinkedFile.visibleProperty().bind(linkedFile.isAutomaticallyFoundProperty());
         acceptAutoLinkedFile.setOnAction(event -> linkedFile.acceptAsLinked());
         acceptAutoLinkedFile.getStyleClass().setAll("icon-button");
 
-        Button writeXMPMetadata = MaterialDesignIconFactory.get().createIconButton(MaterialDesignIcon.IMPORT);
+        Button writeXMPMetadata = JabRefMaterialDesignIconFactory.get().createIconButton(MaterialDesignIcon.IMPORT);
         writeXMPMetadata.setTooltip(new Tooltip(Localization.lang("Write BibTeXEntry as XMP-metadata to PDF.")));
         writeXMPMetadata.visibleProperty().bind(linkedFile.canWriteXMPMetadataProperty());
         writeXMPMetadata.setOnAction(event -> linkedFile.writeXMPMetadata());

src/main/java/org/jabref/gui/icon/IconTheme.java

@@ -209,6 +209,7 @@ public enum JabRefIcons implements JabRefIcon {
         EXPORT_TO_CLIPBOARD(MaterialDesignIcon.CLIPBOARD_ARROW_LEFT) /*css: clipboard-arrow-left */,
         ATTACH_FILE(MaterialDesignIcon.PAPERCLIP) /*css: paperclip*/,
         AUTO_FILE_LINK(MaterialDesignIcon.FILE_FIND) /*css: file-find */,
+        AUTO_LINKED_FILE(MaterialDesignIcon.BRIEFCASE_CHECK) /*css: briefcase-check */,
         QUALITY_ASSURED(MaterialDesignIcon.CERTIFICATE), /*css: certificate */
         QUALITY(MaterialDesignIcon.CERTIFICATE), /*css: certificate */
         OPEN(MaterialDesignIcon.FOLDER_OUTLINE) /*css: folder */,
@@ -251,6 +252,7 @@ public enum JabRefIcons implements JabRefIcon {
         FIND_DUPLICATES(MaterialDesignIcon.CODE_EQUAL), /*css: code-equal */
         CONNECT_DB(MaterialDesignIcon.CLOUD_UPLOAD), /*cloud-upload*/
         SUCCESS(MaterialDesignIcon.CHECK_CIRCLE),
+        CHECK(MaterialDesignIcon.CHECK) /*css: check */,
         WARNING(MaterialDesignIcon.ALERT),
         ERROR(MaterialDesignIcon.ALERT_CIRCLE),
         CASE_SENSITIVE(MaterialDesignIcon.ALPHABETICAL), /* css: mdi-alphabetical */
@@ -292,7 +294,8 @@ public enum JabRefIcons implements JabRefIcon {
         LATEX_FILE(MaterialDesignIcon.FILE_OUTLINE),
         LATEX_COMMENT(MaterialDesignIcon.COMMENT_TEXT_OUTLINE),
         LATEX_LINE(MaterialDesignIcon.FORMAT_LINE_SPACING),
-        PASSWORD_REVEALED(MaterialDesignIcon.EYE);
+        PASSWORD_REVEALED(MaterialDesignIcon.EYE),
+        ALL_ENTRIES_GROUP_DEFAULT_ICON(MaterialDesignIcon.DATABASE);
 
         private final JabRefIcon icon;
 

src/main/java/org/jabref/gui/icon/JabRefMaterialDesignIconFactory.java

@@ -0,0 +1,51 @@
+package org.jabref.gui.icon;
+
+import javafx.scene.control.Button;
+import javafx.scene.text.Text;
+
+import de.jensd.fx.glyphs.GlyphIcon;
+import de.jensd.fx.glyphs.GlyphIcons;
+import de.jensd.fx.glyphs.materialdesignicons.MaterialDesignIcon;
+import de.jensd.fx.glyphs.materialdesignicons.MaterialDesignIconView;
+
+/**
+ Custom Factory class as a workaround for using de.jensd.fx.glyphs.materialdesignicons.utils.MaterialDesignIconFactory because of the following issue: https://github.com/JabRef/jabref/issues/5245
+ If fixed, use de.jensd.fx.glyphs.materialdesignicons.utils.MaterialDesignIconFactory again and delete this class
+ */
+public class JabRefMaterialDesignIconFactory {
+
+    private static JabRefMaterialDesignIconFactory me;
+
+    private JabRefMaterialDesignIconFactory() { }
+
+    public static JabRefMaterialDesignIconFactory get() {
+        if (me == null) {
+            me = new JabRefMaterialDesignIconFactory();
+        }
+        return me;
+    }
+
+    public Button createIconButton(GlyphIcons icon) {
+        Text label = createIcon(icon, GlyphIcon.DEFAULT_FONT_SIZE);
+        Button button = new Button();
+        button.setGraphic(label);
+        return button;
+    }
+
+    public Text createIcon(GlyphIcons icon) {
+        return createIcon(icon, GlyphIcon.DEFAULT_FONT_SIZE);
+    }
+
+    public Text createIcon(GlyphIcons icon, String iconSize) {
+        if (icon instanceof MaterialDesignIcon) {
+            // workaround for not using MaterialDesignIconFactory
+            return new MaterialDesignIconView((MaterialDesignIcon) icon, iconSize);
+        } else {
+            // default case copied from GlyphsFactory
+            Text text = new Text(icon.unicode());
+            text.getStyleClass().add("glyph-icon");
+            text.setStyle(String.format("-fx-font-family: %s; -fx-font-size: %s;", icon.fontFamily(), iconSize));
+            return text;
+        }
+    }
+}

src/main/java/org/jabref/gui/util/ViewModelListCellFactory.java

@@ -18,10 +18,10 @@
 import javafx.scene.text.Text;
 import javafx.util.Callback;
 
+import org.jabref.gui.icon.JabRefMaterialDesignIconFactory;
 import org.jabref.model.strings.StringUtil;
 
 import de.jensd.fx.glyphs.GlyphIcons;
-import de.jensd.fx.glyphs.materialdesignicons.utils.MaterialDesignIconFactory;
 
 /**
  * Constructs a {@link ListCell} based on the view model of the row and a bunch of specified converter methods.
@@ -57,7 +57,7 @@ public ViewModelListCellFactory<T> withIcon(Callback<T, GlyphIcons> toIcon) {
         this.toGraphic = viewModel -> {
             GlyphIcons icon = toIcon.call(viewModel);
             if (icon != null) {
-                return MaterialDesignIconFactory.get().createIcon(icon);
+                return JabRefMaterialDesignIconFactory.get().createIcon(icon);
             }
             return null;
         };
@@ -66,7 +66,7 @@ public ViewModelListCellFactory<T> withIcon(Callback<T, GlyphIcons> toIcon) {
 
     public ViewModelListCellFactory<T> withIcon(Callback<T, GlyphIcons> toIcon, Callback<T, Paint> toColor) {
         this.toGraphic = viewModel -> {
-            Text graphic = MaterialDesignIconFactory.get().createIcon(toIcon.call(viewModel));
+            Text graphic = JabRefMaterialDesignIconFactory.get().createIcon(toIcon.call(viewModel));
             graphic.setFill(toColor.call(viewModel));
             return graphic;
         };