diff --git a/main/ui/src/main/java/org/cryptomator/ui/controls/FontAwesome5Icon.java b/main/ui/src/main/java/org/cryptomator/ui/controls/FontAwesome5Icon.java index 742d29438..530123412 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/controls/FontAwesome5Icon.java +++ b/main/ui/src/main/java/org/cryptomator/ui/controls/FontAwesome5Icon.java @@ -5,12 +5,13 @@ package org.cryptomator.ui.controls; */ public enum FontAwesome5Icon { ANCHOR("\uF13D"), // - ARROW_ALT_UP("\uF357"), // + ARROW_UP("\uF062"), // CHECK("\uF00C"), // COG("\uF013"), // COGS("\uF085"), // COPY("\uF0C5"), // - EXCLAMATION("\uF12A"), + CROWN("\uF521"), // + EXCLAMATION("\uF12A"), // EXCLAMATION_CIRCLE("\uF06A"), // EXCLAMATION_TRIANGLE("\uF071"), // EYE("\uF06E"), // @@ -22,16 +23,15 @@ public enum FontAwesome5Icon { HDD("\uF0A0"), // KEY("\uF084"), // LINK("\uF0C1"), // - LOCK_ALT("\uF30D"), // - LOCK_OPEN_ALT("\uF3C2"), // + LOCK("\uF023"), // + LOCK_OPEN("\uF3C1"), // + MAGIC("\uF0D0"), // PLUS("\uF067"), // PRINT("\uF02F"), // QUESTION("\uF128"), // - SPARKLES("\uF890"), // SPINNER("\uF110"), // SYNC("\uF021"), // TIMES("\uF00D"), // - USER_CROWN("\uF6A4"), // WRENCH("\uF0AD"), // ; diff --git a/main/ui/src/main/java/org/cryptomator/ui/controls/FontAwesome5IconView.java b/main/ui/src/main/java/org/cryptomator/ui/controls/FontAwesome5IconView.java index a0c6618fa..6d131da27 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/controls/FontAwesome5IconView.java +++ b/main/ui/src/main/java/org/cryptomator/ui/controls/FontAwesome5IconView.java @@ -18,7 +18,7 @@ public class FontAwesome5IconView extends Text { private static final FontAwesome5Icon DEFAULT_GLYPH = FontAwesome5Icon.ANCHOR; private static final double DEFAULT_GLYPH_SIZE = 12.0; - private static final String FONT_PATH = "/css/fontawesome5-pro-solid.otf"; + private static final String FONT_PATH = "/css/fontawesome5-free-solid.otf"; private static final Font FONT; private ObjectProperty glyph = new SimpleObjectProperty<>(this, "glyph", DEFAULT_GLYPH); diff --git a/main/ui/src/main/java/org/cryptomator/ui/controls/NiceSecurePasswordField.java b/main/ui/src/main/java/org/cryptomator/ui/controls/NiceSecurePasswordField.java index 0a50f5322..d23951a4b 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/controls/NiceSecurePasswordField.java +++ b/main/ui/src/main/java/org/cryptomator/ui/controls/NiceSecurePasswordField.java @@ -32,7 +32,7 @@ public class NiceSecurePasswordField extends StackPane { iconContainer.getStyleClass().add(ICONS_STLYE_CLASS); StackPane.setAlignment(iconContainer, Pos.CENTER_RIGHT); - capsLockedIcon.setGlyph(FontAwesome5Icon.ARROW_ALT_UP); + capsLockedIcon.setGlyph(FontAwesome5Icon.ARROW_UP); capsLockedIcon.setGlyphSize(ICON_SIZE); capsLockedIcon.visibleProperty().bind(passwordField.capsLockedProperty()); capsLockedIcon.managedProperty().bind(passwordField.capsLockedProperty()); diff --git a/main/ui/src/main/java/org/cryptomator/ui/mainwindow/VaultDetailController.java b/main/ui/src/main/java/org/cryptomator/ui/mainwindow/VaultDetailController.java index dc77d04b5..7f25bdf62 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/mainwindow/VaultDetailController.java +++ b/main/ui/src/main/java/org/cryptomator/ui/mainwindow/VaultDetailController.java @@ -33,11 +33,11 @@ public class VaultDetailController implements FxController { private FontAwesome5Icon getGlyphForVaultState(VaultState state) { switch (state) { case LOCKED: - return FontAwesome5Icon.LOCK_ALT; + return FontAwesome5Icon.LOCK; case PROCESSING: return FontAwesome5Icon.SPINNER; case UNLOCKED: - return FontAwesome5Icon.LOCK_OPEN_ALT; + return FontAwesome5Icon.LOCK_OPEN; default: return FontAwesome5Icon.EXCLAMATION_TRIANGLE; } diff --git a/main/ui/src/main/java/org/cryptomator/ui/mainwindow/VaultListCellController.java b/main/ui/src/main/java/org/cryptomator/ui/mainwindow/VaultListCellController.java index 1575c128f..ec553c329 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/mainwindow/VaultListCellController.java +++ b/main/ui/src/main/java/org/cryptomator/ui/mainwindow/VaultListCellController.java @@ -25,11 +25,11 @@ public class VaultListCellController implements FxController { private FontAwesome5Icon getGlyphForVaultState(VaultState state) { switch (state) { case LOCKED: - return FontAwesome5Icon.LOCK_ALT; + return FontAwesome5Icon.LOCK; case PROCESSING: return FontAwesome5Icon.SPINNER; case UNLOCKED: - return FontAwesome5Icon.LOCK_OPEN_ALT; + return FontAwesome5Icon.LOCK_OPEN; default: return FontAwesome5Icon.EXCLAMATION_TRIANGLE; } diff --git a/main/ui/src/main/resources/css/fontawesome5-free-solid.otf b/main/ui/src/main/resources/css/fontawesome5-free-solid.otf new file mode 100644 index 000000000..7f130607c Binary files /dev/null and b/main/ui/src/main/resources/css/fontawesome5-free-solid.otf differ diff --git a/main/ui/src/main/resources/css/fontawesome5-pro-solid.otf b/main/ui/src/main/resources/css/fontawesome5-pro-solid.otf deleted file mode 100644 index 66ce2e49f..000000000 Binary files a/main/ui/src/main/resources/css/fontawesome5-pro-solid.otf and /dev/null differ diff --git a/main/ui/src/main/resources/fxml/addvault_welcome.fxml b/main/ui/src/main/resources/fxml/addvault_welcome.fxml index 06911a9f8..0be047ca4 100644 --- a/main/ui/src/main/resources/fxml/addvault_welcome.fxml +++ b/main/ui/src/main/resources/fxml/addvault_welcome.fxml @@ -29,7 +29,7 @@